diff --git a/.gitattributes b/.gitattributes
index 5e7ce3d7279..a1918ad4c2a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,4 @@
 docker/**/*.sh text eol=lf
 *.svg binary
 *.ipynb binary
+*.geojson binary
diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index 124392ca875..b13dfedbd6f 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -41,8 +41,8 @@ body:
       label: Superset version
       options:
         - master / latest-dev
+        - "5.0.0"
         - "4.1.2"
-        - "4.0.2"
     validations:
       required: true
   - type: dropdown
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 0bfb116dcbd..40a5c18be56 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -12,6 +12,10 @@ updates:
       # not until React >= 18.0.0
       - dependency-name: "storybook"
       - dependency-name: "@storybook*"
+      # JSDOM v30 doesn't play well with Jest v30
+      # Source: https://jestjs.io/blog#known-issues
+      # GH thread: https://github.com/jsdom/jsdom/issues/3492
+      - dependency-name: "jest-environment-jsdom"
     directory: "/superset-frontend/"
     schedule:
       interval: "monthly"
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index df36d2f546d..91417cc86a5 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -111,6 +111,9 @@ jobs:
           docker compose up superset-init --exit-code-from superset-init
 
   docker-compose-image-tag:
+    # Run this job only on pushes to master (not for PRs)
+    # goal is to check that building the latest image works, not required for all PR pushes
+    if: github.event_name == 'push' && github.ref == 'refs/heads/master'
     runs-on: ubuntu-24.04
     steps:
       - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index 9c3ed206289..ec7031e5081 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -53,6 +53,14 @@ jobs:
           cd docs
           yarn install --immutable
 
+      - name: Cache pre-commit environments
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/pre-commit
+          key: pre-commit-v2-${{ runner.os }}-py${{ matrix.python-version }}-${{ hashFiles('.pre-commit-config.yaml') }}
+          restore-keys: |
+            pre-commit-v2-${{ runner.os }}-py${{ matrix.python-version }}-
+
       - name: pre-commit
         run: |
           set +e  # Don't exit immediately on failure
diff --git a/.github/workflows/superset-e2e.yml b/.github/workflows/superset-e2e.yml
index 6997abf408a..7c77f323df6 100644
--- a/.github/workflows/superset-e2e.yml
+++ b/.github/workflows/superset-e2e.yml
@@ -73,6 +73,7 @@ jobs:
         with:
           persist-credentials: false
           submodules: recursive
+          ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
       - name: Checkout using ref (workflow_dispatch)
         if: github.event_name == 'workflow_dispatch' && github.event.inputs.ref != ''
         uses: actions/checkout@v4
@@ -137,9 +138,16 @@ jobs:
           NODE_OPTIONS: "--max-old-space-size=4096"
         with:
           run: cypress-run-all ${{ env.USE_DASHBOARD }} ${{ matrix.app_root }}
+      - name: Set safe app root
+        if: failure()
+        id: set-safe-app-root
+        run: |
+          APP_ROOT="${{ matrix.app_root }}"
+          SAFE_APP_ROOT=${APP_ROOT//\//_}
+          echo "safe_app_root=$SAFE_APP_ROOT" >> $GITHUB_OUTPUT
       - name: Upload Artifacts
         uses: actions/upload-artifact@v4
         if: failure()
         with:
           path: ${{ github.workspace }}/superset-frontend/cypress-base/cypress/screenshots
-          name: cypress-artifact-${{ github.run_id }}-${{ github.job }}-${{ matrix.browser }}-${{ matrix.parallel_id }}
+          name: cypress-artifact-${{ github.run_id }}-${{ github.job }}-${{ matrix.browser }}-${{ matrix.parallel_id }}--${{ steps.set-safe-app-root.outputs.safe_app_root }}
diff --git a/.github/workflows/superset-frontend.yml b/.github/workflows/superset-frontend.yml
index 6e1c494a045..3665c6f0591 100644
--- a/.github/workflows/superset-frontend.yml
+++ b/.github/workflows/superset-frontend.yml
@@ -26,6 +26,8 @@ jobs:
         uses: actions/checkout@v4
         with:
           persist-credentials: false
+          fetch-depth: 0
+          ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
 
       - name: Check for File Changes
         id: check
@@ -39,6 +41,10 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
+          echo "git rev-parse --short HEAD"
+          git rev-parse --short HEAD
+          echo "git show -s --format=raw HEAD"
+          git show -s --format=raw HEAD
           docker buildx build \
             -t $TAG \
             --cache-from=type=registry,ref=apache/superset-cache:3.10-slim-bookworm \
@@ -115,24 +121,6 @@ jobs:
           files: merged-output/coverage-summary.json
           slug: apache/superset
 
-  core-cover:
-    needs: frontend-build
-    if: needs.frontend-build.outputs.should-run == 'true'
-    runs-on: ubuntu-24.04
-    steps:
-      - name: Download Docker Image Artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: docker-image
-
-      - name: Load Docker Image
-        run: docker load < docker-image.tar.gz
-
-      - name: superset-ui/core coverage
-        run: |
-          docker run --rm $TAG bash -c \
-          "npm run core:cover"
-
   lint-frontend:
     needs: frontend-build
     if: needs.frontend-build.outputs.should-run == 'true'
@@ -144,7 +132,8 @@ jobs:
           name: docker-image
 
       - name: Load Docker Image
-        run: docker load < docker-image.tar.gz
+        run: |
+          docker load < docker-image.tar.gz
 
       - name: eslint
         run: |
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 228d305325b..0b93b4f96f6 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -58,7 +58,7 @@ repos:
       - id: prettier
         additional_dependencies:
           - prettier@3.5.3
-        args: ["--ignore-path=./superset-frontend/.prettierignore"]
+        args: ["--ignore-path=./superset-frontend/.prettierignore", "--exclude", "site-packages"]
         files: "superset-frontend"
   - repo: local
     hooks:
@@ -100,3 +100,22 @@ repos:
       - id: ruff
         args: [--fix]
       - id: ruff-format
+  - repo: local
+    hooks:
+    - id: pylint
+      name: pylint with custom Superset plugins
+      entry: bash
+      language: system
+      types: [python]
+      exclude: ^(tests/|superset/migrations/|scripts/|RELEASING/|docker/)
+      args:
+        - -c
+        - |
+          TARGET_BRANCH=${GITHUB_BASE_REF:-master}
+          git fetch origin "$TARGET_BRANCH"
+          files=$(git diff --name-only --diff-filter=ACM origin/"$TARGET_BRANCH"..HEAD | grep '^superset/.*\.py$' || true)
+          if [ -n "$files" ]; then
+            pylint --rcfile=.pylintrc --load-plugins=superset.extensions.pylint $files
+          else
+            echo "No Python files to lint."
+          fi
diff --git a/.pylintrc b/.pylintrc
new file mode 100644
index 00000000000..80b5ef5f668
--- /dev/null
+++ b/.pylintrc
@@ -0,0 +1,355 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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.
+#
+[MASTER]
+
+# Specify a configuration file.
+#rcfile=
+
+# Python code to execute, usually for sys.path manipulation such as
+# pygtk.require().
+#init-hook=
+
+# Add files or directories to the blacklist. They should be base names, not
+# paths.
+ignore=CVS,migrations
+
+# Add files or directories matching the regex patterns to the blacklist. The
+# regex matches against base names, not paths.
+ignore-patterns=
+
+# Pickle collected data for later comparisons.
+persistent=yes
+
+# List of plugins (as comma separated values of python modules names) to load,
+# usually to register additional checkers.
+load-plugins=superset.extensions.pylint
+
+# Use multiple processes to speed up Pylint.
+jobs=2
+
+# Allow loading of arbitrary C extensions. Extensions are imported into the
+# active Python interpreter and may run arbitrary code.
+unsafe-load-any-extension=no
+
+# A comma-separated list of package or module names from where C extensions may
+# be loaded. Extensions are loading into the active Python interpreter and may
+# run arbitrary code
+extension-pkg-whitelist=pyarrow
+
+
+[MESSAGES CONTROL]
+disable=all
+enable=disallowed-json-import,disallowed-sql-import,consider-using-transaction
+
+
+[REPORTS]
+
+# Set the output format. Available formats are text, parseable, colorized, msvs
+# (visual studio) and html. You can also give a reporter class, eg
+# mypackage.mymodule.MyReporterClass.
+output-format=text
+
+# Tells whether to display a full report or only the messages
+reports=yes
+
+# Python expression which should return a note less than 10 (10 is the highest
+# note). You have access to the variables errors warning, statement which
+# respectively contain the number of errors / warnings messages and the total
+# number of statements analyzed. This is used by the global evaluation report
+# (RP0004).
+evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
+
+# Template used to display messages. This is a python new-style format string
+# used to format the message information. See doc for all details
+#msg-template=
+
+
+[BASIC]
+
+# Good variable names which should always be accepted, separated by a comma
+good-names=_,df,ex,f,i,id,j,k,l,o,pk,Run,ts,v,x,y
+
+# Bad variable names which should always be refused, separated by a comma
+bad-names=bar,baz,db,fd,foo,sesh,session,tata,toto,tutu
+
+# Colon-delimited sets of names that determine each other's naming style when
+# the name regexes allow several styles.
+name-group=
+
+# Include a hint for the correct naming format with invalid-name
+include-naming-hint=no
+
+# List of decorators that produce properties, such as abc.abstractproperty. Add
+# to this list to register other decorators that produce valid properties.
+property-classes=
+    abc.abstractproperty,
+    sqlalchemy.ext.hybrid.hybrid_property
+
+# Regular expression matching correct argument names
+argument-rgx=[a-z_][a-z0-9_]{2,30}$
+
+# Regular expression matching correct method names
+method-rgx=[a-z_][a-z0-9_]{2,30}$
+
+# Regular expression matching correct variable names
+variable-rgx=[a-z_][a-z0-9_]{1,30}$
+
+# Regular expression matching correct inline iteration names
+inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$
+
+# Regular expression matching correct constant names
+const-rgx=(([A-Za-z_][A-Za-z0-9_]*)|(__.*__))$
+
+# Regular expression matching correct class names
+class-rgx=[A-Z_][a-zA-Z0-9]+$
+
+# Regular expression matching correct class attribute names
+class-attribute-rgx=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$
+
+# Regular expression matching correct module names
+module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
+
+# Regular expression matching correct attribute names
+attr-rgx=[a-z_][a-z0-9_]{2,30}$
+
+# Regular expression matching correct function names
+function-rgx=[a-z_][a-z0-9_]{2,30}$
+
+# Regular expression which should only match function or class names that do
+# not require a docstring.
+no-docstring-rgx=^_
+
+# Minimum line length for functions/classes that require docstrings, shorter
+# ones are exempt.
+docstring-min-length=10
+
+
+[ELIF]
+
+# Maximum number of nested blocks for function / method body
+max-nested-blocks=5
+
+
+[FORMAT]
+
+# Maximum number of characters on a single line.
+max-line-length=100
+
+# Regexp for a line that is allowed to be longer than the limit.
+ignore-long-lines=^\s*(# )?<?https?://\S+>?$
+
+# Allow the body of an if to be on the same line as the test if there is no
+# else.
+single-line-if-stmt=no
+
+# Maximum number of lines in a module
+max-module-lines=1000
+
+# String used as indentation unit. This is usually "    " (4 spaces) or "\t" (1
+# tab).
+indent-string='    '
+
+# Number of spaces of indent required inside a hanging  or continued line.
+indent-after-paren=4
+
+# Expected format of line ending, e.g. empty (any line ending), LF or CRLF.
+expected-line-ending-format=
+
+
+[LOGGING]
+
+# Logging modules to check that the string format arguments are in logging
+# function parameter format
+logging-modules=logging
+
+
+[MISCELLANEOUS]
+
+# List of note tags to take in consideration, separated by a comma.
+notes=FIXME,XXX
+
+
+[SIMILARITIES]
+
+# Minimum lines number of a similarity.
+min-similarity-lines=5
+
+# Ignore comments when computing similarities.
+ignore-comments=yes
+
+# Ignore docstrings when computing similarities.
+ignore-docstrings=yes
+
+# Ignore imports when computing similarities.
+ignore-imports=no
+
+
+[SPELLING]
+
+# Spelling dictionary name. Available dictionaries: none. To make it working
+# install python-enchant package.
+spelling-dict=
+
+# List of comma separated words that should not be checked.
+spelling-ignore-words=
+
+# A path to a file that contains private dictionary; one word per line.
+spelling-private-dict-file=
+
+# Tells whether to store unknown words to indicated private dictionary in
+# --spelling-private-dict-file option instead of raising a message.
+spelling-store-unknown-words=no
+
+
+[TYPECHECK]
+
+# Tells whether missing members accessed in mixin class should be ignored. A
+# mixin class is detected if its name ends with "mixin" (case insensitive).
+ignore-mixin-members=yes
+
+# List of module names for which member attributes should not be checked
+# (useful for modules/projects where namespaces are manipulated during runtime
+# and thus existing member attributes cannot be deduced by static analysis. It
+# supports qualified module names, as well as Unix pattern matching.
+ignored-modules=numpy,pandas,alembic.op,sqlalchemy,alembic.context,flask_appbuilder.security.sqla.PermissionView.role,flask_appbuilder.Model.metadata,flask_appbuilder.Base.metadata
+
+# List of class names for which member attributes should not be checked (useful
+# for classes with dynamically set attributes). This supports the use of
+# qualified names.
+ignored-classes=contextlib.closing,optparse.Values,thread._local,_thread._local
+
+# List of members which are set dynamically and missed by pylint inference
+# system, and so shouldn't trigger E1101 when accessed. Python regular
+# expressions are accepted.
+generated-members=
+
+# List of decorators that produce context managers, such as
+# contextlib.contextmanager. Add to this list to register other decorators that
+# produce valid context managers.
+contextmanager-decorators=contextlib.contextmanager
+
+
+[VARIABLES]
+
+# Tells whether we should check for unused import in __init__ files.
+init-import=no
+
+# A regular expression matching the name of dummy variables (i.e. expectedly
+# not used).
+dummy-variables-rgx=(_+[a-zA-Z0-9]*?$)|dummy
+
+# List of additional names supposed to be defined in builtins. Remember that
+# you should avoid to define new builtins when possible.
+additional-builtins=
+
+# List of strings which can identify a callback function by name. A callback
+# name must start or end with one of those strings.
+callbacks=cb_,_cb
+
+# List of qualified module names which can have objects that can redefine
+# builtins.
+redefining-builtins-modules=six.moves,future.builtins
+
+
+[CLASSES]
+
+# List of method names used to declare (i.e. assign) instance attributes.
+defining-attr-methods=__init__,__new__,setUp
+
+# List of valid names for the first argument in a class method.
+valid-classmethod-first-arg=cls
+
+# List of valid names for the first argument in a metaclass class method.
+valid-metaclass-classmethod-first-arg=mcs
+
+# List of member names, which should be excluded from the protected access
+# warning.
+exclude-protected=_asdict,_fields,_replace,_source,_make
+
+
+[DESIGN]
+
+# Maximum number of arguments for function / method
+max-args=5
+
+# Argument names that match this expression will be ignored. Default to name
+# with leading underscore
+ignored-argument-names=_.*
+
+# Maximum number of locals for function / method body
+max-locals=15
+
+# Maximum number of return / yield for function / method body
+max-returns=10
+
+# Maximum number of branch for function / method body
+max-branches=15
+
+# Maximum number of statements in function / method body
+max-statements=50
+
+# Maximum number of parents for a class (see R0901).
+max-parents=7
+
+# Maximum number of attributes for a class (see R0902).
+max-attributes=8
+
+# Minimum number of public methods for a class (see R0903).
+min-public-methods=2
+
+# Maximum number of public methods for a class (see R0904).
+max-public-methods=20
+
+# Maximum number of boolean expressions in a if statement
+max-bool-expr=5
+
+
+[IMPORTS]
+
+# Deprecated modules which should not be used, separated by a comma
+deprecated-modules=optparse
+
+# Create a graph of every (i.e. internal and external) dependencies in the
+# given file (report RP0402 must not be disabled)
+import-graph=
+
+# Create a graph of external dependencies in the given file (report RP0402 must
+# not be disabled)
+ext-import-graph=
+
+# Create a graph of internal dependencies in the given file (report RP0402 must
+# not be disabled)
+int-import-graph=
+
+# Force import order to recognize a module as part of the standard
+# compatibility libraries.
+known-standard-library=
+
+# Force import order to recognize a module as part of a third party library.
+known-third-party=enchant
+
+# Analyse import fallback blocks. This can be used to support both Python 2 and
+# 3 compatible code, which means that the block might have code that exists
+# only in one or another interpreter, leading to false positives when analysed.
+analyse-fallback-blocks=no
+
+
+[EXCEPTIONS]
+
+# Exceptions that will emit a warning when being caught. Defaults to
+# "Exception"
+overgeneral-exceptions=builtins.Exception
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f00ba2d39f0..9e8f17c823d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -44,3 +44,4 @@ under the License.
 - [4.0.1](./CHANGELOG/4.0.1.md)
 - [4.0.2](./CHANGELOG/4.0.2.md)
 - [4.1.0](./CHANGELOG/4.1.0.md)
+- [5.0.0](./CHANGELOG/5.0.0.md)
diff --git a/CHANGELOG/5.0.0.md b/CHANGELOG/5.0.0.md
new file mode 100644
index 00000000000..fe68f211ef7
--- /dev/null
+++ b/CHANGELOG/5.0.0.md
@@ -0,0 +1,937 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you 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.
+-->
+
+## Change Log
+
+### 5.0.0 (Wed Jun 18 13:54:10 2025 -0300)
+
+**Database Migrations**
+
+- [#31959](https://github.com/apache/superset/pull/31959) refactor: upload data unification, less permissions and less endpoints (@dpgaspar)
+- [#31582](https://github.com/apache/superset/pull/31582) refactor: Removes 5.0 approved legacy charts (@michael-s-molina)
+- [#31490](https://github.com/apache/superset/pull/31490) feat: use docker in frontend GHA to parallelize work (@mistercrunch)
+- [#30398](https://github.com/apache/superset/pull/30398) feat: add and use UUIDMixin for most models (@mistercrunch)
+- [#29649](https://github.com/apache/superset/pull/29649) fix: remove old database constraint on the Dataset model (@betodealmeida)
+- [#31447](https://github.com/apache/superset/pull/31447) chore: enforce more ruff rules (@mistercrunch)
+- [#31303](https://github.com/apache/superset/pull/31303) feat: Adds helper functions for migrations (@luizotavio32)
+
+**Features**
+
+- [#32052](https://github.com/apache/superset/pull/32052) feat: add connector for Parseable (@AdheipSingh)
+- [#32051](https://github.com/apache/superset/pull/32051) feat(sqllab): improve table metadata UI (@justinpark)
+- [#29900](https://github.com/apache/superset/pull/29900) feat(sqllab): Replace FilterableTable by AgGrid Table (@justinpark)
+- [#31979](https://github.com/apache/superset/pull/31979) feat(fe): upgrade `superset-frontend` to Typescript v5 (@hainenber)
+- [#31413](https://github.com/apache/superset/pull/31413) feat: add date format to the email subject (@US579)
+- [#31984](https://github.com/apache/superset/pull/31984) feat: run prettier before eslint in pre-commit hooks (@mistercrunch)
+- [#31889](https://github.com/apache/superset/pull/31889) feat(CalendarFrame): adding previous calendar quarter (@alexandrusoare)
+- [#31796](https://github.com/apache/superset/pull/31796) feat: get docker-compose to work as the backend for Cypress tests (@mistercrunch)
+- [#31876](https://github.com/apache/superset/pull/31876) feat: use npm run dev-server in docker-compose (@mistercrunch)
+- [#31849](https://github.com/apache/superset/pull/31849) feat: old Firebolt dialect (@betodealmeida)
+- [#31840](https://github.com/apache/superset/pull/31840) feat: Mutate SQL query executed by alerts (@Vitor-Avila)
+- [#31825](https://github.com/apache/superset/pull/31825) feat: Firebolt sqlglot dialect (@betodealmeida)
+- [#31575](https://github.com/apache/superset/pull/31575) feat: redesign labels (@mistercrunch)
+- [#31747](https://github.com/apache/superset/pull/31747) feat: improve docker-compose services boot sequence (@mistercrunch)
+- [#31760](https://github.com/apache/superset/pull/31760) feat: allowing print() statements to be unbuffered in docker (@mistercrunch)
+- [#31486](https://github.com/apache/superset/pull/31486) feat: push predicates into virtual datasets (@betodealmeida)
+- [#31518](https://github.com/apache/superset/pull/31518) feat: adds a github action to auto label draft prs (@sadpandajoe)
+- [#31740](https://github.com/apache/superset/pull/31740) feat: make CI against 'next' python version not-required (@mistercrunch)
+- [#31602](https://github.com/apache/superset/pull/31602) feat(Sqllab): Enabling selection and copying of columns and rows in sql lab and dataset view (@samraHanif0340)
+- [#31580](https://github.com/apache/superset/pull/31580) feat(doris): add catalog support for Apache Doris (@liujiwen-up)
+- [#25869](https://github.com/apache/superset/pull/25869) feat(plugin): add plugin-chart-cartodiagram (@jansule)
+- [#31037](https://github.com/apache/superset/pull/31037) feat(country-map): add map for France with all overseas territories (@tarraschk)
+- [#31386](https://github.com/apache/superset/pull/31386) feat(gha): various docker / docker-compose build improvements (@mistercrunch)
+- [#31316](https://github.com/apache/superset/pull/31316) feat(sqllab): giving the query history pane a facelift (@mistercrunch)
+- [#31273](https://github.com/apache/superset/pull/31273) feat: fine-grain chart data telemetry (@betodealmeida)
+- [#31141](https://github.com/apache/superset/pull/31141) feat: add YDB as a new database engine (@vgvoleg)
+- [#31261](https://github.com/apache/superset/pull/31261) feat(Handlebars): formatNumber and group helpers (@Vitor-Avila)
+- [#31260](https://github.com/apache/superset/pull/31260) feat: use uv in CI (@mistercrunch)
+- [#31187](https://github.com/apache/superset/pull/31187) feat(sqllab): Popup notification when download data can exceed row count (@justinpark)
+- [#31166](https://github.com/apache/superset/pull/31166) feat: make sure to quote formulas on Excel export (@betodealmeida)
+- [#31164](https://github.com/apache/superset/pull/31164) feat: purge OAuth2 tokens when DB changes (@betodealmeida)
+- [#30870](https://github.com/apache/superset/pull/30870) feat: make ephemeral env use supersetbot + deprecate build_docker.py (@mistercrunch)
+- [#30926](https://github.com/apache/superset/pull/30926) feat(trino,presto): add missing time grains (@villebro)
+- [#30884](https://github.com/apache/superset/pull/30884) feat: add logging durations for screenshot async service (@mistercrunch)
+- [#29609](https://github.com/apache/superset/pull/29609) feat: add a script to check environment software versions (@mistercrunch)
+- [#30081](https://github.com/apache/superset/pull/30081) feat(oauth2): add support for trino (@joaoferrao)
+- [#30694](https://github.com/apache/superset/pull/30694) feat: allow exporting all tabs to a single PDF in report (@US579)
+- [#30674](https://github.com/apache/superset/pull/30674) feat(oauth): adding necessary changes to support bigquery oauth (@fisjac)
+- [#30721](https://github.com/apache/superset/pull/30721) feat(dataset API): Add parameter to optionally render Jinja macros in API response (@Vitor-Avila)
+- [#30412](https://github.com/apache/superset/pull/30412) feat: cancel impala query on stop (@wugeer)
+- [#30710](https://github.com/apache/superset/pull/30710) feat(helm-chart): Add extraLabels to all resources (@maxforasteiro)
+- [#29927](https://github.com/apache/superset/pull/29927) feat(db_engine_specs): added support for Denodo Virtual DataPort (@denodo-research-labs)
+- [#30593](https://github.com/apache/superset/pull/30593) feat(number-format): Add duration formatter with colon notation (@gerbermichi)
+- [#30559](https://github.com/apache/superset/pull/30559) feat(formatting): Add memory units adaptive formatter to format bytes (@mkopec87)
+- [#30501](https://github.com/apache/superset/pull/30501) feat(SQL Lab): better SQL parsing error messages (@betodealmeida)
+- [#30390](https://github.com/apache/superset/pull/30390) feat(be/cfg): replace deprecated imp.load_source with importlib.util (@hainenber)
+- [#29395](https://github.com/apache/superset/pull/29395) feat(dashboard): update tab drag and drop reordering with positional placement and indicators for UI (@rtexelm)
+- [#30380](https://github.com/apache/superset/pull/30380) feat(auth): when user is not logged in, failure to access a dashboard should redirect to login screen (@sfirke)
+- [#30364](https://github.com/apache/superset/pull/30364) feat(datasets): Allow swap dataset after deletion (@Antonio-RiveroMartnez)
+- [#30336](https://github.com/apache/superset/pull/30336) feat(Digest): Add RLS at digest generation for Charts and Dashboards (@geido)
+- [#30266](https://github.com/apache/superset/pull/30266) feat: allow configuring an engine context manager (@betodealmeida)
+- [#30323](https://github.com/apache/superset/pull/30323) feat(jinja): add option to format time filters using strftime (@villebro)
+- [#29897](https://github.com/apache/superset/pull/29897) feat(explore): Add time shift color control to ECharts (@rtexelm)
+- [#30016](https://github.com/apache/superset/pull/30016) feat: Displaying details to Dataset/Database deletion modals (@rusackas)
+- [#30142](https://github.com/apache/superset/pull/30142) feat(jinja): add advanced temporal filter functionality (@villebro)
+- [#28110](https://github.com/apache/superset/pull/28110) feat(db_engine): Implement user impersonation support for StarRocks (@Woellchen)
+- [#30126](https://github.com/apache/superset/pull/30126) feat: OAuth2 database field (@betodealmeida)
+- [#30082](https://github.com/apache/superset/pull/30082) feat: Oauth2 in DatabaseSelector (@betodealmeida)
+- [#30071](https://github.com/apache/superset/pull/30071) feat: allow create/update OAuth2 DB (@betodealmeida)
+- [#29912](https://github.com/apache/superset/pull/29912) feat(GAQ): Add Redis Sentinel Support for Global Async Queries (@nsivarajan)
+- [#24308](https://github.com/apache/superset/pull/24308) feat(docker): add GUNICORN_LOGLEVEL env var (@drummerwolli)
+- [#29333](https://github.com/apache/superset/pull/29333) feat(alert/reports): adding logic to handle downstream reports when tab is deleted from dashboard (@fisjac)
+- [#30002](https://github.com/apache/superset/pull/30002) feat(time_comparison): Support all date formats when computing custom and inherit offsets (@Antonio-RiveroMartnez)
+- [#25775](https://github.com/apache/superset/pull/25775) feat: Adding Elestio as deployment option (@kaiwalyakoparkar)
+- [#29941](https://github.com/apache/superset/pull/29941) feat(docs): fix bug google chrome < 114 not found (@hoalongnatsu)
+- [#29917](https://github.com/apache/superset/pull/29917) feat: Enable injecting custom html into head (@kgabryje)
+- [#29875](https://github.com/apache/superset/pull/29875) feat(build): webpack visualizer (@rusackas)
+- [#29724](https://github.com/apache/superset/pull/29724) feat: get html (links/styling/img/...) to work in pivot table (@mistercrunch)
+- [#29795](https://github.com/apache/superset/pull/29795) feat: adding AntdThemeProvider to storybook config (@rusackas)
+- [#29096](https://github.com/apache/superset/pull/29096) feat(alerts): enable tab selection for dashboard alerts/reports (@fisjac)
+- [#29553](https://github.com/apache/superset/pull/29553) feat(explorer): Add configs and formatting to discrete comparison columns (@rtexelm)
+- [#29627](https://github.com/apache/superset/pull/29627) feat(country map): Adding Hungary (and other touchups) (@rusackas)
+
+**Fixes**
+
+- [#33817](https://github.com/apache/superset/pull/33817) fix: SQL Lab warning message sizes (@michael-s-molina)
+- [#33779](https://github.com/apache/superset/pull/33779) fix(Echarts): Echarts Legend Scroll fix (@amaannawab923)
+- [#33765](https://github.com/apache/superset/pull/33765) fix(tooltip): Sanitize tooltip html (@msyavuz)
+- [#33759](https://github.com/apache/superset/pull/33759) fix: apply d3 format to BigNumber(s) (@betodealmeida)
+- [#33752](https://github.com/apache/superset/pull/33752) fix(create chart page): add missing space between words (@Quatters)
+- [#33748](https://github.com/apache/superset/pull/33748) fix: sync dot color between dashboard chart and edit chart (@anantaoutlook)
+- [#33743](https://github.com/apache/superset/pull/33743) fix(dataset): Fix plural toast messages (@rad-pat)
+- [#33717](https://github.com/apache/superset/pull/33717) fix(explore): add gap to the "Cached" button (@Quatters)
+- [#33719](https://github.com/apache/superset/pull/33719) fix(Alerts & reports): invalid "Last updated" time formatting (@Quatters)
+- [#33726](https://github.com/apache/superset/pull/33726) fix(dashboard): show dashboard thumbnail images when retrieved (@rad-pat)
+- [#33296](https://github.com/apache/superset/pull/33296) fix(template_processing): get_filters now works for IS_NULL and IS_NOT_NULL operators (@Prokos)
+- [#32414](https://github.com/apache/superset/pull/32414) fix(api): Added uuid to list api calls (@withnale)
+- [#33710](https://github.com/apache/superset/pull/33710) fix: Migrate charts with empty query_context (@luizotavio32)
+- [#33592](https://github.com/apache/superset/pull/33592) fix: Makes time compare migration more resilient (@michael-s-molina)
+- [#33596](https://github.com/apache/superset/pull/33596) fix: Missing processor context when rendering Jinja (@michael-s-molina)
+- [#33285](https://github.com/apache/superset/pull/33285) fix: Adjust viz migrations to also migrate the queries object (@luizotavio32)
+- [#33431](https://github.com/apache/superset/pull/33431) fix(sankey): incorrect nodeValues (@richardfogaca)
+- [#33553](https://github.com/apache/superset/pull/33553) fix(AllEntities): Display action buttons according to the user permissions (@Vitor-Avila)
+- [#30577](https://github.com/apache/superset/pull/30577) fix(user settings): Update forked cosmo theme to resolve down chevron in caret style (#30514) (@mklumpen)
+- [#33540](https://github.com/apache/superset/pull/33540) fix(table): table sort by fix (@amaannawab923)
+- [#33522](https://github.com/apache/superset/pull/33522) fix(Sqllab): Autocomplete got stuck in UI when open it too fast (@rebenitez1802)
+- [#33444](https://github.com/apache/superset/pull/33444) fix: allow metadata to parse json (@eschutho)
+- [#33425](https://github.com/apache/superset/pull/33425) fix(table-chart): time shift is not working (@justinpark)
+- [#33364](https://github.com/apache/superset/pull/33364) fix(deckgl): fix deckgl multiple layers chart filter and viewport (@syedbarimanjan)
+- [#33422](https://github.com/apache/superset/pull/33422) fix(Row): don't unload charts while embedded to reduce rerenders (@msyavuz)
+- [#33354](https://github.com/apache/superset/pull/33354) fix: loading examples from raw.githubusercontent.com fails with 429 errors (@mistercrunch)
+- [#31917](https://github.com/apache/superset/pull/31917) fix(be/utils): sync cache timeout for memoized function (@hainenber)
+- [#33345](https://github.com/apache/superset/pull/33345) fix(i18n): zh_TW pybabel compile error: placeholders are incompatible (@bestlong)
+- [#33337](https://github.com/apache/superset/pull/33337) fix: Edge case with metric not getting quoted in sort by when normalize_columns is enabled (@Vitor-Avila)
+- [#33224](https://github.com/apache/superset/pull/33224) fix: Temporal filter conversion in viz migrations (@michael-s-molina)
+- [#33306](https://github.com/apache/superset/pull/33306) fix: improve function detection (@betodealmeida)
+- [#33269](https://github.com/apache/superset/pull/33269) fix(echarts): rename time series shifted colnames (@justinpark)
+- [#33267](https://github.com/apache/superset/pull/33267) fix: mask password on DB import (@betodealmeida)
+- [#33025](https://github.com/apache/superset/pull/33025) fix: LocalProxy is not mapped warning (@dpgaspar)
+- [#33248](https://github.com/apache/superset/pull/33248) fix(histogram): remove extra single quotes (@rusackas)
+- [#33250](https://github.com/apache/superset/pull/33250) fix(DB update): Gracefully handle querry error during DB update (@Vitor-Avila)
+- [#33238](https://github.com/apache/superset/pull/33238) fix(heatmap): correctly render int and boolean falsy values on axes (@sfirke)
+- [#33237](https://github.com/apache/superset/pull/33237) fix(sqllab permalink): Commit SQL Lab permalinks (@Vitor-Avila)
+- [#33234](https://github.com/apache/superset/pull/33234) fix(standalone): Ensure correct URL param value for standalone mode (@Vitor-Avila)
+- [#33291](https://github.com/apache/superset/pull/33291) fix(antd): Invalid dashed border in tertiary button (@justinpark)
+- [#33214](https://github.com/apache/superset/pull/33214) fix(export): Full CSV/Excel exports respecting SQL_MAX_ROW config (@Vitor-Avila)
+- [#33164](https://github.com/apache/superset/pull/33164) fix(sqllab): Invalid SQL Error breaks SQL Lab (@justinpark)
+- [#33154](https://github.com/apache/superset/pull/33154) fix(deckgl): Update Arc to properly adjust line width (@rusackas)
+- [#33161](https://github.com/apache/superset/pull/33161) fix: os.makedirs race condition (@jamra)
+- [#33143](https://github.com/apache/superset/pull/33143) fix(echart): Thrown errors shown after resized (@justinpark)
+- [#33138](https://github.com/apache/superset/pull/33138) fix(echart): Tooltip date format doesn't follow time grain (@justinpark)
+- [#31692](https://github.com/apache/superset/pull/31692) fix(lang): patch FAB's LocaleView to redirect to previous page (@pomegranited)
+- [#33106](https://github.com/apache/superset/pull/33106) fix(dashboard): invalid active tab state (@justinpark)
+- [#33037](https://github.com/apache/superset/pull/33037) fix: Viz migration error handling (@michael-s-molina)
+- [#33107](https://github.com/apache/superset/pull/33107) fix(playwright): allow screenshotting empty dashboards (@hxtmdev)
+- [#33110](https://github.com/apache/superset/pull/33110) fix: resolve recent merge collisio (@mistercrunch)
+- [#33103](https://github.com/apache/superset/pull/33103) fix: Allows configuration of Selenium Webdriver binary (@michael-s-molina)
+- [#33109](https://github.com/apache/superset/pull/33109) fix(thumbnails): ensure consistent cache_key (@hxtmdev)
+- [#32193](https://github.com/apache/superset/pull/32193) fix(dashboard): Generate screenshot via celery (@tahvane1)
+- [#33087](https://github.com/apache/superset/pull/33087) fix(docker): fallback to pip if uv is not available (@hossein-khalilian)
+- [#33059](https://github.com/apache/superset/pull/33059) fix: Adds missing **init** file to commands/logs (@michael-s-molina)
+- [#33048](https://github.com/apache/superset/pull/33048) fix: improve error type on parse error (@justinpark)
+- [#31720](https://github.com/apache/superset/pull/31720) fix(export): charts csv export in dashboards (@EmmanuelCbd)
+- [#33024](https://github.com/apache/superset/pull/33024) fix(log): Missing failed query log on async queries (@justinpark)
+- [#32839](https://github.com/apache/superset/pull/32839) fix: fix bug where dashboard did not enter fullscreen mode. (@LevisNgigi)
+- [#28428](https://github.com/apache/superset/pull/28428) fix(dashboard): chart fullscreen issue when filter pane is collapsed (@hlvhe)
+- [#29422](https://github.com/apache/superset/pull/29422) fix: `show_filters` URL parameter is not working (@hexcafe)
+- [#32965](https://github.com/apache/superset/pull/32965) fix: Bar Chart (legacy) migration to keep labels layout (@michael-s-molina)
+- [#30679](https://github.com/apache/superset/pull/30679) fix: fixed Add Metrics to Tree Chart (#29158) (@SBIN2010)
+- [#32968](https://github.com/apache/superset/pull/32968) fix(pivot-table): Revert "fix(Pivot Table): Fix column width to respect currency config (#31414)" (@justinpark)
+- [#32384](https://github.com/apache/superset/pull/32384) fix: Clicking in the body of a Markdown component does not put it into edit mode (@notHuman9504)
+- [#32763](https://github.com/apache/superset/pull/32763) fix(sqllab): Invalid display of table column keys (@justinpark)
+- [#32871](https://github.com/apache/superset/pull/32871) fix(Jinja): Emit time grain to table charts even if they don't have a temporal column (@Vitor-Avila)
+- [#32372](https://github.com/apache/superset/pull/32372) fix(backend/async_events): allow user to configure username for Redis authentication in GLOBAL_ASYNC_QUERIES_CACHE_BACKEND (@hainenber)
+- [#32873](https://github.com/apache/superset/pull/32873) fix: use role_model from security manager (@lohart13)
+- [#32851](https://github.com/apache/superset/pull/32851) fix(ColorPickerControl): change color picker control width (@SBIN2010)
+- [#32863](https://github.com/apache/superset/pull/32863) fix(table-chart): Do not show comparison columns config if time_compare is set to [] (@Vitor-Avila)
+- [#31869](https://github.com/apache/superset/pull/31869) fix(translation): Dutch translations for Current datetime filter (@christiaan)
+- [#32829](https://github.com/apache/superset/pull/32829) fix: update dataset/query catalog on DB changes (@betodealmeida)
+- [#32850](https://github.com/apache/superset/pull/32850) fix(echarts): Sort series by name using natural comparison (@Vitor-Avila)
+- [#32795](https://github.com/apache/superset/pull/32795) fix(log): store navigation path to get correct logging path (@justinpark)
+- [#32665](https://github.com/apache/superset/pull/32665) fix: Time Comparison Feature Reverts Metric Labels to Metric Keys in Table Charts (@fardin-developer)
+- [#32792](https://github.com/apache/superset/pull/32792) fix: key error in frontend on disallowed GSheets (@chrisvnimbus)
+- [#32797](https://github.com/apache/superset/pull/32797) fix: CSV/Excel upload form change column dates description (@SBIN2010)
+- [#32802](https://github.com/apache/superset/pull/32802) fix(sec): resolve CVE-2025-29907 and CVE-2025-25977 by pinning `jspdf` to v3 (@hainenber)
+- [#32406](https://github.com/apache/superset/pull/32406) fix(model/helper): represent RLS filter clause in proper textual SQL string (@hainenber)
+- [#32739](https://github.com/apache/superset/pull/32739) fix(excel export): big number truncation handling (@CharlesNkdl)
+- [#32778](https://github.com/apache/superset/pull/32778) fix(config): correct slack image url in talisman (@v9dev)
+- [#28350](https://github.com/apache/superset/pull/28350) fix(css): typos in styles (@Kukusik8)
+- [#32775](https://github.com/apache/superset/pull/32775) fix(import): Missing catalog field in saved query schema (@Quatters)
+- [#32774](https://github.com/apache/superset/pull/32774) fix(sqllab): Pass query_id as kwarg so backoff can see it (@Antonio-RiveroMartnez)
+- [#32720](https://github.com/apache/superset/pull/32720) fix(chart control): Change default of "Y Axis Title Margin" (@Quatters)
+- [#32761](https://github.com/apache/superset/pull/32761) fix: do not add calculated columns when syncing (@eschutho)
+- [#31751](https://github.com/apache/superset/pull/31751) fix: Changing language doesn't affect echarts charts (@jpchev)
+- [#28203](https://github.com/apache/superset/pull/28203) fix(contextmenu): uncaught TypeError (@sowo)
+- [#32679](https://github.com/apache/superset/pull/32679) fix: ensure datasource permission in explore (@hxtmdev)
+- [#32410](https://github.com/apache/superset/pull/32410) fix(import): Ensure import exceptions are logged (@withnale)
+- [#32683](https://github.com/apache/superset/pull/32683) fix: coerce datetime conversion errors (@betodealmeida)
+- [#32708](https://github.com/apache/superset/pull/32708) fix(logging): missing path in event data (@justinpark)
+- [#32701](https://github.com/apache/superset/pull/32701) fix: boolean filters in Explore (@betodealmeida)
+- [#32696](https://github.com/apache/superset/pull/32696) fix(spreadsheet uploads): make file extension comparisons case-insensitive (@sfirke)
+- [#32691](https://github.com/apache/superset/pull/32691) fix(cosmetics): allow toast message to be toggled off when modal is opened (@hainenber)
+- [#32699](https://github.com/apache/superset/pull/32699) fix: Signature of Celery pruner jobs (@michael-s-molina)
+- [#32681](https://github.com/apache/superset/pull/32681) fix(log): Update recent_activity by event name (@justinpark)
+- [#32678](https://github.com/apache/superset/pull/32678) fix: Update RELEASING/README.md (@michael-s-molina)
+- [#32661](https://github.com/apache/superset/pull/32661) fix(gsheets): update params from encrypted extra (@betodealmeida)
+- [#32657](https://github.com/apache/superset/pull/32657) fix(import): Import a DB connection with expanded rows enabled (@Vitor-Avila)
+- [#32646](https://github.com/apache/superset/pull/32646) fix(dashboard): Ensure `dashboardId` is included in `form_data` for embedded mode (@mostopalove)
+- [#32652](https://github.com/apache/superset/pull/32652) fix: Upgrade node base image to Debian 12 bookworm (@dolph)
+- [#32608](https://github.com/apache/superset/pull/32608) fix(welcome): perf on distinct recent activities (@justinpark)
+- [#32549](https://github.com/apache/superset/pull/32549) fix(dashboard): Support bigint value in native filters (@justinpark)
+- [#32599](https://github.com/apache/superset/pull/32599) fix(Slack V2): Specify the filename for the Slack upload method (@Vitor-Avila)
+- [#32572](https://github.com/apache/superset/pull/32572) fix: Log table retention policy (@michael-s-molina)
+- [#32532](https://github.com/apache/superset/pull/32532) fix: add DateOffset to json serializer (@eschutho)
+- [#32523](https://github.com/apache/superset/pull/32523) fix: keep calculated columns when datasource is updated (@eschutho)
+- [#32507](https://github.com/apache/superset/pull/32507) fix: Show response message as default error (@eschutho)
+- [#32336](https://github.com/apache/superset/pull/32336) fix(Slack): Fix Slack recipients migration to V2 (@Vitor-Avila)
+- [#32511](https://github.com/apache/superset/pull/32511) fix(beat): prune_query celery task args fix (@Usiel)
+- [#32499](https://github.com/apache/superset/pull/32499) fix(explore): Glitch in a tooltip with metric's name (@kgabryje)
+- [#32486](https://github.com/apache/superset/pull/32486) fix: skip DB filter when doing OAuth2 (@betodealmeida)
+- [#32488](https://github.com/apache/superset/pull/32488) fix(tooltip): displaying <a> tags correctly (@rusackas)
+- [#32473](https://github.com/apache/superset/pull/32473) fix(plugin-chart-echarts): remove erroneous upper bound value (@villebro)
+- [#32420](https://github.com/apache/superset/pull/32420) fix(com/grid-comp/markdown): pin `remark-gfm` to v3 to allow inline code block by backticks in Markdown (@hainenber)
+- [#32423](https://github.com/apache/superset/pull/32423) fix(clickhouse): get_parameters_from_uri failing when secure is true (@codenamelxl)
+- [#32290](https://github.com/apache/superset/pull/32290) fix(viz): update nesting logic to handle multiple dimensions in PartitionViz (@DamianPendrak)
+- [#32382](https://github.com/apache/superset/pull/32382) fix(pinot): revert join and subquery flags (@yuribogomolov)
+- [#32325](https://github.com/apache/superset/pull/32325) fix: bump FAB to 4.5.4 (@dpgaspar)
+- [#32344](https://github.com/apache/superset/pull/32344) fix: ensure metric_macro expands templates (@betodealmeida)
+- [#32348](https://github.com/apache/superset/pull/32348) fix: clickhouse-connect engine SSH parameter (@maybedino)
+- [#32362](https://github.com/apache/superset/pull/32362) fix(docker): Configure nginx for consistent port mapping and hot reloading (@vedantprajapati)
+- [#32350](https://github.com/apache/superset/pull/32350) fix(firebolt): allow backslach escape for single quotes (@betodealmeida)
+- [#32356](https://github.com/apache/superset/pull/32356) fix(SSHTunnelForm): make the password tooltip visible (@EnxDev)
+- [#32284](https://github.com/apache/superset/pull/32284) fix(roles): Add SqlLabPermalinkRestApi as default sqlab roles. (@LevisNgigi)
+- [#32035](https://github.com/apache/superset/pull/32035) fix(fe/dashboard-list): display modifier info for `Last modified` data (@hainenber)
+- [#32337](https://github.com/apache/superset/pull/32337) fix: revert "fix: remove sort values on stacked totals (#31333)" (@eschutho)
+- [#31993](https://github.com/apache/superset/pull/31993) fix: oauth2 trino (@aurokk)
+- [#32332](https://github.com/apache/superset/pull/32332) fix: Download as PDF fails due to cache error (@kgabryje)
+- [#30888](https://github.com/apache/superset/pull/30888) fix: keep the tab order (@US579)
+- [#32272](https://github.com/apache/superset/pull/32272) fix(viz/table): selected column not shown in Conditional Formatting popover (@hainenber)
+- [#32253](https://github.com/apache/superset/pull/32253) fix: Decimal values for Histogram bins (@michael-s-molina)
+- [#32218](https://github.com/apache/superset/pull/32218) fix(Datasource): handle undefined datasource_type in fetchSyncedColumns (@tahvane1)
+- [#32240](https://github.com/apache/superset/pull/32240) fix: upgrade to 3.11.11-slim-bookworm to address critical vulnerabilities (@gpchandran)
+- [#31333](https://github.com/apache/superset/pull/31333) fix: remove sort values on stacked totals (@eschutho)
+- [#32227](https://github.com/apache/superset/pull/32227) fix: Update 'Last modified' time when modifying RLS rules (@fardin-developer)
+- [#32115](https://github.com/apache/superset/pull/32115) fix(Scope): Correct issue where filters appear out of scope when sort is unchecked. (@LevisNgigi)
+- [#32224](https://github.com/apache/superset/pull/32224) fix(sqllab): close the table tab (@justinpark)
+- [#32212](https://github.com/apache/superset/pull/32212) fix: set `Rich tooltip` -> 'Show percentage' to false by default (@mistercrunch)
+- [#32222](https://github.com/apache/superset/pull/32222) fix(SaveDatasetModal): repairs field alignment in the SaveDatasetModal component (@EnxDev)
+- [#32211](https://github.com/apache/superset/pull/32211) fix: hydrate datasetsStatus (@betodealmeida)
+- [#32195](https://github.com/apache/superset/pull/32195) fix: handlebars html and css templates reset on dataset update (@DamianPendrak)
+- [#32176](https://github.com/apache/superset/pull/32176) fix: TDengine move tdengine.png to databases/ subfolder (@DuanKuanJun)
+- [#32185](https://github.com/apache/superset/pull/32185) fix: Adds an entry to UPDATING.md about DISABLE_LEGACY_DATASOURCE_EDITOR (@michael-s-molina)
+- [#32154](https://github.com/apache/superset/pull/32154) fix(sqllab): correct URL format for SQL Lab permalinks (@LevisNgigi)
+- [#30903](https://github.com/apache/superset/pull/30903) fix(virtual dataset sync): Sync virtual dataset columns when changing the SQL query (@fisjac)
+- [#32163](https://github.com/apache/superset/pull/32163) fix(docker): Docker python-translation-build (@EmmanuelCbd)
+- [#32156](https://github.com/apache/superset/pull/32156) fix: ScreenshotCachePayload serialization (@betodealmeida)
+- [#32151](https://github.com/apache/superset/pull/32151) fix(releasing): fix borked SVN-based image building process (@hainenber)
+- [#32137](https://github.com/apache/superset/pull/32137) fix: copy oauth2 capture to `get_sqla_engine` (@betodealmeida)
+- [#32135](https://github.com/apache/superset/pull/32135) fix: Local tarball Docker container is missing zstd dependency (@michael-s-molina)
+- [#32133](https://github.com/apache/superset/pull/32133) fix: No virtual environment when running Docker translation compiler (@michael-s-molina)
+- [#32040](https://github.com/apache/superset/pull/32040) fix(ci): ephemeral env, handle different label, create comment (@dpgaspar)
+- [#32064](https://github.com/apache/superset/pull/32064) fix(datepicker): Full width datepicker on filter value select (@msyavuz)
+- [#32122](https://github.com/apache/superset/pull/32122) fix: Histogram examples config (@michael-s-molina)
+- [#32053](https://github.com/apache/superset/pull/32053) fix: enforce `ALERT_REPORTS_MAX_CUSTOM_SCREENSHOT_WIDTH` (@betodealmeida)
+- [#31757](https://github.com/apache/superset/pull/31757) fix(thumbnail cache): Enabling force parameter on screenshot/thumbnail cache (@fisjac)
+- [#32061](https://github.com/apache/superset/pull/32061) fix(DatePicker): Increase z-index over Modal (@geido)
+- [#32031](https://github.com/apache/superset/pull/32031) fix(fe/explore): prevent runtime error when editing Dataset-origin Chart with empty title (@hainenber)
+- [#32045](https://github.com/apache/superset/pull/32045) fix: Revert "fix: re-enable cypress checks" (@mistercrunch)
+- [#32008](https://github.com/apache/superset/pull/32008) fix: re-enable cypress checks (@mistercrunch)
+- [#32017](https://github.com/apache/superset/pull/32017) fix: eph env + improve docker images to run in userspace (@mistercrunch)
+- [#31340](https://github.com/apache/superset/pull/31340) fix(ci): change ephemeral env to use github labels instead of comments (@dpgaspar)
+- [#32025](https://github.com/apache/superset/pull/32025) fix: Filters badge disappeared (@kgabryje)
+- [#32015](https://github.com/apache/superset/pull/32015) fix(issue #31927): TimeGrain.WEEK_STARTING_MONDAY (@AdrianMastronardi)
+- [#30716](https://github.com/apache/superset/pull/30716) fix: Reordering echart props to fix confidence interval in Mixed Charts (@geotab-data-platform)
+- [#32005](https://github.com/apache/superset/pull/32005) fix(sqllab): tab layout truncated (@justinpark)
+- [#29417](https://github.com/apache/superset/pull/29417) fix(verbose map): Correct raw metrics handling in verbose map (@mcdogg17)
+- [#31962](https://github.com/apache/superset/pull/31962) fix: proper URL building (@betodealmeida)
+- [#31941](https://github.com/apache/superset/pull/31941) fix(timezoneselector): Correct the order to match names first (@msyavuz)
+- [#25166](https://github.com/apache/superset/pull/25166) fix: correct value for config variable `UPLOAD_FOLDER` (@sebastianliebscher)
+- [#31948](https://github.com/apache/superset/pull/31948) fix: Load cached DB metadata as DatasourceName and add catalog to schema_list cache key (@Vitor-Avila)
+- [#31809](https://github.com/apache/superset/pull/31809) fix: Prevent undo functionality from referencing incorrect dashboard edits (@fardin-developer)
+- [#30949](https://github.com/apache/superset/pull/30949) fix: adjust line type as well as weight for time series (@eschutho)
+- [#31933](https://github.com/apache/superset/pull/31933) fix(E2E): Fix flaky Dashboard list delete test (@geido)
+- [#31867](https://github.com/apache/superset/pull/31867) fix(date_parser): fixed bug for advanced time range filter (@alexandrusoare)
+- [#31873](https://github.com/apache/superset/pull/31873) fix(documentation): updated link to CORS_OPTIONS in Networking Settings (@ankur-zignite91)
+- [#31910](https://github.com/apache/superset/pull/31910) fix: add catalog to cache key when getting tables/views (@betodealmeida)
+- [#31837](https://github.com/apache/superset/pull/31837) fix(bigquery): return no catalogs when creds not set (@betodealmeida)
+- [#31848](https://github.com/apache/superset/pull/31848) fix: d3.count doesn't exist (@mistercrunch)
+- [#31830](https://github.com/apache/superset/pull/31830) fix: fix/suppress webpack console warnings (@mistercrunch)
+- [#31834](https://github.com/apache/superset/pull/31834) fix(OAuth): Remove masked_encrypted_extra from DB update properties (@Vitor-Avila)
+- [#31798](https://github.com/apache/superset/pull/31798) fix(Embedded): Skip CSRF validation for dashboard download endpoints (@Vitor-Avila)
+- [#31815](https://github.com/apache/superset/pull/31815) fix(modal): fixed z-index issue (@alexandrusoare)
+- [#31774](https://github.com/apache/superset/pull/31774) fix: corrects spelling of USE_ANALAGOUS_COLORS to be USE_ANALOGOUS_COLORS (@rusackas)
+- [#31777](https://github.com/apache/superset/pull/31777) fix(oauth): Handle updates to the OAuth config (@Vitor-Avila)
+- [#31789](https://github.com/apache/superset/pull/31789) fix(button): change back button styles for dropdown buttons (@msyavuz)
+- [#31752](https://github.com/apache/superset/pull/31752) fix: Heatmap sorting (@michael-s-molina)
+- [#31742](https://github.com/apache/superset/pull/31742) fix: GHA frontend builds fail when frontends hasn't changed (@mistercrunch)
+- [#31732](https://github.com/apache/superset/pull/31732) fix: docker builds in forks (@mistercrunch)
+- [#31606](https://github.com/apache/superset/pull/31606) fix: docker-compose-image-tag fails to start (@mistercrunch)
+- [#31710](https://github.com/apache/superset/pull/31710) fix(inthewild): Update companies using superset (@gwthm-in)
+- [#31673](https://github.com/apache/superset/pull/31673) fix: typo in plugin-chart-echats controls (@vhf)
+- [#31688](https://github.com/apache/superset/pull/31688) fix(helm): change values.yaml comments (@sule26)
+- [#31588](https://github.com/apache/superset/pull/31588) fix: install uv in docker-bootstrap (@mistercrunch)
+- [#31583](https://github.com/apache/superset/pull/31583) fix(docs): get quickstart guide working again (@sfirke)
+- [#31561](https://github.com/apache/superset/pull/31561) fix: add various recent issues on master CI (@mistercrunch)
+- [#31493](https://github.com/apache/superset/pull/31493) fix: master docker builds fail because of multi-platform builds can't --load (@mistercrunch)
+- [#31483](https://github.com/apache/superset/pull/31483) fix: Card component background color (@kgabryje)
+- [#31472](https://github.com/apache/superset/pull/31472) fix: Tooltip covers the date selector in native filters (@kgabryje)
+- [#31473](https://github.com/apache/superset/pull/31473) fix(explore): Styling issue in Search Metrics input field (@kgabryje)
+- [#31449](https://github.com/apache/superset/pull/31449) fix(filter options): full size list item targets (@rusackas)
+- [#31458](https://github.com/apache/superset/pull/31458) fix(api): typo api.py (@zero-stroke)
+- [#31385](https://github.com/apache/superset/pull/31385) fix: docker refactor (@mistercrunch)
+- [#31374](https://github.com/apache/superset/pull/31374) fix(Dashboard): Sync color configuration via dedicated endpoint (@geido)
+- [#31411](https://github.com/apache/superset/pull/31411) fix: pkg_resources is getting deprecated (@mistercrunch)
+- [#31391](https://github.com/apache/superset/pull/31391) fix: don't include chromium on ephemeral envs (@mistercrunch)
+- [#31387](https://github.com/apache/superset/pull/31387) fix: Revert "chore(deps-dev): bump esbuild from 0.20.0 to 0.24.0 in /super… (@sadpandajoe)
+- [#31236](https://github.com/apache/superset/pull/31236) fix: ephemeral envs fail on noop (@dpgaspar)
+- [#31350](https://github.com/apache/superset/pull/31350) fix(alerts&reports): tabs with userfriendly urls (@tahvane1)
+- [#30956](https://github.com/apache/superset/pull/30956) fix: added missing pod labels for init job (@glothriel)
+- [#31279](https://github.com/apache/superset/pull/31279) fix(filters): improving the add filter/divider UI. (@rusackas)
+- [#31155](https://github.com/apache/superset/pull/31155) fix: helm chart deploy to open PRs to now-protected gh-pages branch (@mistercrunch)
+- [#31152](https://github.com/apache/superset/pull/31152) fix: try to re-enable gh-pages (@mistercrunch)
+- [#31148](https://github.com/apache/superset/pull/31148) fix: touch helm/ folder to trigger doc deploy in CI (@mistercrunch)
+- [#31035](https://github.com/apache/superset/pull/31035) fix: ephemeral environments missing env var (@mistercrunch)
+- [#30966](https://github.com/apache/superset/pull/30966) fix(helm-chart): Fix broken PodDisruptionBudget due to introduction of extraLabels. (@theoriginalgri)
+- [#30964](https://github.com/apache/superset/pull/30964) fix(Card): Use correct class names for Ant Design 5 Card component (@geido)
+- [#30924](https://github.com/apache/superset/pull/30924) fix(helm): use submodule on helm release action (@villebro)
+- [#30767](https://github.com/apache/superset/pull/30767) fix(empty dashboards): Allow downloading a screenshot of an empty dashboard (@msyavuz)
+- [#30885](https://github.com/apache/superset/pull/30885) fix(docs): add missing bracket in openID config (@samarsrivastav)
+- [#30858](https://github.com/apache/superset/pull/30858) fix(chart data): removing query from /chart/data payload when accessing as guest user (@fisjac)
+- [#30848](https://github.com/apache/superset/pull/30848) fix(time_comparison): Allow deleting dates when using custom shift (@Antonio-RiveroMartnez)
+- [#28524](https://github.com/apache/superset/pull/28524) fix: warning emits an error (@eschutho)
+- [#30682](https://github.com/apache/superset/pull/30682) fix(explore): Update tooltip copy for rendering html in tables and pivot tables (@yousoph)
+- [#30618](https://github.com/apache/superset/pull/30618) fix(mssql db_engine_spec): adds uniqueidentifier to column_type_mappings (@rparsonsbb)
+- [#27142](https://github.com/apache/superset/pull/27142) fix(chart): apply number format in Box Plot tooltip only where necessary (@goto-loop)
+- [#30608](https://github.com/apache/superset/pull/30608) fix(country-map): Rename incorrect Vietnam province name for Country Map (@tienhung2812)
+- [#30702](https://github.com/apache/superset/pull/30702) fix(Dashboard): DatePicker to not autoclose modal (@geido)
+- [#30688](https://github.com/apache/superset/pull/30688) fix: bump FAB to 4.5.2 (@dpgaspar)
+- [#30659](https://github.com/apache/superset/pull/30659) fix: Link Checking (@CodeWithEmad)
+- [#30661](https://github.com/apache/superset/pull/30661) fix: Domain 'undefined' error in Storybook (@kgabryje)
+- [#30626](https://github.com/apache/superset/pull/30626) fix: Module is not defined in Partition chart (@michael-s-molina)
+- [#30616](https://github.com/apache/superset/pull/30616) fix(docs): leading whitespace line is causing page title and header to be malformed (@sfirke)
+- [#30606](https://github.com/apache/superset/pull/30606) fix: Set correct amount of steps to avoid confusing logs while loading examples (@deathstrokedarksky)
+- [#30522](https://github.com/apache/superset/pull/30522) fix(SQL Lab): hang when result set size is too big (@anamitraadhikari)
+- [#30443](https://github.com/apache/superset/pull/30443) fix(Jinja metric macro): Support Drill By and Excel/CSV download without a dataset ID (@Vitor-Avila)
+- [#30569](https://github.com/apache/superset/pull/30569) fix(dev-server): Revert "chore(fe): bump webpack-related packages to v5" (@geido)
+- [#30069](https://github.com/apache/superset/pull/30069) fix(frontend/generator): fix failed Viz plugin build due to missing JSDOM config and dep (@hainenber)
+- [#30277](https://github.com/apache/superset/pull/30277) fix(examples): fix examples uri for sqlite (@villebro)
+- [#30509](https://github.com/apache/superset/pull/30509) fix(plugin/echarts): correct enum values for LABEL_POSITION map (@hainenber)
+- [#30500](https://github.com/apache/superset/pull/30500) fix(sqllab): Remove redundant scrolling (@justinpark)
+- [#30349](https://github.com/apache/superset/pull/30349) fix(radar-chart): metric options not available & add `min` option (@goncaloacteixeira)
+- [#30493](https://github.com/apache/superset/pull/30493) fix(Package.json): Bump dayjs version (@geido)
+- [#30406](https://github.com/apache/superset/pull/30406) fix(language): pt_BR translation (@diegolnasc)
+- [#30441](https://github.com/apache/superset/pull/30441) fix: battling cypress' dashboard feature (@mistercrunch)
+- [#30430](https://github.com/apache/superset/pull/30430) fix: cypress on master doesn't work because of --parallel flag (@mistercrunch)
+- [#29444](https://github.com/apache/superset/pull/29444) fix(plugin/country/map): rectify naming for some Vietnamese provinces (@hainenber)
+- [#30388](https://github.com/apache/superset/pull/30388) fix(ECharts): Revert ECharts version bump (@geido)
+- [#30340](https://github.com/apache/superset/pull/30340) fix(CI): increase node JS heap size (@rusackas)
+- [#30325](https://github.com/apache/superset/pull/30325) fix(db_engine_specs): add a few missing time grains to Postgres spec (@sfirke)
+- [#30273](https://github.com/apache/superset/pull/30273) fix(dashboard): invalid button style in undo/redo button (@justinpark)
+- [#30099](https://github.com/apache/superset/pull/30099) fix: Move copying translation files before npm run build in Docker (@martyngigg)
+- [#30279](https://github.com/apache/superset/pull/30279) fix(install/docker): use zstd-baked image for building superset-frontend in containerized env (@hainenber)
+- [#30234](https://github.com/apache/superset/pull/30234) fix(deps): release new embedded sdk (@rusackas)
+- [#30237](https://github.com/apache/superset/pull/30237) fix(docs): change flask-oidc url (@drblack666)
+- [#30217](https://github.com/apache/superset/pull/30217) fix(sdk): use latest @supserset-ui/switchboard version to avoid pulling empty dependency (@hainenber)
+- [#30147](https://github.com/apache/superset/pull/30147) fix(docs): typo in docker-compose.mdx (@alexengrig)
+- [#30148](https://github.com/apache/superset/pull/30148) fix: Adds the Deprecated label to Time-series Percent Change chart (@michael-s-molina)
+- [#30141](https://github.com/apache/superset/pull/30141) fix(sqllab): race condition when updating same cursor position (@justinpark)
+- [#30041](https://github.com/apache/superset/pull/30041) fix: Revert "fix(list/chart views): Chart Properties modal now has transitions" (@rusackas)
+- [#30034](https://github.com/apache/superset/pull/30034) fix: Handle zstd encoding in webpack proxy config (@kgabryje)
+- [#29916](https://github.com/apache/superset/pull/29916) fix: duplicate `truncateXAxis` option in `BarChart` (@dmitriyVasilievich1986)
+- [#30013](https://github.com/apache/superset/pull/30013) fix(translations): Fixed APPLY translation in Spanish (@jvines)
+- [#30001](https://github.com/apache/superset/pull/30001) fix: Reports are not sent when selecting to send as PNG, CSV or text (@eschutho)
+- [#29686](https://github.com/apache/superset/pull/29686) fix: Removed fixed width constraint from Save button (@goldjee)
+- [#29951](https://github.com/apache/superset/pull/29951) fix(i18n): translation fix in server side generated time grains (@Seboeb)
+- [#29938](https://github.com/apache/superset/pull/29938) fix: thumbnail url json response was malformed (@eschutho)
+- [#29944](https://github.com/apache/superset/pull/29944) fix: only show dataset name in list (@eschutho)
+- [#29935](https://github.com/apache/superset/pull/29935) fix: Fix delete_fake_db (@stamplevskiyd)
+- [#29522](https://github.com/apache/superset/pull/29522) fix(cli): add impersonate_user to db import (@chessman)
+- [#29895](https://github.com/apache/superset/pull/29895) fix(PivotTable): Pass string only to safeHtmlSpan (@geido)
+- [#29864](https://github.com/apache/superset/pull/29864) fix: mypy issue on py3.9 + prevent similar issues (@mistercrunch)
+- [#29861](https://github.com/apache/superset/pull/29861) fix: mypy fails related to simplejson.dumps (@mistercrunch)
+- [#24411](https://github.com/apache/superset/pull/24411) fix(docs): update timescale.png (@mathisve)
+- [#29851](https://github.com/apache/superset/pull/29851) fix: Add missing icons (@kgabryje)
+- [#29591](https://github.com/apache/superset/pull/29591) fix: machine auth for GAQ enabled deployments (@harshit2283)
+- [#29798](https://github.com/apache/superset/pull/29798) fix: set default timezone to UTC for cron timezone conversions (@danielli-ziprecruiter)
+- [#28796](https://github.com/apache/superset/pull/28796) fix(list/chart views): Chart Properties modal now has transitions (@rusackas)
+- [#29688](https://github.com/apache/superset/pull/29688) fix(ci): release process for labeling PRs (@mistercrunch)
+- [#29779](https://github.com/apache/superset/pull/29779) fix: remove --no-optional from docker-compose build (@mistercrunch)
+
+**Others**
+
+- [#33745](https://github.com/apache/superset/pull/33745) build: update Dockerfile to 3.11.13-slim-bookworm (@gpchandran)
+- [#33612](https://github.com/apache/superset/pull/33612) chore: update Dockerfile - Upgrade to 3.11.12 (@gpchandran)
+- [#33339](https://github.com/apache/superset/pull/33339) chore(🦾): bump python h11 0.14.0 -> 0.16.0 (@github-actions[bot])
+- [#32745](https://github.com/apache/superset/pull/32745) chore(🦾): bump python sqlglot 26.1.3 -> 26.11.1 (@github-actions[bot])
+- [#32239](https://github.com/apache/superset/pull/32239) docs: adding notes about using uv instead of raw pip (@mistercrunch)
+- [#32221](https://github.com/apache/superset/pull/32221) chore(ci): fix ephemeral env null issue number (v2) (@dpgaspar)
+- [#32220](https://github.com/apache/superset/pull/32220) chore(ci): fix ephemeral env null issue number (@dpgaspar)
+- [#32030](https://github.com/apache/superset/pull/32030) chore(timeseries charts): adjust legend width by padding (@eschutho)
+- [#32062](https://github.com/apache/superset/pull/32062) chore: Re-enable asnyc event API tests (@Vitor-Avila)
+- [#32004](https://github.com/apache/superset/pull/32004) refactor(Radio): Upgrade Radio Component to Ant Design 5 (@EnxDev)
+- [#32054](https://github.com/apache/superset/pull/32054) chore: Add more database-related tests (follow up to #31948) (@Vitor-Avila)
+- [#31811](https://github.com/apache/superset/pull/31811) chore(Network Errors): Update network errors on filter bars and charts (@msyavuz)
+- [#31794](https://github.com/apache/superset/pull/31794) chore: Removing DASHBOARD_CROSS_FILTERS flag and all that comes with it. (@rusackas)
+- [#32013](https://github.com/apache/superset/pull/32013) chore: add UPDATING note for CSV_UPLOAD_MAX_SIZE removal (@dpgaspar)
+- [#31961](https://github.com/apache/superset/pull/31961) refactor: Upgrade to React 17 (@kgabryje)
+- [#32007](https://github.com/apache/superset/pull/32007) chore(fe): correct typing for sheetsColumnNames (@hainenber)
+- [#32000](https://github.com/apache/superset/pull/32000) refactor: Remove CSV upload size limit and related validation (@sha174n)
+- [#31421](https://github.com/apache/superset/pull/31421) refactor(Shared_url_query): Fix shared query URL access for SQL Lab users. (@LevisNgigi)
+- [#31980](https://github.com/apache/superset/pull/31980) chore: Add FYND to INTHEWILD.md (@darpanjain07)
+- [#31976](https://github.com/apache/superset/pull/31976) refactor: Removes the legacy dataset editor (@michael-s-molina)
+- [#31858](https://github.com/apache/superset/pull/31858) chore: refactor Alert-related components (@mistercrunch)
+- [#31547](https://github.com/apache/superset/pull/31547) chore(deps): bump react-transition-group and @types/react-transition-group in /superset-frontend (@dependabot[bot])
+- [#31963](https://github.com/apache/superset/pull/31963) chore(build): enforce eslint rule banning antd imports outside of core Superset components (@rusackas)
+- [#31965](https://github.com/apache/superset/pull/31965) chore: fix `tsc` errors (@hainenber)
+- [#31860](https://github.com/apache/superset/pull/31860) chore: Empty state refactor (@mistercrunch)
+- [#31844](https://github.com/apache/superset/pull/31844) chore: replace selenium user with fixed user (@villebro)
+- [#31943](https://github.com/apache/superset/pull/31943) refactor: Removes legacy dashboard endpoints (@michael-s-molina)
+- [#31942](https://github.com/apache/superset/pull/31942) refactor: Removes legacy CSS template endpoint (@michael-s-molina)
+- [#31819](https://github.com/apache/superset/pull/31819) chore(fe): migrate 6 Enzyme-based unit tests to RTL (@hainenber)
+- [#31947](https://github.com/apache/superset/pull/31947) chore: bump FAB to 4.5.3 (@dpgaspar)
+- [#30284](https://github.com/apache/superset/pull/30284) chore(GAQ): Remove GLOBAL_ASYNC_QUERIES_REDIS_CONFIG (@nsivarajan)
+- [#31926](https://github.com/apache/superset/pull/31926) chore: cypress set up tweaks (@mistercrunch)
+- [#31905](https://github.com/apache/superset/pull/31905) chore: Reduces the form_data_key length (@michael-s-molina)
+- [#31460](https://github.com/apache/superset/pull/31460) docs: Removed mentioning of .env-non-dev in docker/README.md (@nikelborm)
+- [#31907](https://github.com/apache/superset/pull/31907) chore: replace Lodash usage with native JS implementation (@hainenber)
+- [#31699](https://github.com/apache/superset/pull/31699) refactor(Menu): Upgrade Menu Component to Ant Design 5 (@geido)
+- [#31908](https://github.com/apache/superset/pull/31908) chore(fe): dev deps cleanup (@hainenber)
+- [#31916](https://github.com/apache/superset/pull/31916) docs: clarify port configuration for Cypress (@mistercrunch)
+- [#29163](https://github.com/apache/superset/pull/29163) refactor(sqllab): migrate share queries via kv by permalink (@justinpark)
+- [#29121](https://github.com/apache/superset/pull/29121) perf(dashboard): dashboard list endpoint returning large and unnecessary data (@Always-prog)
+- [#31894](https://github.com/apache/superset/pull/31894) chore(config): Deprecating Domain Sharding (@rusackas)
+- [#31795](https://github.com/apache/superset/pull/31795) chore: Re-enable skipped tests (@michael-s-molina)
+- [#31875](https://github.com/apache/superset/pull/31875) chore: add a disable for pylint (@betodealmeida)
+- [#31874](https://github.com/apache/superset/pull/31874) docs: add a note about accessing the dev env's postgres database (@mistercrunch)
+- [#31845](https://github.com/apache/superset/pull/31845) chore: add eslint to pre-commit hooks (@mistercrunch)
+- [#31847](https://github.com/apache/superset/pull/31847) chore(ci): auto delete branches on merge (@rusackas)
+- [#31846](https://github.com/apache/superset/pull/31846) chore: properly import expect from chai in cypress-base/cypress/support/e2e.ts (@mistercrunch)
+- [#31831](https://github.com/apache/superset/pull/31831) chore: bump @ant-design/icons to fix fill-rule console warning (@mistercrunch)
+- [#31503](https://github.com/apache/superset/pull/31503) chore: python version to 3.11 (while supporting 3.10) (@mistercrunch)
+- [#31761](https://github.com/apache/superset/pull/31761) build(eslint): disabling wildcard imports with eslint (@rusackas)
+- [#25933](https://github.com/apache/superset/pull/25933) chore(deps): bump selenium 4.14.0+ (@gnought)
+- [#31820](https://github.com/apache/superset/pull/31820) chore(tests): Changing the logic for an intermittent tag test (@Vitor-Avila)
+- [#31631](https://github.com/apache/superset/pull/31631) refactor(bulk_select): Fix bulk select tagging issues for users (@LevisNgigi)
+- [#31019](https://github.com/apache/superset/pull/31019) refactor(date picker): Migrate Date Picker to Ant Design 5 (@msyavuz)
+- [#31787](https://github.com/apache/superset/pull/31787) docs: improve dev python environment install (@sha174n)
+- [#31797](https://github.com/apache/superset/pull/31797) chore: adding Antonio as a helm codeowner (@eschutho)
+- [#31452](https://github.com/apache/superset/pull/31452) refactor(dashboard): Migrate ResizableContainer to TypeScript and functional component (@EnxDev)
+- [#31791](https://github.com/apache/superset/pull/31791) chore: Skips integration tests affected by legacy charts removal (@michael-s-molina)
+- [#31661](https://github.com/apache/superset/pull/31661) build(deps-dev): bump css-loader from 6.8.1 to 7.1.2 in /superset-frontend (@dependabot[bot])
+- [#31668](https://github.com/apache/superset/pull/31668) build(deps-dev): bump css-minimizer-webpack-plugin from 5.0.1 to 7.0.0 in /superset-frontend (@dependabot[bot])
+- [#31754](https://github.com/apache/superset/pull/31754) refactor: Removes Apply to all panels filters scope configuration (@michael-s-molina)
+- [#31623](https://github.com/apache/superset/pull/31623) refactor(Button): Upgrade Button component to Antd5 (@alexandrusoare)
+- [#31756](https://github.com/apache/superset/pull/31756) docs: add Remita to list (@mujibishola)
+- [#31750](https://github.com/apache/superset/pull/31750) docs: add cover genius to the user list (@US579)
+- [#31412](https://github.com/apache/superset/pull/31412) chore(ff): deprecating `DRILL_TO_DETAIL` feature flag to launch it prime-time (@rusackas)
+- [#31718](https://github.com/apache/superset/pull/31718) refactor(Steps): Migrate Steps to Ant Design 5 (@msyavuz)
+- [#31537](https://github.com/apache/superset/pull/31537) chore(deps): bump react-virtualized-auto-sizer from 1.0.24 to 1.0.25 in /superset-frontend (@dependabot[bot])
+- [#31552](https://github.com/apache/superset/pull/31552) chore(deps-dev): bump eslint-plugin-react-hooks from 4.6.0 to 4.6.2 in /superset-frontend (@dependabot[bot])
+- [#31545](https://github.com/apache/superset/pull/31545) chore(deps-dev): bump webpack from 5.94.0 to 5.97.1 in /superset-frontend (@dependabot[bot])
+- [#31551](https://github.com/apache/superset/pull/31551) chore(deps-dev): bump eslint-plugin-cypress from 3.5.0 to 3.6.0 in /superset-frontend (@dependabot[bot])
+- [#31559](https://github.com/apache/superset/pull/31559) chore(deps): bump abortcontroller-polyfill from 1.7.5 to 1.7.8 in /superset-frontend (@dependabot[bot])
+- [#31653](https://github.com/apache/superset/pull/31653) build(deps): update @emotion/cache requirement from ^11.4.0 to ^11.14.0 in /superset-frontend/packages/superset-ui-demo (@dependabot[bot])
+- [#31664](https://github.com/apache/superset/pull/31664) build(deps): bump markdown-to-jsx from 7.4.7 to 7.7.2 in /superset-frontend (@dependabot[bot])
+- [#31665](https://github.com/apache/superset/pull/31665) build(deps): bump html-webpack-plugin from 5.6.0 to 5.6.3 in /superset-frontend (@dependabot[bot])
+- [#31666](https://github.com/apache/superset/pull/31666) build(deps-dev): bump @emotion/babel-plugin from 11.12.0 to 11.13.5 in /superset-frontend (@dependabot[bot])
+- [#31667](https://github.com/apache/superset/pull/31667) build(deps-dev): bump jsdom from 24.1.1 to 25.0.1 in /superset-frontend (@dependabot[bot])
+- [#31685](https://github.com/apache/superset/pull/31685) build(deps): bump jinja2 from 3.1.4 to 3.1.5 in /superset/translations (@dependabot[bot])
+- [#31622](https://github.com/apache/superset/pull/31622) chore: replace `imp` built-in module usage for future Python3.12 usage (@hainenber)
+- [#31712](https://github.com/apache/superset/pull/31712) chore(fe/sec): resolve High CVE-2024-21538 and Moderate CVE-2024-55565 by bumping `nanoid` and `cross-spawn` (@hainenber)
+- [#31627](https://github.com/apache/superset/pull/31627) chore(helm): bump helm on CI to latest version (@villebro)
+- [#31701](https://github.com/apache/superset/pull/31701) chore: add helm code owners (@villebro)
+- [#31691](https://github.com/apache/superset/pull/31691) docs: add Open edX to users list (@pomegranited)
+- [#31693](https://github.com/apache/superset/pull/31693) refactor(space): Migrate Space to Ant Design 5 (@msyavuz)
+- [#31530](https://github.com/apache/superset/pull/31530) chore(deps-dev): bump eslint from 9.14.0 to 9.17.0 in /superset-websocket (@dependabot[bot])
+- [#31670](https://github.com/apache/superset/pull/31670) build(deps): update echarts requirement from ^5.4.1 to ^5.6.0 in /superset-frontend/plugins/plugin-chart-echarts (@dependabot[bot])
+- [#31652](https://github.com/apache/superset/pull/31652) build(deps): update chalk requirement from ^5.4.0 to ^5.4.1 in /superset-frontend/packages/generator-superset (@dependabot[bot])
+- [#31655](https://github.com/apache/superset/pull/31655) build(deps): bump core-js from 3.38.1 to 3.39.0 in /superset-frontend/packages/superset-ui-demo (@dependabot[bot])
+- [#31656](https://github.com/apache/superset/pull/31656) build(deps): bump antd from 5.22.5 to 5.22.7 in /docs (@dependabot[bot])
+- [#31657](https://github.com/apache/superset/pull/31657) build(deps-dev): update @babel/core requirement from ^7.23.9 to ^7.26.0 in /superset-frontend/packages/superset-ui-demo (@dependabot[bot])
+- [#31658](https://github.com/apache/superset/pull/31658) build(deps): update @emotion/react requirement from ^11.13.3 to ^11.14.0 in /superset-frontend/packages/superset-ui-demo (@dependabot[bot])
+- [#31662](https://github.com/apache/superset/pull/31662) build(deps-dev): bump @types/node from 22.7.4 to 22.10.3 in /superset-websocket (@dependabot[bot])
+- [#31663](https://github.com/apache/superset/pull/31663) build(deps-dev): bump typescript-eslint from 8.12.2 to 8.19.0 in /superset-websocket (@dependabot[bot])
+- [#31672](https://github.com/apache/superset/pull/31672) build(deps-dev): update @types/node requirement from ^22.5.4 to ^22.10.3 in /superset-frontend/packages/superset-ui-core (@dependabot[bot])
+- [#31633](https://github.com/apache/superset/pull/31633) refactor(empty): Migrate Empty component to Ant Design 5 (@msyavuz)
+- [#31607](https://github.com/apache/superset/pull/31607) refactor(Divider): Migrate Divider to Ant Design 5 (@msyavuz)
+- [#31310](https://github.com/apache/superset/pull/31310) refactor(moment): Replace Moment.js with DayJs (@msyavuz)
+- [#30778](https://github.com/apache/superset/pull/30778) build(deps-dev): update @types/jest requirement from ^29.5.12 to ^29.5.14 in /superset-frontend/plugins/plugin-chart-handlebars (@dependabot[bot])
+- [#31526](https://github.com/apache/superset/pull/31526) chore(deps): bump hot-shots from 10.0.0 to 10.2.1 in /superset-websocket (@dependabot[bot])
+- [#31538](https://github.com/apache/superset/pull/31538) chore(deps-dev): update @babel/preset-react requirement from ^7.23.3 to ^7.26.3 in /superset-frontend/packages/superset-ui-demo (@dependabot[bot])
+- [#31217](https://github.com/apache/superset/pull/31217) chore(deps-dev): bump eslint-plugin-jest-dom from 3.6.5 to 5.5.0 in /superset-frontend (@dependabot[bot])
+- [#31541](https://github.com/apache/superset/pull/31541) chore(deps): bump antd from 5.22.2 to 5.22.5 in /docs (@dependabot[bot])
+- [#31536](https://github.com/apache/superset/pull/31536) chore(deps): bump prism-react-renderer from 2.4.0 to 2.4.1 in /docs (@dependabot[bot])
+- [#30322](https://github.com/apache/superset/pull/30322) build(deps): bump find-my-way and @applitools/eyes-cypress in /superset-frontend/cypress-base (@dependabot[bot])
+- [#30789](https://github.com/apache/superset/pull/30789) build(deps-dev): update @types/lodash requirement from ^4.17.7 to ^4.17.13 in /superset-frontend/packages/superset-ui-core (@dependabot[bot])
+- [#31523](https://github.com/apache/superset/pull/31523) chore(deps-dev): bump @types/lodash from 4.17.7 to 4.17.13 in /superset-websocket (@dependabot[bot])
+- [#31546](https://github.com/apache/superset/pull/31546) chore(deps-dev): bump @types/rison from 0.0.9 to 0.1.0 in /superset-frontend (@dependabot[bot])
+- [#31557](https://github.com/apache/superset/pull/31557) chore(deps): bump react-reverse-portal from 2.1.1 to 2.1.2 in /superset-frontend (@dependabot[bot])
+- [#31577](https://github.com/apache/superset/pull/31577) docs: add Virtuoso QA to users list (@shubham-rohatgi)
+- [#31520](https://github.com/apache/superset/pull/31520) chore(deps): bump debug from 4.3.7 to 4.4.0 in /superset-websocket/utils/client-ws-app (@dependabot[bot])
+- [#30474](https://github.com/apache/superset/pull/30474) build(deps-dev): bump thread-loader from 4.0.2 to 4.0.4 in /superset-frontend (@dependabot[bot])
+- [#30085](https://github.com/apache/superset/pull/30085) build(deps): bump gh-pages from 5.0.0 to 6.1.1 in /superset-frontend/packages/superset-ui-demo (@dependabot[bot])
+- [#31558](https://github.com/apache/superset/pull/31558) chore(deps-dev): bump eslint-import-resolver-typescript from 3.6.3 to 3.7.0 in /superset-frontend (@dependabot[bot])
+- [#31521](https://github.com/apache/superset/pull/31521) chore(deps-dev): bump prettier from 3.3.3 to 3.4.2 in /superset-websocket (@dependabot[bot])
+- [#30785](https://github.com/apache/superset/pull/30785) build(deps-dev): update @types/underscore requirement from ^1.11.15 to ^1.13.0 in /superset-frontend/plugins/legacy-preset-chart-deckgl (@dependabot[bot])
+- [#30779](https://github.com/apache/superset/pull/30779) build(deps-dev): update @types/lodash requirement from ^4.17.7 to ^4.17.13 in /superset-frontend/plugins/plugin-chart-handlebars (@dependabot[bot])
+- [#31539](https://github.com/apache/superset/pull/31539) chore(deps-dev): bump webpack from 5.96.1 to 5.97.1 in /docs (@dependabot[bot])
+- [#31540](https://github.com/apache/superset/pull/31540) chore(deps): bump @algolia/client-search from 5.15.0 to 5.18.0 in /docs (@dependabot[bot])
+- [#27809](https://github.com/apache/superset/pull/27809) build(deps): bump @math.gl/web-mercator from 3.6.3 to 4.0.1 in /superset-frontend/plugins/legacy-preset-chart-deckgl (@dependabot[bot])
+- [#31529](https://github.com/apache/superset/pull/31529) chore(deps): update @deck.gl/aggregation-layers requirement from ^9.0.37 to ^9.0.38 in /superset-frontend/plugins/legacy-preset-chart-deckgl (@dependabot[bot])
+- [#31572](https://github.com/apache/superset/pull/31572) chore(deps): bump gh-pages from 5.0.0 to 6.2.0 in /superset-frontend/packages/superset-ui-demo (@dependabot[bot])
+- [#30458](https://github.com/apache/superset/pull/30458) build(deps): bump @types/d3-format from 1.4.5 to 3.0.4 in /superset-frontend/packages/superset-ui-core (@dependabot[bot])
+- [#31542](https://github.com/apache/superset/pull/31542) chore(deps): bump @docsearch/react from 3.6.3 to 3.8.2 in /docs (@dependabot[bot])
+- [#31225](https://github.com/apache/superset/pull/31225) chore(deps-dev): bump typescript from 4.9.5 to 5.7.2 in /superset-frontend/packages/superset-ui-demo (@dependabot[bot])
+- [#31388](https://github.com/apache/superset/pull/31388) chore(deps): update dompurify requirement from ^3.1.3 to ^3.2.3 in /superset-frontend/plugins/legacy-preset-chart-nvd3 (@dependabot[bot])
+- [#31543](https://github.com/apache/superset/pull/31543) chore(deps): bump @storybook/types from 8.1.11 to 8.4.7 in /superset-frontend/packages/superset-ui-demo (@dependabot[bot])
+- [#31533](https://github.com/apache/superset/pull/31533) chore(deps): update chalk requirement from ^5.3.0 to ^5.4.0 in /superset-frontend/packages/generator-superset (@dependabot[bot])
+- [#31532](https://github.com/apache/superset/pull/31532) chore(deps-dev): update @types/d3-time requirement from ^3.0.3 to ^3.0.4 in /superset-frontend/packages/superset-ui-core (@dependabot[bot])
+- [#31531](https://github.com/apache/superset/pull/31531) chore(deps): update yeoman-generator requirement from ^7.3.2 to ^7.4.0 in /superset-frontend/packages/generator-superset (@dependabot[bot])
+- [#31525](https://github.com/apache/superset/pull/31525) chore(deps): update @deck.gl/layers requirement from ^9.0.37 to ^9.0.38 in /superset-frontend/plugins/legacy-preset-chart-deckgl (@dependabot[bot])
+- [#31524](https://github.com/apache/superset/pull/31524) chore(deps-dev): update @babel/types requirement from ^7.25.6 to ^7.26.3 in /superset-frontend/plugins/plugin-chart-pivot-table (@dependabot[bot])
+- [#31389](https://github.com/apache/superset/pull/31389) chore(deps): update @emotion/styled requirement from ^11.3.0 to ^11.14.0 in /superset-frontend/packages/superset-ui-demo (@dependabot[bot])
+- [#31519](https://github.com/apache/superset/pull/31519) chore: remove dependency on func_timeout because LGPL (@mistercrunch)
+- [#31517](https://github.com/apache/superset/pull/31517) chore: update browser list (@mistercrunch)
+- [#31420](https://github.com/apache/superset/pull/31420) refactor(Modal): Upgrade Modal component to Antd5 (@alexandrusoare)
+- [#31511](https://github.com/apache/superset/pull/31511) chore: rename `apply_post_process` (@betodealmeida)
+- [#31390](https://github.com/apache/superset/pull/31390) chore(gha): bump ubuntu to latest fresh release (@mistercrunch)
+- [#31313](https://github.com/apache/superset/pull/31313) chore: deprecate pip-compile-multi in favor or uv (@mistercrunch)
+- [#31515](https://github.com/apache/superset/pull/31515) chore: deprecate fossa in favor of liccheck to validate python licenses (@mistercrunch)
+- [#31501](https://github.com/apache/superset/pull/31501) chore(code owners): Update CODEOWNERS file to remove a couple inactive contributors (@rusackas)
+- [#31496](https://github.com/apache/superset/pull/31496) docs: Update new user for Careem to user's list (@samraHanif0340)
+- [#31451](https://github.com/apache/superset/pull/31451) chore: remove numba and llvmlite deps as they are large and we don't use them (@mistercrunch)
+- [#30605](https://github.com/apache/superset/pull/30605) chore(translations): German translation update (@gerbermichi)
+- [#31262](https://github.com/apache/superset/pull/31262) chore: deprecate `pylint` in favor of `ruff` (@mistercrunch)
+- [#31422](https://github.com/apache/superset/pull/31422) docs: CVEs fixed on 4.1.0 v2 (@dpgaspar)
+- [#31268](https://github.com/apache/superset/pull/31268) refactor: Migrate AdhocFilterEditPopoverSqlTabContent to TypeScript (@EnxDev)
+- [#30196](https://github.com/apache/superset/pull/30196) build(packages): npm build/publish improvements. Making packages publishable again. (@rusackas)
+- [#31378](https://github.com/apache/superset/pull/31378) chore(deps): bump nanoid from 3.3.7 to 3.3.8 in /docs (@dependabot[bot])
+- [#31381](https://github.com/apache/superset/pull/31381) chore(embedded sdk): bump sdk version number (@rusackas)
+- [#31380](https://github.com/apache/superset/pull/31380) chore(embedded sdk): bumping dependencies (@rusackas)
+- [#31362](https://github.com/apache/superset/pull/31362) chore(deps): bump nanoid from 5.0.7 to 5.0.9 in /superset-frontend/cypress-base (@dependabot[bot])
+- [#31209](https://github.com/apache/superset/pull/31209) chore(deps): bump antd from 5.21.6 to 5.22.2 in /docs (@dependabot[bot])
+- [#31219](https://github.com/apache/superset/pull/31219) chore(deps-dev): bump esbuild from 0.20.0 to 0.24.0 in /superset-frontend (@dependabot[bot])
+- [#31314](https://github.com/apache/superset/pull/31314) chore(deps): bump path-to-regexp and express in /superset-websocket/utils/client-ws-app (@dependabot[bot])
+- [#31220](https://github.com/apache/superset/pull/31220) chore(deps): bump winston from 3.15.0 to 3.17.0 in /superset-websocket (@dependabot[bot])
+- [#31218](https://github.com/apache/superset/pull/31218) chore(deps-dev): bump @babel/eslint-parser from 7.23.10 to 7.25.9 in /superset-frontend (@dependabot[bot])
+- [#31222](https://github.com/apache/superset/pull/31222) chore(deps-dev): bump @eslint/js from 9.14.0 to 9.16.0 in /superset-websocket (@dependabot[bot])
+- [#31352](https://github.com/apache/superset/pull/31352) docs: CVEs fixed on 4.1.0 (@dpgaspar)
+- [#31168](https://github.com/apache/superset/pull/31168) refactor(Alert): Migrate Alert component to Ant Design V5 (@LevisNgigi)
+- [#31290](https://github.com/apache/superset/pull/31290) chore(FilterBar): move the "Add/edit filters" button in the FilterBar to the settings menu (@alexandrusoare)
+- [#31312](https://github.com/apache/superset/pull/31312) refactor(Name_column): Make 'Name' column of Saved Query page into links (@LevisNgigi)
+- [#31203](https://github.com/apache/superset/pull/31203) chore(deps): bump deck.gl from 9.0.34 to 9.0.36 in /superset-frontend/plugins/legacy-preset-chart-deckgl (@dependabot[bot])
+- [#31275](https://github.com/apache/superset/pull/31275) chore: relax greenlet requirements (@sadpandajoe)
+- [#31205](https://github.com/apache/superset/pull/31205) chore(deps-dev): bump typescript from 5.6.3 to 5.7.2 in /docs (@dependabot[bot])
+- [#31207](https://github.com/apache/superset/pull/31207) chore(deps): bump @algolia/client-search from 5.12.0 to 5.15.0 in /docs (@dependabot[bot])
+- [#31208](https://github.com/apache/superset/pull/31208) chore(deps): bump less from 4.2.0 to 4.2.1 in /docs (@dependabot[bot])
+- [#31204](https://github.com/apache/superset/pull/31204) chore(deps-dev): bump @docusaurus/tsconfig from 3.5.2 to 3.6.3 in /docs (@dependabot[bot])
+- [#31206](https://github.com/apache/superset/pull/31206) chore(deps): bump swagger-ui-react from 5.17.14 to 5.18.2 in /docs (@dependabot[bot])
+- [#31224](https://github.com/apache/superset/pull/31224) chore(deps-dev): bump @types/jest from 29.5.12 to 29.5.14 in /superset-websocket (@dependabot[bot])
+- [#31228](https://github.com/apache/superset/pull/31228) chore(deps): bump @types/react-table from 7.7.19 to 7.7.20 in /superset-frontend (@dependabot[bot])
+- [#31210](https://github.com/apache/superset/pull/31210) chore(deps-dev): bump @docusaurus/module-type-aliases from 3.5.2 to 3.6.3 in /docs (@dependabot[bot])
+- [#31213](https://github.com/apache/superset/pull/31213) chore(deps): bump @ant-design/icons from 5.5.1 to 5.5.2 in /docs (@dependabot[bot])
+- [#31230](https://github.com/apache/superset/pull/31230) chore(deps): bump @scarf/scarf from 1.3.0 to 1.4.0 in /superset-frontend (@dependabot[bot])
+- [#31259](https://github.com/apache/superset/pull/31259) chore(bug report template): bump Superset versions to reflect 4.1.1 release (@sfirke)
+- [#31231](https://github.com/apache/superset/pull/31231) chore(deps): bump re-resizable from 6.10.0 to 6.10.1 in /superset-frontend (@dependabot[bot])
+- [#31270](https://github.com/apache/superset/pull/31270) refactor: Split SliceHeaderControls into smaller files (@kgabryje)
+- [#30864](https://github.com/apache/superset/pull/30864) docs: adapt docs to suggest 'docker compose up --build' (@mistercrunch)
+- [#31034](https://github.com/apache/superset/pull/31034) chore: simplify Dockerfile package install calls with bash wrappers (@mistercrunch)
+- [#31214](https://github.com/apache/superset/pull/31214) chore(deps): bump codecov/codecov-action from 4 to 5 (@dependabot[bot])
+- [#31250](https://github.com/apache/superset/pull/31250) chore(🦾): bump python flask-migrate subpackage(s) (@github-actions[bot])
+- [#31249](https://github.com/apache/superset/pull/31249) chore(🦾): bump python nh3 0.2.18 -> 0.2.19 (@github-actions[bot])
+- [#31253](https://github.com/apache/superset/pull/31253) chore(🦾): bump python pyjwt 2.10.0 -> 2.10.1 (@github-actions[bot])
+- [#31254](https://github.com/apache/superset/pull/31254) chore: pin greenlet in base dependencies (@mistercrunch)
+- [#31186](https://github.com/apache/superset/pull/31186) docs(contributing): how to nuke the docker-compose postgres (@mistercrunch)
+- [#31244](https://github.com/apache/superset/pull/31244) perf: Optimize DashboardPage and SyncDashboardState (@kgabryje)
+- [#31243](https://github.com/apache/superset/pull/31243) perf: Optimize native filters and cross filters (@kgabryje)
+- [#31240](https://github.com/apache/superset/pull/31240) perf: Optimize dashboard grid components (@kgabryje)
+- [#31242](https://github.com/apache/superset/pull/31242) perf: Optimize Dashboard components (@kgabryje)
+- [#31241](https://github.com/apache/superset/pull/31241) perf: Optimize dashboard chart-related components (@kgabryje)
+- [#31182](https://github.com/apache/superset/pull/31182) chore(Tooltip): Upgrade Tooltip to Ant Design 5 (@alexandrusoare)
+- [#31193](https://github.com/apache/superset/pull/31193) refactor: Creates the VizType enum (@michael-s-molina)
+- [#31165](https://github.com/apache/superset/pull/31165) docs: update slack alert instructions to work with V2 slack API (@PJDuszynski)
+- [#28461](https://github.com/apache/superset/pull/28461) chore(🦾): bump python sqlglot 23.6.3 -> 23.15.8 (@github-actions[bot])
+- [#31171](https://github.com/apache/superset/pull/31171) chore(🦾): bump python pyparsing 3.1.2 -> 3.2.0 (@github-actions[bot])
+- [#31170](https://github.com/apache/superset/pull/31170) chore(deps): cap async_timeout<5.0.0 (@mistercrunch)
+- [#31032](https://github.com/apache/superset/pull/31032) refactor: remove more sqlparse (@betodealmeida)
+- [#31126](https://github.com/apache/superset/pull/31126) chore(🦾): bump python importlib-metadata 7.1.0 -> 8.5.0 (@github-actions[bot])
+- [#29382](https://github.com/apache/superset/pull/29382) chore: deprecate tox in favor of act (@mistercrunch)
+- [#31109](https://github.com/apache/superset/pull/31109) chore(🦾): bump python billiard 4.2.0 -> 4.2.1 (@github-actions[bot])
+- [#31138](https://github.com/apache/superset/pull/31138) chore(🦾): bump python flask-limiter 3.7.0 -> 3.8.0 (@github-actions[bot])
+- [#31140](https://github.com/apache/superset/pull/31140) chore(🦾): bump python mako 1.3.5 -> 1.3.6 (@github-actions[bot])
+- [#31127](https://github.com/apache/superset/pull/31127) chore(🦾): bump python celery subpackage(s) (@github-actions[bot])
+- [#31128](https://github.com/apache/superset/pull/31128) chore(🦾): bump python humanize 4.9.0 -> 4.11.0 (@github-actions[bot])
+- [#31129](https://github.com/apache/superset/pull/31129) chore(🦾): bump python simplejson 3.19.2 -> 3.19.3 (@github-actions[bot])
+- [#31130](https://github.com/apache/superset/pull/31130) chore(🦾): bump python numexpr 2.10.1 -> 2.10.2 (@github-actions[bot])
+- [#31132](https://github.com/apache/superset/pull/31132) chore(🦾): bump python slack-sdk 3.27.2 -> 3.33.4 (@github-actions[bot])
+- [#31133](https://github.com/apache/superset/pull/31133) chore(🦾): bump python pyopenssl 24.1.0 -> 24.2.1 (@github-actions[bot])
+- [#31135](https://github.com/apache/superset/pull/31135) chore(🦾): bump python dnspython 2.6.1 -> 2.7.0 (@github-actions[bot])
+- [#31136](https://github.com/apache/superset/pull/31136) chore(🦾): bump python zstandard 0.22.0 -> 0.23.0 (@github-actions[bot])
+- [#31137](https://github.com/apache/superset/pull/31137) chore(🦾): bump python limits 3.12.0 -> 3.13.0 (@github-actions[bot])
+- [#31139](https://github.com/apache/superset/pull/31139) chore(🦾): bump python flask-jwt-extended 4.6.0 -> 4.7.1 (@github-actions[bot])
+- [#31125](https://github.com/apache/superset/pull/31125) chore(🦾): bump python gunicorn 22.0.0 -> 23.0.0 (@github-actions[bot])
+- [#31124](https://github.com/apache/superset/pull/31124) chore(🦾): bump python zipp 3.19.0 -> 3.21.0 (@github-actions[bot])
+- [#31123](https://github.com/apache/superset/pull/31123) chore(🦾): bump python flask-compress 1.15 -> 1.17 (@github-actions[bot])
+- [#31108](https://github.com/apache/superset/pull/31108) chore(🦾): bump python dill 0.3.8 -> 0.3.9 (@github-actions[bot])
+- [#31116](https://github.com/apache/superset/pull/31116) chore(🦾): bump python email-validator 2.1.1 -> 2.2.0 (@github-actions[bot])
+- [#31153](https://github.com/apache/superset/pull/31153) chore(asf): add `gh-pages` to protected branches (@rusackas)
+- [#31122](https://github.com/apache/superset/pull/31122) chore(🦾): bump python async-timeout 4.0.3 -> 5.0.1 (@github-actions[bot])
+- [#31121](https://github.com/apache/superset/pull/31121) chore(🦾): bump python prompt-toolkit 3.0.44 -> 3.0.48 (@github-actions[bot])
+- [#31119](https://github.com/apache/superset/pull/31119) chore(🦾): bump python sqlparse 0.5.0 -> 0.5.2 (@github-actions[bot])
+- [#30963](https://github.com/apache/superset/pull/30963) refactor(List): Upgrade List from antdesign4 to antdesign5 (@alexandrusoare)
+- [#31113](https://github.com/apache/superset/pull/31113) chore(🦾): bump python mysqlclient 2.2.4 -> 2.2.6 (@github-actions[bot])
+- [#31114](https://github.com/apache/superset/pull/31114) chore(🦾): bump python grpcio-status subpackage(s) (@github-actions[bot])
+- [#31112](https://github.com/apache/superset/pull/31112) chore(🦾): bump python cycler 0.11.0 -> 0.12.1 (@github-actions[bot])
+- [#31091](https://github.com/apache/superset/pull/31091) chore(🦾): bump python croniter 2.0.5 -> 5.0.1 (@github-actions[bot])
+- [#31107](https://github.com/apache/superset/pull/31107) chore(🦾): bump python google-auth 2.29.0 -> 2.36.0 (@github-actions[bot])
+- [#31106](https://github.com/apache/superset/pull/31106) chore(🦾): bump python psutil 6.0.0 -> 6.1.0 (@github-actions[bot])
+- [#31105](https://github.com/apache/superset/pull/31105) chore(🦾): bump python dnspython 2.6.1 -> 2.7.0 (@github-actions[bot])
+- [#31102](https://github.com/apache/superset/pull/31102) chore(🦾): bump python markdown 3.6 -> 3.7 (@github-actions[bot])
+- [#31101](https://github.com/apache/superset/pull/31101) chore(🦾): bump python pluggy 1.4.0 -> 1.5.0 (@github-actions[bot])
+- [#31100](https://github.com/apache/superset/pull/31100) chore(🦾): bump python sqloxide 0.1.43 -> 0.1.51 (@github-actions[bot])
+- [#31099](https://github.com/apache/superset/pull/31099) chore(🦾): bump python wheel 0.43.0 -> 0.45.1 (@github-actions[bot])
+- [#31098](https://github.com/apache/superset/pull/31098) chore(🦾): bump python pyproject-api 1.6.1 -> 1.8.0 (@github-actions[bot])
+- [#31096](https://github.com/apache/superset/pull/31096) chore(🦾): bump python pytest-cov 5.0.0 -> 6.0.0 (@github-actions[bot])
+- [#31094](https://github.com/apache/superset/pull/31094) chore(🦾): bump python chardet 5.1.0 -> 5.2.0 (@github-actions[bot])
+- [#31093](https://github.com/apache/superset/pull/31093) chore(🦾): bump python jsonpath-ng 1.6.1 -> 1.7.0 (@github-actions[bot])
+- [#31092](https://github.com/apache/superset/pull/31092) chore(🦾): bump python sshtunnel subpackage(s) (@github-actions[bot])
+- [#31097](https://github.com/apache/superset/pull/31097) chore(🦾): bump python mako 1.3.5 -> 1.3.6 (@github-actions[bot])
+- [#31090](https://github.com/apache/superset/pull/31090) chore(🦾): bump python tomlkit 0.12.5 -> 0.13.2 (@github-actions[bot])
+- [#31087](https://github.com/apache/superset/pull/31087) chore(🦾): bump python isodate 0.6.1 -> 0.7.2 (@github-actions[bot])
+- [#31082](https://github.com/apache/superset/pull/31082) chore(🦾): bump python db-dtypes 1.2.0 -> 1.3.1 (@github-actions[bot])
+- [#31081](https://github.com/apache/superset/pull/31081) chore(🦾): bump python trino 0.328.0 -> 0.330.0 (@github-actions[bot])
+- [#31089](https://github.com/apache/superset/pull/31089) chore(🦾): bump python certifi 2024.2.2 -> 2024.8.30 (@github-actions[bot])
+- [#31088](https://github.com/apache/superset/pull/31088) chore(🦾): bump python pydata-google-auth 1.7.0 -> 1.9.0 (@github-actions[bot])
+- [#31086](https://github.com/apache/superset/pull/31086) chore(🦾): bump python pyproject-hooks 1.0.0 -> 1.2.0 (@github-actions[bot])
+- [#31085](https://github.com/apache/superset/pull/31085) chore(🦾): bump python sqlalchemy-bigquery 1.11.0 -> 1.12.0 (@github-actions[bot])
+- [#31084](https://github.com/apache/superset/pull/31084) chore(🦾): bump python kiwisolver 1.4.5 -> 1.4.7 (@github-actions[bot])
+- [#31083](https://github.com/apache/superset/pull/31083) chore(🦾): bump python coverage subpackage(s) (@github-actions[bot])
+- [#31077](https://github.com/apache/superset/pull/31077) chore(🦾): bump python cfgv 3.3.1 -> 3.4.0 (@github-actions[bot])
+- [#31075](https://github.com/apache/superset/pull/31075) chore(🦾): bump python fonttools 4.51.0 -> 4.55.0 (@github-actions[bot])
+- [#31076](https://github.com/apache/superset/pull/31076) chore(🦾): bump python pyasn1-modules 0.4.0 -> 0.4.1 (@github-actions[bot])
+- [#31079](https://github.com/apache/superset/pull/31079) chore(🦾): bump python pyhive subpackage(s) (@github-actions[bot])
+- [#31078](https://github.com/apache/superset/pull/31078) chore(🦾): bump python google-cloud-core 2.3.2 -> 2.4.1 (@github-actions[bot])
+- [#31048](https://github.com/apache/superset/pull/31048) chore(🦾): bump python sqlalchemy-utils subpackage(s) (@github-actions[bot])
+- [#31073](https://github.com/apache/superset/pull/31073) chore(🦾): bump python amqp 5.2.0 -> 5.3.1 (@github-actions[bot])
+- [#31071](https://github.com/apache/superset/pull/31071) chore(🦾): bump python cachetools 5.3.3 -> 5.5.0 (@github-actions[bot])
+- [#31074](https://github.com/apache/superset/pull/31074) chore(🦾): bump python kombu 5.3.7 -> 5.4.2 (@github-actions[bot])
+- [#31066](https://github.com/apache/superset/pull/31066) chore(🦾): bump python pyyaml 6.0.1 -> 6.0.2 (@github-actions[bot])
+- [#31068](https://github.com/apache/superset/pull/31068) chore(🦾): bump python tqdm 4.66.4 -> 4.67.1 (@github-actions[bot])
+- [#31069](https://github.com/apache/superset/pull/31069) chore(🦾): bump python proto-plus 1.22.2 -> 1.25.0 (@github-actions[bot])
+- [#31067](https://github.com/apache/superset/pull/31067) chore(🦾): bump python importlib-resources 6.4.0 -> 6.4.5 (@github-actions[bot])
+- [#31062](https://github.com/apache/superset/pull/31062) chore(🦾): bump python apispec subpackage(s) (@github-actions[bot])
+- [#31056](https://github.com/apache/superset/pull/31056) chore(🦾): bump python deprecated 1.2.14 -> 1.2.15 (@github-actions[bot])
+- [#31050](https://github.com/apache/superset/pull/31050) chore(🦾): bump python pre-commit 3.7.1 -> 4.0.1 (@github-actions[bot])
+- [#31064](https://github.com/apache/superset/pull/31064) chore(🦾): bump python charset-normalizer 3.3.2 -> 3.4.0 (@github-actions[bot])
+- [#31001](https://github.com/apache/superset/pull/31001) chore(🦾): bump python ruff 0.4.5 -> 0.8.0 (@github-actions[bot])
+- [#31049](https://github.com/apache/superset/pull/31049) chore(🦾): bump python googleapis-common-protos 1.63.0 -> 1.66.0 (@github-actions[bot])
+- [#31046](https://github.com/apache/superset/pull/31046) chore(🦾): bump python cron-descriptor 1.4.3 -> 1.4.5 (@github-actions[bot])
+- [#31052](https://github.com/apache/superset/pull/31052) chore(🦾): bump python flask-wtf 1.2.1 -> 1.2.2 (@github-actions[bot])
+- [#31044](https://github.com/apache/superset/pull/31044) docs: updated the install process in pypi.mdx (@Rkejji)
+- [#31054](https://github.com/apache/superset/pull/31054) chore(🦾): bump python nh3 0.2.17 -> 0.2.18 (@github-actions[bot])
+- [#31045](https://github.com/apache/superset/pull/31045) chore(🦾): bump python marshmallow 3.21.2 -> 3.23.1 (@github-actions[bot])
+- [#31041](https://github.com/apache/superset/pull/31041) chore(🦾): bump python idna 3.7 -> 3.10 (@github-actions[bot])
+- [#31042](https://github.com/apache/superset/pull/31042) chore(🦾): bump python pyjwt 2.8.0 -> 2.10.0 (@github-actions[bot])
+- [#31040](https://github.com/apache/superset/pull/31040) chore(🦾): bump python et-xmlfile 1.1.0 -> 2.0.0 & remove pyhive[hive] from requirements/development.in (@github-actions[bot])
+- [#30651](https://github.com/apache/superset/pull/30651) chore(legacy-plugin-chart-map-box): replace viewport-mercator-project with @math.gl/web-mercator (@birkskyum)
+- [#31004](https://github.com/apache/superset/pull/31004) chore(🦾): bump python pandas subpackage(s) (@github-actions[bot])
+- [#31030](https://github.com/apache/superset/pull/31030) chore: Cleanup code related to MetadataBar, fix types (@kgabryje)
+- [#31029](https://github.com/apache/superset/pull/31029) chore: Refactor dashboard header to func component (@kgabryje)
+- [#30998](https://github.com/apache/superset/pull/30998) chore(🦾): bump python cattrs 23.2.3 -> 24.1.2 (@github-actions[bot])
+- [#30867](https://github.com/apache/superset/pull/30867) docs: Update doc about CSV upload (@seiyab)
+- [#30972](https://github.com/apache/superset/pull/30972) docs: Embedded sdk (@jpchev)
+- [#30981](https://github.com/apache/superset/pull/30981) chore: publish wheels (@dimbleby)
+- [#31000](https://github.com/apache/superset/pull/31000) chore(🦾): bump python flask-babel subpackage(s) (@github-actions[bot])
+- [#31002](https://github.com/apache/superset/pull/31002) chore(🦾): bump python cffi 1.16.0 -> 1.17.1 (@github-actions[bot])
+- [#31006](https://github.com/apache/superset/pull/31006) chore(🦾): bump python numexpr 2.10.0 -> 2.10.1 (@github-actions[bot])
+- [#31021](https://github.com/apache/superset/pull/31021) chore: add unit tests for `is_mutating()` (@betodealmeida)
+- [#30918](https://github.com/apache/superset/pull/30918) chore(helm): bumping app version to 4.1.1 in helm chart (@lodu)
+- [#30948](https://github.com/apache/superset/pull/30948) chore: add performance information to tooltip (@eschutho)
+- [#30970](https://github.com/apache/superset/pull/30970) build(deps): bump cross-spawn from 7.0.3 to 7.0.6 in /docs (@dependabot[bot])
+- [#30969](https://github.com/apache/superset/pull/30969) build(deps): bump cross-spawn from 7.0.3 to 7.0.6 in /superset-frontend/cypress-base (@dependabot[bot])
+- [#30818](https://github.com/apache/superset/pull/30818) chore(Accessibility): Fix accessibility for 'Show x entries' dropdown in tables (@LevisNgigi)
+- [#30946](https://github.com/apache/superset/pull/30946) chore(docs): Update list of supported databases to include CrateDB (@amotl)
+- [#30915](https://github.com/apache/superset/pull/30915) chore: update change log, UPDATING.md and bug-report.yml for 4.1 release (@sadpandajoe)
+- [#29243](https://github.com/apache/superset/pull/29243) chore(deps): Migrate from `crate[sqlalchemy]` to `sqlalchemy-cratedb` (@amotl)
+- [#30930](https://github.com/apache/superset/pull/30930) docs: add Free2Move to INTHEWILD.md (@PaoloTerzi)
+- [#30925](https://github.com/apache/superset/pull/30925) chore(ci): add tai and michael to helm owners (@villebro)
+- [#30730](https://github.com/apache/superset/pull/30730) refactor(input): Migrate Input component to Ant Design 5 (@msyavuz)
+- [#30740](https://github.com/apache/superset/pull/30740) refactor(Avatar): Migrate Avatar to Ant Design 5 (@msyavuz)
+- [#30806](https://github.com/apache/superset/pull/30806) build(deps): bump remark-gfm from 3.0.1 to 4.0.0 in /superset-frontend (@dependabot[bot])
+- [#29545](https://github.com/apache/superset/pull/29545) chore(AntD5): touchup on component imports/exports, theming ListViewCard (@rusackas)
+- [#30775](https://github.com/apache/superset/pull/30775) chore: update help text copy on dataset settings (@yousoph)
+- [#30792](https://github.com/apache/superset/pull/30792) build(deps): bump @algolia/client-search from 4.24.0 to 5.12.0 in /docs (@dependabot[bot])
+- [#30770](https://github.com/apache/superset/pull/30770) docs: make it more clear that GLOBAL_ASYNC_QUERIES is experimental/beta (@mistercrunch)
+- [#30883](https://github.com/apache/superset/pull/30883) perf: Prevent redundant calls to getRelevantDataMask (@kgabryje)
+- [#30847](https://github.com/apache/superset/pull/30847) chore(GHA): Making the Linkinator STEP non-blocking, rather than the JOB. (@rusackas)
+- [#30812](https://github.com/apache/superset/pull/30812) chore(FilterBar): Filter bar accessibility (@alexandrusoare)
+- [#30854](https://github.com/apache/superset/pull/30854) chore: Chart context menu permissions cleanup (@kgabryje)
+- [#30255](https://github.com/apache/superset/pull/30255) chore(scripts): purge node_modules folder on `npm prune` (@rusackas)
+- [#30846](https://github.com/apache/superset/pull/30846) chore(actions): Bump Linkinator in superset-docs-verify.yml (@rusackas)
+- [#30797](https://github.com/apache/superset/pull/30797) build(deps): bump @docsearch/react from 3.6.2 to 3.6.3 in /docs (@dependabot[bot])
+- [#30796](https://github.com/apache/superset/pull/30796) build(deps): bump @mdx-js/react from 3.0.1 to 3.1.0 in /docs (@dependabot[bot])
+- [#30793](https://github.com/apache/superset/pull/30793) build(deps-dev): bump @types/react from 18.3.10 to 18.3.12 in /docs (@dependabot[bot])
+- [#30795](https://github.com/apache/superset/pull/30795) build(deps-dev): bump typescript from 5.6.2 to 5.6.3 in /docs (@dependabot[bot])
+- [#30799](https://github.com/apache/superset/pull/30799) build(deps): bump @saucelabs/theme-github-codeblock from 0.2.3 to 0.3.0 in /docs (@dependabot[bot])
+- [#30824](https://github.com/apache/superset/pull/30824) docs: Update INTHEWILD.md with 2070Health Org (@sanjaynayak007)
+- [#30838](https://github.com/apache/superset/pull/30838) chore: Revert "build(deps): bump JustinBeckwith/linkinator-action from 1.10.4 to 1.11.0" (@rusackas)
+- [#30832](https://github.com/apache/superset/pull/30832) build(deps-dev): bump webpack from 5.95.0 to 5.96.1 in /docs (@dependabot[bot])
+- [#30822](https://github.com/apache/superset/pull/30822) docs: Update INTHEWILD.md (@Habeeb556)
+- [#30835](https://github.com/apache/superset/pull/30835) build(deps-dev): bump eslint from 9.11.0 to 9.14.0 in /superset-websocket (@dependabot[bot])
+- [#30782](https://github.com/apache/superset/pull/30782) build(deps): bump uuid from 10.0.0 to 11.0.2 in /superset-websocket (@dependabot[bot])
+- [#30784](https://github.com/apache/superset/pull/30784) build(deps): bump winston from 3.13.0 to 3.15.0 in /superset-websocket (@dependabot[bot])
+- [#30786](https://github.com/apache/superset/pull/30786) build(deps): bump deck.gl from 9.0.28 to 9.0.34 in /superset-frontend/plugins/legacy-preset-chart-deckgl (@dependabot[bot])
+- [#30803](https://github.com/apache/superset/pull/30803) build(deps-dev): bump eslint-plugin-react from 7.33.2 to 7.37.2 in /superset-frontend (@dependabot[bot])
+- [#30781](https://github.com/apache/superset/pull/30781) build(deps-dev): bump typescript-eslint from 8.8.0 to 8.12.2 in /superset-websocket (@dependabot[bot])
+- [#30809](https://github.com/apache/superset/pull/30809) build(deps-dev): bump prettier-plugin-packagejson from 2.5.2 to 2.5.3 in /superset-frontend (@dependabot[bot])
+- [#30817](https://github.com/apache/superset/pull/30817) build(deps): bump webpack from 5.80.0 to 5.96.1 in /superset-frontend/cypress-base (@dependabot[bot])
+- [#30794](https://github.com/apache/superset/pull/30794) build(deps): bump antd from 5.20.5 to 5.21.6 in /docs (@dependabot[bot])
+- [#30811](https://github.com/apache/superset/pull/30811) build(deps): bump @rjsf/validator-ajv8 from 5.19.4 to 5.22.3 in /superset-frontend (@dependabot[bot])
+- [#30804](https://github.com/apache/superset/pull/30804) build(deps): bump ace-builds from 1.35.4 to 1.36.3 in /superset-frontend (@dependabot[bot])
+- [#30810](https://github.com/apache/superset/pull/30810) build(deps-dev): bump eslint-plugin-testing-library from 6.2.2 to 6.4.0 in /superset-frontend (@dependabot[bot])
+- [#30805](https://github.com/apache/superset/pull/30805) build(deps-dev): bump eslint-import-resolver-typescript from 3.6.1 to 3.6.3 in /superset-frontend (@dependabot[bot])
+- [#30802](https://github.com/apache/superset/pull/30802) build(deps): bump JustinBeckwith/linkinator-action from 1.10.4 to 1.11.0 (@dependabot[bot])
+- [#30758](https://github.com/apache/superset/pull/30758) style(databases-upload-form): update Upload Form cosmetics (@vine-trellis)
+- [#30697](https://github.com/apache/superset/pull/30697) refactor: Migrate SliceAdder to typescript (@EnxDev)
+- [#30731](https://github.com/apache/superset/pull/30731) refactor(Switch): Upgrade Switch to Ant Design 5 (@alexandrusoare)
+- [#30757](https://github.com/apache/superset/pull/30757) docs: Adding link to StarRocks official docs (@rusackas)
+- [#30747](https://github.com/apache/superset/pull/30747) docs: Update INTHEWILD.md (@MSTartan)
+- [#30753](https://github.com/apache/superset/pull/30753) docs: add Sarathi to users list (@SaiSkandaTNI)
+- [#30749](https://github.com/apache/superset/pull/30749) docs: Update INTHEWILD.md with Medic (@1yuv)
+- [#30355](https://github.com/apache/superset/pull/30355) chore(fe): replace deprecate aliased Jest matchers with corresponding substituents (@hainenber)
+- [#30536](https://github.com/apache/superset/pull/30536) build(deps): bump cookie from 0.6.0 to 0.7.0 in /superset-websocket (@dependabot[bot])
+- [#30480](https://github.com/apache/superset/pull/30480) build(deps-dev): bump webpack from 5.94.0 to 5.95.0 in /docs (@dependabot[bot])
+- [#30571](https://github.com/apache/superset/pull/30571) build(deps): bump cookie, cookie-parser and express in /superset-websocket/utils/client-ws-app (@dependabot[bot])
+- [#30738](https://github.com/apache/superset/pull/30738) docs: rename Twitter to X in the INTHEWILD.md (@wugeer)
+- [#30743](https://github.com/apache/superset/pull/30743) docs(templating): Replace "true" with "1 = 1" and explain its purpose (@sfirke)
+- [#30709](https://github.com/apache/superset/pull/30709) build(deps-dev): bump http-proxy-middleware from 2.0.6 to 2.0.7 in /superset-frontend (@dependabot[bot])
+- [#30654](https://github.com/apache/superset/pull/30654) refactor: Migrate UndoRedoKeyListeners to typescript (@EnxDev)
+- [#30653](https://github.com/apache/superset/pull/30653) refactor: Migration publishedStatus to typescript (@EnxDev)
+- [#30683](https://github.com/apache/superset/pull/30683) build(deps): bump http-proxy-middleware from 2.0.6 to 2.0.7 in /docs (@dependabot[bot])
+- [#30568](https://github.com/apache/superset/pull/30568) refactor: Migrate HeaderActionsDropdown to typescript (@EnxDev)
+- [#30655](https://github.com/apache/superset/pull/30655) docs: frontend long build time (@CodeWithEmad)
+- [#30662](https://github.com/apache/superset/pull/30662) refactor: Split FastVizSwitcher into multiple files for readability (@kgabryje)
+- [#30609](https://github.com/apache/superset/pull/30609) refactor(Dashboard): Native filters form update endpoint (@geido)
+- [#30613](https://github.com/apache/superset/pull/30613) chore: Enable suppressing default chart context menu (@kgabryje)
+- [#30523](https://github.com/apache/superset/pull/30523) docs: Clarification on which command to use on which Ubuntu version. (@kkovacs)
+- [#30599](https://github.com/apache/superset/pull/30599) chore(number-formatter): upgrade pretty-ms to 9.1.0 (@villebro)
+- [#30572](https://github.com/apache/superset/pull/30572) build(deps): bump cookie, @applitools/eyes-storybook and express in /superset-frontend (@dependabot[bot])
+- [#30357](https://github.com/apache/superset/pull/30357) chore(fe): uplift FE packages to latest version (@hainenber)
+- [#30521](https://github.com/apache/superset/pull/30521) chore: enable lint PT009 'use regular assert over self.assert.\*' (@mistercrunch)
+- [#28370](https://github.com/apache/superset/pull/28370) refactor: Migration of Chart to TypeScript (@EnxDev)
+- [#30528](https://github.com/apache/superset/pull/30528) chore(fe): bump webpack-related packages to v5 (@hainenber)
+- [#30526](https://github.com/apache/superset/pull/30526) chore(translations): Slovenian translation update (@dkrat7)
+- [#30495](https://github.com/apache/superset/pull/30495) chore: add native filters to Covid Vaccines dashboard (@sadpandajoe)
+- [#30463](https://github.com/apache/superset/pull/30463) build(deps-dev): bump typescript from 5.5.4 to 5.6.2 in /superset-websocket (@dependabot[bot])
+- [#30472](https://github.com/apache/superset/pull/30472) build(deps): bump express from 4.20.0 to 4.21.0 in /superset-websocket/utils/client-ws-app (@dependabot[bot])
+- [#30496](https://github.com/apache/superset/pull/30496) docs: fix broken links in CI (@mistercrunch)
+- [#30476](https://github.com/apache/superset/pull/30476) build(deps-dev): bump typescript from 5.5.4 to 5.6.2 in /docs (@dependabot[bot])
+- [#30461](https://github.com/apache/superset/pull/30461) build(deps): bump @rjsf/core from 5.19.4 to 5.21.1 in /superset-frontend (@dependabot[bot])
+- [#30465](https://github.com/apache/superset/pull/30465) build(deps-dev): bump typescript-eslint from 8.6.0 to 8.8.0 in /superset-websocket (@dependabot[bot])
+- [#30466](https://github.com/apache/superset/pull/30466) build(deps-dev): bump @types/node from 22.0.2 to 22.7.4 in /superset-websocket (@dependabot[bot])
+- [#30467](https://github.com/apache/superset/pull/30467) build(deps): bump @types/prop-types from 15.7.5 to 15.7.13 in /superset-frontend (@dependabot[bot])
+- [#30469](https://github.com/apache/superset/pull/30469) build(deps): bump @types/react-loadable from 5.5.6 to 5.5.11 in /superset-frontend (@dependabot[bot])
+- [#30471](https://github.com/apache/superset/pull/30471) build(deps): bump debug from 4.3.6 to 4.3.7 in /superset-websocket/utils/client-ws-app (@dependabot[bot])
+- [#30281](https://github.com/apache/superset/pull/30281) refactor(frontend): migrate 6 Enzyme-based tests to RTL, part 2 (@hainenber)
+- [#30487](https://github.com/apache/superset/pull/30487) build(deps-dev): bump esbuild-loader from 4.1.0 to 4.2.2 in /superset-frontend (@dependabot[bot])
+- [#30460](https://github.com/apache/superset/pull/30460) build(deps-dev): bump eslint-plugin-file-progress from 1.4.0 to 1.5.0 in /superset-frontend (@dependabot[bot])
+- [#30459](https://github.com/apache/superset/pull/30459) build(deps-dev): bump @cypress/react from 5.12.5 to 8.0.2 in /superset-frontend (@dependabot[bot])
+- [#30464](https://github.com/apache/superset/pull/30464) build(deps-dev): bump @typescript-eslint/eslint-plugin from 8.6.0 to 8.8.0 in /superset-websocket (@dependabot[bot])
+- [#30477](https://github.com/apache/superset/pull/30477) build(deps): bump re-resizable from 6.9.11 to 6.10.0 in /superset-frontend (@dependabot[bot])
+- [#30473](https://github.com/apache/superset/pull/30473) build(deps-dev): bump webpack-manifest-plugin from 4.1.1 to 5.0.0 in /superset-frontend (@dependabot[bot])
+- [#30481](https://github.com/apache/superset/pull/30481) build(deps-dev): bump @types/react from 18.3.5 to 18.3.10 in /docs (@dependabot[bot])
+- [#30483](https://github.com/apache/superset/pull/30483) build(deps): bump @docsearch/react from 3.6.1 to 3.6.2 in /docs (@dependabot[bot])
+- [#30484](https://github.com/apache/superset/pull/30484) build(deps): bump handlebars from 4.7.7 to 4.7.8 in /superset-frontend (@dependabot[bot])
+- [#30485](https://github.com/apache/superset/pull/30485) build(deps-dev): bump @types/yargs from 17.0.32 to 17.0.33 in /superset-frontend (@dependabot[bot])
+- [#30445](https://github.com/apache/superset/pull/30445) docs(dashboard): add docs for named and index colors (@villebro)
+- [#30410](https://github.com/apache/superset/pull/30410) chore: log warnings for database tables api (@eschutho)
+- [#28747](https://github.com/apache/superset/pull/28747) chore: document upper bound for python lib 'holidays' >= 0.26 (@mistercrunch)
+- [#30440](https://github.com/apache/superset/pull/30440) chore(Dashboard): Unblock Global Styles (@geido)
+- [#30365](https://github.com/apache/superset/pull/30365) chore: add logging for dashboards/get warnings (@eschutho)
+- [#30128](https://github.com/apache/superset/pull/30128) chore(View): Remove unnecessary theme view and defer basic styles (@geido)
+- [#30407](https://github.com/apache/superset/pull/30407) chore: Merge description and reproduction steps in the issue template (@michael-s-molina)
+- [#30305](https://github.com/apache/superset/pull/30305) chore(legacy-plugin-chart-map-box): bump supercluster to v8 (@birkskyum)
+- [#30086](https://github.com/apache/superset/pull/30086) build(deps): update @emotion/react requirement from ^11.4.1 to ^11.13.3 in /superset-frontend/packages/superset-ui-demo (@dependabot[bot])
+- [#27827](https://github.com/apache/superset/pull/27827) build(deps): bump @emotion/react from 11.4.1 to 11.11.4 in /superset-frontend (@dependabot[bot])
+- [#28346](https://github.com/apache/superset/pull/28346) refactor: Migration of AnnotationLayerControl to TypeScript (@EnxDev)
+- [#30251](https://github.com/apache/superset/pull/30251) build(deps-dev): bump sinon from 18.0.0 to 18.0.1 in /superset-frontend (@dependabot[bot])
+- [#30315](https://github.com/apache/superset/pull/30315) docs: Corrected Dremio connection string (@doernemt)
+- [#30352](https://github.com/apache/superset/pull/30352) chore(docs): fix an agreement error in caching docs (@sfirke)
+- [#30346](https://github.com/apache/superset/pull/30346) docs: add HANA database logo in README.md (@axuew)
+- [#28290](https://github.com/apache/superset/pull/28290) build(deps): update dompurify requirement from ^3.1.0 to ^3.1.2 in /superset-frontend/plugins/legacy-preset-chart-nvd3 (@dependabot[bot])
+- [#30089](https://github.com/apache/superset/pull/30089) build(deps-dev): bump @storybook/react-webpack5 from 8.1.11 to 8.2.9 in /superset-frontend/packages/superset-ui-demo (@dependabot[bot])
+- [#30359](https://github.com/apache/superset/pull/30359) build(websocket): upgrade ESLint to v9 (@hainenber)
+- [#30084](https://github.com/apache/superset/pull/30084) build(deps): bump deck.gl from 9.0.24 to 9.0.28 in /superset-frontend/plugins/legacy-preset-chart-deckgl (@dependabot[bot])
+- [#30300](https://github.com/apache/superset/pull/30300) build(deps): bump dompurify from 3.1.0 to 3.1.3 in /superset-frontend (@dependabot[bot])
+- [#30247](https://github.com/apache/superset/pull/30247) build(deps): bump path-to-regexp from 1.8.0 to 1.9.0 in /superset-frontend/cypress-base (@dependabot[bot])
+- [#30337](https://github.com/apache/superset/pull/30337) docs: sql-templating (@torgge)
+- [#30333](https://github.com/apache/superset/pull/30333) docs: Update cache.mdx, add needed space (@varfigstar)
+- [#30123](https://github.com/apache/superset/pull/30123) chore: correct a typo (@dl57934)
+- [#30262](https://github.com/apache/superset/pull/30262) chore: bump cypress to v 11 (@eschutho)
+- [#30313](https://github.com/apache/superset/pull/30313) chore(UPDATING.md): Add item to UPDATING describing translations build flag (@martyngigg)
+- [#30227](https://github.com/apache/superset/pull/30227) build(deps): bump express from 4.19.2 to 4.20.0 in /docs (@dependabot[bot])
+- [#30032](https://github.com/apache/superset/pull/30032) docs: HTML embedding of charts/dashboards without authentication (@lindner-tj)
+- [#30254](https://github.com/apache/superset/pull/30254) style(explore): clarify ambiguously named "sort by" field (@sfirke)
+- [#30321](https://github.com/apache/superset/pull/30321) chore(explore): Medium font weight for section headers (@kasiazjc)
+- [#30261](https://github.com/apache/superset/pull/30261) chore: remove redundant code (@villebro)
+- [#25910](https://github.com/apache/superset/pull/25910) chore(deps): bump dremio deps (@gnought)
+- [#30268](https://github.com/apache/superset/pull/30268) docs: Update kubernetes.mdx (@nyandajr)
+- [#29771](https://github.com/apache/superset/pull/29771) chore(docker): move mysql os-level deps (GPL) to dev image only (@mistercrunch)
+- [#30151](https://github.com/apache/superset/pull/30151) refactor(frontend): migrate 6 tests from Enzyme to RTL (@hainenber)
+- [#30253](https://github.com/apache/superset/pull/30253) chore(build): remove extraneous prettier step in superset-frontend CI (@hainenber)
+- [#30257](https://github.com/apache/superset/pull/30257) build(ci): make linkinator advisory (@rusackas)
+- [#30242](https://github.com/apache/superset/pull/30242) build(deps, deps-dev): upgrade major versions for dependencies of `@superset/embedded-sdk` (@hainenber)
+- [#30228](https://github.com/apache/superset/pull/30228) build(deps): bump send and express in /superset-frontend (@dependabot[bot])
+- [#30229](https://github.com/apache/superset/pull/30229) build(deps): bump serve-static and express in /superset-frontend (@dependabot[bot])
+- [#30232](https://github.com/apache/superset/pull/30232) refactor(explore): Migrate MetricsControl test suite to RTL (@rtexelm)
+- [#30226](https://github.com/apache/superset/pull/30226) build(deps): bump serve-static and express in /superset-websocket/utils/client-ws-app (@dependabot[bot])
+- [#30225](https://github.com/apache/superset/pull/30225) build(deps): bump send and express in /superset-websocket/utils/client-ws-app (@dependabot[bot])
+- [#30091](https://github.com/apache/superset/pull/30091) build(deps): update @babel/runtime requirement from ^7.1.2 to ^7.25.6 in /superset-frontend/packages/superset-ui-core (@dependabot[bot])
+- [#25452](https://github.com/apache/superset/pull/25452) chore(frontend): Spelling (@jsoref)
+- [#30103](https://github.com/apache/superset/pull/30103) build(deps-dev): update @babel/types requirement from ^7.25.2 to ^7.25.6 in /superset-frontend/plugins/plugin-chart-pivot-table (@dependabot[bot])
+- [#30199](https://github.com/apache/superset/pull/30199) chore(docs): Removing dead link from INTHEWILD.md (@rusackas)
+- [#30101](https://github.com/apache/superset/pull/30101) build(deps-dev): bump @types/react from 18.3.3 to 18.3.5 in /docs (@dependabot[bot])
+- [#30036](https://github.com/apache/superset/pull/30036) build(deps-dev): bump webpack from 5.93.0 to 5.94.0 in /docs (@dependabot[bot])
+- [#30179](https://github.com/apache/superset/pull/30179) build(deps): bump antd from 5.20.0 to 5.20.5 in /docs (@dependabot[bot])
+- [#30166](https://github.com/apache/superset/pull/30166) build(deps): bump @types/node from 20.12.7 to 22.5.4 in /superset-frontend (@dependabot[bot])
+- [#30097](https://github.com/apache/superset/pull/30097) build(deps-dev): bump typescript from 4.9.5 to 5.5.4 in /superset-websocket (@dependabot[bot])
+- [#30088](https://github.com/apache/superset/pull/30088) build(deps): bump core-js from 3.37.1 to 3.38.1 in /superset-frontend/packages/superset-ui-demo (@dependabot[bot])
+- [#29963](https://github.com/apache/superset/pull/29963) build(dev-deps, deps): upgrade major versions for FE deps (@hainenber)
+- [#30167](https://github.com/apache/superset/pull/30167) chore(docs): bump docusaurus from 3.4.0 to 3.5.2 (@villebro)
+- [#30094](https://github.com/apache/superset/pull/30094) build(deps): bump ws and @types/ws in /superset-websocket (@dependabot[bot])
+- [#30105](https://github.com/apache/superset/pull/30105) build(deps-dev): bump @docusaurus/module-type-aliases from 3.4.0 to 3.5.2 in /docs (@dependabot[bot])
+- [#30111](https://github.com/apache/superset/pull/30111) build(deps): bump react-ultimate-pagination and @types/react-ultimate-pagination in /superset-frontend (@dependabot[bot])
+- [#30106](https://github.com/apache/superset/pull/30106) build(deps): bump prism-react-renderer from 2.3.1 to 2.4.0 in /docs (@dependabot[bot])
+- [#30107](https://github.com/apache/superset/pull/30107) build(deps-dev): bump @docusaurus/tsconfig from 3.4.0 to 3.5.2 in /docs (@dependabot[bot])
+- [#30108](https://github.com/apache/superset/pull/30108) build(deps): bump react-svg-pan-zoom from 3.12.1 to 3.13.1 in /docs (@dependabot[bot])
+- [#30095](https://github.com/apache/superset/pull/30095) build(deps-dev): bump ts-jest from 29.1.5 to 29.2.5 in /superset-websocket (@dependabot[bot])
+- [#30096](https://github.com/apache/superset/pull/30096) build(deps): bump uuid and @types/uuid in /superset-websocket (@dependabot[bot])
+- [#30143](https://github.com/apache/superset/pull/30143) build(deps): bump cryptography from 42.0.7 to 42.0.8 (@dependabot[bot])
+- [#30118](https://github.com/apache/superset/pull/30118) build(deps-dev): bump prettier-plugin-packagejson from 2.4.10 to 2.5.2 in /superset-frontend (@dependabot[bot])
+- [#30127](https://github.com/apache/superset/pull/30127) docs: Fixing missing 'c' in installation guide documentation (@JordanTB)
+- [#30155](https://github.com/apache/superset/pull/30155) chore(docs): replace http with https (@villebro)
+- [#30072](https://github.com/apache/superset/pull/30072) chore(tests): skip extremely flaky gaq test (@villebro)
+- [#30153](https://github.com/apache/superset/pull/30153) chore(docs): update xendit link (@villebro)
+- [#30021](https://github.com/apache/superset/pull/30021) chore: accelerate docker compose by skipping frontend build (@mistercrunch)
+- [#30090](https://github.com/apache/superset/pull/30090) build(deps): bump aws-actions/amazon-ecs-deploy-task-definition from 1 to 2 (@dependabot[bot])
+- [#30037](https://github.com/apache/superset/pull/30037) build(deps-dev): bump webpack from 5.76.0 to 5.94.0 in /superset-embedded-sdk (@dependabot[bot])
+- [#30038](https://github.com/apache/superset/pull/30038) build(deps-dev): bump webpack from 5.93.0 to 5.94.0 in /superset-frontend (@dependabot[bot])
+- [#30102](https://github.com/apache/superset/pull/30102) build(deps-dev): bump eslint-plugin-react-prefer-function-component from 0.0.7 to 3.3.0 in /superset-frontend (@dependabot[bot])
+- [#30117](https://github.com/apache/superset/pull/30117) build(deps): bump d3-time-format and @types/d3-time-format in /superset-frontend (@dependabot[bot])
+- [#30116](https://github.com/apache/superset/pull/30116) build(deps-dev): bump eslint-plugin-no-only-tests from 2.4.0 to 3.3.0 in /superset-frontend (@dependabot[bot])
+- [#30027](https://github.com/apache/superset/pull/30027) refactor(databases): Create constants.ts, move interface to types.ts (@rtexelm)
+- [#30030](https://github.com/apache/superset/pull/30030) chore(docs): docker instructions use `docker compose` instead of the deprecated `docker-compose` (@rusackas)
+- [#30057](https://github.com/apache/superset/pull/30057) chore(docs): clean up a few md errors (@villebro)
+- [#29586](https://github.com/apache/superset/pull/29586) chore(translations): Arabic translations (@abdilra7eem)
+- [#30011](https://github.com/apache/superset/pull/30011) chore(deps): bump core-js (@rusackas)
+- [#30007](https://github.com/apache/superset/pull/30007) chore(deps): bump cross-env (@rusackas)
+- [#30008](https://github.com/apache/superset/pull/30008) build(deps): bump micromatch from 4.0.4 to 4.0.8 in /superset-frontend/cypress-base (@dependabot[bot])
+- [#30009](https://github.com/apache/superset/pull/30009) build(deps): bump micromatch from 4.0.5 to 4.0.8 in /docs (@dependabot[bot])
+- [#27832](https://github.com/apache/superset/pull/27832) build(deps): bump remark-gfm from 3.0.1 to 4.0.0 in /superset-frontend/packages/superset-ui-core (@dependabot[bot])
+- [#28292](https://github.com/apache/superset/pull/28292) build(deps): bump d3-time from 1.1.0 to 3.1.0 in /superset-frontend/packages/superset-ui-core (@dependabot[bot])
+- [#29990](https://github.com/apache/superset/pull/29990) chore(init): adding link to secret key instructions (@rusackas)
+- [#29947](https://github.com/apache/superset/pull/29947) build(deps): bump ws and @applitools/eyes-cypress in /superset-frontend/cypress-base (@dependabot[bot])
+- [#29988](https://github.com/apache/superset/pull/29988) build(node): Bumping to Node 20 (@rusackas)
+- [#25454](https://github.com/apache/superset/pull/25454) chore(tests): Spelling (@jsoref)
+- [#29970](https://github.com/apache/superset/pull/29970) docs: improve pre-commit docs and discoverability when CI fails (@mistercrunch)
+- [#29964](https://github.com/apache/superset/pull/29964) build(deps-dev): bump eslint-plugin-cypress from 2.11.2 to 3.4.0 in /superset-frontend + corresponding refactor (@hainenber)
+- [#29969](https://github.com/apache/superset/pull/29969) chore(antd): straightening out button import paths (@rusackas)
+- [#29948](https://github.com/apache/superset/pull/29948) chore(deps): bump micromatch (@rusackas)
+- [#29952](https://github.com/apache/superset/pull/29952) chore: add additional code owners to migrations (@sadpandajoe)
+- [#29945](https://github.com/apache/superset/pull/29945) build(deps): bump axios from 1.6.8 to 1.7.4 in /docs (@dependabot[bot])
+- [#29949](https://github.com/apache/superset/pull/29949) build(deps-dev): bump axios from 1.7.3 to 1.7.4 in /superset-frontend (@dependabot[bot])
+- [#29946](https://github.com/apache/superset/pull/29946) build(deps-dev): bump axios from 1.6.0 to 1.7.4 in /superset-embedded-sdk (@dependabot[bot])
+- [#29904](https://github.com/apache/superset/pull/29904) chore: Changes the migrations owners (@michael-s-molina)
+- [#29868](https://github.com/apache/superset/pull/29868) chore: remove useless GitHub action (@mistercrunch)
+- [#29869](https://github.com/apache/superset/pull/29869) chore: remove useless GitHub action required check (@mistercrunch)
+- [#29859](https://github.com/apache/superset/pull/29859) chore(deps): bumping underscore via npm override (@rusackas)
+- [#29876](https://github.com/apache/superset/pull/29876) chore(docs): reorder fs users (@villebro)
+- [#29841](https://github.com/apache/superset/pull/29841) chore(deps): bumping jquery (@rusackas)
+- [#29870](https://github.com/apache/superset/pull/29870) docs: add unit to companies list (@amitmiran137)
+- [#29652](https://github.com/apache/superset/pull/29652) chore(build): uplift several outdated frontend packages (@hainenber)
+- [#29866](https://github.com/apache/superset/pull/29866) chore: pre-matrixify pre-commit check (@mistercrunch)
+- [#29844](https://github.com/apache/superset/pull/29844) chore(cleanup): Removing bootstrap (experimental) (@rusackas)
+- [#29863](https://github.com/apache/superset/pull/29863) chore: describe timezone issue with alerts and reports scheduler in UPDATING.md (@danielli-ziprecruiter)
+- [#29855](https://github.com/apache/superset/pull/29855) perf: Lazy load rehype-raw and react-markdown (@kgabryje)
+- [#29788](https://github.com/apache/superset/pull/29788) perf: Remove antd-with-locales import (@kgabryje)
+- [#29791](https://github.com/apache/superset/pull/29791) perf: Lazy load moment-timezone (@kgabryje)
+- [#29808](https://github.com/apache/superset/pull/29808) build(deps-dev): update @babel/types requirement from ^7.24.5 to ^7.25.2 in /superset-frontend/plugins/plugin-chart-pivot-table (@dependabot[bot])
+- [#29838](https://github.com/apache/superset/pull/29838) chore(deps): npm audit fix results (@rusackas)
+- [#28294](https://github.com/apache/superset/pull/28294) build(deps): bump react-bootstrap-slider from 2.1.5 to 3.0.0 in /superset-frontend/plugins/legacy-preset-chart-deckgl (@dependabot[bot])
+- [#29756](https://github.com/apache/superset/pull/29756) build(deps): bump react-diff-viewer-continued from 3.2.5 to 3.4.0 in /superset-frontend (@dependabot[bot])
+- [#29759](https://github.com/apache/superset/pull/29759) build(deps-dev): bump eslint-plugin-file-progress from 1.2.0 to 1.4.0 in /superset-frontend (@dependabot[bot])
+- [#29812](https://github.com/apache/superset/pull/29812) build(deps): bump @fontsource/inter from 5.0.19 to 5.0.20 in /superset-frontend (@dependabot[bot])
+- [#29813](https://github.com/apache/superset/pull/29813) build(deps): bump chrono-node from 2.7.5 to 2.7.6 in /superset-frontend (@dependabot[bot])
+- [#29815](https://github.com/apache/superset/pull/29815) build(deps): bump mustache from 2.3.2 to 4.2.0 in /superset-frontend (@dependabot[bot])
+- [#29816](https://github.com/apache/superset/pull/29816) build(deps-dev): bump @types/react-syntax-highlighter from 15.5.11 to 15.5.13 in /superset-frontend (@dependabot[bot])
+- [#29820](https://github.com/apache/superset/pull/29820) build(deps-dev): bump style-loader from 3.3.4 to 4.0.0 in /superset-frontend (@dependabot[bot])
+- [#29821](https://github.com/apache/superset/pull/29821) build(deps): bump memoize-one from 5.1.1 to 5.2.1 in /superset-frontend (@dependabot[bot])
+- [#29809](https://github.com/apache/superset/pull/29809) build(deps-dev): bump @types/jest from 27.0.2 to 29.5.12 in /superset-websocket (@dependabot[bot])
+- [#29811](https://github.com/apache/superset/pull/29811) build(deps-dev): bump @types/node from 22.0.0 to 22.0.2 in /superset-websocket (@dependabot[bot])
+- [#29758](https://github.com/apache/superset/pull/29758) build(deps): bump rimraf from 3.0.2 to 6.0.1 in /superset-frontend (@dependabot[bot])
+- [#29787](https://github.com/apache/superset/pull/29787) perf: Antd icons tree shaking (@kgabryje)
+- [#29796](https://github.com/apache/superset/pull/29796) perf: Lazy load React Ace (@kgabryje)
+- [#29792](https://github.com/apache/superset/pull/29792) chore: deleting vestigial EMAIL_NOTIFICATIONS (@rusackas)
+- [#29673](https://github.com/apache/superset/pull/29673) style: remove uppercase from labels, buttons, tabs to align with design system (@mistercrunch)
+- [#29755](https://github.com/apache/superset/pull/29755) build(deps): bump @types/lodash from 4.17.0 to 4.17.7 in /superset-frontend (@dependabot[bot])
+- [#29765](https://github.com/apache/superset/pull/29765) build(deps-dev): bump webpack from 5.89.0 to 5.93.0 in /superset-frontend (@dependabot[bot])
+- [#29794](https://github.com/apache/superset/pull/29794) chore(deps): bump dayjs to unblock CI. (@rusackas)
+- [#29790](https://github.com/apache/superset/pull/29790) chore(docs): remove mention of MariaDB in dev environment setup (@sfirke)
+- [#29738](https://github.com/apache/superset/pull/29738) build(deps-dev): bump @types/node from 20.13.0 to 22.0.0 in /superset-websocket (@dependabot[bot])
+- [#29748](https://github.com/apache/superset/pull/29748) build(deps): bump @ant-design/icons from 5.3.7 to 5.4.0 in /docs (@dependabot[bot])
+- [#29747](https://github.com/apache/superset/pull/29747) build(deps-dev): bump webpack from 5.92.1 to 5.93.0 in /docs (@dependabot[bot])
+- [#29427](https://github.com/apache/superset/pull/29427) chore(deps): bump abortcontroller-polyfill from 1.2.1 to 1.7.5 in /superset-frontend (@dependabot[bot])
+- [#28820](https://github.com/apache/superset/pull/28820) chore(deps): bump d3-hierarchy from 1.1.9 to 3.1.2 in /superset-frontend (@dependabot[bot])
+- [#29740](https://github.com/apache/superset/pull/29740) build(deps-dev): update @types/lodash requirement from ^4.17.6 to ^4.17.7 in /superset-frontend/plugins/plugin-chart-handlebars (@dependabot[bot])
+- [#29743](https://github.com/apache/superset/pull/29743) build(deps): update underscore requirement from ^1.13.6 to ^1.13.7 in /superset-frontend/plugins/legacy-preset-chart-deckgl (@dependabot[bot])
+- [#29763](https://github.com/apache/superset/pull/29763) build(deps-dev): bump history from 4.10.1 to 5.3.0 in /superset-frontend (@dependabot[bot])
+- [#29760](https://github.com/apache/superset/pull/29760) build(deps-dev): bump ts-loader from 7.0.5 to 9.5.1 in /superset-frontend (@dependabot[bot])
+- [#28297](https://github.com/apache/superset/pull/28297) build(deps-dev): update @babel/types requirement from ^7.24.0 to ^7.24.5 in /superset-frontend/plugins/plugin-chart-pivot-table (@dependabot[bot])
+- [#29767](https://github.com/apache/superset/pull/29767) build(deps): bump fast-xml-parser from 4.2.7 to 4.4.1 in /superset-frontend (@dependabot[bot])
+- [#29739](https://github.com/apache/superset/pull/29739) build(deps): bump debug from 4.3.5 to 4.3.6 in /superset-websocket/utils/client-ws-app (@dependabot[bot])
+- [#29742](https://github.com/apache/superset/pull/29742) build(deps-dev): bump prettier from 3.2.5 to 3.3.3 in /superset-websocket (@dependabot[bot])
+- [#29744](https://github.com/apache/superset/pull/29744) build(deps): bump deck.gl from 9.0.21 to 9.0.24 in /superset-frontend/plugins/legacy-preset-chart-deckgl (@dependabot[bot])
+- [#29746](https://github.com/apache/superset/pull/29746) build(deps): bump @types/lodash from 4.17.4 to 4.17.7 in /superset-websocket (@dependabot[bot])
+- [#29750](https://github.com/apache/superset/pull/29750) build(deps-dev): bump typescript from 5.5.2 to 5.5.4 in /docs (@dependabot[bot])
+- [#29751](https://github.com/apache/superset/pull/29751) build(deps): bump @docsearch/react from 3.6.0 to 3.6.1 in /docs (@dependabot[bot])
+- [#29753](https://github.com/apache/superset/pull/29753) build(deps-dev): bump mini-css-extract-plugin from 2.7.6 to 2.9.0 in /superset-frontend (@dependabot[bot])
+- [#29754](https://github.com/apache/superset/pull/29754) build(deps-dev): bump @svgr/webpack from 8.0.1 to 8.1.0 in /superset-frontend (@dependabot[bot])
+- [#29762](https://github.com/apache/superset/pull/29762) build(deps): bump ace-builds from 1.4.14 to 1.35.4 in /superset-frontend (@dependabot[bot])
+- [#29731](https://github.com/apache/superset/pull/29731) chore(build): pin Storybook-related packages to 8.1.11 as further v8+ version requires React 18 (@hainenber)
+- [#26557](https://github.com/apache/superset/pull/26557) build(deps-dev): bump thread-loader from 3.0.4 to 4.0.2 in /superset-frontend (@dependabot[bot])
diff --git a/Dockerfile b/Dockerfile
index da859f6b1fb..223746eac98 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,7 @@
 ######################################################################
 # Node stage to deal with static asset construction
 ######################################################################
-ARG PY_VER=3.11.12-slim-bookworm
+ARG PY_VER=3.11.13-slim-bookworm
 
 # If BUILDPLATFORM is null, set it to 'amd64' (or leave as is otherwise).
 ARG BUILDPLATFORM=${BUILDPLATFORM:-amd64}
diff --git a/README.md b/README.md
index 1cc4c44a6d0..cf2558c9216 100644
--- a/README.md
+++ b/README.md
@@ -103,7 +103,7 @@ Here are some of the major database solutions that are supported:
 
 <p align="center">
   <img src="https://superset.apache.org/img/databases/redshift.png" alt="redshift" border="0" width="200"/>
-  <img src="https://superset.apache.org/img/databases/google-biquery.png" alt="google-biquery" border="0" width="200"/>
+  <img src="https://superset.apache.org/img/databases/google-biquery.png" alt="google-bigquery" border="0" width="200"/>
   <img src="https://superset.apache.org/img/databases/snowflake.png" alt="snowflake" border="0" width="200"/>
   <img src="https://superset.apache.org/img/databases/trino.png" alt="trino" border="0" width="150" />
   <img src="https://superset.apache.org/img/databases/presto.png" alt="presto" border="0" width="200"/>
@@ -111,7 +111,6 @@ Here are some of the major database solutions that are supported:
   <img src="https://superset.apache.org/img/databases/druid.png" alt="druid" border="0" width="200" />
   <img src="https://superset.apache.org/img/databases/firebolt.png" alt="firebolt" border="0" width="200" />
   <img src="https://superset.apache.org/img/databases/timescale.png" alt="timescale" border="0" width="200" />
-  <img src="https://superset.apache.org/img/databases/rockset.png" alt="rockset" border="0" width="200" />
   <img src="https://superset.apache.org/img/databases/postgresql.png" alt="postgresql" border="0" width="200" />
   <img src="https://superset.apache.org/img/databases/mysql.png" alt="mysql" border="0" width="200" />
   <img src="https://superset.apache.org/img/databases/mssql-server.png" alt="mssql-server" border="0" width="200" />
@@ -136,7 +135,7 @@ Here are some of the major database solutions that are supported:
   <img src="https://superset.apache.org/img/databases/starrocks.png" alt="starrocks" border="0" width="200" />
   <img src="https://superset.apache.org/img/databases/doris.png" alt="doris" border="0" width="200" />
   <img src="https://superset.apache.org/img/databases/oceanbase.svg" alt="oceanbase" border="0" width="220" />
-  <img src="https://superset.apache.org/img/databases/sap-hana.png" alt="oceanbase" border="0" width="220" />
+  <img src="https://superset.apache.org/img/databases/sap-hana.png" alt="sap-hana" border="0" width="220" />
   <img src="https://superset.apache.org/img/databases/denodo.png" alt="denodo" border="0" width="200" />
   <img src="https://superset.apache.org/img/databases/ydb.svg" alt="ydb" border="0" width="200" />
   <img src="https://superset.apache.org/img/databases/tdengine.png" alt="TDengine" border="0" width="200" />
diff --git a/RELEASING/README.md b/RELEASING/README.md
index 4468c9d2783..0d0d8d1be43 100644
--- a/RELEASING/README.md
+++ b/RELEASING/README.md
@@ -469,8 +469,7 @@ an account first if you don't have one, and reference your username
 while requesting access to push packages.
 
 ```bash
-twine upload dist/apache_superset-${SUPERSET_VERSION}-py3-none-any.whl
-twine upload dist/apache_superset-${SUPERSET_VERSION}.tar.gz
+twine upload dist/*
 ```
 
 Set your username to `__token__`
diff --git a/RESOURCES/STANDARD_ROLES.md b/RESOURCES/STANDARD_ROLES.md
index bfc25049038..207474c9abe 100644
--- a/RESOURCES/STANDARD_ROLES.md
+++ b/RESOURCES/STANDARD_ROLES.md
@@ -132,13 +132,6 @@ under the License.
 | can download on DynamicPlugin                    |:heavy_check_mark:|O|O|O|
 | can add on DynamicPlugin                         |:heavy_check_mark:|O|O|O|
 | can delete on DynamicPlugin                      |:heavy_check_mark:|O|O|O|
-| can edit on RowLevelSecurityFiltersModelView     |:heavy_check_mark:|O|O|O|
-| can list on RowLevelSecurityFiltersModelView     |:heavy_check_mark:|O|O|O|
-| can show on RowLevelSecurityFiltersModelView     |:heavy_check_mark:|O|O|O|
-| can download on RowLevelSecurityFiltersModelView |:heavy_check_mark:|O|O|O|
-| can add on RowLevelSecurityFiltersModelView      |:heavy_check_mark:|O|O|O|
-| can delete on RowLevelSecurityFiltersModelView   |:heavy_check_mark:|O|O|O|
-| muldelete on RowLevelSecurityFiltersModelView    |:heavy_check_mark:|O|O|O|
 | can external metadata by name on Datasource      |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|O|
 | can get value on KV                              |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|O|
 | can store on KV                                  |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|O|
diff --git a/UPDATING.md b/UPDATING.md
index 41f6e7d6784..f36778beb48 100644
--- a/UPDATING.md
+++ b/UPDATING.md
@@ -23,9 +23,15 @@ This file documents any backwards-incompatible changes in Superset and
 assists people when migrating to a new version.
 
 ## Next
+
 - [33116](https://github.com/apache/superset/pull/33116) In Echarts Series charts (e.g. Line, Area, Bar, etc.) charts, the `x_axis_sort_series` and `x_axis_sort_series_ascending` form data items have been renamed with `x_axis_sort` and `x_axis_sort_asc`.
-There's a migration added that can potentially affect a significant number of existing charts.
+  There's a migration added that can potentially affect a significant number of existing charts.
 - [32317](https://github.com/apache/superset/pull/32317) The horizontal filter bar feature is now out of testing/beta development and its feature flag `HORIZONTAL_FILTER_BAR` has been removed.
+- [31590](https://github.com/apache/superset/pull/31590) Marks the begining of intricate work around supporting dynamic Theming, and breaks support for [THEME_OVERRIDES](https://github.com/apache/superset/blob/732de4ac7fae88e29b7f123b6cbb2d7cd411b0e4/superset/config.py#L671) in favor of a new theming system based on AntD V5. Likely this will be in disrepair until settling over the 5.x lifecycle.
+- [32432](https://github.com/apache/superset/pull/31260) Moves the List Roles FAB view to the frontend and requires `FAB_ADD_SECURITY_API` to be enabled in the configuration and `superset init` to be executed.
+
+## 5.0.0
+
 - [31976](https://github.com/apache/superset/pull/31976) Removed the `DISABLE_LEGACY_DATASOURCE_EDITOR` feature flag. The previous value of the feature flag was `True` and now the feature is permanently removed.
 - [31959](https://github.com/apache/superset/pull/32000) Removes CSV_UPLOAD_MAX_SIZE config, use your web server to control file upload size.
 - [31959](https://github.com/apache/superset/pull/31959) Removes the following endpoints from data uploads: `/api/v1/database/<id>/<file type>_upload` and `/api/v1/database/<file type>_metadata`, in favour of new one (Details on the PR). And simplifies permissions.
@@ -34,10 +40,12 @@ There's a migration added that can potentially affect a significant number of ex
 - [31794](https://github.com/apache/superset/pull/31794) Removed the previously deprecated `DASHBOARD_CROSS_FILTERS` feature flag
 - [31774](https://github.com/apache/superset/pull/31774): Fixes the spelling of the `USE-ANALAGOUS-COLORS` feature flag. Please update any scripts/configuration item to use the new/corrected `USE-ANALOGOUS-COLORS` flag spelling.
 - [31582](https://github.com/apache/superset/pull/31582) Removed the legacy Area, Bar, Event Flow, Heatmap, Histogram, Line, Sankey, and Sankey Loop charts. They were all automatically migrated to their ECharts counterparts with the exception of the Event Flow and Sankey Loop charts which were removed as they were not actively maintained and not widely used. If you were using the Event Flow or Sankey Loop charts, you will need to find an alternative solution.
+- [31198](https://github.com/apache/superset/pull/31198) Disallows by default the use of the following ClickHouse functions: "version", "currentDatabase", "hostName".
 - [29798](https://github.com/apache/superset/pull/29798) Since 3.1.0, the intial schedule for an alert or report was mistakenly offset by the specified timezone's relation to UTC. The initial schedule should now begin at the correct time.
 - [30021](https://github.com/apache/superset/pull/30021) The `dev` layer in our Dockerfile no long includes firefox binaries, only Chromium to reduce bloat/docker-build-time.
-- [30099](https://github.com/apache/superset/pull/30099) Translations are no longer included in the default docker image builds. If your environment requires translations, you'll want to set the docker build arg `BUILD_TRANSACTION=true`.
+- [30099](https://github.com/apache/superset/pull/30099) Translations are no longer included in the default docker image builds. If your environment requires translations, you'll want to set the docker build arg `BUILD_TRANSLATIONS=true`.
 - [31262](https://github.com/apache/superset/pull/31262) NOTE: deprecated `pylint` in favor of `ruff` as our only python linter. Only affect development workflows positively (not the release itself). It should cover most important rules, be much faster, but some things linting rules that were enforced before may not be enforce in the exact same way as before.
+- [31173](https://github.com/apache/superset/pull/31173) Modified `fetch_csrf_token` to align with HTTP standards, particularly regarding how cookies are handled. If you encounter any issues related to CSRF functionality, please report them as a new issue and reference this PR for context.
 - [31413](https://github.com/apache/superset/pull/31413) Enable the DATE_FORMAT_IN_EMAIL_SUBJECT feature flag to allow users to specify a date format for the email subject, which will then be replaced with the actual date.
 - [31385](https://github.com/apache/superset/pull/31385) Significant docker refactor, reducing access levels for the `superset` user, streamlining layer building, ...
 - [31503](https://github.com/apache/superset/pull/31503) Deprecating python 3.9.x support, 3.11 is now the recommended version and 3.10 is still supported over the Superset 5.0 lifecycle.
@@ -47,7 +55,6 @@ There's a migration added that can potentially affect a significant number of ex
 - [30284](https://github.com/apache/superset/pull/30284) Deprecated GLOBAL_ASYNC_QUERIES_REDIS_CONFIG in favor of the new GLOBAL_ASYNC_QUERIES_CACHE_BACKEND configuration. To leverage Redis Sentinel, set CACHE_TYPE to RedisSentinelCache, or use RedisCache for standalone Redis
 - [31961](https://github.com/apache/superset/pull/31961) Upgraded React from version 16.13.1 to 17.0.2. If you are using custom frontend extensions or plugins, you may need to update them to be compatible with React 17.
 - [31260](https://github.com/apache/superset/pull/31260) Docker images now use `uv pip install` instead of `pip install` to manage the python envrionment. Most docker-based deployments will be affected, whether you derive one of the published images, or have custom bootstrap script that install python libraries (drivers)
-- [32432](https://github.com/apache/superset/pull/31260) Moves the List Roles FAB view to the frontend and requires `FAB_ADD_SECURITY_API` to be enabled in the configuration and `superset init` to be executed.
 
 ### Potential Downtime
 
diff --git a/docs/docs/configuration/databases.mdx b/docs/docs/configuration/databases.mdx
index 0aeee2afa06..2b293e79c86 100644
--- a/docs/docs/configuration/databases.mdx
+++ b/docs/docs/configuration/databases.mdx
@@ -71,7 +71,6 @@ are compatible with Superset.
 | [Parseable](/docs/configuration/databases#parseable)                    | `pip install sqlalchemy-parseable`                                                 | `parseable://<UserName>:<DBPassword>@<Database Host>/<Stream Name>`                                                                                    |
 | [PostgreSQL](/docs/configuration/databases#postgres)                    | `pip install psycopg2`                                                             | `postgresql://<UserName>:<DBPassword>@<Database Host>/<Database Name>`                                                                                 |
 | [Presto](/docs/configuration/databases#presto)                          | `pip install pyhive`                                                               | `presto://{username}:{password}@{hostname}:{port}/{database}`                                                                                                                                            |
-| [Rockset](/docs/configuration/databases#rockset)                        | `pip install rockset-sqlalchemy`                                                   | `rockset://<api_key>:@<api_server>`                                                                                                                    |
 | [SAP Hana](/docs/configuration/databases#hana) | `pip install hdbcli sqlalchemy-hana` or `pip install apache_superset[hana]` | `hana://{username}:{password}@{host}:{port}` |
 | [SingleStore](/docs/configuration/databases#singlestore)                | `pip install sqlalchemy-singlestoredb`                                               | `singlestoredb://{username}:{password}@{host}:{port}/{database}`                                                                                     |
 | [StarRocks](/docs/configuration/databases#starrocks)                    | `pip install starrocks`                                                            | `starrocks://<User>:<Password>@<Host>:<Port>/<Catalog>.<Database>`                                                                                     |
@@ -1174,25 +1173,6 @@ The expected connection string is formatted as follows:
 risingwave://root@{hostname}:{port}/{database}?sslmode=disable
 ```
 
-#### Rockset
-
-The connection string for Rockset is:
-
-```
-rockset://{api key}:@{api server}
-```
-
-Get your API key from the [Rockset console](https://console.rockset.com/apikeys).
-Find your API server from the [API reference](https://rockset.com/docs/rest-api/#introduction). Omit the `https://` portion of the URL.
-
-To target to a specific virtual instance, use this URI format:
-
-```
-rockset://{api key}:@{api server}/{VI ID}
-```
-
-For more complete instructions, we recommend the [Rockset documentation](https://docs.rockset.com/apache-superset/).
-
 #### Snowflake
 
 ##### Install Snowflake Driver
diff --git a/docs/docs/configuration/event-logging.mdx b/docs/docs/configuration/event-logging.mdx
index 79b419c234b..ceb751af650 100644
--- a/docs/docs/configuration/event-logging.mdx
+++ b/docs/docs/configuration/event-logging.mdx
@@ -51,6 +51,7 @@ if desired. Most endpoints hit are logged as
 well as key events like query start and end in SQL Lab.
 
 To setup StatsD logging, it’s a matter of configuring the logger in your `superset_config.py`.
+If not already present, you need to ensure that the `statsd`-package is installed in Superset's python environment.
 
 ```python
 from superset.stats_logger import StatsdStatsLogger
diff --git a/docs/docs/configuration/theming.mdx b/docs/docs/configuration/theming.mdx
new file mode 100644
index 00000000000..7983b07d17c
--- /dev/null
+++ b/docs/docs/configuration/theming.mdx
@@ -0,0 +1,53 @@
+---
+title: Theming
+hide_title: true
+sidebar_position: 12
+version: 1
+---
+# Theming Superset
+
+:::note
+apache-superset>=6.0
+:::
+
+Superset now rides on **Ant Design v5’s token-based theming**.
+Every Antd token works, plus a handful of Superset-specific ones for charts and dashboard chrome.
+
+## 1 — Create a theme
+
+1. Open the official [Ant Design Theme Editor](https://ant.design/theme-editor)
+2. Design your palette, typography, and component overrides.
+3. Open the `CONFIG` modal and paste the JSON.
+
+You can also extend with Superset-specific tokens (documented in the default theme object) before you import.
+
+## 2 — Apply it instance-wide
+
+```python
+# superset_config.py
+THEME = {
+    # Paste your JSON theme definition here
+}
+```
+
+Restart Superset to apply changes
+
+## 3 — Tweak live in the app (beta)
+
+Set the feature flag in your `superset_config`
+```python
+DEFAULT_FEATURE_FLAGS: dict[str, bool] = {
+    {{ ... }}
+    THEME_ALLOW_THEME_EDITOR_BETA = True,
+}
+```
+
+- Enables a JSON editor panel inside Superset as a new icon in the navbar
+- Intended for testing/design and rapid in-context iteration
+- End-user theme switching & preferences coming later
+
+## 4 — Potential Next Steps
+
+- CRUD UI for managing multiple themes
+- Per-dashboard & per-workspace theme assignment
+- User-selectable theme preferences
diff --git a/docs/docs/faq.mdx b/docs/docs/faq.mdx
index f7617fe8925..d168eacde24 100644
--- a/docs/docs/faq.mdx
+++ b/docs/docs/faq.mdx
@@ -275,3 +275,11 @@ No. Currently, there is no way to recover a deleted Superset dashboard/chart/dat
 Hence, it is recommended to take periodic backups of the metadata database. For recovery, you can launch a recovery instance of a Superset server with the backed-up copy of the DB attached and use the Export Dashboard button in the Superset UI (or the `superset export-dashboards` CLI command). Then, take the .zip file and import it into the current Superset instance.
 
 Alternatively, you can programmatically take regular exports of the assets as a backup.
+
+## I ran a security scan of the Superset container image and it showed dozens of "high" and "critical" vulnerabilities! Can you release a version of Superset without these?
+
+You are talking about dependency CVEs: identified vulnerabilities in software that Superset uses. Most of these CVEs are in the Linux kernel or Python, both of which have many other people working on their security.
+
+We address these dependency CVEs as best we can by regularly updating our dependencies to newer versions. We use bots to assist with that and cheerfully welcome pull requests from humans that fix dependency CVEs.
+
+The Superset [security team](https://superset.apache.org/docs/security/#reporting-security-vulnerabilities) focuses primarily on vulnerabilities _in Superset itself_. See our [CVEs page](https://superset.apache.org/docs/security/cves) for a list of past Superset CVEs.
diff --git a/docs/docs/installation/docker-builds.mdx b/docs/docs/installation/docker-builds.mdx
index c0a268426e2..73bf4dd26d6 100644
--- a/docs/docs/installation/docker-builds.mdx
+++ b/docs/docs/installation/docker-builds.mdx
@@ -16,7 +16,7 @@ https://hub.docker.com/r/apache/superset) using GitHub Actions.
 Different sets of images are built and/or published at different times:
 
 - **Published releases** (`release`): published using
-  tags like `3.0.0` and the `latest` tag.
+  tags like `5.0.0` and the `latest` tag.
 - **Pull request iterations** (`pull_request`): for each pull request, while
   we actively build the docker to validate the build, we do
   not publish those images for security reasons, we simply `docker build --load`
@@ -32,7 +32,7 @@ for the build, and/or base image.
 Here are the build presets that are exposed through the `supersetbot docker` utility:
 
 - `lean`: The default Docker image, including both frontend and backend. Tags
-  without a build_preset are lean builds (ie: `latest`, `4.0.0`, `3.0.0`, ...). `lean`
+  without a build_preset are lean builds (ie: `latest`, `5.0.0`, `4.1.2`, ...). `lean`
   builds do not contain database
   drivers, meaning you need to install your own. That applies to analytics databases **AND
   the metadata database**. You'll likely want to layer either `mysqlclient` or `psycopg2-binary`
@@ -73,10 +73,10 @@ Here's an example Dockerfile that does this. Follow the in-line comments to cust
 your desired Superset version and database drivers. The comments also note that a certain feature flag will
 have to be enabled in your config file.
 
-You would build the image with `docker build -t mysuperset:latest .` or `docker build -t ourcompanysuperset:4.1.2 .`
+You would build the image with `docker build -t mysuperset:latest .` or `docker build -t ourcompanysuperset:5.0.0 .`
 
 ```Dockerfile
-# change this to apache/superset:4.1.2 or whatever version you want to build from;
+# change this to apache/superset:5.0.0 or whatever version you want to build from;
 # otherwise the default is the latest commit on GitHub master branch
 FROM apache/superset:master
 
@@ -86,7 +86,7 @@ USER root
 ENV PLAYWRIGHT_BROWSERS_PATH=/usr/local/share/playwright-browsers
 
 # Install packages using uv into the virtual environment
-# Superset started using uv after the 4.1 branch; if you are building from apache/superset:4.1.x,
+# Superset started using uv after the 4.1 branch; if you are building from apache/superset:4.1.x or an older version,
 # replace the first two lines with RUN pip install \
 RUN . /app/.venv/bin/activate && \
     uv pip install \
diff --git a/docs/docs/installation/docker-compose.mdx b/docs/docs/installation/docker-compose.mdx
index 24dccde7c25..16be28975d8 100644
--- a/docs/docs/installation/docker-compose.mdx
+++ b/docs/docs/installation/docker-compose.mdx
@@ -36,12 +36,12 @@ Note that there are 3 major ways we support to run `docker compose`:
   at the time you fire this up will be reflected, but changes to the code
   while `up` won't be reflected in the app
 1. **docker-compose-image-tag.yml** where we fetch an image from docker-hub say for the
-  `3.0.0` release for instance, and fire it up so you can try it. Here what's in
+  `5.0.0` release for instance, and fire it up so you can try it. Here what's in
   the local branch has no effects on what's running, we just fetch and run
   pre-built images from docker-hub. For `docker compose` to work along with the
   Postgres image it boots up, you'll want to point to a `-dev`-suffixed TAG, as in
-  `export TAG=4.0.0-dev` or `export TAG=3.0.0-dev`, with `latest-dev` being the default.
-  That's because The `dev` builds happen to package the `psycopg2-binary` required to connect
+  `export TAG=5.0.0-dev` or `export TAG=4.1.2-dev`, with `latest-dev` being the default.
+  The `dev` builds include the `psycopg2-binary` required to connect
   to the Postgres database launched as part of the `docker compose` builds.
 
 More on these two approaches after setting up the requirements for either.
@@ -113,7 +113,7 @@ docker compose -f docker-compose-non-dev.yml up
 
 ```bash
 # Set the version you want to run
-export TAG=3.1.1
+export TAG=5.0.0
 # Fetch the tag you're about to check out (assuming you shallow-cloned the repo)
 git fetch --depth=1 origin tag $TAG
 # Could also fetch all tags too if you've got bandwidth to spare
@@ -129,8 +129,8 @@ Refer to the docker-related documentation to learn more about existing tags you
 from Docker Hub.
 
 :::note
-For option #2 and #3, we recommend checking out the release tag from the better repository
-(ie: `git checkout 4.0.0`) for more guaranteed results. This ensures that the `docker-compose.*.yml`
+For option #2 and #3, we recommend checking out the release tag from the git repository
+(ie: `git checkout 5.0.0`) for more guaranteed results. This ensures that the `docker-compose.*.yml`
 configurations and that the mounted `docker/` scripts are in sync with the image you are
 looking to fire up.
 :::
@@ -143,7 +143,7 @@ its metadata database. In production, this database should be backed up.  The de
 with docker compose will store that data in a PostgreSQL database contained in a Docker
 [volume](https://docs.docker.com/storage/volumes/), which is not backed up.
 
-Again, **DO NOT USE THIS FOR PRODUCTION**
+Again, **THE DOCKER-COMPOSE INSTALLATION IS NOT PRODUCTION-READY OUT OF THE BOX.**
 
 :::
 
diff --git a/docs/docs/installation/pypi.mdx b/docs/docs/installation/pypi.mdx
index c03261461d7..14228c20812 100644
--- a/docs/docs/installation/pypi.mdx
+++ b/docs/docs/installation/pypi.mdx
@@ -22,6 +22,13 @@ level dependencies.
 
 **Debian and Ubuntu**
 
+Ubuntu **24.04** uses python 3.12 per default, which currently is not supported by Superset. You need to add a second python installation of 3.11 and install the required additional dependencies.
+```bash
+sudo add-apt-repository ppa:deadsnakes/ppa
+sudo apt update
+sudo apt install python3.11 python3.11-dev python3.11-venv build-essential libssl-dev libffi-dev libsasl2-dev libldap2-dev default-libmysqlclient-dev
+```
+
 In Ubuntu **20.04 and 22.04** the following command will ensure that the required dependencies are installed:
 
 ```bash
@@ -94,14 +101,9 @@ These will now be available when pip installing requirements.
 
 ## Python Virtual Environment
 
-We highly recommend installing Superset inside of a virtual environment. Python ships with
-`virtualenv` out of the box. If you're using [pyenv](https://github.com/pyenv/pyenv), you can install [pyenv-virtualenv](https://github.com/pyenv/pyenv-virtualenv). Or you can install it with `pip`:
+We highly recommend installing Superset inside of a virtual environment.
 
-```bash
-pip install virtualenv
-```
-
-You can create and activate a virtual environment using:
+You can create and activate a virtual environment using the following commands. Ensure you are using a compatible version of python. You might have to explicitly use for example `python3.11` instead of `python3`.
 
 ```bash
 # virtualenv is shipped in Python 3.6+ as venv instead of pyvenv.
@@ -132,7 +134,7 @@ pip install apache_superset
 
 Then, define mandatory configurations, SECRET_KEY and FLASK_APP:
 ```bash
-export SUPERSET_SECRET_KEY=YOUR-SECRET-KEY
+export SUPERSET_SECRET_KEY=YOUR-SECRET-KEY # For production use, make sure this is a strong key, for example generated using `openssl rand -base64 42`. See https://superset.apache.org/docs/configuration/configuring-superset#specifying-a-secret_key
 export FLASK_APP=superset
 ```
 
diff --git a/docs/docs/quickstart.mdx b/docs/docs/quickstart.mdx
index 4ff3b381941..4e23b422e99 100644
--- a/docs/docs/quickstart.mdx
+++ b/docs/docs/quickstart.mdx
@@ -32,7 +32,7 @@ git clone https://github.com/apache/superset
 $ cd superset
 
 # Set the repo to the state associated with the latest official version
-$ git checkout tags/4.1.2
+$ git checkout tags/5.0.0
 
 # Fire up Superset using Docker Compose
 $ docker compose -f docker-compose-image-tag.yml up
diff --git a/docs/docs/security/security.mdx b/docs/docs/security/security.mdx
index 1b2aa8fd240..fa59981560d 100644
--- a/docs/docs/security/security.mdx
+++ b/docs/docs/security/security.mdx
@@ -340,8 +340,8 @@ TALISMAN_CONFIG = {
 }
 ```
 
-# For more information on setting up Talisman, please refer to
-https://superset.apache.org/docs/configuration/networking-settings/#changing-flask-talisman-csp
+For more information on setting up Talisman, please refer to
+https://superset.apache.org/docs/configuration/networking-settings/#changing-flask-talisman-csp.
 
 ### Reporting Security Vulnerabilities
 
diff --git a/docs/package.json b/docs/package.json
index 1fa0b5feb5a..fc69cee854a 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -18,15 +18,15 @@
     "eslint": "eslint . --ext .js,.jsx,.ts,.tsx"
   },
   "dependencies": {
-    "@ant-design/icons": "^5.5.2",
-    "@docusaurus/core": "3.7.0",
-    "@docusaurus/plugin-client-redirects": "3.7.0",
-    "@docusaurus/preset-classic": "3.7.0",
-    "@docusaurus/theme-mermaid": "3.7.0",
+    "@ant-design/icons": "^6.0.0",
+    "@docusaurus/core": "3.8.1",
+    "@docusaurus/plugin-client-redirects": "3.8.1",
+    "@docusaurus/preset-classic": "3.8.1",
+    "@docusaurus/theme-mermaid": "3.8.1",
     "@emotion/styled": "^10.0.27",
     "@saucelabs/theme-github-codeblock": "^0.3.0",
     "@superset-ui/style": "^0.14.23",
-    "antd": "^5.25.1",
+    "antd": "^5.26.3",
     "docusaurus-plugin-less": "^2.0.2",
     "less": "^4.3.0",
     "less-loader": "^12.3.0",
@@ -35,12 +35,12 @@
     "react-dom": "^18.3.1",
     "react-github-btn": "^1.4.0",
     "react-svg-pan-zoom": "^3.13.1",
-    "swagger-ui-react": "^5.21.0"
+    "swagger-ui-react": "^5.26.0"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "^3.7.0",
-    "@docusaurus/tsconfig": "^3.7.0",
-    "@types/react": "^18.3.12",
+    "@docusaurus/module-type-aliases": "^3.8.1",
+    "@docusaurus/tsconfig": "^3.8.1",
+    "@types/react": "^19.1.8",
     "@typescript-eslint/eslint-plugin": "^5.0.0",
     "@typescript-eslint/parser": "^5.0.0",
     "eslint": "^8.0.0",
@@ -49,7 +49,7 @@
     "eslint-plugin-react": "^7.37.5",
     "prettier": "^2.0.0",
     "typescript": "~5.8.3",
-    "webpack": "^5.99.8"
+    "webpack": "^5.99.9"
   },
   "browserslist": {
     "production": [
diff --git a/docs/src/pages/index.tsx b/docs/src/pages/index.tsx
index 167b25ec7fa..f4196c4ed96 100644
--- a/docs/src/pages/index.tsx
+++ b/docs/src/pages/index.tsx
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { useRef, useState, useEffect } from 'react';
+import { useRef, useState, useEffect, JSX } from 'react';
 import Layout from '@theme/Layout';
 import Link from '@docusaurus/Link';
 import { Carousel } from 'antd';
diff --git a/docs/src/resources/data.js b/docs/src/resources/data.js
index 7bd418778ee..4a8ba52c386 100644
--- a/docs/src/resources/data.js
+++ b/docs/src/resources/data.js
@@ -50,7 +50,7 @@ export const Databases = [
   },
   {
     title: 'Apache Druid',
-    href: 'http://druid.io/',
+    href: 'https://druid.apache.org/',
     imgName: 'druid.png',
   },
   {
@@ -69,17 +69,12 @@ export const Databases = [
   },
   {
     title: 'ClickHouse',
-    href: 'https://clickhouse.tech/',
+    href: 'https://clickhouse.com/',
     imgName: 'clickhouse.png',
   },
-  {
-    title: 'Rockset',
-    href: 'https://rockset.com/',
-    imgName: 'rockset.png',
-  },
   {
     title: 'Dremio',
-    href: 'https://dremio.com/',
+    href: 'https://www.dremio.com/',
     imgName: 'dremio.png',
   },
   {
@@ -104,12 +99,12 @@ export const Databases = [
   },
   {
     title: 'IBM Db2',
-    href: 'https://www.ibm.com/analytics/db2',
+    href: 'https://www.ibm.com/products/db2',
     imgName: 'ibmdb2.png',
   },
   {
     title: 'SAP Hana',
-    href: 'https://www.sap.com/products/technology-platform/hana.html',
+    href: 'https://www.sap.com/products/data-cloud/hana.html',
     imgName: 'sap-hana.jpg',
   },
   {
@@ -139,7 +134,7 @@ export const Databases = [
   },
   {
     title: 'TDengine',
-    href: 'https://www.tdengine.com/',
+    href: 'https://tdengine.com/',
     imgName: 'tdengine.png',
   },
 ];
diff --git a/docs/static/img/databases/rockset.png b/docs/static/img/databases/rockset.png
deleted file mode 100644
index c38350619c9..00000000000
Binary files a/docs/static/img/databases/rockset.png and /dev/null differ
diff --git a/docs/yarn.lock b/docs/yarn.lock
index 095df59e0dc..6121390e12b 100644
--- a/docs/yarn.lock
+++ b/docs/yarn.lock
@@ -158,13 +158,20 @@
     "@jridgewell/gen-mapping" "^0.3.5"
     "@jridgewell/trace-mapping" "^0.3.24"
 
-"@ant-design/colors@^7.0.0", "@ant-design/colors@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.npmjs.org/@ant-design/colors/-/colors-7.2.0.tgz"
-  integrity sha512-bjTObSnZ9C/O8MB/B4OUtd/q9COomuJAR2SYfhxLyHvCKn4EKwCN3e+fWGMo7H5InAyV0wL17jdE9ALrdOW/6A==
+"@ant-design/colors@^7.0.0", "@ant-design/colors@^7.2.1":
+  version "7.2.1"
+  resolved "https://registry.yarnpkg.com/@ant-design/colors/-/colors-7.2.1.tgz#3bbc1c6c18550020d1622a0067ff03492318df98"
+  integrity sha512-lCHDcEzieu4GA3n8ELeZ5VQ8pKQAWcGGLRTQ50aQM2iqPpq2evTxER84jfdPvsPAtEcZ7m44NI45edFMo8oOYQ==
   dependencies:
     "@ant-design/fast-color" "^2.0.6"
 
+"@ant-design/colors@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@ant-design/colors/-/colors-8.0.0.tgz#92b5aa1cd44896b62c7b67133b4d5a6a00266162"
+  integrity sha512-6YzkKCw30EI/E9kHOIXsQDHmMvTllT8STzjMb4K2qzit33RW2pqCJP0sk+hidBntXxE+Vz4n1+RvCTfBw6OErw==
+  dependencies:
+    "@ant-design/fast-color" "^3.0.0"
+
 "@ant-design/cssinjs-utils@^1.1.3":
   version "1.1.3"
   resolved "https://registry.npmjs.org/@ant-design/cssinjs-utils/-/cssinjs-utils-1.1.3.tgz"
@@ -194,12 +201,17 @@
   dependencies:
     "@babel/runtime" "^7.24.7"
 
+"@ant-design/fast-color@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@ant-design/fast-color/-/fast-color-3.0.0.tgz#fb5178203de825f284809538f5142203d0ef3d80"
+  integrity sha512-eqvpP7xEDm2S7dUzl5srEQCBTXZMmY3ekf97zI+M2DHOYyKdJGH0qua0JACHTqbkRnD/KHFQP9J1uMJ/XWVzzA==
+
 "@ant-design/icons-svg@^4.4.0":
   version "4.4.2"
   resolved "https://registry.npmjs.org/@ant-design/icons-svg/-/icons-svg-4.4.2.tgz"
   integrity sha512-vHbT+zJEVzllwP+CM+ul7reTEfBR0vgxFe7+lREAsAA7YGsYpboiq2sQNeQeRvh09GfQgs/GyFEvZpJ9cLXpXA==
 
-"@ant-design/icons@^5.5.2", "@ant-design/icons@^5.6.1":
+"@ant-design/icons@^5.6.1":
   version "5.6.1"
   resolved "https://registry.npmjs.org/@ant-design/icons/-/icons-5.6.1.tgz"
   integrity sha512-0/xS39c91WjPAZOWsvi1//zjx6kAp4kxWwctR6kuU6p133w8RU0D2dSCvZC19uQyharg/sAvYxGYWl01BbZZfg==
@@ -210,6 +222,16 @@
     classnames "^2.2.6"
     rc-util "^5.31.1"
 
+"@ant-design/icons@^6.0.0":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@ant-design/icons/-/icons-6.0.0.tgz#302c935b8b0b429e4444cbc45809247276186d94"
+  integrity sha512-o0aCCAlHc1o4CQcapAwWzHeaW2x9F49g7P3IDtvtNXgHowtRWYb7kiubt8sQPFvfVIVU/jLw2hzeSlNt0FU+Uw==
+  dependencies:
+    "@ant-design/colors" "^8.0.0"
+    "@ant-design/icons-svg" "^4.4.0"
+    "@rc-component/util" "^1.2.1"
+    classnames "^2.2.6"
+
 "@ant-design/react-slick@~1.1.2":
   version "1.1.2"
   resolved "https://registry.npmjs.org/@ant-design/react-slick/-/react-slick-1.1.2.tgz"
@@ -234,7 +256,7 @@
   resolved "https://registry.yarnpkg.com/@antfu/utils/-/utils-8.1.1.tgz#95b1947d292a9a2efffba2081796dcaa05ecedfb"
   integrity sha512-Mex9nXf9vR6AhcXmMrlz/HVgYYZpVGJ6YlPgwl7UnaFpnshXs6EK/oa5Gpf3CzENMjkvEx2tQtntGnb7UtSTOQ==
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.16.0", "@babel/code-frame@^7.26.2", "@babel/code-frame@^7.8.3":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.26.2":
   version "7.26.2"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.26.2.tgz#4b5fab97d33338eff916235055f0ebc21e573a85"
   integrity sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==
@@ -1084,13 +1106,12 @@
     "@babel/plugin-transform-modules-commonjs" "^7.26.3"
     "@babel/plugin-transform-typescript" "^7.27.0"
 
-"@babel/runtime-corejs3@^7.20.7", "@babel/runtime-corejs3@^7.22.15", "@babel/runtime-corejs3@^7.25.9", "@babel/runtime-corejs3@^7.26.10":
-  version "7.27.0"
-  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.27.0.tgz#c766df350ec7a2caf3ed64e3659b100954589413"
-  integrity sha512-UWjX6t+v+0ckwZ50Y5ShZLnlk95pP5MyW/pon9tiYzl3+18pkTHTFNTKr7rQbfRXPkowt2QAn30o1b6oswszew==
+"@babel/runtime-corejs3@^7.20.7", "@babel/runtime-corejs3@^7.22.15", "@babel/runtime-corejs3@^7.25.9", "@babel/runtime-corejs3@^7.26.10", "@babel/runtime-corejs3@^7.27.1":
+  version "7.27.6"
+  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.27.6.tgz#97644153808a62898e7c05f3361501417db3c48b"
+  integrity sha512-vDVrlmRAY8z9Ul/HxT+8ceAru95LQgkSKiXkSYZvqtbkPSfhZJgpRp45Cldbh1GJ1kxzQkI70AqyrTI58KpaWQ==
   dependencies:
     core-js-pure "^3.30.2"
-    regenerator-runtime "^0.14.0"
 
 "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.3", "@babel/runtime@^7.10.4", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.16.7", "@babel/runtime@^7.18.0", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.0", "@babel/runtime@^7.20.7", "@babel/runtime@^7.21.0", "@babel/runtime@^7.22.5", "@babel/runtime@^7.23.2", "@babel/runtime@^7.23.6", "@babel/runtime@^7.23.9", "@babel/runtime@^7.24.4", "@babel/runtime@^7.24.7", "@babel/runtime@^7.24.8", "@babel/runtime@^7.25.7", "@babel/runtime@^7.25.9", "@babel/runtime@^7.26.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4":
   version "7.27.0"
@@ -1171,43 +1192,43 @@
   resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9"
   integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==
 
-"@csstools/cascade-layer-name-parser@^2.0.4":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@csstools/cascade-layer-name-parser/-/cascade-layer-name-parser-2.0.4.tgz#64d128529397aa1e1c986f685713363b262b81b1"
-  integrity sha512-7DFHlPuIxviKYZrOiwVU/PiHLm3lLUR23OMuEEtfEOQTOp9hzQ2JjdY6X5H18RVuUPJqSCI+qNnD5iOLMVE0bA==
+"@csstools/cascade-layer-name-parser@^2.0.5":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@csstools/cascade-layer-name-parser/-/cascade-layer-name-parser-2.0.5.tgz#43f962bebead0052a9fed1a2deeb11f85efcbc72"
+  integrity sha512-p1ko5eHgV+MgXFVa4STPKpvPxr6ReS8oS2jzTukjR74i5zJNyWO1ZM1m8YKBXnzDKWfBN1ztLYlHxbVemDD88A==
 
 "@csstools/color-helpers@^5.0.2":
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/@csstools/color-helpers/-/color-helpers-5.0.2.tgz#82592c9a7c2b83c293d9161894e2a6471feb97b8"
   integrity sha512-JqWH1vsgdGcw2RR6VliXXdA0/59LttzlU8UlRT/iUUsEeWfYq8I+K0yhihEUTTHLRm1EXvpsCx3083EU15ecsA==
 
-"@csstools/css-calc@^2.1.2":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/@csstools/css-calc/-/css-calc-2.1.2.tgz#bffd55f002dab119b76d4023f95cd943e6c8c11e"
-  integrity sha512-TklMyb3uBB28b5uQdxjReG4L80NxAqgrECqLZFQbyLekwwlcDDS8r3f07DKqeo8C4926Br0gf/ZDe17Zv4wIuw==
+"@csstools/css-calc@^2.1.4":
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/@csstools/css-calc/-/css-calc-2.1.4.tgz#8473f63e2fcd6e459838dd412401d5948f224c65"
+  integrity sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ==
 
-"@csstools/css-color-parser@^3.0.8":
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/@csstools/css-color-parser/-/css-color-parser-3.0.8.tgz#5fe9322920851450bf5e065c2b0e731b9e165394"
-  integrity sha512-pdwotQjCCnRPuNi06jFuP68cykU1f3ZWExLe/8MQ1LOs8Xq+fTkYgd+2V8mWUWMrOn9iS2HftPVaMZDaXzGbhQ==
+"@csstools/css-color-parser@^3.0.10":
+  version "3.0.10"
+  resolved "https://registry.yarnpkg.com/@csstools/css-color-parser/-/css-color-parser-3.0.10.tgz#79fc68864dd43c3b6782d2b3828bc0fa9d085c10"
+  integrity sha512-TiJ5Ajr6WRd1r8HSiwJvZBiJOqtH86aHpUjq5aEKWHiII2Qfjqd/HCWKPOW8EP4vcspXbHnXrwIDlu5savQipg==
   dependencies:
     "@csstools/color-helpers" "^5.0.2"
-    "@csstools/css-calc" "^2.1.2"
+    "@csstools/css-calc" "^2.1.4"
 
-"@csstools/css-parser-algorithms@^3.0.4":
+"@csstools/css-parser-algorithms@^3.0.5":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.5.tgz#5755370a9a29abaec5515b43c8b3f2cf9c2e3076"
+  integrity sha512-DaDeUkXZKjdGhgYaHNJTV9pV7Y9B3b644jCLs9Upc3VeNGg6LWARAT6O+Q+/COo+2gg/bM5rhpMAtf70WqfBdQ==
+
+"@csstools/css-tokenizer@^3.0.4":
   version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.4.tgz#74426e93bd1c4dcab3e441f5cc7ba4fb35d94356"
-  integrity sha512-Up7rBoV77rv29d3uKHUIVubz1BTcgyUK72IvCQAbfbMv584xHcGKCKbWh7i8hPrRJ7qU4Y8IO3IY9m+iTB7P3A==
+  resolved "https://registry.yarnpkg.com/@csstools/css-tokenizer/-/css-tokenizer-3.0.4.tgz#333fedabc3fd1a8e5d0100013731cf19e6a8c5d3"
+  integrity sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw==
 
-"@csstools/css-tokenizer@^3.0.3":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@csstools/css-tokenizer/-/css-tokenizer-3.0.3.tgz#a5502c8539265fecbd873c1e395a890339f119c2"
-  integrity sha512-UJnjoFsmxfKUdNYdWgOB0mWUypuLvAfQPH1+pyvRJs6euowbFkFC6P13w1l8mJyi3vxYMxc9kld5jZEGRQs6bw==
-
-"@csstools/media-query-list-parser@^4.0.2":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@csstools/media-query-list-parser/-/media-query-list-parser-4.0.2.tgz#e80e17eba1693fceafb8d6f2cfc68c0e7a9ab78a"
-  integrity sha512-EUos465uvVvMJehckATTlNqGj4UJWkTmdWuDMjqvSUkjGpmOyFZBVwb4knxCm/k2GMTXY+c/5RkdndzFYWeX5A==
+"@csstools/media-query-list-parser@^4.0.3":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@csstools/media-query-list-parser/-/media-query-list-parser-4.0.3.tgz#7aec77bcb89c2da80ef207e73f474ef9e1b3cdf1"
+  integrity sha512-HAYH7d3TLRHDOUQK4mZKf9k9Ph/m8Akstg66ywKR4SFAigjs3yBiUeZtFxywiTm5moZMAp/5W/ZuFnNXXYLuuQ==
 
 "@csstools/postcss-cascade-layers@^5.0.1":
   version "5.0.1"
@@ -1217,46 +1238,57 @@
     "@csstools/selector-specificity" "^5.0.0"
     postcss-selector-parser "^7.0.0"
 
-"@csstools/postcss-color-function@^4.0.8":
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-color-function/-/postcss-color-function-4.0.8.tgz#4c16ea78abfdfd62c947616c6e68836e50f2441c"
-  integrity sha512-9dUvP2qpZI6PlGQ/sob+95B3u5u7nkYt9yhZFCC7G9HBRHBxj+QxS/wUlwaMGYW0waf+NIierI8aoDTssEdRYw==
+"@csstools/postcss-color-function@^4.0.10":
+  version "4.0.10"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-color-function/-/postcss-color-function-4.0.10.tgz#11ad43a66ef2cc794ab826a07df8b5fa9fb47a3a"
+  integrity sha512-4dY0NBu7NVIpzxZRgh/Q/0GPSz/jLSw0i/u3LTUor0BkQcz/fNhN10mSWBDsL0p9nDb0Ky1PD6/dcGbhACuFTQ==
   dependencies:
-    "@csstools/css-color-parser" "^3.0.8"
-    "@csstools/css-parser-algorithms" "^3.0.4"
-    "@csstools/css-tokenizer" "^3.0.3"
-    "@csstools/postcss-progressive-custom-properties" "^4.0.0"
+    "@csstools/css-color-parser" "^3.0.10"
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-tokenizer" "^3.0.4"
+    "@csstools/postcss-progressive-custom-properties" "^4.1.0"
     "@csstools/utilities" "^2.0.0"
 
-"@csstools/postcss-color-mix-function@^3.0.8":
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-color-mix-function/-/postcss-color-mix-function-3.0.8.tgz#45a006dfcc65f2a61ae60f2df7ebc108fdb9eaf1"
-  integrity sha512-yuZpgWUzqZWQhEqfvtJufhl28DgO9sBwSbXbf/59gejNuvZcoUTRGQZhzhwF4ccqb53YAGB+u92z9+eSKoB4YA==
+"@csstools/postcss-color-mix-function@^3.0.10":
+  version "3.0.10"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-color-mix-function/-/postcss-color-mix-function-3.0.10.tgz#8c9d0ccfae5c45a9870dd84807ea2995c7a3a514"
+  integrity sha512-P0lIbQW9I4ShE7uBgZRib/lMTf9XMjJkFl/d6w4EMNHu2qvQ6zljJGEcBkw/NsBtq/6q3WrmgxSS8kHtPMkK4Q==
   dependencies:
-    "@csstools/css-color-parser" "^3.0.8"
-    "@csstools/css-parser-algorithms" "^3.0.4"
-    "@csstools/css-tokenizer" "^3.0.3"
-    "@csstools/postcss-progressive-custom-properties" "^4.0.0"
+    "@csstools/css-color-parser" "^3.0.10"
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-tokenizer" "^3.0.4"
+    "@csstools/postcss-progressive-custom-properties" "^4.1.0"
     "@csstools/utilities" "^2.0.0"
 
-"@csstools/postcss-content-alt-text@^2.0.4":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-content-alt-text/-/postcss-content-alt-text-2.0.4.tgz#76f4687fb15ed45bc1139bb71e5775779762897a"
-  integrity sha512-YItlZUOuZJCBlRaCf8Aucc1lgN41qYGALMly0qQllrxYJhiyzlI6RxOTMUvtWk+KhS8GphMDsDhKQ7KTPfEMSw==
+"@csstools/postcss-color-mix-variadic-function-arguments@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-color-mix-variadic-function-arguments/-/postcss-color-mix-variadic-function-arguments-1.0.0.tgz#0b29cb9b4630d7ed68549db265662d41554a17ed"
+  integrity sha512-Z5WhouTyD74dPFPrVE7KydgNS9VvnjB8qcdes9ARpCOItb4jTnm7cHp4FhxCRUoyhabD0WVv43wbkJ4p8hLAlQ==
   dependencies:
-    "@csstools/css-parser-algorithms" "^3.0.4"
-    "@csstools/css-tokenizer" "^3.0.3"
-    "@csstools/postcss-progressive-custom-properties" "^4.0.0"
+    "@csstools/css-color-parser" "^3.0.10"
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-tokenizer" "^3.0.4"
+    "@csstools/postcss-progressive-custom-properties" "^4.1.0"
     "@csstools/utilities" "^2.0.0"
 
-"@csstools/postcss-exponential-functions@^2.0.7":
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-exponential-functions/-/postcss-exponential-functions-2.0.7.tgz#c369f241c6645a5e8a184bfd02cdcc65bd22fcbd"
-  integrity sha512-XTb6Mw0v2qXtQYRW9d9duAjDnoTbBpsngD7sRNLmYDjvwU2ebpIHplyxgOeo6jp/Kr52gkLi5VaK5RDCqzMzZQ==
+"@csstools/postcss-content-alt-text@^2.0.6":
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-content-alt-text/-/postcss-content-alt-text-2.0.6.tgz#548862226eac54bab0ee5f1bf3a9981393ab204b"
+  integrity sha512-eRjLbOjblXq+byyaedQRSrAejKGNAFued+LcbzT+LCL78fabxHkxYjBbxkroONxHHYu2qxhFK2dBStTLPG3jpQ==
   dependencies:
-    "@csstools/css-calc" "^2.1.2"
-    "@csstools/css-parser-algorithms" "^3.0.4"
-    "@csstools/css-tokenizer" "^3.0.3"
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-tokenizer" "^3.0.4"
+    "@csstools/postcss-progressive-custom-properties" "^4.1.0"
+    "@csstools/utilities" "^2.0.0"
+
+"@csstools/postcss-exponential-functions@^2.0.9":
+  version "2.0.9"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-exponential-functions/-/postcss-exponential-functions-2.0.9.tgz#fc03d1272888cb77e64cc1a7d8a33016e4f05c69"
+  integrity sha512-abg2W/PI3HXwS/CZshSa79kNWNZHdJPMBXeZNyPQFbbj8sKO3jXxOt/wF7juJVjyDTc6JrvaUZYFcSBZBhaxjw==
+  dependencies:
+    "@csstools/css-calc" "^2.1.4"
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-tokenizer" "^3.0.4"
 
 "@csstools/postcss-font-format-keywords@^4.0.0":
   version "4.0.0"
@@ -1266,43 +1298,43 @@
     "@csstools/utilities" "^2.0.0"
     postcss-value-parser "^4.2.0"
 
-"@csstools/postcss-gamut-mapping@^2.0.8":
-  version "2.0.8"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-gamut-mapping/-/postcss-gamut-mapping-2.0.8.tgz#e9441e7b5a7b0d3cc1a92486378824abb76ef849"
-  integrity sha512-/K8u9ZyGMGPjmwCSIjgaOLKfic2RIGdFHHes84XW5LnmrvdhOTVxo255NppHi3ROEvoHPW7MplMJgjZK5Q+TxA==
+"@csstools/postcss-gamut-mapping@^2.0.10":
+  version "2.0.10"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-gamut-mapping/-/postcss-gamut-mapping-2.0.10.tgz#f518d941231d721dbecf5b41e3c441885ff2f28b"
+  integrity sha512-QDGqhJlvFnDlaPAfCYPsnwVA6ze+8hhrwevYWlnUeSjkkZfBpcCO42SaUD8jiLlq7niouyLgvup5lh+f1qessg==
   dependencies:
-    "@csstools/css-color-parser" "^3.0.8"
-    "@csstools/css-parser-algorithms" "^3.0.4"
-    "@csstools/css-tokenizer" "^3.0.3"
+    "@csstools/css-color-parser" "^3.0.10"
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-tokenizer" "^3.0.4"
 
-"@csstools/postcss-gradients-interpolation-method@^5.0.8":
-  version "5.0.8"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-gradients-interpolation-method/-/postcss-gradients-interpolation-method-5.0.8.tgz#f7f0324fd564c092ac13ce35b5a09ffda0165a90"
-  integrity sha512-CoHQ/0UXrvxLovu0ZeW6c3/20hjJ/QRg6lyXm3dZLY/JgvRU6bdbQZF/Du30A4TvowfcgvIHQmP1bNXUxgDrAw==
+"@csstools/postcss-gradients-interpolation-method@^5.0.10":
+  version "5.0.10"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-gradients-interpolation-method/-/postcss-gradients-interpolation-method-5.0.10.tgz#3146da352c31142a721fdba062ac3a6d11dbbec3"
+  integrity sha512-HHPauB2k7Oits02tKFUeVFEU2ox/H3OQVrP3fSOKDxvloOikSal+3dzlyTZmYsb9FlY9p5EUpBtz0//XBmy+aw==
   dependencies:
-    "@csstools/css-color-parser" "^3.0.8"
-    "@csstools/css-parser-algorithms" "^3.0.4"
-    "@csstools/css-tokenizer" "^3.0.3"
-    "@csstools/postcss-progressive-custom-properties" "^4.0.0"
+    "@csstools/css-color-parser" "^3.0.10"
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-tokenizer" "^3.0.4"
+    "@csstools/postcss-progressive-custom-properties" "^4.1.0"
     "@csstools/utilities" "^2.0.0"
 
-"@csstools/postcss-hwb-function@^4.0.8":
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-hwb-function/-/postcss-hwb-function-4.0.8.tgz#13a85203601b3db97a6672e16f6699fe464827b0"
-  integrity sha512-LpFKjX6hblpeqyych1cKmk+3FJZ19QmaJtqincySoMkbkG/w2tfbnO5oE6mlnCTXcGUJ0rCEuRHvTqKK0nHYUQ==
+"@csstools/postcss-hwb-function@^4.0.10":
+  version "4.0.10"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-hwb-function/-/postcss-hwb-function-4.0.10.tgz#f93f3c457e6440ac37ef9b908feb5d901b417d50"
+  integrity sha512-nOKKfp14SWcdEQ++S9/4TgRKchooLZL0TUFdun3nI4KPwCjETmhjta1QT4ICQcGVWQTvrsgMM/aLB5We+kMHhQ==
   dependencies:
-    "@csstools/css-color-parser" "^3.0.8"
-    "@csstools/css-parser-algorithms" "^3.0.4"
-    "@csstools/css-tokenizer" "^3.0.3"
-    "@csstools/postcss-progressive-custom-properties" "^4.0.0"
+    "@csstools/css-color-parser" "^3.0.10"
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-tokenizer" "^3.0.4"
+    "@csstools/postcss-progressive-custom-properties" "^4.1.0"
     "@csstools/utilities" "^2.0.0"
 
-"@csstools/postcss-ic-unit@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-ic-unit/-/postcss-ic-unit-4.0.0.tgz#b60ec06500717c337447c39ae7fe7952eeb9d48f"
-  integrity sha512-9QT5TDGgx7wD3EEMN3BSUG6ckb6Eh5gSPT5kZoVtUuAonfPmLDJyPhqR4ntPpMYhUKAMVKAg3I/AgzqHMSeLhA==
+"@csstools/postcss-ic-unit@^4.0.2":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-ic-unit/-/postcss-ic-unit-4.0.2.tgz#7561e09db65fac8304ceeab9dd3e5c6e43414587"
+  integrity sha512-lrK2jjyZwh7DbxaNnIUjkeDmU8Y6KyzRBk91ZkI5h8nb1ykEfZrtIVArdIjX4DHMIBGpdHrgP0n4qXDr7OHaKA==
   dependencies:
-    "@csstools/postcss-progressive-custom-properties" "^4.0.0"
+    "@csstools/postcss-progressive-custom-properties" "^4.1.0"
     "@csstools/utilities" "^2.0.0"
     postcss-value-parser "^4.2.0"
 
@@ -1311,22 +1343,22 @@
   resolved "https://registry.yarnpkg.com/@csstools/postcss-initial/-/postcss-initial-2.0.1.tgz#c385bd9d8ad31ad159edd7992069e97ceea4d09a"
   integrity sha512-L1wLVMSAZ4wovznquK0xmC7QSctzO4D0Is590bxpGqhqjboLXYA16dWZpfwImkdOgACdQ9PqXsuRroW6qPlEsg==
 
-"@csstools/postcss-is-pseudo-class@^5.0.1":
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-5.0.1.tgz#12041448fedf01090dd4626022c28b7f7623f58e"
-  integrity sha512-JLp3POui4S1auhDR0n8wHd/zTOWmMsmK3nQd3hhL6FhWPaox5W7j1se6zXOG/aP07wV2ww0lxbKYGwbBszOtfQ==
+"@csstools/postcss-is-pseudo-class@^5.0.3":
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-5.0.3.tgz#d34e850bcad4013c2ed7abe948bfa0448aa8eb74"
+  integrity sha512-jS/TY4SpG4gszAtIg7Qnf3AS2pjcUM5SzxpApOrlndMeGhIbaTzWBzzP/IApXoNWEW7OhcjkRT48jnAUIFXhAQ==
   dependencies:
     "@csstools/selector-specificity" "^5.0.0"
     postcss-selector-parser "^7.0.0"
 
-"@csstools/postcss-light-dark-function@^2.0.7":
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-light-dark-function/-/postcss-light-dark-function-2.0.7.tgz#807c170cd28eebb0c00e64dfc6ab0bf418f19209"
-  integrity sha512-ZZ0rwlanYKOHekyIPaU+sVm3BEHCe+Ha0/px+bmHe62n0Uc1lL34vbwrLYn6ote8PHlsqzKeTQdIejQCJ05tfw==
+"@csstools/postcss-light-dark-function@^2.0.9":
+  version "2.0.9"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-light-dark-function/-/postcss-light-dark-function-2.0.9.tgz#9fb080188907539734a9d5311d2a1cb82531ef38"
+  integrity sha512-1tCZH5bla0EAkFAI2r0H33CDnIBeLUaJh1p+hvvsylJ4svsv2wOmJjJn+OXwUZLXef37GYbRIVKX+X+g6m+3CQ==
   dependencies:
-    "@csstools/css-parser-algorithms" "^3.0.4"
-    "@csstools/css-tokenizer" "^3.0.3"
-    "@csstools/postcss-progressive-custom-properties" "^4.0.0"
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-tokenizer" "^3.0.4"
+    "@csstools/postcss-progressive-custom-properties" "^4.1.0"
     "@csstools/utilities" "^2.0.0"
 
 "@csstools/postcss-logical-float-and-clear@^3.0.0":
@@ -1351,32 +1383,32 @@
   dependencies:
     postcss-value-parser "^4.2.0"
 
-"@csstools/postcss-logical-viewport-units@^3.0.3":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-logical-viewport-units/-/postcss-logical-viewport-units-3.0.3.tgz#f6cc63520ca2a6eb76b9cd946070c38dda66d733"
-  integrity sha512-OC1IlG/yoGJdi0Y+7duz/kU/beCwO+Gua01sD6GtOtLi7ByQUpcIqs7UE/xuRPay4cHgOMatWdnDdsIDjnWpPw==
+"@csstools/postcss-logical-viewport-units@^3.0.4":
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-logical-viewport-units/-/postcss-logical-viewport-units-3.0.4.tgz#016d98a8b7b5f969e58eb8413447eb801add16fc"
+  integrity sha512-q+eHV1haXA4w9xBwZLKjVKAWn3W2CMqmpNpZUk5kRprvSiBEGMgrNH3/sJZ8UA3JgyHaOt3jwT9uFa4wLX4EqQ==
   dependencies:
-    "@csstools/css-tokenizer" "^3.0.3"
+    "@csstools/css-tokenizer" "^3.0.4"
     "@csstools/utilities" "^2.0.0"
 
-"@csstools/postcss-media-minmax@^2.0.7":
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-media-minmax/-/postcss-media-minmax-2.0.7.tgz#42816871decf0a092af3f6c8500e04d9918cc342"
-  integrity sha512-LB6tIP7iBZb5CYv8iRenfBZmbaG3DWNEziOnPjGoQX5P94FBPvvTBy68b/d9NnS5PELKwFmmOYsAEIgEhDPCHA==
+"@csstools/postcss-media-minmax@^2.0.9":
+  version "2.0.9"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-media-minmax/-/postcss-media-minmax-2.0.9.tgz#184252d5b93155ae526689328af6bdf3fc113987"
+  integrity sha512-af9Qw3uS3JhYLnCbqtZ9crTvvkR+0Se+bBqSr7ykAnl9yKhk6895z9rf+2F4dClIDJWxgn0iZZ1PSdkhrbs2ig==
   dependencies:
-    "@csstools/css-calc" "^2.1.2"
-    "@csstools/css-parser-algorithms" "^3.0.4"
-    "@csstools/css-tokenizer" "^3.0.3"
-    "@csstools/media-query-list-parser" "^4.0.2"
+    "@csstools/css-calc" "^2.1.4"
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-tokenizer" "^3.0.4"
+    "@csstools/media-query-list-parser" "^4.0.3"
 
-"@csstools/postcss-media-queries-aspect-ratio-number-values@^3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-media-queries-aspect-ratio-number-values/-/postcss-media-queries-aspect-ratio-number-values-3.0.4.tgz#d71102172c74baf3f892fac88cf1ea46a961600d"
-  integrity sha512-AnGjVslHMm5xw9keusQYvjVWvuS7KWK+OJagaG0+m9QnIjZsrysD2kJP/tr/UJIyYtMCtu8OkUd+Rajb4DqtIQ==
+"@csstools/postcss-media-queries-aspect-ratio-number-values@^3.0.5":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-media-queries-aspect-ratio-number-values/-/postcss-media-queries-aspect-ratio-number-values-3.0.5.tgz#f485c31ec13d6b0fb5c528a3474334a40eff5f11"
+  integrity sha512-zhAe31xaaXOY2Px8IYfoVTB3wglbJUVigGphFLj6exb7cjZRH9A6adyE22XfFK3P2PzwRk0VDeTJmaxpluyrDg==
   dependencies:
-    "@csstools/css-parser-algorithms" "^3.0.4"
-    "@csstools/css-tokenizer" "^3.0.3"
-    "@csstools/media-query-list-parser" "^4.0.2"
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-tokenizer" "^3.0.4"
+    "@csstools/media-query-list-parser" "^4.0.3"
 
 "@csstools/postcss-nested-calc@^4.0.0":
   version "4.0.0"
@@ -1393,42 +1425,42 @@
   dependencies:
     postcss-value-parser "^4.2.0"
 
-"@csstools/postcss-oklab-function@^4.0.8":
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-oklab-function/-/postcss-oklab-function-4.0.8.tgz#9d723e0db69703f3df549ebedfd605f849217fff"
-  integrity sha512-+5aPsNWgxohXoYNS1f+Ys0x3Qnfehgygv3qrPyv+Y25G0yX54/WlVB+IXprqBLOXHM1gsVF+QQSjlArhygna0Q==
+"@csstools/postcss-oklab-function@^4.0.10":
+  version "4.0.10"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-oklab-function/-/postcss-oklab-function-4.0.10.tgz#d4c23c51dd0be45e6dedde22432d7d0003710780"
+  integrity sha512-ZzZUTDd0fgNdhv8UUjGCtObPD8LYxMH+MJsW9xlZaWTV8Ppr4PtxlHYNMmF4vVWGl0T6f8tyWAKjoI6vePSgAg==
   dependencies:
-    "@csstools/css-color-parser" "^3.0.8"
-    "@csstools/css-parser-algorithms" "^3.0.4"
-    "@csstools/css-tokenizer" "^3.0.3"
-    "@csstools/postcss-progressive-custom-properties" "^4.0.0"
+    "@csstools/css-color-parser" "^3.0.10"
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-tokenizer" "^3.0.4"
+    "@csstools/postcss-progressive-custom-properties" "^4.1.0"
     "@csstools/utilities" "^2.0.0"
 
-"@csstools/postcss-progressive-custom-properties@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-4.0.0.tgz#ecdb85bcdb1852d73970a214a376684a91f82bdc"
-  integrity sha512-XQPtROaQjomnvLUSy/bALTR5VCtTVUFwYs1SblvYgLSeTo2a/bMNwUwo2piXw5rTv/FEYiy5yPSXBqg9OKUx7Q==
+"@csstools/postcss-progressive-custom-properties@^4.1.0":
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-4.1.0.tgz#70c8d41b577f4023633b7e3791604e0b7f3775bc"
+  integrity sha512-YrkI9dx8U4R8Sz2EJaoeD9fI7s7kmeEBfmO+UURNeL6lQI7VxF6sBE+rSqdCBn4onwqmxFdBU3lTwyYb/lCmxA==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-"@csstools/postcss-random-function@^1.0.3":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-random-function/-/postcss-random-function-1.0.3.tgz#f737f5bab3826fc71fd663b21e70ee392b144f20"
-  integrity sha512-dbNeEEPHxAwfQJ3duRL5IPpuD77QAHtRl4bAHRs0vOVhVbHrsL7mHnwe0irYjbs9kYwhAHZBQTLBgmvufPuRkA==
+"@csstools/postcss-random-function@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-random-function/-/postcss-random-function-2.0.1.tgz#3191f32fe72936e361dadf7dbfb55a0209e2691e"
+  integrity sha512-q+FQaNiRBhnoSNo+GzqGOIBKoHQ43lYz0ICrV+UudfWnEF6ksS6DsBIJSISKQT2Bvu3g4k6r7t0zYrk5pDlo8w==
   dependencies:
-    "@csstools/css-calc" "^2.1.2"
-    "@csstools/css-parser-algorithms" "^3.0.4"
-    "@csstools/css-tokenizer" "^3.0.3"
+    "@csstools/css-calc" "^2.1.4"
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-tokenizer" "^3.0.4"
 
-"@csstools/postcss-relative-color-syntax@^3.0.8":
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-relative-color-syntax/-/postcss-relative-color-syntax-3.0.8.tgz#833cdea06e5cbec2702f939d1aadfd280e4f4c07"
-  integrity sha512-eGE31oLnJDoUysDdjS9MLxNZdtqqSxjDXMdISpLh80QMaYrKs7VINpid34tWQ+iU23Wg5x76qAzf1Q/SLLbZVg==
+"@csstools/postcss-relative-color-syntax@^3.0.10":
+  version "3.0.10"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-relative-color-syntax/-/postcss-relative-color-syntax-3.0.10.tgz#daa840583969461e1e06b12e9c591e52a790ec86"
+  integrity sha512-8+0kQbQGg9yYG8hv0dtEpOMLwB9M+P7PhacgIzVzJpixxV4Eq9AUQtQw8adMmAJU1RBBmIlpmtmm3XTRd/T00g==
   dependencies:
-    "@csstools/css-color-parser" "^3.0.8"
-    "@csstools/css-parser-algorithms" "^3.0.4"
-    "@csstools/css-tokenizer" "^3.0.3"
-    "@csstools/postcss-progressive-custom-properties" "^4.0.0"
+    "@csstools/css-color-parser" "^3.0.10"
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-tokenizer" "^3.0.4"
+    "@csstools/postcss-progressive-custom-properties" "^4.1.0"
     "@csstools/utilities" "^2.0.0"
 
 "@csstools/postcss-scope-pseudo-class@^4.0.1":
@@ -1438,23 +1470,23 @@
   dependencies:
     postcss-selector-parser "^7.0.0"
 
-"@csstools/postcss-sign-functions@^1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-sign-functions/-/postcss-sign-functions-1.1.2.tgz#9664762870de4f8d189829a86798e532bbaad053"
-  integrity sha512-4EcAvXTUPh7n6UoZZkCzgtCf/wPzMlTNuddcKg7HG8ozfQkUcHsJ2faQKeLmjyKdYPyOUn4YA7yDPf8K/jfIxw==
+"@csstools/postcss-sign-functions@^1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-sign-functions/-/postcss-sign-functions-1.1.4.tgz#a9ac56954014ae4c513475b3f1b3e3424a1e0c12"
+  integrity sha512-P97h1XqRPcfcJndFdG95Gv/6ZzxUBBISem0IDqPZ7WMvc/wlO+yU0c5D/OCpZ5TJoTt63Ok3knGk64N+o6L2Pg==
   dependencies:
-    "@csstools/css-calc" "^2.1.2"
-    "@csstools/css-parser-algorithms" "^3.0.4"
-    "@csstools/css-tokenizer" "^3.0.3"
+    "@csstools/css-calc" "^2.1.4"
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-tokenizer" "^3.0.4"
 
-"@csstools/postcss-stepped-value-functions@^4.0.7":
-  version "4.0.7"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-4.0.7.tgz#c681fbcdb8a2fcfeaea2bb0ea9d497832bab9ef7"
-  integrity sha512-rdrRCKRnWtj5FyRin0u/gLla7CIvZRw/zMGI1fVJP0Sg/m1WGicjPVHRANL++3HQtsiXKAbPrcPr+VkyGck0IA==
+"@csstools/postcss-stepped-value-functions@^4.0.9":
+  version "4.0.9"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-4.0.9.tgz#36036f1a0e5e5ee2308e72f3c9cb433567c387b9"
+  integrity sha512-h9btycWrsex4dNLeQfyU3y3w40LMQooJWFMm/SK9lrKguHDcFl4VMkncKKoXi2z5rM9YGWbUQABI8BT2UydIcA==
   dependencies:
-    "@csstools/css-calc" "^2.1.2"
-    "@csstools/css-parser-algorithms" "^3.0.4"
-    "@csstools/css-tokenizer" "^3.0.3"
+    "@csstools/css-calc" "^2.1.4"
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-tokenizer" "^3.0.4"
 
 "@csstools/postcss-text-decoration-shorthand@^4.0.2":
   version "4.0.2"
@@ -1464,24 +1496,24 @@
     "@csstools/color-helpers" "^5.0.2"
     postcss-value-parser "^4.2.0"
 
-"@csstools/postcss-trigonometric-functions@^4.0.7":
-  version "4.0.7"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-4.0.7.tgz#8941a4c99dc1fec31daf052ac0fb6e7bf7c92403"
-  integrity sha512-qTrZgLju3AV7Djhzuh2Bq/wjFqbcypnk0FhHjxW8DWJQcZLS1HecIus4X2/RLch1ukX7b+YYCdqbEnpIQO5ccg==
+"@csstools/postcss-trigonometric-functions@^4.0.9":
+  version "4.0.9"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-4.0.9.tgz#3f94ed2e319b57f2c59720b64e4d0a8a6fb8c3b2"
+  integrity sha512-Hnh5zJUdpNrJqK9v1/E3BbrQhaDTj5YiX7P61TOvUhoDHnUmsNNxcDAgkQ32RrcWx9GVUvfUNPcUkn8R3vIX6A==
   dependencies:
-    "@csstools/css-calc" "^2.1.2"
-    "@csstools/css-parser-algorithms" "^3.0.4"
-    "@csstools/css-tokenizer" "^3.0.3"
+    "@csstools/css-calc" "^2.1.4"
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-tokenizer" "^3.0.4"
 
 "@csstools/postcss-unset-value@^4.0.0":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/@csstools/postcss-unset-value/-/postcss-unset-value-4.0.0.tgz#7caa981a34196d06a737754864baf77d64de4bba"
   integrity sha512-cBz3tOCI5Fw6NIFEwU3RiwK6mn3nKegjpJuzCndoGq3BZPkUjnsq7uQmIeMNeMbMk7YD2MfKcgCpZwX5jyXqCA==
 
-"@csstools/selector-resolve-nested@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@csstools/selector-resolve-nested/-/selector-resolve-nested-3.0.0.tgz#704a9b637975680e025e069a4c58b3beb3e2752a"
-  integrity sha512-ZoK24Yku6VJU1gS79a5PFmC8yn3wIapiKmPgun0hZgEI5AOqgH2kiPRsPz1qkGv4HL+wuDLH83yQyk6inMYrJQ==
+"@csstools/selector-resolve-nested@^3.1.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@csstools/selector-resolve-nested/-/selector-resolve-nested-3.1.0.tgz#848c6f44cb65e3733e478319b9342b7aa436fac7"
+  integrity sha512-mf1LEW0tJLKfWyvn5KdDrhpxHyuxpbNwTIwOYLIvsTffeyOf85j5oIzfG0yosxDgx/sswlqBnESYUcQH0vgZ0g==
 
 "@csstools/selector-specificity@^5.0.0":
   version "5.0.0"
@@ -1503,7 +1535,7 @@
   resolved "https://registry.yarnpkg.com/@docsearch/css/-/css-3.9.0.tgz#3bc29c96bf024350d73b0cfb7c2a7b71bf251cd5"
   integrity sha512-cQbnVbq0rrBwNAKegIac/t6a8nWoUAn8frnkLFW6YARaRmAQr5/Eoe6Ln2fqkUCZ40KpdrKbpSAmgrkviOxuWA==
 
-"@docsearch/react@^3.8.1":
+"@docsearch/react@^3.9.0":
   version "3.9.0"
   resolved "https://registry.yarnpkg.com/@docsearch/react/-/react-3.9.0.tgz#d0842b700c3ee26696786f3c8ae9f10c1a3f0db3"
   integrity sha512-mb5FOZYZIkRQ6s/NWnM98k879vu5pscWqTLubLFBO87igYYT4VzVazh4h5o/zCvTIZgEt3PvsCOMOswOUo9yHQ==
@@ -1513,10 +1545,10 @@
     "@docsearch/css" "3.9.0"
     algoliasearch "^5.14.2"
 
-"@docusaurus/babel@3.7.0":
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/@docusaurus/babel/-/babel-3.7.0.tgz#770dd5da525a9d6a2fee7d3212ec62040327f776"
-  integrity sha512-0H5uoJLm14S/oKV3Keihxvh8RV+vrid+6Gv+2qhuzbqHanawga8tYnsdpjEyt36ucJjqlby2/Md2ObWjA02UXQ==
+"@docusaurus/babel@3.8.1":
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/@docusaurus/babel/-/babel-3.8.1.tgz#db329ac047184214e08e2dbc809832c696c18506"
+  integrity sha512-3brkJrml8vUbn9aeoZUlJfsI/GqyFcDgQJwQkmBtclJgWDEQBKKeagZfOgx0WfUQhagL1sQLNW0iBdxnI863Uw==
   dependencies:
     "@babel/core" "^7.25.9"
     "@babel/generator" "^7.25.9"
@@ -1528,55 +1560,54 @@
     "@babel/runtime" "^7.25.9"
     "@babel/runtime-corejs3" "^7.25.9"
     "@babel/traverse" "^7.25.9"
-    "@docusaurus/logger" "3.7.0"
-    "@docusaurus/utils" "3.7.0"
+    "@docusaurus/logger" "3.8.1"
+    "@docusaurus/utils" "3.8.1"
     babel-plugin-dynamic-import-node "^2.3.3"
     fs-extra "^11.1.1"
     tslib "^2.6.0"
 
-"@docusaurus/bundler@3.7.0":
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/@docusaurus/bundler/-/bundler-3.7.0.tgz#d8e7867b3b2c43a1e320ed429f8dfe873c38506d"
-  integrity sha512-CUUT9VlSGukrCU5ctZucykvgCISivct+cby28wJwCC/fkQFgAHRp/GKv2tx38ZmXb7nacrKzFTcp++f9txUYGg==
+"@docusaurus/bundler@3.8.1":
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/@docusaurus/bundler/-/bundler-3.8.1.tgz#e2b11d615f09a6e470774bb36441b8d06736b94c"
+  integrity sha512-/z4V0FRoQ0GuSLToNjOSGsk6m2lQUG4FRn8goOVoZSRsTrU8YR2aJacX5K3RG18EaX9b+52pN4m1sL3MQZVsQA==
   dependencies:
     "@babel/core" "^7.25.9"
-    "@docusaurus/babel" "3.7.0"
-    "@docusaurus/cssnano-preset" "3.7.0"
-    "@docusaurus/logger" "3.7.0"
-    "@docusaurus/types" "3.7.0"
-    "@docusaurus/utils" "3.7.0"
+    "@docusaurus/babel" "3.8.1"
+    "@docusaurus/cssnano-preset" "3.8.1"
+    "@docusaurus/logger" "3.8.1"
+    "@docusaurus/types" "3.8.1"
+    "@docusaurus/utils" "3.8.1"
     babel-loader "^9.2.1"
-    clean-css "^5.3.2"
+    clean-css "^5.3.3"
     copy-webpack-plugin "^11.0.0"
-    css-loader "^6.8.1"
+    css-loader "^6.11.0"
     css-minimizer-webpack-plugin "^5.0.1"
     cssnano "^6.1.2"
     file-loader "^6.2.0"
     html-minifier-terser "^7.2.0"
-    mini-css-extract-plugin "^2.9.1"
+    mini-css-extract-plugin "^2.9.2"
     null-loader "^4.0.1"
-    postcss "^8.4.26"
-    postcss-loader "^7.3.3"
-    postcss-preset-env "^10.1.0"
-    react-dev-utils "^12.0.1"
+    postcss "^8.5.4"
+    postcss-loader "^7.3.4"
+    postcss-preset-env "^10.2.1"
     terser-webpack-plugin "^5.3.9"
     tslib "^2.6.0"
     url-loader "^4.1.1"
     webpack "^5.95.0"
     webpackbar "^6.0.1"
 
-"@docusaurus/core@3.7.0":
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/@docusaurus/core/-/core-3.7.0.tgz#e871586d099093723dfe6de81c1ce610aeb20292"
-  integrity sha512-b0fUmaL+JbzDIQaamzpAFpTviiaU4cX3Qz8cuo14+HGBCwa0evEK0UYCBFY3n4cLzL8Op1BueeroUD2LYAIHbQ==
+"@docusaurus/core@3.8.1":
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/@docusaurus/core/-/core-3.8.1.tgz#c22e47c16a22cb7d245306c64bc54083838ff3db"
+  integrity sha512-ENB01IyQSqI2FLtOzqSI3qxG2B/jP4gQPahl2C3XReiLebcVh5B5cB9KYFvdoOqOWPyr5gXK4sjgTKv7peXCrA==
   dependencies:
-    "@docusaurus/babel" "3.7.0"
-    "@docusaurus/bundler" "3.7.0"
-    "@docusaurus/logger" "3.7.0"
-    "@docusaurus/mdx-loader" "3.7.0"
-    "@docusaurus/utils" "3.7.0"
-    "@docusaurus/utils-common" "3.7.0"
-    "@docusaurus/utils-validation" "3.7.0"
+    "@docusaurus/babel" "3.8.1"
+    "@docusaurus/bundler" "3.8.1"
+    "@docusaurus/logger" "3.8.1"
+    "@docusaurus/mdx-loader" "3.8.1"
+    "@docusaurus/utils" "3.8.1"
+    "@docusaurus/utils-common" "3.8.1"
+    "@docusaurus/utils-validation" "3.8.1"
     boxen "^6.2.1"
     chalk "^4.1.2"
     chokidar "^3.5.3"
@@ -1584,19 +1615,19 @@
     combine-promises "^1.1.0"
     commander "^5.1.0"
     core-js "^3.31.1"
-    del "^6.1.1"
     detect-port "^1.5.1"
     escape-html "^1.0.3"
     eta "^2.2.0"
     eval "^0.1.8"
+    execa "5.1.1"
     fs-extra "^11.1.1"
     html-tags "^3.3.1"
     html-webpack-plugin "^5.6.0"
     leven "^3.1.0"
     lodash "^4.17.21"
+    open "^8.4.0"
     p-map "^4.0.0"
     prompts "^2.4.2"
-    react-dev-utils "^12.0.1"
     react-helmet-async "npm:@slorber/react-helmet-async@1.3.0"
     react-loadable "npm:@docusaurus/react-loadable@6.0.0"
     react-loadable-ssr-addon-v5-slorber "^1.0.1"
@@ -1605,7 +1636,7 @@
     react-router-dom "^5.3.4"
     semver "^7.5.4"
     serve-handler "^6.1.6"
-    shelljs "^0.8.5"
+    tinypool "^1.0.2"
     tslib "^2.6.0"
     update-notifier "^6.0.2"
     webpack "^5.95.0"
@@ -1613,39 +1644,39 @@
     webpack-dev-server "^4.15.2"
     webpack-merge "^6.0.1"
 
-"@docusaurus/cssnano-preset@3.7.0":
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/@docusaurus/cssnano-preset/-/cssnano-preset-3.7.0.tgz#8fe8f2c3acbd32384b69e14983b9a63c98cae34e"
-  integrity sha512-X9GYgruZBSOozg4w4dzv9uOz8oK/EpPVQXkp0MM6Tsgp/nRIU9hJzJ0Pxg1aRa3xCeEQTOimZHcocQFlLwYajQ==
+"@docusaurus/cssnano-preset@3.8.1":
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/@docusaurus/cssnano-preset/-/cssnano-preset-3.8.1.tgz#bd55026251a6ab8e2194839a2042458ef9880c44"
+  integrity sha512-G7WyR2N6SpyUotqhGznERBK+x84uyhfMQM2MmDLs88bw4Flom6TY46HzkRkSEzaP9j80MbTN8naiL1fR17WQug==
   dependencies:
     cssnano-preset-advanced "^6.1.2"
-    postcss "^8.4.38"
+    postcss "^8.5.4"
     postcss-sort-media-queries "^5.2.0"
     tslib "^2.6.0"
 
-"@docusaurus/logger@3.7.0":
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/@docusaurus/logger/-/logger-3.7.0.tgz#07ecc2f460c4d2382df4991f9ce4e348e90af04c"
-  integrity sha512-z7g62X7bYxCYmeNNuO9jmzxLQG95q9QxINCwpboVcNff3SJiHJbGrarxxOVMVmAh1MsrSfxWkVGv4P41ktnFsA==
+"@docusaurus/logger@3.8.1":
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/@docusaurus/logger/-/logger-3.8.1.tgz#45321b2e2e14695d0dbd8b4104ea7b0fbaa98700"
+  integrity sha512-2wjeGDhKcExEmjX8k1N/MRDiPKXGF2Pg+df/bDDPnnJWHXnVEZxXj80d6jcxp1Gpnksl0hF8t/ZQw9elqj2+ww==
   dependencies:
     chalk "^4.1.2"
     tslib "^2.6.0"
 
-"@docusaurus/mdx-loader@3.7.0":
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/@docusaurus/mdx-loader/-/mdx-loader-3.7.0.tgz#5890c6e7a5b68cb1d066264ac5290cdcd59d4ecc"
-  integrity sha512-OFBG6oMjZzc78/U3WNPSHs2W9ZJ723ewAcvVJaqS0VgyeUfmzUV8f1sv+iUHA0DtwiR5T5FjOxj6nzEE8LY6VA==
+"@docusaurus/mdx-loader@3.8.1":
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/@docusaurus/mdx-loader/-/mdx-loader-3.8.1.tgz#74309b3614bbcef1d55fb13e6cc339b7fb000b5f"
+  integrity sha512-DZRhagSFRcEq1cUtBMo4TKxSNo/W6/s44yhr8X+eoXqCLycFQUylebOMPseHi5tc4fkGJqwqpWJLz6JStU9L4w==
   dependencies:
-    "@docusaurus/logger" "3.7.0"
-    "@docusaurus/utils" "3.7.0"
-    "@docusaurus/utils-validation" "3.7.0"
+    "@docusaurus/logger" "3.8.1"
+    "@docusaurus/utils" "3.8.1"
+    "@docusaurus/utils-validation" "3.8.1"
     "@mdx-js/mdx" "^3.0.0"
     "@slorber/remark-comment" "^1.0.0"
     escape-html "^1.0.3"
     estree-util-value-to-estree "^3.0.1"
     file-loader "^6.2.0"
     fs-extra "^11.1.1"
-    image-size "^1.0.2"
+    image-size "^2.0.2"
     mdast-util-mdx "^3.0.0"
     mdast-util-to-string "^4.0.0"
     rehype-raw "^7.0.0"
@@ -1661,212 +1692,225 @@
     vfile "^6.0.1"
     webpack "^5.88.1"
 
-"@docusaurus/module-type-aliases@3.7.0", "@docusaurus/module-type-aliases@^3.7.0":
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/@docusaurus/module-type-aliases/-/module-type-aliases-3.7.0.tgz#15c0745b829c6966c5b3b2c2527c72b54830b0e5"
-  integrity sha512-g7WdPqDNaqA60CmBrr0cORTrsOit77hbsTj7xE2l71YhBn79sxdm7WMK7wfhcaafkbpIh7jv5ef5TOpf1Xv9Lg==
+"@docusaurus/module-type-aliases@3.8.1", "@docusaurus/module-type-aliases@^3.8.1":
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/@docusaurus/module-type-aliases/-/module-type-aliases-3.8.1.tgz#454de577bd7f50b5eae16db0f76b49ca5e4e281a"
+  integrity sha512-6xhvAJiXzsaq3JdosS7wbRt/PwEPWHr9eM4YNYqVlbgG1hSK3uQDXTVvQktasp3VO6BmfYWPozueLWuj4gB+vg==
   dependencies:
-    "@docusaurus/types" "3.7.0"
+    "@docusaurus/types" "3.8.1"
     "@types/history" "^4.7.11"
     "@types/react" "*"
     "@types/react-router-config" "*"
     "@types/react-router-dom" "*"
-    react-helmet-async "npm:@slorber/react-helmet-async@*"
+    react-helmet-async "npm:@slorber/react-helmet-async@1.3.0"
     react-loadable "npm:@docusaurus/react-loadable@6.0.0"
 
-"@docusaurus/plugin-client-redirects@3.7.0":
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-client-redirects/-/plugin-client-redirects-3.7.0.tgz#b5cf92529768c457c01ad350bfc50862c6149463"
-  integrity sha512-6B4XAtE5ZVKOyhPgpgMkb7LwCkN+Hgd4vOnlbwR8nCdTQhLjz8MHbGlwwvZ/cay2SPNRX5KssqKAlcHVZP2m8g==
+"@docusaurus/plugin-client-redirects@3.8.1":
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-client-redirects/-/plugin-client-redirects-3.8.1.tgz#1d02b3565ae4e53a3b8005835501f07fb0bc0267"
+  integrity sha512-F+86R7PBn6VNgy/Ux8w3ZRypJGJEzksbejQKlbTC8u6uhBUhfdXWkDp6qdOisIoW0buY5nLqucvZt1zNJzhJhA==
   dependencies:
-    "@docusaurus/core" "3.7.0"
-    "@docusaurus/logger" "3.7.0"
-    "@docusaurus/utils" "3.7.0"
-    "@docusaurus/utils-common" "3.7.0"
-    "@docusaurus/utils-validation" "3.7.0"
+    "@docusaurus/core" "3.8.1"
+    "@docusaurus/logger" "3.8.1"
+    "@docusaurus/utils" "3.8.1"
+    "@docusaurus/utils-common" "3.8.1"
+    "@docusaurus/utils-validation" "3.8.1"
     eta "^2.2.0"
     fs-extra "^11.1.1"
     lodash "^4.17.21"
     tslib "^2.6.0"
 
-"@docusaurus/plugin-content-blog@3.7.0":
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-blog/-/plugin-content-blog-3.7.0.tgz#7bd69de87a1f3adb652e1473ef5b7ccc9468f47e"
-  integrity sha512-EFLgEz6tGHYWdPU0rK8tSscZwx+AsyuBW/r+tNig2kbccHYGUJmZtYN38GjAa3Fda4NU+6wqUO5kTXQSRBQD3g==
+"@docusaurus/plugin-content-blog@3.8.1":
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-blog/-/plugin-content-blog-3.8.1.tgz#88d842b562b04cf59df900d9f6984b086f821525"
+  integrity sha512-vNTpMmlvNP9n3hGEcgPaXyvTljanAKIUkuG9URQ1DeuDup0OR7Ltvoc8yrmH+iMZJbcQGhUJF+WjHLwuk8HSdw==
   dependencies:
-    "@docusaurus/core" "3.7.0"
-    "@docusaurus/logger" "3.7.0"
-    "@docusaurus/mdx-loader" "3.7.0"
-    "@docusaurus/theme-common" "3.7.0"
-    "@docusaurus/types" "3.7.0"
-    "@docusaurus/utils" "3.7.0"
-    "@docusaurus/utils-common" "3.7.0"
-    "@docusaurus/utils-validation" "3.7.0"
+    "@docusaurus/core" "3.8.1"
+    "@docusaurus/logger" "3.8.1"
+    "@docusaurus/mdx-loader" "3.8.1"
+    "@docusaurus/theme-common" "3.8.1"
+    "@docusaurus/types" "3.8.1"
+    "@docusaurus/utils" "3.8.1"
+    "@docusaurus/utils-common" "3.8.1"
+    "@docusaurus/utils-validation" "3.8.1"
     cheerio "1.0.0-rc.12"
     feed "^4.2.2"
     fs-extra "^11.1.1"
     lodash "^4.17.21"
-    reading-time "^1.5.0"
+    schema-dts "^1.1.2"
     srcset "^4.0.0"
     tslib "^2.6.0"
     unist-util-visit "^5.0.0"
     utility-types "^3.10.0"
     webpack "^5.88.1"
 
-"@docusaurus/plugin-content-docs@3.7.0":
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-docs/-/plugin-content-docs-3.7.0.tgz#297a549e926ee2b1147b5242af6f21532c7b107c"
-  integrity sha512-GXg5V7kC9FZE4FkUZA8oo/NrlRb06UwuICzI6tcbzj0+TVgjq/mpUXXzSgKzMS82YByi4dY2Q808njcBCyy6tQ==
+"@docusaurus/plugin-content-docs@3.8.1":
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-docs/-/plugin-content-docs-3.8.1.tgz#40686a206abb6373bee5638de100a2c312f112a4"
+  integrity sha512-oByRkSZzeGNQByCMaX+kif5Nl2vmtj2IHQI2fWjCfCootsdKZDPFLonhIp5s3IGJO7PLUfe0POyw0Xh/RrGXJA==
   dependencies:
-    "@docusaurus/core" "3.7.0"
-    "@docusaurus/logger" "3.7.0"
-    "@docusaurus/mdx-loader" "3.7.0"
-    "@docusaurus/module-type-aliases" "3.7.0"
-    "@docusaurus/theme-common" "3.7.0"
-    "@docusaurus/types" "3.7.0"
-    "@docusaurus/utils" "3.7.0"
-    "@docusaurus/utils-common" "3.7.0"
-    "@docusaurus/utils-validation" "3.7.0"
+    "@docusaurus/core" "3.8.1"
+    "@docusaurus/logger" "3.8.1"
+    "@docusaurus/mdx-loader" "3.8.1"
+    "@docusaurus/module-type-aliases" "3.8.1"
+    "@docusaurus/theme-common" "3.8.1"
+    "@docusaurus/types" "3.8.1"
+    "@docusaurus/utils" "3.8.1"
+    "@docusaurus/utils-common" "3.8.1"
+    "@docusaurus/utils-validation" "3.8.1"
     "@types/react-router-config" "^5.0.7"
     combine-promises "^1.1.0"
     fs-extra "^11.1.1"
     js-yaml "^4.1.0"
     lodash "^4.17.21"
+    schema-dts "^1.1.2"
     tslib "^2.6.0"
     utility-types "^3.10.0"
     webpack "^5.88.1"
 
-"@docusaurus/plugin-content-pages@3.7.0":
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-pages/-/plugin-content-pages-3.7.0.tgz#c4a8f7237872236aacb77665822c474c0a00e91a"
-  integrity sha512-YJSU3tjIJf032/Aeao8SZjFOrXJbz/FACMveSMjLyMH4itQyZ2XgUIzt4y+1ISvvk5zrW4DABVT2awTCqBkx0Q==
+"@docusaurus/plugin-content-pages@3.8.1":
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-pages/-/plugin-content-pages-3.8.1.tgz#41b684dbd15390b7bb6a627f78bf81b6324511ac"
+  integrity sha512-a+V6MS2cIu37E/m7nDJn3dcxpvXb6TvgdNI22vJX8iUTp8eoMoPa0VArEbWvCxMY/xdC26WzNv4wZ6y0iIni/w==
   dependencies:
-    "@docusaurus/core" "3.7.0"
-    "@docusaurus/mdx-loader" "3.7.0"
-    "@docusaurus/types" "3.7.0"
-    "@docusaurus/utils" "3.7.0"
-    "@docusaurus/utils-validation" "3.7.0"
+    "@docusaurus/core" "3.8.1"
+    "@docusaurus/mdx-loader" "3.8.1"
+    "@docusaurus/types" "3.8.1"
+    "@docusaurus/utils" "3.8.1"
+    "@docusaurus/utils-validation" "3.8.1"
     fs-extra "^11.1.1"
     tslib "^2.6.0"
     webpack "^5.88.1"
 
-"@docusaurus/plugin-debug@3.7.0":
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-debug/-/plugin-debug-3.7.0.tgz#a4fd45132e40cffe96bb51f48e89982a1cb8e194"
-  integrity sha512-Qgg+IjG/z4svtbCNyTocjIwvNTNEwgRjSXXSJkKVG0oWoH0eX/HAPiu+TS1HBwRPQV+tTYPWLrUypYFepfujZA==
+"@docusaurus/plugin-css-cascade-layers@3.8.1":
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-css-cascade-layers/-/plugin-css-cascade-layers-3.8.1.tgz#cb414b4a82aa60fc64ef2a435ad0105e142a6c71"
+  integrity sha512-VQ47xRxfNKjHS5ItzaVXpxeTm7/wJLFMOPo1BkmoMG4Cuz4nuI+Hs62+RMk1OqVog68Swz66xVPK8g9XTrBKRw==
   dependencies:
-    "@docusaurus/core" "3.7.0"
-    "@docusaurus/types" "3.7.0"
-    "@docusaurus/utils" "3.7.0"
+    "@docusaurus/core" "3.8.1"
+    "@docusaurus/types" "3.8.1"
+    "@docusaurus/utils" "3.8.1"
+    "@docusaurus/utils-validation" "3.8.1"
+    tslib "^2.6.0"
+
+"@docusaurus/plugin-debug@3.8.1":
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-debug/-/plugin-debug-3.8.1.tgz#45b107e46b627caaae66995f53197ace78af3491"
+  integrity sha512-nT3lN7TV5bi5hKMB7FK8gCffFTBSsBsAfV84/v293qAmnHOyg1nr9okEw8AiwcO3bl9vije5nsUvP0aRl2lpaw==
+  dependencies:
+    "@docusaurus/core" "3.8.1"
+    "@docusaurus/types" "3.8.1"
+    "@docusaurus/utils" "3.8.1"
     fs-extra "^11.1.1"
-    react-json-view-lite "^1.2.0"
+    react-json-view-lite "^2.3.0"
     tslib "^2.6.0"
 
-"@docusaurus/plugin-google-analytics@3.7.0":
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-analytics/-/plugin-google-analytics-3.7.0.tgz#d20f665e810fb2295d1c1bbfe13398c5ff42eb24"
-  integrity sha512-otIqiRV/jka6Snjf+AqB360XCeSv7lQC+DKYW+EUZf6XbuE8utz5PeUQ8VuOcD8Bk5zvT1MC4JKcd5zPfDuMWA==
+"@docusaurus/plugin-google-analytics@3.8.1":
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-analytics/-/plugin-google-analytics-3.8.1.tgz#64a302e62fe5cb6e007367c964feeef7b056764a"
+  integrity sha512-Hrb/PurOJsmwHAsfMDH6oVpahkEGsx7F8CWMjyP/dw1qjqmdS9rcV1nYCGlM8nOtD3Wk/eaThzUB5TSZsGz+7Q==
   dependencies:
-    "@docusaurus/core" "3.7.0"
-    "@docusaurus/types" "3.7.0"
-    "@docusaurus/utils-validation" "3.7.0"
+    "@docusaurus/core" "3.8.1"
+    "@docusaurus/types" "3.8.1"
+    "@docusaurus/utils-validation" "3.8.1"
     tslib "^2.6.0"
 
-"@docusaurus/plugin-google-gtag@3.7.0":
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-gtag/-/plugin-google-gtag-3.7.0.tgz#a48638dfd132858060458b875a440b6cbda6bf8f"
-  integrity sha512-M3vrMct1tY65ModbyeDaMoA+fNJTSPe5qmchhAbtqhDD/iALri0g9LrEpIOwNaoLmm6lO88sfBUADQrSRSGSWA==
+"@docusaurus/plugin-google-gtag@3.8.1":
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-gtag/-/plugin-google-gtag-3.8.1.tgz#8c76f8a1d96448f2f0f7b10e6bde451c40672b95"
+  integrity sha512-tKE8j1cEZCh8KZa4aa80zpSTxsC2/ZYqjx6AAfd8uA8VHZVw79+7OTEP2PoWi0uL5/1Is0LF5Vwxd+1fz5HlKg==
   dependencies:
-    "@docusaurus/core" "3.7.0"
-    "@docusaurus/types" "3.7.0"
-    "@docusaurus/utils-validation" "3.7.0"
+    "@docusaurus/core" "3.8.1"
+    "@docusaurus/types" "3.8.1"
+    "@docusaurus/utils-validation" "3.8.1"
     "@types/gtag.js" "^0.0.12"
     tslib "^2.6.0"
 
-"@docusaurus/plugin-google-tag-manager@3.7.0":
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-tag-manager/-/plugin-google-tag-manager-3.7.0.tgz#0a4390f4b0e760d073bdb1905436bfa7bd71356b"
-  integrity sha512-X8U78nb8eiMiPNg3jb9zDIVuuo/rE1LjGDGu+5m5CX4UBZzjMy+klOY2fNya6x8ACyE/L3K2erO1ErheP55W/w==
+"@docusaurus/plugin-google-tag-manager@3.8.1":
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-tag-manager/-/plugin-google-tag-manager-3.8.1.tgz#88241ffd06369f4a4d5fb982ff3ac2777561ae37"
+  integrity sha512-iqe3XKITBquZq+6UAXdb1vI0fPY5iIOitVjPQ581R1ZKpHr0qe+V6gVOrrcOHixPDD/BUKdYwkxFjpNiEN+vBw==
   dependencies:
-    "@docusaurus/core" "3.7.0"
-    "@docusaurus/types" "3.7.0"
-    "@docusaurus/utils-validation" "3.7.0"
+    "@docusaurus/core" "3.8.1"
+    "@docusaurus/types" "3.8.1"
+    "@docusaurus/utils-validation" "3.8.1"
     tslib "^2.6.0"
 
-"@docusaurus/plugin-sitemap@3.7.0":
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-sitemap/-/plugin-sitemap-3.7.0.tgz#2c1bf9de26aeda455df6f77748e5887ace39b2d7"
-  integrity sha512-bTRT9YLZ/8I/wYWKMQke18+PF9MV8Qub34Sku6aw/vlZ/U+kuEuRpQ8bTcNOjaTSfYsWkK4tTwDMHK2p5S86cA==
+"@docusaurus/plugin-sitemap@3.8.1":
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-sitemap/-/plugin-sitemap-3.8.1.tgz#3aebd39186dc30e53023f1aab44625bc0bdac892"
+  integrity sha512-+9YV/7VLbGTq8qNkjiugIelmfUEVkTyLe6X8bWq7K5qPvGXAjno27QAfFq63mYfFFbJc7z+pudL63acprbqGzw==
   dependencies:
-    "@docusaurus/core" "3.7.0"
-    "@docusaurus/logger" "3.7.0"
-    "@docusaurus/types" "3.7.0"
-    "@docusaurus/utils" "3.7.0"
-    "@docusaurus/utils-common" "3.7.0"
-    "@docusaurus/utils-validation" "3.7.0"
+    "@docusaurus/core" "3.8.1"
+    "@docusaurus/logger" "3.8.1"
+    "@docusaurus/types" "3.8.1"
+    "@docusaurus/utils" "3.8.1"
+    "@docusaurus/utils-common" "3.8.1"
+    "@docusaurus/utils-validation" "3.8.1"
     fs-extra "^11.1.1"
     sitemap "^7.1.1"
     tslib "^2.6.0"
 
-"@docusaurus/plugin-svgr@3.7.0":
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-svgr/-/plugin-svgr-3.7.0.tgz#018e89efd615d5fde77b891a8c2aadf203013f5d"
-  integrity sha512-HByXIZTbc4GV5VAUkZ2DXtXv1Qdlnpk3IpuImwSnEzCDBkUMYcec5282hPjn6skZqB25M1TYCmWS91UbhBGxQg==
+"@docusaurus/plugin-svgr@3.8.1":
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-svgr/-/plugin-svgr-3.8.1.tgz#6f340be8eae418a2cce540d8ece096ffd9c9b6ab"
+  integrity sha512-rW0LWMDsdlsgowVwqiMb/7tANDodpy1wWPwCcamvhY7OECReN3feoFwLjd/U4tKjNY3encj0AJSTxJA+Fpe+Gw==
   dependencies:
-    "@docusaurus/core" "3.7.0"
-    "@docusaurus/types" "3.7.0"
-    "@docusaurus/utils" "3.7.0"
-    "@docusaurus/utils-validation" "3.7.0"
+    "@docusaurus/core" "3.8.1"
+    "@docusaurus/types" "3.8.1"
+    "@docusaurus/utils" "3.8.1"
+    "@docusaurus/utils-validation" "3.8.1"
     "@svgr/core" "8.1.0"
     "@svgr/webpack" "^8.1.0"
     tslib "^2.6.0"
     webpack "^5.88.1"
 
-"@docusaurus/preset-classic@3.7.0":
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/@docusaurus/preset-classic/-/preset-classic-3.7.0.tgz#f6656a04ae6a4877523dbd04f7c491632e4003b9"
-  integrity sha512-nPHj8AxDLAaQXs+O6+BwILFuhiWbjfQWrdw2tifOClQoNfuXDjfjogee6zfx6NGHWqshR23LrcN115DmkHC91Q==
+"@docusaurus/preset-classic@3.8.1":
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/@docusaurus/preset-classic/-/preset-classic-3.8.1.tgz#bb79fd12f3211363720c569a526c7e24d3aa966b"
+  integrity sha512-yJSjYNHXD8POMGc2mKQuj3ApPrN+eG0rO1UPgSx7jySpYU+n4WjBikbrA2ue5ad9A7aouEtMWUoiSRXTH/g7KQ==
   dependencies:
-    "@docusaurus/core" "3.7.0"
-    "@docusaurus/plugin-content-blog" "3.7.0"
-    "@docusaurus/plugin-content-docs" "3.7.0"
-    "@docusaurus/plugin-content-pages" "3.7.0"
-    "@docusaurus/plugin-debug" "3.7.0"
-    "@docusaurus/plugin-google-analytics" "3.7.0"
-    "@docusaurus/plugin-google-gtag" "3.7.0"
-    "@docusaurus/plugin-google-tag-manager" "3.7.0"
-    "@docusaurus/plugin-sitemap" "3.7.0"
-    "@docusaurus/plugin-svgr" "3.7.0"
-    "@docusaurus/theme-classic" "3.7.0"
-    "@docusaurus/theme-common" "3.7.0"
-    "@docusaurus/theme-search-algolia" "3.7.0"
-    "@docusaurus/types" "3.7.0"
+    "@docusaurus/core" "3.8.1"
+    "@docusaurus/plugin-content-blog" "3.8.1"
+    "@docusaurus/plugin-content-docs" "3.8.1"
+    "@docusaurus/plugin-content-pages" "3.8.1"
+    "@docusaurus/plugin-css-cascade-layers" "3.8.1"
+    "@docusaurus/plugin-debug" "3.8.1"
+    "@docusaurus/plugin-google-analytics" "3.8.1"
+    "@docusaurus/plugin-google-gtag" "3.8.1"
+    "@docusaurus/plugin-google-tag-manager" "3.8.1"
+    "@docusaurus/plugin-sitemap" "3.8.1"
+    "@docusaurus/plugin-svgr" "3.8.1"
+    "@docusaurus/theme-classic" "3.8.1"
+    "@docusaurus/theme-common" "3.8.1"
+    "@docusaurus/theme-search-algolia" "3.8.1"
+    "@docusaurus/types" "3.8.1"
 
-"@docusaurus/theme-classic@3.7.0":
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/@docusaurus/theme-classic/-/theme-classic-3.7.0.tgz#b483bd8e2923b6994b5f47238884b9f8984222c5"
-  integrity sha512-MnLxG39WcvLCl4eUzHr0gNcpHQfWoGqzADCly54aqCofQX6UozOS9Th4RK3ARbM9m7zIRv3qbhggI53dQtx/hQ==
+"@docusaurus/theme-classic@3.8.1":
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/@docusaurus/theme-classic/-/theme-classic-3.8.1.tgz#1e45c66d89ded359225fcd29bf3258d9205765c1"
+  integrity sha512-bqDUCNqXeYypMCsE1VcTXSI1QuO4KXfx8Cvl6rYfY0bhhqN6d2WZlRkyLg/p6pm+DzvanqHOyYlqdPyP0iz+iw==
   dependencies:
-    "@docusaurus/core" "3.7.0"
-    "@docusaurus/logger" "3.7.0"
-    "@docusaurus/mdx-loader" "3.7.0"
-    "@docusaurus/module-type-aliases" "3.7.0"
-    "@docusaurus/plugin-content-blog" "3.7.0"
-    "@docusaurus/plugin-content-docs" "3.7.0"
-    "@docusaurus/plugin-content-pages" "3.7.0"
-    "@docusaurus/theme-common" "3.7.0"
-    "@docusaurus/theme-translations" "3.7.0"
-    "@docusaurus/types" "3.7.0"
-    "@docusaurus/utils" "3.7.0"
-    "@docusaurus/utils-common" "3.7.0"
-    "@docusaurus/utils-validation" "3.7.0"
+    "@docusaurus/core" "3.8.1"
+    "@docusaurus/logger" "3.8.1"
+    "@docusaurus/mdx-loader" "3.8.1"
+    "@docusaurus/module-type-aliases" "3.8.1"
+    "@docusaurus/plugin-content-blog" "3.8.1"
+    "@docusaurus/plugin-content-docs" "3.8.1"
+    "@docusaurus/plugin-content-pages" "3.8.1"
+    "@docusaurus/theme-common" "3.8.1"
+    "@docusaurus/theme-translations" "3.8.1"
+    "@docusaurus/types" "3.8.1"
+    "@docusaurus/utils" "3.8.1"
+    "@docusaurus/utils-common" "3.8.1"
+    "@docusaurus/utils-validation" "3.8.1"
     "@mdx-js/react" "^3.0.0"
     clsx "^2.0.0"
     copy-text-to-clipboard "^3.2.0"
     infima "0.2.0-alpha.45"
     lodash "^4.17.21"
     nprogress "^0.2.0"
-    postcss "^8.4.26"
+    postcss "^8.5.4"
     prism-react-renderer "^2.3.0"
     prismjs "^1.29.0"
     react-router-dom "^5.3.4"
@@ -1874,15 +1918,15 @@
     tslib "^2.6.0"
     utility-types "^3.10.0"
 
-"@docusaurus/theme-common@3.7.0":
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/@docusaurus/theme-common/-/theme-common-3.7.0.tgz#18bf5c6b149a701f4bd865715ee8b595aa40b354"
-  integrity sha512-8eJ5X0y+gWDsURZnBfH0WabdNm8XMCXHv8ENy/3Z/oQKwaB/EHt5lP9VsTDTf36lKEp0V6DjzjFyFIB+CetL0A==
+"@docusaurus/theme-common@3.8.1":
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/@docusaurus/theme-common/-/theme-common-3.8.1.tgz#17c23316fbe3ee3f7e707c7298cb59a0fff38b4b"
+  integrity sha512-UswMOyTnPEVRvN5Qzbo+l8k4xrd5fTFu2VPPfD6FcW/6qUtVLmJTQCktbAL3KJ0BVXGm5aJXz/ZrzqFuZERGPw==
   dependencies:
-    "@docusaurus/mdx-loader" "3.7.0"
-    "@docusaurus/module-type-aliases" "3.7.0"
-    "@docusaurus/utils" "3.7.0"
-    "@docusaurus/utils-common" "3.7.0"
+    "@docusaurus/mdx-loader" "3.8.1"
+    "@docusaurus/module-type-aliases" "3.8.1"
+    "@docusaurus/utils" "3.8.1"
+    "@docusaurus/utils-common" "3.8.1"
     "@types/history" "^4.7.11"
     "@types/react" "*"
     "@types/react-router-config" "*"
@@ -1892,32 +1936,32 @@
     tslib "^2.6.0"
     utility-types "^3.10.0"
 
-"@docusaurus/theme-mermaid@3.7.0":
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/@docusaurus/theme-mermaid/-/theme-mermaid-3.7.0.tgz#1bc4307e09886186ed6e51607bf43c5089f35de5"
-  integrity sha512-7kNDvL7hm+tshjxSxIqYMtsLUPsEBYnkevej/ext6ru9xyLgCed+zkvTfGzTWNeq8rJIEe2YSS8/OV5gCVaPCw==
+"@docusaurus/theme-mermaid@3.8.1":
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/@docusaurus/theme-mermaid/-/theme-mermaid-3.8.1.tgz#2b73b5e90057bd9fb46f267aeb2d3470b168a7c8"
+  integrity sha512-IWYqjyTPjkNnHsFFu9+4YkeXS7PD1xI3Bn2shOhBq+f95mgDfWInkpfBN4aYvx4fTT67Am6cPtohRdwh4Tidtg==
   dependencies:
-    "@docusaurus/core" "3.7.0"
-    "@docusaurus/module-type-aliases" "3.7.0"
-    "@docusaurus/theme-common" "3.7.0"
-    "@docusaurus/types" "3.7.0"
-    "@docusaurus/utils-validation" "3.7.0"
-    mermaid ">=10.4"
+    "@docusaurus/core" "3.8.1"
+    "@docusaurus/module-type-aliases" "3.8.1"
+    "@docusaurus/theme-common" "3.8.1"
+    "@docusaurus/types" "3.8.1"
+    "@docusaurus/utils-validation" "3.8.1"
+    mermaid ">=11.6.0"
     tslib "^2.6.0"
 
-"@docusaurus/theme-search-algolia@3.7.0":
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/@docusaurus/theme-search-algolia/-/theme-search-algolia-3.7.0.tgz#2108ddf0b300b82de7c2b9ff9fcf62121b66ea37"
-  integrity sha512-Al/j5OdzwRU1m3falm+sYy9AaB93S1XF1Lgk9Yc6amp80dNxJVplQdQTR4cYdzkGtuQqbzUA8+kaoYYO0RbK6g==
+"@docusaurus/theme-search-algolia@3.8.1":
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/@docusaurus/theme-search-algolia/-/theme-search-algolia-3.8.1.tgz#3aa3d99c35cc2d4b709fcddd4df875a9b536e29b"
+  integrity sha512-NBFH5rZVQRAQM087aYSRKQ9yGEK9eHd+xOxQjqNpxMiV85OhJDD4ZGz6YJIod26Fbooy54UWVdzNU0TFeUUUzQ==
   dependencies:
-    "@docsearch/react" "^3.8.1"
-    "@docusaurus/core" "3.7.0"
-    "@docusaurus/logger" "3.7.0"
-    "@docusaurus/plugin-content-docs" "3.7.0"
-    "@docusaurus/theme-common" "3.7.0"
-    "@docusaurus/theme-translations" "3.7.0"
-    "@docusaurus/utils" "3.7.0"
-    "@docusaurus/utils-validation" "3.7.0"
+    "@docsearch/react" "^3.9.0"
+    "@docusaurus/core" "3.8.1"
+    "@docusaurus/logger" "3.8.1"
+    "@docusaurus/plugin-content-docs" "3.8.1"
+    "@docusaurus/theme-common" "3.8.1"
+    "@docusaurus/theme-translations" "3.8.1"
+    "@docusaurus/utils" "3.8.1"
+    "@docusaurus/utils-validation" "3.8.1"
     algoliasearch "^5.17.1"
     algoliasearch-helper "^3.22.6"
     clsx "^2.0.0"
@@ -1927,23 +1971,23 @@
     tslib "^2.6.0"
     utility-types "^3.10.0"
 
-"@docusaurus/theme-translations@3.7.0":
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/@docusaurus/theme-translations/-/theme-translations-3.7.0.tgz#0891aedc7c7040afcb3a1b34051d3a69096d0d25"
-  integrity sha512-Ewq3bEraWDmienM6eaNK7fx+/lHMtGDHQyd1O+4+3EsDxxUmrzPkV7Ct3nBWTuE0MsoZr3yNwQVKjllzCMuU3g==
+"@docusaurus/theme-translations@3.8.1":
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/@docusaurus/theme-translations/-/theme-translations-3.8.1.tgz#4b1d76973eb53861e167c7723485e059ba4ffd0a"
+  integrity sha512-OTp6eebuMcf2rJt4bqnvuwmm3NVXfzfYejL+u/Y1qwKhZPrjPoKWfk1CbOP5xH5ZOPkiAsx4dHdQBRJszK3z2g==
   dependencies:
     fs-extra "^11.1.1"
     tslib "^2.6.0"
 
-"@docusaurus/tsconfig@^3.7.0":
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/@docusaurus/tsconfig/-/tsconfig-3.7.0.tgz#654dcc524e25b8809af0f1b0b42485c18c047ab5"
-  integrity sha512-vRsyj3yUZCjscgfgcFYjIsTcAru/4h4YH2/XAE8Rs7wWdnng98PgWKvP5ovVc4rmRpRg2WChVW0uOy2xHDvDBQ==
+"@docusaurus/tsconfig@^3.8.1":
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/@docusaurus/tsconfig/-/tsconfig-3.8.1.tgz#a1f7daadfc93455289200647f4ee10cdca540f7b"
+  integrity sha512-XBWCcqhRHhkhfolnSolNL+N7gj3HVE3CoZVqnVjfsMzCoOsuQw2iCLxVVHtO+rePUUfouVZHURDgmqIySsF66A==
 
-"@docusaurus/types@3.7.0":
-  version "3.7.0"
-  resolved "https://registry.npmjs.org/@docusaurus/types/-/types-3.7.0.tgz"
-  integrity sha512-kOmZg5RRqJfH31m+6ZpnwVbkqMJrPOG5t0IOl4i/+3ruXyNfWzZ0lVtVrD0u4ONc/0NOsS9sWYaxxWNkH1LdLQ==
+"@docusaurus/types@3.8.1":
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/@docusaurus/types/-/types-3.8.1.tgz#83ab66c345464e003b576a49f78897482061fc26"
+  integrity sha512-ZPdW5AB+pBjiVrcLuw3dOS6BFlrG0XkS2lDGsj8TizcnREQg3J8cjsgfDviszOk4CweNfwo1AEELJkYaMUuOPg==
   dependencies:
     "@mdx-js/mdx" "^3.0.0"
     "@types/history" "^4.7.11"
@@ -1955,37 +1999,38 @@
     webpack "^5.95.0"
     webpack-merge "^5.9.0"
 
-"@docusaurus/utils-common@3.7.0":
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/@docusaurus/utils-common/-/utils-common-3.7.0.tgz#1bef52837d321db5dd2361fc07f3416193b5d029"
-  integrity sha512-IZeyIfCfXy0Mevj6bWNg7DG7B8G+S6o6JVpddikZtWyxJguiQ7JYr0SIZ0qWd8pGNuMyVwriWmbWqMnK7Y5PwA==
+"@docusaurus/utils-common@3.8.1":
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/@docusaurus/utils-common/-/utils-common-3.8.1.tgz#c369b8c3041afb7dcd595d4172beb1cc1015c85f"
+  integrity sha512-zTZiDlvpvoJIrQEEd71c154DkcriBecm4z94OzEE9kz7ikS3J+iSlABhFXM45mZ0eN5pVqqr7cs60+ZlYLewtg==
   dependencies:
-    "@docusaurus/types" "3.7.0"
+    "@docusaurus/types" "3.8.1"
     tslib "^2.6.0"
 
-"@docusaurus/utils-validation@3.7.0":
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/@docusaurus/utils-validation/-/utils-validation-3.7.0.tgz#dc0786fb633ae5cef8e93337bf21c2a826c7ecbd"
-  integrity sha512-w8eiKk8mRdN+bNfeZqC4nyFoxNyI1/VExMKAzD9tqpJfLLbsa46Wfn5wcKH761g9WkKh36RtFV49iL9lh1DYBA==
+"@docusaurus/utils-validation@3.8.1":
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/@docusaurus/utils-validation/-/utils-validation-3.8.1.tgz#0499c0d151a4098a0963237057993282cfbd538e"
+  integrity sha512-gs5bXIccxzEbyVecvxg6upTwaUbfa0KMmTj7HhHzc016AGyxH2o73k1/aOD0IFrdCsfJNt37MqNI47s2MgRZMA==
   dependencies:
-    "@docusaurus/logger" "3.7.0"
-    "@docusaurus/utils" "3.7.0"
-    "@docusaurus/utils-common" "3.7.0"
+    "@docusaurus/logger" "3.8.1"
+    "@docusaurus/utils" "3.8.1"
+    "@docusaurus/utils-common" "3.8.1"
     fs-extra "^11.2.0"
     joi "^17.9.2"
     js-yaml "^4.1.0"
     lodash "^4.17.21"
     tslib "^2.6.0"
 
-"@docusaurus/utils@3.7.0":
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/@docusaurus/utils/-/utils-3.7.0.tgz#dfdebd63524c52b498f36b2907a3b2261930b9bb"
-  integrity sha512-e7zcB6TPnVzyUaHMJyLSArKa2AG3h9+4CfvKXKKWNx6hRs+p0a+u7HHTJBgo6KW2m+vqDnuIHK4X+bhmoghAFA==
+"@docusaurus/utils@3.8.1":
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/@docusaurus/utils/-/utils-3.8.1.tgz#2ac1e734106e2f73dbd0f6a8824d525f9064e9f0"
+  integrity sha512-P1ml0nvOmEFdmu0smSXOqTS1sxU5tqvnc0dA4MTKV39kye+bhQnjkIKEE18fNOvxjyB86k8esoCIFM3x4RykOQ==
   dependencies:
-    "@docusaurus/logger" "3.7.0"
-    "@docusaurus/types" "3.7.0"
-    "@docusaurus/utils-common" "3.7.0"
+    "@docusaurus/logger" "3.8.1"
+    "@docusaurus/types" "3.8.1"
+    "@docusaurus/utils-common" "3.8.1"
     escape-string-regexp "^4.0.0"
+    execa "5.1.1"
     file-loader "^6.2.0"
     fs-extra "^11.1.1"
     github-slugger "^1.5.0"
@@ -1995,9 +2040,9 @@
     js-yaml "^4.1.0"
     lodash "^4.17.21"
     micromatch "^4.0.5"
+    p-queue "^6.6.2"
     prompts "^2.4.2"
     resolve-pathname "^3.0.0"
-    shelljs "^0.8.5"
     tslib "^2.6.0"
     url-loader "^4.1.1"
     utility-types "^3.10.0"
@@ -2412,10 +2457,10 @@
     classnames "^2.3.2"
     rc-util "^5.24.4"
 
-"@rc-component/trigger@^2.0.0", "@rc-component/trigger@^2.1.1", "@rc-component/trigger@^2.2.6":
-  version "2.2.6"
-  resolved "https://registry.npmjs.org/@rc-component/trigger/-/trigger-2.2.6.tgz"
-  integrity sha512-/9zuTnWwhQ3S3WT1T8BubuFTT46kvnXgaERR9f4BTKyn61/wpf/BvbImzYBubzJibU707FxwbKszLlHjcLiv1Q==
+"@rc-component/trigger@^2.0.0", "@rc-component/trigger@^2.1.1", "@rc-component/trigger@^2.2.7":
+  version "2.2.7"
+  resolved "https://registry.yarnpkg.com/@rc-component/trigger/-/trigger-2.2.7.tgz#a2b97ecbb93280a3c424e51fa415b371b355d76a"
+  integrity sha512-Qggj4Z0AA2i5dJhzlfFSmg1Qrziu8dsdHOihROL5Kl18seO2Eh/ZaTYt2c8a/CyGaTChnFry7BEYew1+/fhSbA==
   dependencies:
     "@babel/runtime" "^7.23.2"
     "@rc-component/portal" "^1.1.0"
@@ -2424,6 +2469,13 @@
     rc-resize-observer "^1.3.1"
     rc-util "^5.44.0"
 
+"@rc-component/util@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@rc-component/util/-/util-1.2.1.tgz#2c3158f11a4193478cec44ca42915da31f67d8a0"
+  integrity sha512-AUVu6jO+lWjQnUOOECwu8iR0EdElQgWW5NBv5vP/Uf9dWbAX3udhMutRlkVXjuac2E40ghkFy+ve00mc/3Fymg==
+  dependencies:
+    react-is "^18.2.0"
+
 "@saucelabs/theme-github-codeblock@^0.3.0":
   version "0.3.0"
   resolved "https://registry.npmjs.org/@saucelabs/theme-github-codeblock/-/theme-github-codeblock-0.3.0.tgz"
@@ -2590,605 +2642,426 @@
     "@svgr/plugin-jsx" "8.1.0"
     "@svgr/plugin-svgo" "8.1.0"
 
-"@swagger-api/apidom-ast@^1.0.0-beta.12", "@swagger-api/apidom-ast@^1.0.0-beta.3":
-  version "1.0.0-beta.12"
-  resolved "https://registry.npmjs.org/@swagger-api/apidom-ast/-/apidom-ast-1.0.0-beta.12.tgz"
-  integrity sha512-KdJ+8PyYvfnHgpqrC0WWDRJLVx6+YkmYgAGpsdOa8S/p6btJdCUozeqpcXawmGqwAX/9jCXbmKdia3v3fUrP0w==
+"@swagger-api/apidom-ast@^1.0.0-beta.43":
+  version "1.0.0-beta.43"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ast/-/apidom-ast-1.0.0-beta.43.tgz#155cc4f51b3a65c932ce290783582bf8285c1a83"
+  integrity sha512-4S/Reji9JFuFP3sEAjPpNHgoBV0Uck9FyOiCrlZgAqydvrsBfJ8VS5Xu2rP0aZNbOkY08whtSTeZMxjq/1chTw==
   dependencies:
-    "@babel/runtime-corejs3" "^7.20.7"
-    "@swagger-api/apidom-error" "^1.0.0-beta.12"
+    "@babel/runtime-corejs3" "^7.26.10"
+    "@swagger-api/apidom-error" "^1.0.0-beta.43"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
     unraw "^3.0.0"
 
-"@swagger-api/apidom-ast@^1.0.0-beta.30":
-  version "1.0.0-beta.30"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ast/-/apidom-ast-1.0.0-beta.30.tgz#88c25259a4a0b8fd9fa2106634089a927fd1d2d9"
-  integrity sha512-5Wj3zdt0dxS9ERVk4qSuqDIsMQ8dP2vop8b494OpJ/O2W261yCV39Z+vN+PqeJ2NiKDRMlJ+QoQ1uVfKwEo8Kg==
+"@swagger-api/apidom-core@>=1.0.0-beta.41 <1.0.0-rc.0", "@swagger-api/apidom-core@^1.0.0-beta.43":
+  version "1.0.0-beta.43"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-core/-/apidom-core-1.0.0-beta.43.tgz#bf45afdd6a636b582112e7e8c5979e0fd4cf0bea"
+  integrity sha512-NxBKA+gToSCWi9PUAeCyQg2WO/nmkqJ4XVGrUpSzqqJZL7UTtaTHqxBm9h8TdFvSxpeD/PmVijT+hcqVJhvTUA==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-error" "^1.0.0-beta.30"
-    "@types/ramda" "~0.30.0"
-    ramda "~0.30.0"
-    ramda-adjunct "^5.0.0"
-    unraw "^3.0.0"
-
-"@swagger-api/apidom-core@>=1.0.0-beta.13 <1.0.0-rc.0", "@swagger-api/apidom-core@^1.0.0-beta.30":
-  version "1.0.0-beta.30"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-core/-/apidom-core-1.0.0-beta.30.tgz#e0f52d343c109304878e5bf119a9fc297f5a09dc"
-  integrity sha512-pDnUhXIKKUvmeezQfwKLL05rkOH1L7ueiy5ja5ob9y2w4r+HXDID7qHtDGeRxKZoIt4E3Sd1K37OjcE9fNcknQ==
-  dependencies:
-    "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-ast" "^1.0.0-beta.30"
-    "@swagger-api/apidom-error" "^1.0.0-beta.30"
+    "@swagger-api/apidom-ast" "^1.0.0-beta.43"
+    "@swagger-api/apidom-error" "^1.0.0-beta.43"
     "@types/ramda" "~0.30.0"
     minim "~0.23.8"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
-    short-unique-id "^5.0.2"
+    short-unique-id "^5.3.2"
     ts-mixer "^6.0.3"
 
-"@swagger-api/apidom-core@^1.0.0-beta.12", "@swagger-api/apidom-core@^1.0.0-beta.3":
-  version "1.0.0-beta.12"
-  resolved "https://registry.npmjs.org/@swagger-api/apidom-core/-/apidom-core-1.0.0-beta.12.tgz"
-  integrity sha512-CAr6aSk9l9ZJUneHpmwk4Br0NZhFLy2QRHoPmr2pWMlAn+0YC4eRYtwOEB8PVsCmP83D4MiXU5zi6cOZyV/cVw==
-  dependencies:
-    "@babel/runtime-corejs3" "^7.20.7"
-    "@swagger-api/apidom-ast" "^1.0.0-beta.12"
-    "@swagger-api/apidom-error" "^1.0.0-beta.12"
-    "@types/ramda" "~0.30.0"
-    minim "~0.23.8"
-    ramda "~0.30.0"
-    ramda-adjunct "^5.0.0"
-    short-unique-id "^5.0.2"
-    ts-mixer "^6.0.3"
-
-"@swagger-api/apidom-error@>=1.0.0-beta.13 <1.0.0-rc.0", "@swagger-api/apidom-error@^1.0.0-beta.30":
-  version "1.0.0-beta.30"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-error/-/apidom-error-1.0.0-beta.30.tgz#97fdc0eedc9cb28f8f76b29933b7e0b8f784740e"
-  integrity sha512-hVDx0kUF1DTyaEXwmsF3wpJClEfnH0pxjEubqtvHpjjeTMgZzmKc5azbYtvgBX3uUpGHyQZyG/O9g94/wIhhMA==
+"@swagger-api/apidom-error@>=1.0.0-beta.41 <1.0.0-rc.0", "@swagger-api/apidom-error@^1.0.0-beta.43":
+  version "1.0.0-beta.43"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-error/-/apidom-error-1.0.0-beta.43.tgz#43c2c155565a54060bd4b435da56ca42ae076ed5"
+  integrity sha512-3ycgT9wX+oWLNqRpLM44b7f38NEVqk+E6Ac67ybP6rVuxi9tiGTaDRsvMGoijbCsz8e6ebREbsLiwz0IvEXD1g==
   dependencies:
     "@babel/runtime-corejs3" "^7.20.7"
 
-"@swagger-api/apidom-error@^1.0.0-beta.12", "@swagger-api/apidom-error@^1.0.0-beta.3", "@swagger-api/apidom-error@^1.0.0-beta.3 <1.0.0-rc.0":
-  version "1.0.0-beta.12"
-  resolved "https://registry.npmjs.org/@swagger-api/apidom-error/-/apidom-error-1.0.0-beta.12.tgz"
-  integrity sha512-p74a/8GgitGIYvjD5WmROEHv2bGCnDKug3QpJvC5+g36ErZQp428+fK5hhfKQuCo0rjD2fZvs27S17Zh8y0zFw==
-  dependencies:
-    "@babel/runtime-corejs3" "^7.20.7"
-
-"@swagger-api/apidom-json-pointer@>=1.0.0-beta.13 <1.0.0-rc.0", "@swagger-api/apidom-json-pointer@^1.0.0-beta.30":
-  version "1.0.0-beta.30"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-json-pointer/-/apidom-json-pointer-1.0.0-beta.30.tgz#7dc9d17190924bd848661961b85569e854cffdee"
-  integrity sha512-G+BDNXU/ARJCbJiFq1A6dh6pNDDp1J0jPfKeIHjsD8aZoRdpJC0F3F7onm8TjQm2cnvAi4B7vPOKzjWrYN1VWw==
+"@swagger-api/apidom-json-pointer@>=1.0.0-beta.41 <1.0.0-rc.0", "@swagger-api/apidom-json-pointer@^1.0.0-beta.40 <1.0.0-rc.0", "@swagger-api/apidom-json-pointer@^1.0.0-beta.43":
+  version "1.0.0-beta.43"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-json-pointer/-/apidom-json-pointer-1.0.0-beta.43.tgz#6cde897db6b7830249c3e5ff8de054dec4e779c9"
+  integrity sha512-yUDfj/MFtUee/Pp24ubLMD/S1GuDk/vIkyKrCpNTXm9wmbs181G1tr9K3/7l7wFJknkvI6RRNXR6/9pTaITIXQ==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-core" "^1.0.0-beta.30"
-    "@swagger-api/apidom-error" "^1.0.0-beta.30"
-    "@types/ramda" "~0.30.0"
-    ramda "~0.30.0"
-    ramda-adjunct "^5.0.0"
+    "@swagger-api/apidom-core" "^1.0.0-beta.43"
+    "@swagger-api/apidom-error" "^1.0.0-beta.43"
+    "@swaggerexpert/json-pointer" "^2.10.1"
 
-"@swagger-api/apidom-json-pointer@^1.0.0-beta.12", "@swagger-api/apidom-json-pointer@^1.0.0-beta.3 <1.0.0-rc.0":
-  version "1.0.0-beta.12"
-  resolved "https://registry.npmjs.org/@swagger-api/apidom-json-pointer/-/apidom-json-pointer-1.0.0-beta.12.tgz"
-  integrity sha512-JuCqMVfDSWJ7JcdPjYgGjNlqjmKQwxuQh7uKKBLTpNccmXYT+x7WemPuzcWjVVHDd5plw8yQ0YvaU0HlqjS1mA==
+"@swagger-api/apidom-ns-api-design-systems@^1.0.0-beta.43":
+  version "1.0.0-beta.43"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ns-api-design-systems/-/apidom-ns-api-design-systems-1.0.0-beta.43.tgz#956a05e36654375b2cb6828e916b0e3b3e179f2d"
+  integrity sha512-Ad9SWEushiZ8G73R0g96RdV7pzW6eMuCCAnVpMjKPspLrRkQk+1wW0vQU2UOvJZXgxzob8Oq79YXWWnUDkwnLg==
   dependencies:
-    "@babel/runtime-corejs3" "^7.20.7"
-    "@swagger-api/apidom-core" "^1.0.0-beta.12"
-    "@swagger-api/apidom-error" "^1.0.0-beta.12"
-    "@types/ramda" "~0.30.0"
-    ramda "~0.30.0"
-    ramda-adjunct "^5.0.0"
-
-"@swagger-api/apidom-ns-api-design-systems@^1.0.0-beta.3":
-  version "1.0.0-beta.3"
-  resolved "https://registry.npmjs.org/@swagger-api/apidom-ns-api-design-systems/-/apidom-ns-api-design-systems-1.0.0-beta.3.tgz"
-  integrity sha512-x+NiLR0xZ0VB8AMJr7ii+6A27AP2CGjLyPQr6JutnifXG+vpkjbgXCPyz2qlmrvuLIkBJIE2lBuyX3+qQXmgCw==
-  dependencies:
-    "@babel/runtime-corejs3" "^7.20.7"
-    "@swagger-api/apidom-core" "^1.0.0-beta.3"
-    "@swagger-api/apidom-error" "^1.0.0-beta.3"
-    "@swagger-api/apidom-ns-openapi-3-1" "^1.0.0-beta.3"
+    "@babel/runtime-corejs3" "^7.26.10"
+    "@swagger-api/apidom-core" "^1.0.0-beta.43"
+    "@swagger-api/apidom-error" "^1.0.0-beta.43"
+    "@swagger-api/apidom-ns-openapi-3-1" "^1.0.0-beta.43"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
     ts-mixer "^6.0.3"
 
-"@swagger-api/apidom-ns-arazzo-1@^1.0.0-beta.3 <1.0.0-rc.0", "@swagger-api/apidom-ns-arazzo-1@^1.0.0-beta.30":
-  version "1.0.0-beta.30"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ns-arazzo-1/-/apidom-ns-arazzo-1-1.0.0-beta.30.tgz#3f2f8a9ed5d2c8c10157981231afd6032e20b6b9"
-  integrity sha512-HpszcpuDlSOXWruHzasR64L8640VHVDuy8xXJrhx1iBu+gDHriOM8gbh8jQgWST91H0smtPeTG9WV1/h6frhRw==
+"@swagger-api/apidom-ns-arazzo-1@^1.0.0-beta.40 <1.0.0-rc.0", "@swagger-api/apidom-ns-arazzo-1@^1.0.0-beta.43":
+  version "1.0.0-beta.43"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ns-arazzo-1/-/apidom-ns-arazzo-1-1.0.0-beta.43.tgz#ef0aa08bec232dc6b0584bc005011d26ae28db9d"
+  integrity sha512-RQVAGmtS+0izlCnvGmRHWfZ0dvekZNRw/q+MhssNKTBA1dXcjqpHQ1+q6AUh7FsOg6+vO98iyRvF9K8EvRrLiw==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-core" "^1.0.0-beta.30"
-    "@swagger-api/apidom-ns-json-schema-2020-12" "^1.0.0-beta.30"
+    "@swagger-api/apidom-core" "^1.0.0-beta.43"
+    "@swagger-api/apidom-ns-json-schema-2020-12" "^1.0.0-beta.43"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
     ts-mixer "^6.0.3"
 
-"@swagger-api/apidom-ns-asyncapi-2@^1.0.0-beta.3", "@swagger-api/apidom-ns-asyncapi-2@^1.0.0-beta.3 <1.0.0-rc.0":
-  version "1.0.0-beta.3"
-  resolved "https://registry.npmjs.org/@swagger-api/apidom-ns-asyncapi-2/-/apidom-ns-asyncapi-2-1.0.0-beta.3.tgz"
-  integrity sha512-9E4/kTf/OzV3vgRjZOB+6TRqQX2ljirD+UBQ8QPSJKBUTtq8+F7U9a8Z9AGYrKCQUMgbge5JMYCqHmOmrJKVUA==
+"@swagger-api/apidom-ns-asyncapi-2@^1.0.0-beta.40 <1.0.0-rc.0", "@swagger-api/apidom-ns-asyncapi-2@^1.0.0-beta.43":
+  version "1.0.0-beta.43"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ns-asyncapi-2/-/apidom-ns-asyncapi-2-1.0.0-beta.43.tgz#922bbf9598744e68386773b91565d1a2e4dd7b13"
+  integrity sha512-dp1PgbiwXLnU1XiTtzUPj4p/pbg4XEqNom8hWXORqph/539bRkZ8ce+HcjjE+aWZMDivRhO45IH9Qyrv5YnNvA==
   dependencies:
-    "@babel/runtime-corejs3" "^7.20.7"
-    "@swagger-api/apidom-core" "^1.0.0-beta.3"
-    "@swagger-api/apidom-ns-json-schema-draft-7" "^1.0.0-beta.3"
+    "@babel/runtime-corejs3" "^7.26.10"
+    "@swagger-api/apidom-core" "^1.0.0-beta.43"
+    "@swagger-api/apidom-ns-json-schema-draft-7" "^1.0.0-beta.43"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
     ts-mixer "^6.0.3"
 
-"@swagger-api/apidom-ns-json-schema-2019-09@^1.0.0-beta.12":
-  version "1.0.0-beta.12"
-  resolved "https://registry.npmjs.org/@swagger-api/apidom-ns-json-schema-2019-09/-/apidom-ns-json-schema-2019-09-1.0.0-beta.12.tgz"
-  integrity sha512-mrcWwAfCcUDiPrGymowZqnrOpOk7hUNDkW9WjsMe3bFiTrCm4EsQYvGtyWAtB/0yo7hNBMGXYEtDWfGBsw8AyA==
-  dependencies:
-    "@babel/runtime-corejs3" "^7.20.7"
-    "@swagger-api/apidom-core" "^1.0.0-beta.12"
-    "@swagger-api/apidom-error" "^1.0.0-beta.12"
-    "@swagger-api/apidom-ns-json-schema-draft-7" "^1.0.0-beta.12"
-    "@types/ramda" "~0.30.0"
-    ramda "~0.30.0"
-    ramda-adjunct "^5.0.0"
-    ts-mixer "^6.0.4"
-
-"@swagger-api/apidom-ns-json-schema-2019-09@^1.0.0-beta.30":
-  version "1.0.0-beta.30"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ns-json-schema-2019-09/-/apidom-ns-json-schema-2019-09-1.0.0-beta.30.tgz#2467cc1d780f7a20442b8892d77dd9a25147031c"
-  integrity sha512-HZL76SJaUDmL1GuFcev23UX1vVuxSHIED3vvKso+k3KWNfVWZJrr7GX1ELJx84fWW8g3b5S5+nyz5q1ApT084A==
+"@swagger-api/apidom-ns-json-schema-2019-09@^1.0.0-beta.43":
+  version "1.0.0-beta.43"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ns-json-schema-2019-09/-/apidom-ns-json-schema-2019-09-1.0.0-beta.43.tgz#1d22c10da7409ab4b2216a7490adae603f045190"
+  integrity sha512-m0jQXPhlAyUxn4A3Pn+SOmQY0U1wTAyPFx/Vb3EO0q0vYcvBF9YbGJ5rv9ey6c9PNmRX3p1A16oQhhCIGouq4w==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-core" "^1.0.0-beta.30"
-    "@swagger-api/apidom-error" "^1.0.0-beta.30"
-    "@swagger-api/apidom-ns-json-schema-draft-7" "^1.0.0-beta.30"
+    "@swagger-api/apidom-core" "^1.0.0-beta.43"
+    "@swagger-api/apidom-error" "^1.0.0-beta.43"
+    "@swagger-api/apidom-ns-json-schema-draft-7" "^1.0.0-beta.43"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
     ts-mixer "^6.0.4"
 
-"@swagger-api/apidom-ns-json-schema-2020-12@^1.0.0-beta.12":
-  version "1.0.0-beta.12"
-  resolved "https://registry.npmjs.org/@swagger-api/apidom-ns-json-schema-2020-12/-/apidom-ns-json-schema-2020-12-1.0.0-beta.12.tgz"
-  integrity sha512-SW0Jtty3o12OwpTAVJEewurvTSIhxJ72TZlMSk5L36jvekzqKfLL7aBYRCEE9QkV3rxTjxOf0WK/tYLRMKUbzw==
-  dependencies:
-    "@babel/runtime-corejs3" "^7.20.7"
-    "@swagger-api/apidom-core" "^1.0.0-beta.12"
-    "@swagger-api/apidom-error" "^1.0.0-beta.12"
-    "@swagger-api/apidom-ns-json-schema-2019-09" "^1.0.0-beta.12"
-    "@types/ramda" "~0.30.0"
-    ramda "~0.30.0"
-    ramda-adjunct "^5.0.0"
-    ts-mixer "^6.0.4"
-
-"@swagger-api/apidom-ns-json-schema-2020-12@^1.0.0-beta.30":
-  version "1.0.0-beta.30"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ns-json-schema-2020-12/-/apidom-ns-json-schema-2020-12-1.0.0-beta.30.tgz#7247885d81a7639b695687d1912cb1c66ea5897c"
-  integrity sha512-D2adAcu/ISoBe0zRbcX0HyaDvWoMhmaL8iPR4pvjLY7soB2tCR4uLEzAkqPa2zaOKBRA2ziF74aNKrKbM5sX8w==
+"@swagger-api/apidom-ns-json-schema-2020-12@^1.0.0-beta.43":
+  version "1.0.0-beta.43"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ns-json-schema-2020-12/-/apidom-ns-json-schema-2020-12-1.0.0-beta.43.tgz#d59bddd8707427088447a86bc6e1fe893e6dd4aa"
+  integrity sha512-LdKzRytBqMF1Df9lqAPqm976u4L/E+La00UdJnd4Vj1bY4BrhKqToMwXZyLXMVCOCRKWbwK28Q62i2lAYE881A==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-core" "^1.0.0-beta.30"
-    "@swagger-api/apidom-error" "^1.0.0-beta.30"
-    "@swagger-api/apidom-ns-json-schema-2019-09" "^1.0.0-beta.30"
+    "@swagger-api/apidom-core" "^1.0.0-beta.43"
+    "@swagger-api/apidom-error" "^1.0.0-beta.43"
+    "@swagger-api/apidom-ns-json-schema-2019-09" "^1.0.0-beta.43"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
     ts-mixer "^6.0.4"
 
-"@swagger-api/apidom-ns-json-schema-draft-4@^1.0.0-beta.12", "@swagger-api/apidom-ns-json-schema-draft-4@^1.0.0-beta.3":
-  version "1.0.0-beta.12"
-  resolved "https://registry.npmjs.org/@swagger-api/apidom-ns-json-schema-draft-4/-/apidom-ns-json-schema-draft-4-1.0.0-beta.12.tgz"
-  integrity sha512-Z3PnEEdkGnr6zomFAgmkkDGrwlj3bbbEJBfXsshxRuXf3i5RymiURFy42CfKa5Tmx3rw8rSw393p0TkHqS0NIg==
-  dependencies:
-    "@babel/runtime-corejs3" "^7.20.7"
-    "@swagger-api/apidom-ast" "^1.0.0-beta.12"
-    "@swagger-api/apidom-core" "^1.0.0-beta.12"
-    "@types/ramda" "~0.30.0"
-    ramda "~0.30.0"
-    ramda-adjunct "^5.0.0"
-    ts-mixer "^6.0.4"
-
-"@swagger-api/apidom-ns-json-schema-draft-4@^1.0.0-beta.30":
-  version "1.0.0-beta.30"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ns-json-schema-draft-4/-/apidom-ns-json-schema-draft-4-1.0.0-beta.30.tgz#c87a9d2c92236098e78948594fdf3b24d1f77d07"
-  integrity sha512-u5YMIw/g74Z59wPBFS2A2LaheC+EEqRcbpUQOApTvb6zjW+xWxbCuKV1ypzIaVDDPIry8e3mpwjjXLj1mvad5w==
+"@swagger-api/apidom-ns-json-schema-draft-4@^1.0.0-beta.43":
+  version "1.0.0-beta.43"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ns-json-schema-draft-4/-/apidom-ns-json-schema-draft-4-1.0.0-beta.43.tgz#237d9968cb0a3fcc76bb5aee88f47962526235b4"
+  integrity sha512-eQobpiECGLd0SwyJYNsnliIU33UcwubbIOl0HlWAM0kS/F7PUeA36beq4nZnpArTySBra4Ye+S9NW9nhQ8UHsw==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-ast" "^1.0.0-beta.30"
-    "@swagger-api/apidom-core" "^1.0.0-beta.30"
+    "@swagger-api/apidom-ast" "^1.0.0-beta.43"
+    "@swagger-api/apidom-core" "^1.0.0-beta.43"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
     ts-mixer "^6.0.4"
 
-"@swagger-api/apidom-ns-json-schema-draft-6@^1.0.0-beta.12":
-  version "1.0.0-beta.12"
-  resolved "https://registry.npmjs.org/@swagger-api/apidom-ns-json-schema-draft-6/-/apidom-ns-json-schema-draft-6-1.0.0-beta.12.tgz"
-  integrity sha512-QvubeYZvRd19Q8VVP4xGGYTuSVgLQqEp/epe8LXcrFJvgF6A9CTUxkfKVxL4+Q5a9DFaKTZKNYwkRaPzisvnWQ==
-  dependencies:
-    "@babel/runtime-corejs3" "^7.20.7"
-    "@swagger-api/apidom-core" "^1.0.0-beta.12"
-    "@swagger-api/apidom-error" "^1.0.0-beta.12"
-    "@swagger-api/apidom-ns-json-schema-draft-4" "^1.0.0-beta.12"
-    "@types/ramda" "~0.30.0"
-    ramda "~0.30.0"
-    ramda-adjunct "^5.0.0"
-    ts-mixer "^6.0.4"
-
-"@swagger-api/apidom-ns-json-schema-draft-6@^1.0.0-beta.30":
-  version "1.0.0-beta.30"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ns-json-schema-draft-6/-/apidom-ns-json-schema-draft-6-1.0.0-beta.30.tgz#980bce110261b9554bdea19bf3ac01d0e1d43c07"
-  integrity sha512-/Mp11+tBKTN6XnpOiQo/cKnqmvfJhdCniHCK6Bg8wpCI3dMi+nSSpIYgWEPVQfNsLtf/PaYegrtYY56W4UzNRw==
+"@swagger-api/apidom-ns-json-schema-draft-6@^1.0.0-beta.43":
+  version "1.0.0-beta.43"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ns-json-schema-draft-6/-/apidom-ns-json-schema-draft-6-1.0.0-beta.43.tgz#e619ff76a43ec18ec5121020d6bfa39ee2ffed99"
+  integrity sha512-+cmcJ+lHtOdxlm/3a85cHjVp28C9WNUXHsBIUdaVUL2cEEue4d1CMZmBwBa6s4gUAEE+hluRxR+d6VZzIN8bPQ==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-core" "^1.0.0-beta.30"
-    "@swagger-api/apidom-error" "^1.0.0-beta.30"
-    "@swagger-api/apidom-ns-json-schema-draft-4" "^1.0.0-beta.30"
+    "@swagger-api/apidom-core" "^1.0.0-beta.43"
+    "@swagger-api/apidom-error" "^1.0.0-beta.43"
+    "@swagger-api/apidom-ns-json-schema-draft-4" "^1.0.0-beta.43"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
     ts-mixer "^6.0.4"
 
-"@swagger-api/apidom-ns-json-schema-draft-7@^1.0.0-beta.12", "@swagger-api/apidom-ns-json-schema-draft-7@^1.0.0-beta.3":
-  version "1.0.0-beta.12"
-  resolved "https://registry.npmjs.org/@swagger-api/apidom-ns-json-schema-draft-7/-/apidom-ns-json-schema-draft-7-1.0.0-beta.12.tgz"
-  integrity sha512-UIU/vY5xBhYeBEykmXMvQRaIXqWWNWc/RPG5L8LrfILoZhzZbjqcdRMf5w4wQWqteQxXxkpDdkcHVBsJxcQtJg==
-  dependencies:
-    "@babel/runtime-corejs3" "^7.20.7"
-    "@swagger-api/apidom-core" "^1.0.0-beta.12"
-    "@swagger-api/apidom-error" "^1.0.0-beta.12"
-    "@swagger-api/apidom-ns-json-schema-draft-6" "^1.0.0-beta.12"
-    "@types/ramda" "~0.30.0"
-    ramda "~0.30.0"
-    ramda-adjunct "^5.0.0"
-    ts-mixer "^6.0.4"
-
-"@swagger-api/apidom-ns-json-schema-draft-7@^1.0.0-beta.30":
-  version "1.0.0-beta.30"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ns-json-schema-draft-7/-/apidom-ns-json-schema-draft-7-1.0.0-beta.30.tgz#a1a665ff33f71679085f60ea444b46c257b2650e"
-  integrity sha512-6sZ0LLYnEz9KXtt9xTRSc0EORBl5Fj3LUbfabUjqLQZGldsJWU+3TTQ4XtzFFHlan7z2WYyALKP7iP+b60XbPg==
+"@swagger-api/apidom-ns-json-schema-draft-7@^1.0.0-beta.43":
+  version "1.0.0-beta.43"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ns-json-schema-draft-7/-/apidom-ns-json-schema-draft-7-1.0.0-beta.43.tgz#fd67a6cbc0302ca16a0cece220c9a614a722f299"
+  integrity sha512-xkmILa+H8+3CNsYZXd1SGyHJQ854uJEO2k03QLtE+TiLvAd7yZAq68mqETTYeU1pyCV9Ksm+OByMHS3bF0GRGw==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-core" "^1.0.0-beta.30"
-    "@swagger-api/apidom-error" "^1.0.0-beta.30"
-    "@swagger-api/apidom-ns-json-schema-draft-6" "^1.0.0-beta.30"
+    "@swagger-api/apidom-core" "^1.0.0-beta.43"
+    "@swagger-api/apidom-error" "^1.0.0-beta.43"
+    "@swagger-api/apidom-ns-json-schema-draft-6" "^1.0.0-beta.43"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
     ts-mixer "^6.0.4"
 
-"@swagger-api/apidom-ns-openapi-2@^1.0.0-beta.3", "@swagger-api/apidom-ns-openapi-2@^1.0.0-beta.3 <1.0.0-rc.0":
-  version "1.0.0-beta.3"
-  resolved "https://registry.npmjs.org/@swagger-api/apidom-ns-openapi-2/-/apidom-ns-openapi-2-1.0.0-beta.3.tgz"
-  integrity sha512-eBNUkQdIDE2fWUXdIeRpN9OMxwfxU2WJFMRHst204Doanh8iJVp3Mz/+z9agHJ6Pkqth2XTXA0EDd1QiI37t+g==
+"@swagger-api/apidom-ns-openapi-2@^1.0.0-beta.40 <1.0.0-rc.0", "@swagger-api/apidom-ns-openapi-2@^1.0.0-beta.43":
+  version "1.0.0-beta.43"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ns-openapi-2/-/apidom-ns-openapi-2-1.0.0-beta.43.tgz#6f9ca47114f68fa93c8cea3611834bf6ef1aa95d"
+  integrity sha512-+16xczQTr+C1GE3pa8TMDJbReLhIvwHS2VseADBQFgU+3zVSJhmfWTpI34zJ1v1bnTXZIB17PP9KUG2l/Q1/ww==
   dependencies:
-    "@babel/runtime-corejs3" "^7.20.7"
-    "@swagger-api/apidom-core" "^1.0.0-beta.3"
-    "@swagger-api/apidom-error" "^1.0.0-beta.3"
-    "@swagger-api/apidom-ns-json-schema-draft-4" "^1.0.0-beta.3"
+    "@babel/runtime-corejs3" "^7.26.10"
+    "@swagger-api/apidom-core" "^1.0.0-beta.43"
+    "@swagger-api/apidom-error" "^1.0.0-beta.43"
+    "@swagger-api/apidom-ns-json-schema-draft-4" "^1.0.0-beta.43"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
     ts-mixer "^6.0.3"
 
-"@swagger-api/apidom-ns-openapi-3-0@^1.0.0-beta.12", "@swagger-api/apidom-ns-openapi-3-0@^1.0.0-beta.3", "@swagger-api/apidom-ns-openapi-3-0@^1.0.0-beta.3 <1.0.0-rc.0":
-  version "1.0.0-beta.12"
-  resolved "https://registry.npmjs.org/@swagger-api/apidom-ns-openapi-3-0/-/apidom-ns-openapi-3-0-1.0.0-beta.12.tgz"
-  integrity sha512-6TWUagR1/Y9HB8t75/vrkHHDV5c5K0S72Wywx7PoDyNgQ1Jxy3p6iwuSHfTwJYH+/hAxg3f91i6HXXyrHB5RAg==
+"@swagger-api/apidom-ns-openapi-3-0@^1.0.0-beta.40 <1.0.0-rc.0", "@swagger-api/apidom-ns-openapi-3-0@^1.0.0-beta.43":
+  version "1.0.0-beta.43"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ns-openapi-3-0/-/apidom-ns-openapi-3-0-1.0.0-beta.43.tgz#97a710c602c3855f9bdad2edcffd06f9dc0720c0"
+  integrity sha512-6T8O9C40yFHXASh00UV3AgVeClHPjfA3zKtAcgXpgI8ZvMZRbp5Z3lSuG35PYZmmmKgLuEclywjboIfUBA4dag==
   dependencies:
-    "@babel/runtime-corejs3" "^7.20.7"
-    "@swagger-api/apidom-core" "^1.0.0-beta.12"
-    "@swagger-api/apidom-error" "^1.0.0-beta.12"
-    "@swagger-api/apidom-ns-json-schema-draft-4" "^1.0.0-beta.12"
+    "@babel/runtime-corejs3" "^7.26.10"
+    "@swagger-api/apidom-core" "^1.0.0-beta.43"
+    "@swagger-api/apidom-error" "^1.0.0-beta.43"
+    "@swagger-api/apidom-ns-json-schema-draft-4" "^1.0.0-beta.43"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
     ts-mixer "^6.0.3"
 
-"@swagger-api/apidom-ns-openapi-3-0@^1.0.0-beta.30":
-  version "1.0.0-beta.30"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ns-openapi-3-0/-/apidom-ns-openapi-3-0-1.0.0-beta.30.tgz#611709a24279435a9cf8f98552b6fba3991da031"
-  integrity sha512-7bz6kCgjStTKGGI4wBP2ho574lyfjH5EDPPuXhkwmAG2mOn9MZezlQhsbdo3B+vbi/58mqQb2XCoB4aeP1F+GQ==
+"@swagger-api/apidom-ns-openapi-3-1@>=1.0.0-beta.41 <1.0.0-rc.0", "@swagger-api/apidom-ns-openapi-3-1@^1.0.0-beta.40 <1.0.0-rc.0", "@swagger-api/apidom-ns-openapi-3-1@^1.0.0-beta.43":
+  version "1.0.0-beta.43"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ns-openapi-3-1/-/apidom-ns-openapi-3-1-1.0.0-beta.43.tgz#639575eeb4a6b14003a66bf8b44e61d57264c3b9"
+  integrity sha512-9oqgKa1V6Zi1ezVh25GFw8Dty4kiScnnNyuULhYlIHspzkFSNaLKM75aonSAvL79YBEiF78q9cw6yfy0sy+CxQ==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-core" "^1.0.0-beta.30"
-    "@swagger-api/apidom-error" "^1.0.0-beta.30"
-    "@swagger-api/apidom-ns-json-schema-draft-4" "^1.0.0-beta.30"
+    "@swagger-api/apidom-ast" "^1.0.0-beta.43"
+    "@swagger-api/apidom-core" "^1.0.0-beta.43"
+    "@swagger-api/apidom-json-pointer" "^1.0.0-beta.43"
+    "@swagger-api/apidom-ns-json-schema-2020-12" "^1.0.0-beta.43"
+    "@swagger-api/apidom-ns-openapi-3-0" "^1.0.0-beta.43"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
     ts-mixer "^6.0.3"
 
-"@swagger-api/apidom-ns-openapi-3-1@>=1.0.0-beta.13 <1.0.0-rc.0":
-  version "1.0.0-beta.30"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ns-openapi-3-1/-/apidom-ns-openapi-3-1-1.0.0-beta.30.tgz#a43fe94c57ec576c8b4a5ebeb7c2a35683ebf84b"
-  integrity sha512-pq2jxSp0I6xnGzyAiEXWYMuurp8H7TlOQ6Ijr/XX54gNmaIK+yQ3HXc7S6FZx+B2kQx03Tb8Y8O7L7J7YnmFiA==
+"@swagger-api/apidom-parser-adapter-api-design-systems-json@^1.0.0-beta.40 <1.0.0-rc.0":
+  version "1.0.0-beta.43"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-api-design-systems-json/-/apidom-parser-adapter-api-design-systems-json-1.0.0-beta.43.tgz#af4421807c424d3af7483c834994a9ed716e356e"
+  integrity sha512-AnPyqxa9mM2GlhSJ6/+FPG+tgfaHtxs3B5+NULAbXbZ+enkyhZOs3iF2wpIFO6JaW6litXrwKsJYV+ul7Igyew==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-ast" "^1.0.0-beta.30"
-    "@swagger-api/apidom-core" "^1.0.0-beta.30"
-    "@swagger-api/apidom-json-pointer" "^1.0.0-beta.30"
-    "@swagger-api/apidom-ns-json-schema-2020-12" "^1.0.0-beta.30"
-    "@swagger-api/apidom-ns-openapi-3-0" "^1.0.0-beta.30"
-    "@types/ramda" "~0.30.0"
-    ramda "~0.30.0"
-    ramda-adjunct "^5.0.0"
-    ts-mixer "^6.0.3"
-
-"@swagger-api/apidom-ns-openapi-3-1@^1.0.0-beta.3", "@swagger-api/apidom-ns-openapi-3-1@^1.0.0-beta.3 <1.0.0-rc.0":
-  version "1.0.0-beta.12"
-  resolved "https://registry.npmjs.org/@swagger-api/apidom-ns-openapi-3-1/-/apidom-ns-openapi-3-1-1.0.0-beta.12.tgz"
-  integrity sha512-IayaLSawWo5rAyM2nRY6faTfK8cJQ+mGGR94NOmsjcUQw9IljY9uX7PXj3izOdFlXFYjgR1P+mIhuuXyDuw4qg==
-  dependencies:
-    "@babel/runtime-corejs3" "^7.20.7"
-    "@swagger-api/apidom-ast" "^1.0.0-beta.12"
-    "@swagger-api/apidom-core" "^1.0.0-beta.12"
-    "@swagger-api/apidom-json-pointer" "^1.0.0-beta.12"
-    "@swagger-api/apidom-ns-json-schema-2020-12" "^1.0.0-beta.12"
-    "@swagger-api/apidom-ns-openapi-3-0" "^1.0.0-beta.12"
-    "@types/ramda" "~0.30.0"
-    ramda "~0.30.0"
-    ramda-adjunct "^5.0.0"
-    ts-mixer "^6.0.3"
-
-"@swagger-api/apidom-parser-adapter-api-design-systems-json@^1.0.0-beta.3 <1.0.0-rc.0":
-  version "1.0.0-beta.3"
-  resolved "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-api-design-systems-json/-/apidom-parser-adapter-api-design-systems-json-1.0.0-beta.3.tgz"
-  integrity sha512-IpnxjLDVdRaY+ewNW8zbiMzYu5eKifpioFPGDlHc2MoTW6zqo5UKViZKL4MbsncySWBj7+URvTIFYjip3TvkKg==
-  dependencies:
-    "@babel/runtime-corejs3" "^7.20.7"
-    "@swagger-api/apidom-core" "^1.0.0-beta.3"
-    "@swagger-api/apidom-ns-api-design-systems" "^1.0.0-beta.3"
-    "@swagger-api/apidom-parser-adapter-json" "^1.0.0-beta.3"
+    "@swagger-api/apidom-core" "^1.0.0-beta.43"
+    "@swagger-api/apidom-ns-api-design-systems" "^1.0.0-beta.43"
+    "@swagger-api/apidom-parser-adapter-json" "^1.0.0-beta.43"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
 
-"@swagger-api/apidom-parser-adapter-api-design-systems-yaml@^1.0.0-beta.3 <1.0.0-rc.0":
-  version "1.0.0-beta.3"
-  resolved "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-api-design-systems-yaml/-/apidom-parser-adapter-api-design-systems-yaml-1.0.0-beta.3.tgz"
-  integrity sha512-Pvj+4OMIzKMx77Ulbp/CdWGAQhor88q5BJlY3cuSNd2Oth+mfe6r7NUXWVSpG6H9+9Y6YJdnGOzQ1PHWJPOlqA==
-  dependencies:
-    "@babel/runtime-corejs3" "^7.20.7"
-    "@swagger-api/apidom-core" "^1.0.0-beta.3"
-    "@swagger-api/apidom-ns-api-design-systems" "^1.0.0-beta.3"
-    "@swagger-api/apidom-parser-adapter-yaml-1-2" "^1.0.0-beta.3"
-    "@types/ramda" "~0.30.0"
-    ramda "~0.30.0"
-    ramda-adjunct "^5.0.0"
-
-"@swagger-api/apidom-parser-adapter-arazzo-json-1@^1.0.0-beta.3 <1.0.0-rc.0":
-  version "1.0.0-beta.30"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-arazzo-json-1/-/apidom-parser-adapter-arazzo-json-1-1.0.0-beta.30.tgz#3250aa29e0b423bfdf59fd355c8927a6588ee5e2"
-  integrity sha512-SZajkrTJ7c1I9CI3gnsdHZCQFSIyQ2H/lkWDjA/drZkRcfbR1CTbR2q0BGGlV5Y+nFHBxjRNpPbYbZrqh0WV4w==
+"@swagger-api/apidom-parser-adapter-api-design-systems-yaml@^1.0.0-beta.40 <1.0.0-rc.0":
+  version "1.0.0-beta.43"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-api-design-systems-yaml/-/apidom-parser-adapter-api-design-systems-yaml-1.0.0-beta.43.tgz#55fbf74f59123bcb0ef79e25cf1f7c9ea048484b"
+  integrity sha512-/G9T1y9rJl8d116iUWW99OznUVxjMVMA7iOCCHP7YppgLmFf/l8Eh5eHdaUXgsvlnYMwOqtflg+46lYi1oe7Uw==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-core" "^1.0.0-beta.30"
-    "@swagger-api/apidom-ns-arazzo-1" "^1.0.0-beta.30"
-    "@swagger-api/apidom-parser-adapter-json" "^1.0.0-beta.30"
+    "@swagger-api/apidom-core" "^1.0.0-beta.43"
+    "@swagger-api/apidom-ns-api-design-systems" "^1.0.0-beta.43"
+    "@swagger-api/apidom-parser-adapter-yaml-1-2" "^1.0.0-beta.43"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
 
-"@swagger-api/apidom-parser-adapter-arazzo-yaml-1@^1.0.0-beta.3 <1.0.0-rc.0":
-  version "1.0.0-beta.30"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-arazzo-yaml-1/-/apidom-parser-adapter-arazzo-yaml-1-1.0.0-beta.30.tgz#54ab0622a73d8ecc3190a3f1d07c4b994903536a"
-  integrity sha512-T+N1ix+V5IpOWMFcamQRI50830JayD1gifnRm+mVeWJKMzp+xm08bnO8NiR9LQ2SKJZ6FWYM38oG2tAt0Lwxcg==
+"@swagger-api/apidom-parser-adapter-arazzo-json-1@^1.0.0-beta.40 <1.0.0-rc.0":
+  version "1.0.0-beta.43"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-arazzo-json-1/-/apidom-parser-adapter-arazzo-json-1-1.0.0-beta.43.tgz#c443320e89ced2b7f927d17e80dcfd03820a65ce"
+  integrity sha512-aHOXZcNb6ciI6PUiYfW7LGCyWOcf2VTvl9k7Bnp78JCZ3S0BFOKiokH9E2MZSQuT6GkPkaEiUzKHsaYN0//Lhw==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-core" "^1.0.0-beta.30"
-    "@swagger-api/apidom-ns-arazzo-1" "^1.0.0-beta.30"
-    "@swagger-api/apidom-parser-adapter-yaml-1-2" "^1.0.0-beta.30"
+    "@swagger-api/apidom-core" "^1.0.0-beta.43"
+    "@swagger-api/apidom-ns-arazzo-1" "^1.0.0-beta.43"
+    "@swagger-api/apidom-parser-adapter-json" "^1.0.0-beta.43"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
 
-"@swagger-api/apidom-parser-adapter-asyncapi-json-2@^1.0.0-beta.3 <1.0.0-rc.0":
-  version "1.0.0-beta.3"
-  resolved "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-asyncapi-json-2/-/apidom-parser-adapter-asyncapi-json-2-1.0.0-beta.3.tgz"
-  integrity sha512-Z8xIy3pirwAapLgZ18BqRVua5rh0NsvQNpx+5Bi5yJD+SD6Syk5OqsgFkqN7T/LmyqpivQiYRgItUBaHXuDnxg==
+"@swagger-api/apidom-parser-adapter-arazzo-yaml-1@^1.0.0-beta.40 <1.0.0-rc.0":
+  version "1.0.0-beta.43"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-arazzo-yaml-1/-/apidom-parser-adapter-arazzo-yaml-1-1.0.0-beta.43.tgz#be7906d64cb50ea556daef7b4c82cfdb108a7303"
+  integrity sha512-ky9S4fNJSew6Z+LC3Kj/Fs4r0rKKFvbQhpsRnHau2m0Fg9GIKFB8XhNVy28vfJQ7V4YWHiSYm3Xf+0qla6h8+Q==
   dependencies:
-    "@babel/runtime-corejs3" "^7.20.7"
-    "@swagger-api/apidom-core" "^1.0.0-beta.3"
-    "@swagger-api/apidom-ns-asyncapi-2" "^1.0.0-beta.3"
-    "@swagger-api/apidom-parser-adapter-json" "^1.0.0-beta.3"
+    "@babel/runtime-corejs3" "^7.26.10"
+    "@swagger-api/apidom-core" "^1.0.0-beta.43"
+    "@swagger-api/apidom-ns-arazzo-1" "^1.0.0-beta.43"
+    "@swagger-api/apidom-parser-adapter-yaml-1-2" "^1.0.0-beta.43"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
 
-"@swagger-api/apidom-parser-adapter-asyncapi-yaml-2@^1.0.0-beta.3 <1.0.0-rc.0":
-  version "1.0.0-beta.3"
-  resolved "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-asyncapi-yaml-2/-/apidom-parser-adapter-asyncapi-yaml-2-1.0.0-beta.3.tgz"
-  integrity sha512-Xl9MU1+24ZTDuGzy/mKVPlnMSvgA/lS+AoqwMzxLMuiIsTmnQX3gEdiM+pXmK7rg1KV/k0aLwDLKt3e00CPiXQ==
+"@swagger-api/apidom-parser-adapter-asyncapi-json-2@^1.0.0-beta.40 <1.0.0-rc.0":
+  version "1.0.0-beta.43"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-asyncapi-json-2/-/apidom-parser-adapter-asyncapi-json-2-1.0.0-beta.43.tgz#e3c7699f539b90e1db675e8b27b8a2d75f6fc2fd"
+  integrity sha512-b1q2SK7t0EVU3TzmfX6/Qo9o3BtXbJLFqt9xihNeaNNzNx7gJmyvILNejWP/R9pv8GwWKZeDS3rKmrJMDrtloQ==
   dependencies:
-    "@babel/runtime-corejs3" "^7.20.7"
-    "@swagger-api/apidom-core" "^1.0.0-beta.3"
-    "@swagger-api/apidom-ns-asyncapi-2" "^1.0.0-beta.3"
-    "@swagger-api/apidom-parser-adapter-yaml-1-2" "^1.0.0-beta.3"
+    "@babel/runtime-corejs3" "^7.26.10"
+    "@swagger-api/apidom-core" "^1.0.0-beta.43"
+    "@swagger-api/apidom-ns-asyncapi-2" "^1.0.0-beta.43"
+    "@swagger-api/apidom-parser-adapter-json" "^1.0.0-beta.43"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
 
-"@swagger-api/apidom-parser-adapter-json@^1.0.0-beta.3", "@swagger-api/apidom-parser-adapter-json@^1.0.0-beta.3 <1.0.0-rc.0":
-  version "1.0.0-beta.3"
-  resolved "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-json/-/apidom-parser-adapter-json-1.0.0-beta.3.tgz"
-  integrity sha512-28zQdF8oeaUmNxZNU0De4JUY9jvxiaN+QCJ1GZN9aQ6NQ/eOAuGg+HRuL8+RrSe4STacdi1FCX46jHcMGQeqfg==
+"@swagger-api/apidom-parser-adapter-asyncapi-yaml-2@^1.0.0-beta.40 <1.0.0-rc.0":
+  version "1.0.0-beta.43"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-asyncapi-yaml-2/-/apidom-parser-adapter-asyncapi-yaml-2-1.0.0-beta.43.tgz#5f3e81ad293255647a2c238d63e0a1bd4b58e4e5"
+  integrity sha512-7MzYHLPzvuj+QGp4C5HwSpuWIZ+ywio0IUn6RJIboN0YLWcsUaapTL63uQ59nIsInM1yEh0mXg1aikt/BY58cA==
   dependencies:
-    "@babel/runtime-corejs3" "^7.20.7"
-    "@swagger-api/apidom-ast" "^1.0.0-beta.3"
-    "@swagger-api/apidom-core" "^1.0.0-beta.3"
-    "@swagger-api/apidom-error" "^1.0.0-beta.3"
+    "@babel/runtime-corejs3" "^7.26.10"
+    "@swagger-api/apidom-core" "^1.0.0-beta.43"
+    "@swagger-api/apidom-ns-asyncapi-2" "^1.0.0-beta.43"
+    "@swagger-api/apidom-parser-adapter-yaml-1-2" "^1.0.0-beta.43"
+    "@types/ramda" "~0.30.0"
+    ramda "~0.30.0"
+    ramda-adjunct "^5.0.0"
+
+"@swagger-api/apidom-parser-adapter-json@^1.0.0-beta.40 <1.0.0-rc.0", "@swagger-api/apidom-parser-adapter-json@^1.0.0-beta.43":
+  version "1.0.0-beta.43"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-json/-/apidom-parser-adapter-json-1.0.0-beta.43.tgz#60afcfb9e68cf43294ccc28575f16e527ad9a667"
+  integrity sha512-Jm14OxAVEiaNfXXxio/BVUr0Znf1OLRVMCHAalCYgc1745p2R0BBzbESVOQrEblgfPJxdR6NDst6gESKad32Tg==
+  dependencies:
+    "@babel/runtime-corejs3" "^7.26.10"
+    "@swagger-api/apidom-ast" "^1.0.0-beta.43"
+    "@swagger-api/apidom-core" "^1.0.0-beta.43"
+    "@swagger-api/apidom-error" "^1.0.0-beta.43"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
     tree-sitter "=0.21.1"
     tree-sitter-json "=0.24.8"
-    web-tree-sitter "=0.24.3"
-
-"@swagger-api/apidom-parser-adapter-json@^1.0.0-beta.30":
-  version "1.0.0-beta.30"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-json/-/apidom-parser-adapter-json-1.0.0-beta.30.tgz#2febfadd7e3e4ca755fcf954d44a01ee9e66e2ab"
-  integrity sha512-cciT19OOXafwBnXe9KFVwUGEVu4Zrvb4k12TYNlNqzVg1xA9pBc3Ywq5EgHIhiiQOLY3fILr0fr6B36N6irN2Q==
-  dependencies:
-    "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-ast" "^1.0.0-beta.30"
-    "@swagger-api/apidom-core" "^1.0.0-beta.30"
-    "@swagger-api/apidom-error" "^1.0.0-beta.30"
-    "@types/ramda" "~0.30.0"
-    ramda "~0.30.0"
-    ramda-adjunct "^5.0.0"
-    tree-sitter "=0.22.1"
-    tree-sitter-json "=0.24.8"
     web-tree-sitter "=0.24.5"
 
-"@swagger-api/apidom-parser-adapter-openapi-json-2@^1.0.0-beta.3 <1.0.0-rc.0":
-  version "1.0.0-beta.3"
-  resolved "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-openapi-json-2/-/apidom-parser-adapter-openapi-json-2-1.0.0-beta.3.tgz"
-  integrity sha512-ufiQMl89sTGf09qlh/QvFLEUs9FH9ZZV4mjz1xIB127rnNbWg/sSGr0WIcJGKoLrioI9orb+7aqIhmSDw/plmw==
-  dependencies:
-    "@babel/runtime-corejs3" "^7.20.7"
-    "@swagger-api/apidom-core" "^1.0.0-beta.3"
-    "@swagger-api/apidom-ns-openapi-2" "^1.0.0-beta.3"
-    "@swagger-api/apidom-parser-adapter-json" "^1.0.0-beta.3"
-    "@types/ramda" "~0.30.0"
-    ramda "~0.30.0"
-    ramda-adjunct "^5.0.0"
-
-"@swagger-api/apidom-parser-adapter-openapi-json-3-0@^1.0.0-beta.3 <1.0.0-rc.0":
-  version "1.0.0-beta.3"
-  resolved "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-openapi-json-3-0/-/apidom-parser-adapter-openapi-json-3-0-1.0.0-beta.3.tgz"
-  integrity sha512-yINlDTIZCywuKRsBeJJDmQLV4+r9FaWDezb4omw6xFQnQZQV1tHgIb549OsV6lT70TabLj+HoMYNLQ9/Bm59Yw==
-  dependencies:
-    "@babel/runtime-corejs3" "^7.20.7"
-    "@swagger-api/apidom-core" "^1.0.0-beta.3"
-    "@swagger-api/apidom-ns-openapi-3-0" "^1.0.0-beta.3"
-    "@swagger-api/apidom-parser-adapter-json" "^1.0.0-beta.3"
-    "@types/ramda" "~0.30.0"
-    ramda "~0.30.0"
-    ramda-adjunct "^5.0.0"
-
-"@swagger-api/apidom-parser-adapter-openapi-json-3-1@^1.0.0-beta.3 <1.0.0-rc.0":
-  version "1.0.0-beta.3"
-  resolved "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-openapi-json-3-1/-/apidom-parser-adapter-openapi-json-3-1-1.0.0-beta.3.tgz"
-  integrity sha512-kBZsyNHtp6w41g9N5c+PF4FqoE8vosxgYJEfhQeQs4qXK7T7d8sfjXwcnWRjqlOM4X8dt5R359h58AfwyEF20w==
-  dependencies:
-    "@babel/runtime-corejs3" "^7.20.7"
-    "@swagger-api/apidom-core" "^1.0.0-beta.3"
-    "@swagger-api/apidom-ns-openapi-3-1" "^1.0.0-beta.3"
-    "@swagger-api/apidom-parser-adapter-json" "^1.0.0-beta.3"
-    "@types/ramda" "~0.30.0"
-    ramda "~0.30.0"
-    ramda-adjunct "^5.0.0"
-
-"@swagger-api/apidom-parser-adapter-openapi-yaml-2@^1.0.0-beta.3 <1.0.0-rc.0":
-  version "1.0.0-beta.3"
-  resolved "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-openapi-yaml-2/-/apidom-parser-adapter-openapi-yaml-2-1.0.0-beta.3.tgz"
-  integrity sha512-K/FRLCuB0UD9Nq/CNqfjkSVfQfzcpA7lJCg6QueZKd0dQJ54dyHFU9AroshutXHTmEjBleoL7V1K3PNh10HiYQ==
-  dependencies:
-    "@babel/runtime-corejs3" "^7.20.7"
-    "@swagger-api/apidom-core" "^1.0.0-beta.3"
-    "@swagger-api/apidom-ns-openapi-2" "^1.0.0-beta.3"
-    "@swagger-api/apidom-parser-adapter-yaml-1-2" "^1.0.0-beta.3"
-    "@types/ramda" "~0.30.0"
-    ramda "~0.30.0"
-    ramda-adjunct "^5.0.0"
-
-"@swagger-api/apidom-parser-adapter-openapi-yaml-3-0@^1.0.0-beta.3 <1.0.0-rc.0":
-  version "1.0.0-beta.3"
-  resolved "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-openapi-yaml-3-0/-/apidom-parser-adapter-openapi-yaml-3-0-1.0.0-beta.3.tgz"
-  integrity sha512-EUdpzJnqZqCu2keEyOxlCED/u0oaA05c6dO48XzbdyENONY/etoN5wrEoqxqxOz+1cC+FZWj/cnmsXdFfbJlEg==
-  dependencies:
-    "@babel/runtime-corejs3" "^7.20.7"
-    "@swagger-api/apidom-core" "^1.0.0-beta.3"
-    "@swagger-api/apidom-ns-openapi-3-0" "^1.0.0-beta.3"
-    "@swagger-api/apidom-parser-adapter-yaml-1-2" "^1.0.0-beta.3"
-    "@types/ramda" "~0.30.0"
-    ramda "~0.30.0"
-    ramda-adjunct "^5.0.0"
-
-"@swagger-api/apidom-parser-adapter-openapi-yaml-3-1@^1.0.0-beta.3 <1.0.0-rc.0":
-  version "1.0.0-beta.3"
-  resolved "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-openapi-yaml-3-1/-/apidom-parser-adapter-openapi-yaml-3-1-1.0.0-beta.3.tgz"
-  integrity sha512-2Q9vmrgTQ4cA5WALGyTLp8tF984R9C7QmDOjGf/ngrTIQLyyrQZ0ZDaXL7RHTmT6K9Lg6axMpKquBNiO+Aff6g==
-  dependencies:
-    "@babel/runtime-corejs3" "^7.20.7"
-    "@swagger-api/apidom-core" "^1.0.0-beta.3"
-    "@swagger-api/apidom-ns-openapi-3-1" "^1.0.0-beta.3"
-    "@swagger-api/apidom-parser-adapter-yaml-1-2" "^1.0.0-beta.3"
-    "@types/ramda" "~0.30.0"
-    ramda "~0.30.0"
-    ramda-adjunct "^5.0.0"
-
-"@swagger-api/apidom-parser-adapter-yaml-1-2@^1.0.0-beta.3", "@swagger-api/apidom-parser-adapter-yaml-1-2@^1.0.0-beta.3 <1.0.0-rc.0":
-  version "1.0.0-beta.3"
-  resolved "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-yaml-1-2/-/apidom-parser-adapter-yaml-1-2-1.0.0-beta.3.tgz"
-  integrity sha512-sSGxnMTNNTqhJBeUOge4Q/5l/7170maoxyrK6J57kRxqkchSAqam73VIBpKa8c/sJ7zhdZI7CZ9aTJe/q7vc7w==
-  dependencies:
-    "@babel/runtime-corejs3" "^7.20.7"
-    "@swagger-api/apidom-ast" "^1.0.0-beta.3"
-    "@swagger-api/apidom-core" "^1.0.0-beta.3"
-    "@swagger-api/apidom-error" "^1.0.0-beta.3"
-    "@tree-sitter-grammars/tree-sitter-yaml" "=0.6.1"
-    "@types/ramda" "~0.30.0"
-    ramda "~0.30.0"
-    ramda-adjunct "^5.0.0"
-    tree-sitter "=0.21.1"
-    web-tree-sitter "=0.24.3"
-
-"@swagger-api/apidom-parser-adapter-yaml-1-2@^1.0.0-beta.30":
-  version "1.0.0-beta.30"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-yaml-1-2/-/apidom-parser-adapter-yaml-1-2-1.0.0-beta.30.tgz#b48d0f8093d976f97dbc86a51fa86f84dfec8f5a"
-  integrity sha512-NRmQehyw4gbDzeBAl0zjyPqj4e/jNYgqnRLcOsxTKpWODud8RHBqEvju/M6iET6ru0o+A9265efFzqR9hiE0LA==
+"@swagger-api/apidom-parser-adapter-openapi-json-2@^1.0.0-beta.40 <1.0.0-rc.0":
+  version "1.0.0-beta.43"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-openapi-json-2/-/apidom-parser-adapter-openapi-json-2-1.0.0-beta.43.tgz#2d102010908bf2956ebdb97b68c1dcc65132a35b"
+  integrity sha512-ZRmXBVgAxqMST9Dj+3mzQl7yqW/KT8+OnS8IrNjuDETkC/SjZ8oqKpnrOPCMfK6f++y/XPtjCMbomL5kZw/ZDQ==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-ast" "^1.0.0-beta.30"
-    "@swagger-api/apidom-core" "^1.0.0-beta.30"
-    "@swagger-api/apidom-error" "^1.0.0-beta.30"
-    "@tree-sitter-grammars/tree-sitter-yaml" "=0.7.0"
+    "@swagger-api/apidom-core" "^1.0.0-beta.43"
+    "@swagger-api/apidom-ns-openapi-2" "^1.0.0-beta.43"
+    "@swagger-api/apidom-parser-adapter-json" "^1.0.0-beta.43"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
-    tree-sitter "=0.22.1"
+
+"@swagger-api/apidom-parser-adapter-openapi-json-3-0@^1.0.0-beta.40 <1.0.0-rc.0":
+  version "1.0.0-beta.43"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-openapi-json-3-0/-/apidom-parser-adapter-openapi-json-3-0-1.0.0-beta.43.tgz#b7eb460bf1aef42aa25f927d1a0f57be762dbb30"
+  integrity sha512-Kvg0Yz1CTo1vED4T1yGnQuZqgs0VEKLfE5VjDN1tXrgoPcc8f+9Ve2omapIXz7UZ+WyYva9V+RDYPrzPLRevCw==
+  dependencies:
+    "@babel/runtime-corejs3" "^7.26.10"
+    "@swagger-api/apidom-core" "^1.0.0-beta.43"
+    "@swagger-api/apidom-ns-openapi-3-0" "^1.0.0-beta.43"
+    "@swagger-api/apidom-parser-adapter-json" "^1.0.0-beta.43"
+    "@types/ramda" "~0.30.0"
+    ramda "~0.30.0"
+    ramda-adjunct "^5.0.0"
+
+"@swagger-api/apidom-parser-adapter-openapi-json-3-1@^1.0.0-beta.40 <1.0.0-rc.0":
+  version "1.0.0-beta.43"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-openapi-json-3-1/-/apidom-parser-adapter-openapi-json-3-1-1.0.0-beta.43.tgz#aa7d0a2eb61fb316f54007e4ba3f1c0cbeb0de73"
+  integrity sha512-EorhEnAnmCOCtjzaWkIFPzFwndG62wfDXUh/rqcsaX95d7wN9LOxRGHsPMIL5S3qBhDYkXS7DHMiWOrRzGW+Cw==
+  dependencies:
+    "@babel/runtime-corejs3" "^7.26.10"
+    "@swagger-api/apidom-core" "^1.0.0-beta.43"
+    "@swagger-api/apidom-ns-openapi-3-1" "^1.0.0-beta.43"
+    "@swagger-api/apidom-parser-adapter-json" "^1.0.0-beta.43"
+    "@types/ramda" "~0.30.0"
+    ramda "~0.30.0"
+    ramda-adjunct "^5.0.0"
+
+"@swagger-api/apidom-parser-adapter-openapi-yaml-2@^1.0.0-beta.40 <1.0.0-rc.0":
+  version "1.0.0-beta.43"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-openapi-yaml-2/-/apidom-parser-adapter-openapi-yaml-2-1.0.0-beta.43.tgz#0294ecc20fcb42b9c2348ac06028025f175a71a1"
+  integrity sha512-7mfyAu0gY4QmbhTKe6m1k1Uj9/W6X2Iq8RY/lsz9NU5PHj7Q4VgyN1xYbx37fWzpIk+HQ/vB1ddCWi0uc3DwsA==
+  dependencies:
+    "@babel/runtime-corejs3" "^7.26.10"
+    "@swagger-api/apidom-core" "^1.0.0-beta.43"
+    "@swagger-api/apidom-ns-openapi-2" "^1.0.0-beta.43"
+    "@swagger-api/apidom-parser-adapter-yaml-1-2" "^1.0.0-beta.43"
+    "@types/ramda" "~0.30.0"
+    ramda "~0.30.0"
+    ramda-adjunct "^5.0.0"
+
+"@swagger-api/apidom-parser-adapter-openapi-yaml-3-0@^1.0.0-beta.40 <1.0.0-rc.0":
+  version "1.0.0-beta.43"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-openapi-yaml-3-0/-/apidom-parser-adapter-openapi-yaml-3-0-1.0.0-beta.43.tgz#defc2c019b20e1b38da784e882843e84a73d9355"
+  integrity sha512-LD62C+Q6lINNHTJ28JfgrllqWr9wbdRChHLP+nH0Bj0VbR6DKSKfSTyPbkN7FHM0qMcXOpj9kcmFY+e3p+u+NQ==
+  dependencies:
+    "@babel/runtime-corejs3" "^7.26.10"
+    "@swagger-api/apidom-core" "^1.0.0-beta.43"
+    "@swagger-api/apidom-ns-openapi-3-0" "^1.0.0-beta.43"
+    "@swagger-api/apidom-parser-adapter-yaml-1-2" "^1.0.0-beta.43"
+    "@types/ramda" "~0.30.0"
+    ramda "~0.30.0"
+    ramda-adjunct "^5.0.0"
+
+"@swagger-api/apidom-parser-adapter-openapi-yaml-3-1@^1.0.0-beta.40 <1.0.0-rc.0":
+  version "1.0.0-beta.43"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-openapi-yaml-3-1/-/apidom-parser-adapter-openapi-yaml-3-1-1.0.0-beta.43.tgz#c607659d6a9aac0c4b9d4f3e36ae369d7415257b"
+  integrity sha512-jMCbdIY93WNuhcLnUQEtrH5tvuaoBW4lnJLSJEwCO9gbCTc/Y5bAGiOls5bsZcUMX3INLG7hqgc0vPY662D76w==
+  dependencies:
+    "@babel/runtime-corejs3" "^7.26.10"
+    "@swagger-api/apidom-core" "^1.0.0-beta.43"
+    "@swagger-api/apidom-ns-openapi-3-1" "^1.0.0-beta.43"
+    "@swagger-api/apidom-parser-adapter-yaml-1-2" "^1.0.0-beta.43"
+    "@types/ramda" "~0.30.0"
+    ramda "~0.30.0"
+    ramda-adjunct "^5.0.0"
+
+"@swagger-api/apidom-parser-adapter-yaml-1-2@^1.0.0-beta.40 <1.0.0-rc.0", "@swagger-api/apidom-parser-adapter-yaml-1-2@^1.0.0-beta.43":
+  version "1.0.0-beta.43"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-yaml-1-2/-/apidom-parser-adapter-yaml-1-2-1.0.0-beta.43.tgz#d74928601b21cbc5ee4278317651c6bf70727dfa"
+  integrity sha512-1izTQNYBQoWQ3BDKDMdV07vx7fBtqIrIwsvu7474GGQ2z4J0hgV1XJXPcmj59A/2GX2NuRRmw24eB4ZN1YN99Q==
+  dependencies:
+    "@babel/runtime-corejs3" "^7.26.10"
+    "@swagger-api/apidom-ast" "^1.0.0-beta.43"
+    "@swagger-api/apidom-core" "^1.0.0-beta.43"
+    "@swagger-api/apidom-error" "^1.0.0-beta.43"
+    "@tree-sitter-grammars/tree-sitter-yaml" "=0.7.1"
+    "@types/ramda" "~0.30.0"
+    ramda "~0.30.0"
+    ramda-adjunct "^5.0.0"
+    tree-sitter "=0.22.4"
     web-tree-sitter "=0.24.5"
 
-"@swagger-api/apidom-reference@>=1.0.0-beta.13 <1.0.0-rc.0":
-  version "1.0.0-beta.30"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-reference/-/apidom-reference-1.0.0-beta.30.tgz#231f80df4060a88391ecd7cece6c71cc9ae60544"
-  integrity sha512-l1MpLMlmaX+y2hra5EadfR37sAMzmEz1wZomVcnw7vJEFlLQo3WwOdFvpQemPCZ9IJHUs+5zhZ++w7z60uKpSw==
+"@swagger-api/apidom-reference@>=1.0.0-beta.41 <1.0.0-rc.0":
+  version "1.0.0-beta.43"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-reference/-/apidom-reference-1.0.0-beta.43.tgz#03d487ae5ccd546db37588e1d347e5c03c0f4c14"
+  integrity sha512-XKg9Wxg0hrLQL969DWJCdGRnPg6k7P0MnaaN0jPy1gacHftkcdoY9rrIzfgCDIUrGxs9Xpks4V2F4MTS/tKh8Q==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-core" "^1.0.0-beta.30"
+    "@swagger-api/apidom-core" "^1.0.0-beta.43"
+    "@swagger-api/apidom-error" "^1.0.0-beta.43"
     "@types/ramda" "~0.30.0"
-    axios "^1.8.2"
+    axios "^1.9.0"
     minimatch "^7.4.3"
     process "^0.11.10"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
   optionalDependencies:
-    "@swagger-api/apidom-error" "^1.0.0-beta.3 <1.0.0-rc.0"
-    "@swagger-api/apidom-json-pointer" "^1.0.0-beta.3 <1.0.0-rc.0"
-    "@swagger-api/apidom-ns-arazzo-1" "^1.0.0-beta.3 <1.0.0-rc.0"
-    "@swagger-api/apidom-ns-asyncapi-2" "^1.0.0-beta.3 <1.0.0-rc.0"
-    "@swagger-api/apidom-ns-openapi-2" "^1.0.0-beta.3 <1.0.0-rc.0"
-    "@swagger-api/apidom-ns-openapi-3-0" "^1.0.0-beta.3 <1.0.0-rc.0"
-    "@swagger-api/apidom-ns-openapi-3-1" "^1.0.0-beta.3 <1.0.0-rc.0"
-    "@swagger-api/apidom-parser-adapter-api-design-systems-json" "^1.0.0-beta.3 <1.0.0-rc.0"
-    "@swagger-api/apidom-parser-adapter-api-design-systems-yaml" "^1.0.0-beta.3 <1.0.0-rc.0"
-    "@swagger-api/apidom-parser-adapter-arazzo-json-1" "^1.0.0-beta.3 <1.0.0-rc.0"
-    "@swagger-api/apidom-parser-adapter-arazzo-yaml-1" "^1.0.0-beta.3 <1.0.0-rc.0"
-    "@swagger-api/apidom-parser-adapter-asyncapi-json-2" "^1.0.0-beta.3 <1.0.0-rc.0"
-    "@swagger-api/apidom-parser-adapter-asyncapi-yaml-2" "^1.0.0-beta.3 <1.0.0-rc.0"
-    "@swagger-api/apidom-parser-adapter-json" "^1.0.0-beta.3 <1.0.0-rc.0"
-    "@swagger-api/apidom-parser-adapter-openapi-json-2" "^1.0.0-beta.3 <1.0.0-rc.0"
-    "@swagger-api/apidom-parser-adapter-openapi-json-3-0" "^1.0.0-beta.3 <1.0.0-rc.0"
-    "@swagger-api/apidom-parser-adapter-openapi-json-3-1" "^1.0.0-beta.3 <1.0.0-rc.0"
-    "@swagger-api/apidom-parser-adapter-openapi-yaml-2" "^1.0.0-beta.3 <1.0.0-rc.0"
-    "@swagger-api/apidom-parser-adapter-openapi-yaml-3-0" "^1.0.0-beta.3 <1.0.0-rc.0"
-    "@swagger-api/apidom-parser-adapter-openapi-yaml-3-1" "^1.0.0-beta.3 <1.0.0-rc.0"
-    "@swagger-api/apidom-parser-adapter-yaml-1-2" "^1.0.0-beta.3 <1.0.0-rc.0"
+    "@swagger-api/apidom-json-pointer" "^1.0.0-beta.40 <1.0.0-rc.0"
+    "@swagger-api/apidom-ns-arazzo-1" "^1.0.0-beta.40 <1.0.0-rc.0"
+    "@swagger-api/apidom-ns-asyncapi-2" "^1.0.0-beta.40 <1.0.0-rc.0"
+    "@swagger-api/apidom-ns-openapi-2" "^1.0.0-beta.40 <1.0.0-rc.0"
+    "@swagger-api/apidom-ns-openapi-3-0" "^1.0.0-beta.40 <1.0.0-rc.0"
+    "@swagger-api/apidom-ns-openapi-3-1" "^1.0.0-beta.40 <1.0.0-rc.0"
+    "@swagger-api/apidom-parser-adapter-api-design-systems-json" "^1.0.0-beta.40 <1.0.0-rc.0"
+    "@swagger-api/apidom-parser-adapter-api-design-systems-yaml" "^1.0.0-beta.40 <1.0.0-rc.0"
+    "@swagger-api/apidom-parser-adapter-arazzo-json-1" "^1.0.0-beta.40 <1.0.0-rc.0"
+    "@swagger-api/apidom-parser-adapter-arazzo-yaml-1" "^1.0.0-beta.40 <1.0.0-rc.0"
+    "@swagger-api/apidom-parser-adapter-asyncapi-json-2" "^1.0.0-beta.40 <1.0.0-rc.0"
+    "@swagger-api/apidom-parser-adapter-asyncapi-yaml-2" "^1.0.0-beta.40 <1.0.0-rc.0"
+    "@swagger-api/apidom-parser-adapter-json" "^1.0.0-beta.40 <1.0.0-rc.0"
+    "@swagger-api/apidom-parser-adapter-openapi-json-2" "^1.0.0-beta.40 <1.0.0-rc.0"
+    "@swagger-api/apidom-parser-adapter-openapi-json-3-0" "^1.0.0-beta.40 <1.0.0-rc.0"
+    "@swagger-api/apidom-parser-adapter-openapi-json-3-1" "^1.0.0-beta.40 <1.0.0-rc.0"
+    "@swagger-api/apidom-parser-adapter-openapi-yaml-2" "^1.0.0-beta.40 <1.0.0-rc.0"
+    "@swagger-api/apidom-parser-adapter-openapi-yaml-3-0" "^1.0.0-beta.40 <1.0.0-rc.0"
+    "@swagger-api/apidom-parser-adapter-openapi-yaml-3-1" "^1.0.0-beta.40 <1.0.0-rc.0"
+    "@swagger-api/apidom-parser-adapter-yaml-1-2" "^1.0.0-beta.40 <1.0.0-rc.0"
 
 "@swaggerexpert/cookie@^2.0.2":
   version "2.0.2"
@@ -3197,6 +3070,13 @@
   dependencies:
     apg-lite "^1.0.3"
 
+"@swaggerexpert/json-pointer@^2.10.1":
+  version "2.10.2"
+  resolved "https://registry.yarnpkg.com/@swaggerexpert/json-pointer/-/json-pointer-2.10.2.tgz#3f4f8082f166e77021113a401f1f2c4e4b45d574"
+  integrity sha512-qMx1nOrzoB+PF+pzb26Q4Tc2sOlrx9Ba2UBNX9hB31Omrq+QoZ2Gly0KLrQWw4Of1AQ4J9lnD+XOdwOdcdXqqw==
+  dependencies:
+    apg-lite "^1.0.4"
+
 "@szmarczak/http-timer@^5.0.1":
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-5.0.1.tgz#c7c1bf1141cdd4751b0399c8fc7b8b664cd5be3a"
@@ -3204,20 +3084,12 @@
   dependencies:
     defer-to-connect "^2.0.1"
 
-"@tree-sitter-grammars/tree-sitter-yaml@=0.6.1":
-  version "0.6.1"
-  resolved "https://registry.npmjs.org/@tree-sitter-grammars/tree-sitter-yaml/-/tree-sitter-yaml-0.6.1.tgz"
-  integrity sha512-FqgUNdtMuPpk5D/9YQvCxTK4tzlUEVq/yNewdcxJbMv0KVt/yDfuuUn5ZvxphftKyOco+1e/6/oNHCKVQ5A83Q==
+"@tree-sitter-grammars/tree-sitter-yaml@=0.7.1":
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/@tree-sitter-grammars/tree-sitter-yaml/-/tree-sitter-yaml-0.7.1.tgz#9fcf9c56c7b4adb19097f869ada29c2d7a62c93d"
+  integrity sha512-AynBwkIoQCTgjDR33bDUp9Mqq+YTco0is3n5hRApMqG9of/6A4eQsfC1/uSEeHSUyMQSYawcAWamsexnVpIP4Q==
   dependencies:
-    node-addon-api "^8.0.0"
-    node-gyp-build "^4.8.0"
-
-"@tree-sitter-grammars/tree-sitter-yaml@=0.7.0":
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/@tree-sitter-grammars/tree-sitter-yaml/-/tree-sitter-yaml-0.7.0.tgz#83995463cdeed8bb9ad2cdcbeb4d4aed9472411f"
-  integrity sha512-GOMIK3IaDvECD0eZEhAsLl03RMtM1E8StxuGMn6PpMKFg7jyQ+jSzxJZ4Jmc/tYitah9/AECt8o4tlRQ5yEZQg==
-  dependencies:
-    node-addon-api "^8.3.0"
+    node-addon-api "^8.3.1"
     node-gyp-build "^4.8.4"
 
 "@trysound/sax@0.2.0":
@@ -3609,7 +3481,7 @@
   dependencies:
     "@types/istanbul-lib-report" "*"
 
-"@types/json-schema@*", "@types/json-schema@^7.0.15", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
+"@types/json-schema@*", "@types/json-schema@^7.0.15", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
   version "7.0.15"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
   integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
@@ -3665,11 +3537,6 @@
   resolved "https://registry.yarnpkg.com/@types/prismjs/-/prismjs-1.26.5.tgz#72499abbb4c4ec9982446509d2f14fb8483869d6"
   integrity sha512-AUZTa7hQ2KY5L7AmtSiqxlhWxb4ina0yd8hNbl4TWuqnv/pFP0nDMb3YrfSBf4hJVGLh2YEIBfKaBW/9UEl6IQ==
 
-"@types/prop-types@*":
-  version "15.7.14"
-  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.14.tgz#1433419d73b2a7ebfc6918dcefd2ec0d5cd698f2"
-  integrity sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ==
-
 "@types/qs@*":
   version "6.9.18"
   resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.18.tgz#877292caa91f7c1b213032b34626505b746624c2"
@@ -3713,21 +3580,13 @@
     "@types/history" "^4.7.11"
     "@types/react" "*"
 
-"@types/react@*":
-  version "19.1.2"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-19.1.2.tgz#11df86f66f188f212c90ecb537327ec68bfd593f"
-  integrity sha512-oxLPMytKchWGbnQM9O7D67uPa9paTNxO7jVoNMXgkkErULBPhPARCfkKL9ytcIJJRGjbsVwW4ugJzyFFvm/Tiw==
+"@types/react@*", "@types/react@^19.1.8":
+  version "19.1.8"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-19.1.8.tgz#ff8395f2afb764597265ced15f8dddb0720ae1c3"
+  integrity sha512-AwAfQ2Wa5bCx9WP8nZL2uMZWod7J7/JSplxbTmBQ5ms6QpqNYm672H0Vu9ZVKVngQ+ii4R/byguVEUZQyeg44g==
   dependencies:
     csstype "^3.0.2"
 
-"@types/react@^18.3.12":
-  version "18.3.12"
-  resolved "https://registry.npmjs.org/@types/react/-/react-18.3.12.tgz"
-  integrity sha512-D2wOSq/d6Agt28q7rSI3jhU7G6aiuzljDGZ2hTZHIkrTLUI+AF3WMeKkEZ9nN2fkBAlcktT6vcZjDFiIhMYEQw==
-  dependencies:
-    "@types/prop-types" "*"
-    csstype "^3.0.2"
-
 "@types/retry@0.12.0":
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d"
@@ -4060,7 +3919,7 @@ acorn@^8.0.0, acorn@^8.0.4, acorn@^8.11.0, acorn@^8.14.0, acorn@^8.8.2, acorn@^8
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.14.1.tgz#721d5dc10f7d5b5609a891773d47731796935dfb"
   integrity sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==
 
-address@^1.0.1, address@^1.1.2:
+address@^1.0.1:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/address/-/address-1.2.2.tgz#2b5248dac5485a6390532c6a517fda2e3faac89e"
   integrity sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA==
@@ -4080,7 +3939,7 @@ ajv-formats@^2.1.1:
   dependencies:
     ajv "^8.0.0"
 
-ajv-keywords@^3.4.1, ajv-keywords@^3.5.2:
+ajv-keywords@^3.5.2:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
   integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
@@ -4092,7 +3951,7 @@ ajv-keywords@^5.1.0:
   dependencies:
     fast-deep-equal "^3.1.3"
 
-ajv@^6.12.2, ajv@^6.12.4, ajv@^6.12.5:
+ajv@^6.12.4, ajv@^6.12.5:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -4179,12 +4038,12 @@ ansi-styles@^6.1.0:
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
   integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
 
-antd@^5.25.1:
-  version "5.25.1"
-  resolved "https://registry.yarnpkg.com/antd/-/antd-5.25.1.tgz#859b419a18d113492304ccd66c29074a71902241"
-  integrity sha512-4KC7KuPCjr0z3Vuw9DsF+ceqJaPLbuUI3lOX1sY8ix25ceamp+P8yxOmk3Y2JHCD2ZAhq+5IQ/DTJRN2adWYKQ==
+antd@^5.26.3:
+  version "5.26.3"
+  resolved "https://registry.yarnpkg.com/antd/-/antd-5.26.3.tgz#cbbb7e1b48a972dc7b6ee8b6948f51cc91c263f8"
+  integrity sha512-M/s9Q39h/+G7AWnS6fbNxmAI9waTH4ti022GVEXBLq2j810V1wJ3UOQps13nEilzDNcyxnFN/EIbqIgS7wSYaA==
   dependencies:
-    "@ant-design/colors" "^7.2.0"
+    "@ant-design/colors" "^7.2.1"
     "@ant-design/cssinjs" "^1.23.0"
     "@ant-design/cssinjs-utils" "^1.1.3"
     "@ant-design/fast-color" "^2.0.6"
@@ -4195,7 +4054,7 @@ antd@^5.25.1:
     "@rc-component/mutate-observer" "^1.1.0"
     "@rc-component/qrcode" "~1.0.0"
     "@rc-component/tour" "~1.15.1"
-    "@rc-component/trigger" "^2.2.6"
+    "@rc-component/trigger" "^2.2.7"
     classnames "^2.5.1"
     copy-to-clipboard "^3.3.3"
     dayjs "^1.11.11"
@@ -4203,7 +4062,7 @@ antd@^5.25.1:
     rc-checkbox "~3.5.0"
     rc-collapse "~3.9.0"
     rc-dialog "~9.6.0"
-    rc-drawer "~7.2.0"
+    rc-drawer "~7.3.0"
     rc-dropdown "~4.2.1"
     rc-field-form "~2.7.0"
     rc-image "~7.12.0"
@@ -4219,17 +4078,17 @@ antd@^5.25.1:
     rc-rate "~2.13.1"
     rc-resize-observer "^1.4.3"
     rc-segmented "~2.7.0"
-    rc-select "~14.16.7"
+    rc-select "~14.16.8"
     rc-slider "~11.1.8"
     rc-steps "~6.0.1"
     rc-switch "~4.1.0"
-    rc-table "~7.50.4"
+    rc-table "~7.51.1"
     rc-tabs "~15.6.1"
     rc-textarea "~1.10.0"
     rc-tooltip "~6.4.0"
     rc-tree "~5.13.1"
     rc-tree-select "~5.27.0"
-    rc-upload "~4.9.0"
+    rc-upload "~4.9.2"
     rc-util "^5.44.4"
     scroll-into-view-if-needed "^3.1.0"
     throttle-debounce "^5.0.2"
@@ -4365,11 +4224,6 @@ asynckit@^0.4.0:
   resolved "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"
   integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
 
-at-least-node@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
-  integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
-
 autolinker@^3.11.0:
   version "3.16.2"
   resolved "https://registry.npmjs.org/autolinker/-/autolinker-3.16.2.tgz"
@@ -4377,7 +4231,7 @@ autolinker@^3.11.0:
   dependencies:
     tslib "^2.3.0"
 
-autoprefixer@^10.4.19:
+autoprefixer@^10.4.19, autoprefixer@^10.4.21:
   version "10.4.21"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.21.tgz#77189468e7a8ad1d9a37fbc08efc9f480cf0a95d"
   integrity sha512-O+A6LWV5LDHSJD3LjHYoNi4VLsj/Whi7k6zG12xTYaU4cQ8oxQGckXNX8cRHK5yOZ/ppVHe0ZBXGzSV9jXdVbQ==
@@ -4396,10 +4250,10 @@ available-typed-arrays@^1.0.7:
   dependencies:
     possible-typed-array-names "^1.0.0"
 
-axios@^1.8.2:
-  version "1.8.4"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.8.4.tgz#78990bb4bc63d2cae072952d374835950a82f447"
-  integrity sha512-eBSYY4Y68NNlHbHBMdeDmKNtDgXWhQsJcGqzO3iLUM0GraQFSS9cVgPX5I9b3lbdFKyYoAEGAZF1DwhTaljNAw==
+axios@^1.9.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.10.0.tgz#af320aee8632eaf2a400b6a1979fa75856f38d54"
+  integrity sha512-/1xYAC4MP/HEG+3duIhFr4ZQXR4sQXOIe+o6sdqzeykGLx6Upp/1p8MHqhINOvGeP7xyNHe7tsiJByc4SSVUxw==
   dependencies:
     follow-redirects "^1.15.6"
     form-data "^4.0.0"
@@ -4564,17 +4418,17 @@ boxen@^7.0.0:
     wrap-ansi "^8.1.0"
 
 brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.12.tgz#ab9b454466e5a8cc3a187beaad580412a9c5b843"
+  integrity sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==
   dependencies:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
 brace-expansion@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz"
-  integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.2.tgz#54fc53237a613d854c7bd37463aad17df87214e7"
+  integrity sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==
   dependencies:
     balanced-match "^1.0.0"
 
@@ -4585,7 +4439,7 @@ braces@^3.0.3, braces@~3.0.2:
   dependencies:
     fill-range "^7.1.1"
 
-browserslist@^4.0.0, browserslist@^4.18.1, browserslist@^4.23.0, browserslist@^4.24.0, browserslist@^4.24.4:
+browserslist@^4.0.0, browserslist@^4.23.0, browserslist@^4.24.0, browserslist@^4.24.4:
   version "4.24.4"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.24.4.tgz#c6b2865a3f08bcb860a0e827389003b9fe686e4b"
   integrity sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==
@@ -4595,6 +4449,16 @@ browserslist@^4.0.0, browserslist@^4.18.1, browserslist@^4.23.0, browserslist@^4
     node-releases "^2.0.19"
     update-browserslist-db "^1.1.1"
 
+browserslist@^4.25.0:
+  version "4.25.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.25.0.tgz#986aa9c6d87916885da2b50d8eb577ac8d133b2c"
+  integrity sha512-PJ8gYKeS5e/whHBh8xrwYK+dAvEj7JXtz6uTucnMRB8OiGTsKccFekoRrjajPBHV8oOY+2tI4uxeceSimKwMFA==
+  dependencies:
+    caniuse-lite "^1.0.30001718"
+    electron-to-chromium "^1.5.160"
+    node-releases "^2.0.19"
+    update-browserslist-db "^1.1.3"
+
 buffer-from@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
@@ -4692,12 +4556,17 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001688, caniuse-lite@^1.0.30001702:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001714.tgz#cfd27ff07e6fa20a0f45c7a10d28a0ffeaba2122"
   integrity sha512-mtgapdwDLSSBnCI3JokHM7oEQBLxiJKVRtg10AxM1AyeiKcM96f0Mkbqeq+1AbiCtvMcHRulAAEMu693JrSWqg==
 
+caniuse-lite@^1.0.30001718:
+  version "1.0.30001723"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001723.tgz#c4f3174f02089720736e1887eab345e09bb10944"
+  integrity sha512-1R/elMjtehrFejxwmexeXAtae5UO9iSyFn6G/I806CYC/BLyyBk1EPhrKBkWhy6wM6Xnm47dSJQec+tLJ39WHw==
+
 ccount@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/ccount/-/ccount-2.0.1.tgz#17a3bf82302e0870d6da43a01311a8bc02a3ecf5"
   integrity sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==
 
-chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.2:
+chalk@^4.0.0, chalk@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -4794,7 +4663,7 @@ chevrotain@~11.0.3:
     "@chevrotain/utils" "11.0.3"
     lodash-es "4.17.21"
 
-chokidar@^3.4.2, chokidar@^3.5.3:
+chokidar@^3.5.3:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b"
   integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==
@@ -4824,7 +4693,7 @@ classnames@2.x, classnames@^2.2.1, classnames@^2.2.3, classnames@^2.2.5, classna
   resolved "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz"
   integrity sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==
 
-clean-css@^5.2.2, clean-css@^5.3.2, clean-css@~5.3.2:
+clean-css@^5.2.2, clean-css@^5.3.3, clean-css@~5.3.2:
   version "5.3.3"
   resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-5.3.3.tgz#b330653cd3bd6b75009cc25c714cae7b93351ccd"
   integrity sha512-D5J+kHaVb/wKSFcyyV75uCn8fiY4sV38XJoe4CUyGQ+mOU/fMVYUdH1hJC+CJQ5uY3EnW27SbJYS4X8BiLrAFg==
@@ -5174,7 +5043,7 @@ css-has-pseudo@^7.0.2:
     postcss-selector-parser "^7.0.0"
     postcss-value-parser "^4.2.0"
 
-css-loader@^6.8.1:
+css-loader@^6.11.0:
   version "6.11.0"
   resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.11.0.tgz#33bae3bf6363d0a7c2cf9031c96c744ff54d85ba"
   integrity sha512-CTJ+AEQJjq5NzLga5pE39qdiSV56F8ywCIsqNIRF0r7BDgWsN25aazToqAFg7ZrtA/U016xudB3ffgweORxX7g==
@@ -5253,10 +5122,10 @@ css.escape@1.5.1:
   resolved "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz"
   integrity sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg==
 
-cssdb@^8.2.3:
-  version "8.2.5"
-  resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-8.2.5.tgz#728313b62c744ea1590f740ef7827ec0ef5f80a1"
-  integrity sha512-leAt8/hdTCtzql9ZZi86uYAmCLzVKpJMMdjbvOGVnXFXz/BWFpBmM1MHEHU/RqtPyRYmabVmEW1DtX3YGLuuLA==
+cssdb@^8.3.0:
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-8.3.0.tgz#940becad497b8509ad822a28fb0cfe54c969ccfe"
+  integrity sha512-c7bmItIg38DgGjSwDPZOYF/2o0QU/sSgkWOMyl8votOfgFuyiFKWPesmCGEsrGLxEA9uL540cp8LdaGEjUGsZQ==
 
 cssesc@^3.0.0:
   version "3.0.0"
@@ -5677,7 +5546,7 @@ debounce@^1.2.1:
   resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.1.tgz#38881d8f4166a5c5848020c11827b834bcb3e0a5"
   integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==
 
-debug@2.6.9, debug@^2.6.0:
+debug@2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -5722,7 +5591,7 @@ deep-is@^0.1.3:
   resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz"
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
 
-deepmerge@^4.2.2, deepmerge@^4.3.1, deepmerge@~4.3.0:
+deepmerge@^4.3.1, deepmerge@~4.3.0:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a"
   integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==
@@ -5762,20 +5631,6 @@ define-properties@^1.1.3, define-properties@^1.2.1:
     has-property-descriptors "^1.0.0"
     object-keys "^1.1.1"
 
-del@^6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/del/-/del-6.1.1.tgz#3b70314f1ec0aa325c6b14eb36b95786671edb7a"
-  integrity sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg==
-  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"
-
 delaunator@5:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/delaunator/-/delaunator-5.0.1.tgz#39032b08053923e924d6094fe2cde1a99cc51278"
@@ -5813,14 +5668,6 @@ detect-node@^2.0.4:
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
   integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==
 
-detect-port-alt@^1.1.6:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/detect-port-alt/-/detect-port-alt-1.1.6.tgz#24707deabe932d4a3cf621302027c2b266568275"
-  integrity sha512-5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q==
-  dependencies:
-    address "^1.0.1"
-    debug "^2.6.0"
-
 detect-port@^1.5.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/detect-port/-/detect-port-1.6.1.tgz#45e4073997c5f292b957cb678fb0bb8ed4250a67"
@@ -5989,6 +5836,11 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
+electron-to-chromium@^1.5.160:
+  version "1.5.170"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.170.tgz#9f6697de4339e24da8b234e4492a9ecb91f5989c"
+  integrity sha512-GP+M7aeluQo9uAyiTCxgIj/j+PrWhMlY7LFVj8prlsPljd0Fdg9AprlfUi+OCSFWy9Y5/2D/Jrj9HS8Z4rpKWA==
+
 electron-to-chromium@^1.5.73:
   version "1.5.138"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.138.tgz#319e775179bd0889ed96a04d4390d355fb315a44"
@@ -6470,7 +6322,7 @@ eval@^0.1.8:
     "@types/node" "*"
     require-like ">= 0.1.1"
 
-eventemitter3@^4.0.0:
+eventemitter3@^4.0.0, eventemitter3@^4.0.4:
   version "4.0.7"
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
   integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
@@ -6480,7 +6332,7 @@ events@^3.2.0:
   resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
   integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
 
-execa@^5.0.0:
+execa@5.1.1, execa@^5.0.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
   integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
@@ -6647,11 +6499,6 @@ file-loader@^6.2.0:
     loader-utils "^2.0.0"
     schema-utils "^3.0.0"
 
-filesize@^8.0.6:
-  version "8.0.7"
-  resolved "https://registry.yarnpkg.com/filesize/-/filesize-8.0.7.tgz#695e70d80f4e47012c132d57a059e80c6b580bd8"
-  integrity sha512-pjmC+bkIF8XI7fWaH8KxHcZL3DPybs1roSKP4rKDvy20tAWwIObE4+JIseG2byfGKhud5ZnM4YSGKBz7Sh0ndQ==
-
 fill-range@^7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
@@ -6685,13 +6532,6 @@ find-root@^1.1.0:
   resolved "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz"
   integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==
 
-find-up@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
-  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
-  dependencies:
-    locate-path "^3.0.0"
-
 find-up@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
@@ -6744,25 +6584,6 @@ for-each@^0.3.3:
   dependencies:
     is-callable "^1.2.7"
 
-fork-ts-checker-webpack-plugin@^6.5.0:
-  version "6.5.3"
-  resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.3.tgz#eda2eff6e22476a2688d10661688c47f611b37f3"
-  integrity sha512-SbH/l9ikmMWycd5puHJKTkZJKddF4iRLyW3DeZ08HTI7NGyLS38MXd/KGgeWumQO7YNQbW2u/NtPT2YowbPaGQ==
-  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"
-
 form-data-encoder@^2.1.2:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/form-data-encoder/-/form-data-encoder-2.1.4.tgz#261ea35d2a70d48d30ec7a9603130fa5515e9cd5"
@@ -6806,16 +6627,6 @@ fs-extra@^11.1.1, fs-extra@^11.2.0:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
-fs-extra@^9.0.0:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
-  integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
-  dependencies:
-    at-least-node "^1.0.0"
-    graceful-fs "^4.2.0"
-    jsonfile "^6.0.1"
-    universalify "^2.0.0"
-
 fs-monkey@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.6.tgz#8ead082953e88d992cf3ff844faa907b26756da2"
@@ -6946,7 +6757,7 @@ glob-to-regexp@^0.4.1:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
-glob@^7.0.0, glob@^7.1.3, glob@^7.1.6:
+glob@^7.1.3:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -6965,22 +6776,6 @@ global-dirs@^3.0.0:
   dependencies:
     ini "2.0.0"
 
-global-modules@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780"
-  integrity sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==
-  dependencies:
-    global-prefix "^3.0.0"
-
-global-prefix@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97"
-  integrity sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==
-  dependencies:
-    ini "^1.3.5"
-    kind-of "^6.0.2"
-    which "^1.3.1"
-
 globals@^11.1.0:
   version "11.12.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
@@ -7006,7 +6801,7 @@ globalthis@^1.0.4:
     define-properties "^1.2.1"
     gopd "^1.0.1"
 
-globby@^11.0.1, globby@^11.0.4, globby@^11.1.0:
+globby@^11.1.0:
   version "11.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
   integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
@@ -7490,23 +7285,16 @@ ignore@^5.2.0, ignore@^5.2.4:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5"
   integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==
 
-image-size@^1.0.2:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/image-size/-/image-size-1.2.1.tgz#ee118aedfe666db1a6ee12bed5821cde3740276d"
-  integrity sha512-rH+46sQJ2dlwfjfhCyNx5thzrv+dtmBIhPHk0zgRUukHzZ/kRueTJXoYYsclBaKcSMBWuGbOFXtioLpzTb5euw==
-  dependencies:
-    queue "6.0.2"
+image-size@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/image-size/-/image-size-2.0.2.tgz#84a7b43704db5736f364bf0d1b029821299b4bdc"
+  integrity sha512-IRqXKlaXwgSMAMtpNzZa1ZAe8m+Sa1770Dhk8VkSsP9LS+iHD62Zd8FQKs8fbPiagBE7BzoFX23cxFnwshpV6w==
 
 image-size@~0.5.0:
   version "0.5.5"
   resolved "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz"
   integrity sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==
 
-immer@^9.0.7:
-  version "9.0.21"
-  resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.21.tgz#1e025ea31a40f24fb064f1fef23e931496330176"
-  integrity sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA==
-
 immutable@^3.x.x:
   version "3.8.2"
   resolved "https://registry.npmjs.org/immutable/-/immutable-3.8.2.tgz"
@@ -7571,7 +7359,7 @@ ini@2.0.0:
   resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5"
   integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==
 
-ini@^1.3.4, ini@^1.3.5, ini@~1.3.0:
+ini@^1.3.4, ini@~1.3.0:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
@@ -7600,11 +7388,6 @@ internmap@^1.0.0:
   resolved "https://registry.yarnpkg.com/internmap/-/internmap-1.0.1.tgz#0017cc8a3b99605f0302f2b198d272e015e5df95"
   integrity sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw==
 
-interpret@^1.0.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e"
-  integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==
-
 invariant@^2.2.2, invariant@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
@@ -7836,11 +7619,6 @@ is-obj@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
   integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==
 
-is-path-cwd@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb"
-  integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==
-
 is-path-inside@^3.0.2, is-path-inside@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
@@ -7878,11 +7656,6 @@ is-regexp@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
   integrity sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA==
 
-is-root@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-root/-/is-root-2.1.0.tgz#809e18129cf1129644302a4f8544035d51984a9c"
-  integrity sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg==
-
 is-set@^2.0.3:
   version "2.0.3"
   resolved "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz"
@@ -8270,11 +8043,6 @@ loader-utils@^2.0.0:
     emojis-list "^3.0.0"
     json5 "^2.1.2"
 
-loader-utils@^3.2.0:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-3.3.1.tgz#735b9a19fd63648ca7adbd31c2327dfe281304e5"
-  integrity sha512-FMJTLMXfCLMLfJxcX9PFqX5qD88Z5MRGaZCVzfuqeZSPsyiBzs+pahDQjbIWz2QIzPZz0NX9Zy4FX3lmK6YHIg==
-
 local-pkg@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/local-pkg/-/local-pkg-1.1.1.tgz#f5fe74a97a3bd3c165788ee08ca9fbe998dc58dd"
@@ -8284,14 +8052,6 @@ local-pkg@^1.0.0:
     pkg-types "^2.0.1"
     quansync "^0.2.8"
 
-locate-path@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
-  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
-  dependencies:
-    p-locate "^3.0.0"
-    path-exists "^3.0.0"
-
 locate-path@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
@@ -8643,7 +8403,7 @@ media-typer@0.3.0:
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
   integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==
 
-memfs@^3.1.2, memfs@^3.4.3:
+memfs@^3.4.3:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.6.0.tgz#d7a2110f86f79dd950a8b6df6d57bc984aa185f6"
   integrity sha512-EGowvkkgbMcIChjMTMkESFDbZeSh8xZ7kNSF0hAiAN4Jh6jgHCRS0Ga/+C8y6Au+oqpezRHCfPsmJ2+DwAgiwQ==
@@ -8665,7 +8425,7 @@ merge2@^1.3.0, merge2@^1.4.1:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
-mermaid@>=10.4:
+mermaid@>=11.6.0:
   version "11.6.0"
   resolved "https://registry.yarnpkg.com/mermaid/-/mermaid-11.6.0.tgz#eee45cdc3087be561a19faf01745596d946bb575"
   integrity sha512-PE8hGUy1LDlWIHWBP05SFdqUHGmRcCcK4IzpOKPE35eOw+G9zZgcnMpyunJVUEOgb//KBORPjysKndw8bFLuRg==
@@ -9169,7 +8929,7 @@ mimic-response@^4.0.0:
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-4.0.0.tgz#35468b19e7c75d10f5165ea25e75a5ceea7cf70f"
   integrity sha512-e5ISH9xMYU0DzrT+jl8q2ze9D6eWBto+I8CNpe+VI+K2J/F/k3PdkdTdz4wvGVH4NTpo+NRYTVIuMQEMMcsLqg==
 
-mini-css-extract-plugin@^2.9.1:
+mini-css-extract-plugin@^2.9.2:
   version "2.9.2"
   resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.2.tgz#966031b468917a5446f4c24a80854b2947503c5b"
   integrity sha512-GJuACcS//jtq4kCtd5ii/M0SZf7OZRH+BxdqXZHaJfb8TJiVl+NgQRPwiYt2EuqeSkNydn/7vP+bcE27C5mb9w==
@@ -9189,7 +8949,7 @@ minimalistic-assert@^1.0.0:
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
   integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
 
-minimatch@3.1.2, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
+minimatch@3.1.2, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -9246,7 +9006,7 @@ multicast-dns@^7.2.5:
     dns-packet "^5.2.2"
     thunky "^1.0.2"
 
-nanoid@^3.3.8:
+nanoid@^3.3.11, nanoid@^3.3.8:
   version "3.3.11"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.11.tgz#4f4f112cefbe303202f2199838128936266d185b"
   integrity sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==
@@ -9307,11 +9067,16 @@ node-addon-api@^8.0.0, node-addon-api@^8.2.2:
   resolved "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.3.0.tgz"
   integrity sha512-8VOpLHFrOQlAH+qA0ZzuGRlALRA6/LVh8QJldbrC4DY0hXoMP0l4Acq8TzFC018HztWiRqyCEj2aTWY2UvnJUg==
 
-node-addon-api@^8.2.1, node-addon-api@^8.3.0:
+node-addon-api@^8.3.0:
   version "8.3.1"
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-8.3.1.tgz#53bc8a4f8dbde3de787b9828059da94ba9fd4eed"
   integrity sha512-lytcDEdxKjGJPTLEfW4mYMigRezMlyJY8W4wxJK8zE533Jlb8L8dRuObJFWg2P+AuOIxoCgKF+2Oq4d4Zd0OUA==
 
+node-addon-api@^8.3.1:
+  version "8.4.0"
+  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-8.4.0.tgz#8cbc68ee1c216368921a8f63038a23a39cd8ba44"
+  integrity sha512-D9DI/gXHvVmjHS08SVch0Em8G5S1P+QWtU31appcKT/8wFSPRcdHadIFSAntdMMVM5zz+/DL+bL/gz3UDppqtg==
+
 node-domexception@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz"
@@ -9534,12 +9299,10 @@ p-cancelable@^3.0.0:
   resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-3.0.0.tgz#63826694b54d61ca1c20ebcb6d3ecf5e14cd8050"
   integrity sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw==
 
-p-limit@^2.0.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
-  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
-  dependencies:
-    p-try "^2.0.0"
+p-finally@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+  integrity sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==
 
 p-limit@^3.0.2:
   version "3.1.0"
@@ -9555,13 +9318,6 @@ p-limit@^4.0.0:
   dependencies:
     yocto-queue "^1.0.0"
 
-p-locate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
-  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
-  dependencies:
-    p-limit "^2.0.0"
-
 p-locate@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
@@ -9583,6 +9339,14 @@ p-map@^4.0.0:
   dependencies:
     aggregate-error "^3.0.0"
 
+p-queue@^6.6.2:
+  version "6.6.2"
+  resolved "https://registry.yarnpkg.com/p-queue/-/p-queue-6.6.2.tgz#2068a9dcf8e67dd0ec3e7a2bcb76810faa85e426"
+  integrity sha512-RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ==
+  dependencies:
+    eventemitter3 "^4.0.4"
+    p-timeout "^3.2.0"
+
 p-retry@^4.5.0:
   version "4.6.2"
   resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.2.tgz#9baae7184057edd4e17231cee04264106e092a16"
@@ -9591,10 +9355,12 @@ p-retry@^4.5.0:
     "@types/retry" "0.12.0"
     retry "^0.13.1"
 
-p-try@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
-  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
+p-timeout@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-3.2.0.tgz#c7e17abc971d2a7962ef83626b35d635acf23dfe"
+  integrity sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==
+  dependencies:
+    p-finally "^1.0.0"
 
 package-json@^8.1.0:
   version "8.1.1"
@@ -9706,11 +9472,6 @@ path-data-parser@0.1.0, path-data-parser@^0.1.0:
   resolved "https://registry.yarnpkg.com/path-data-parser/-/path-data-parser-0.1.0.tgz#8f5ba5cc70fc7becb3dcefaea08e2659aba60b8c"
   integrity sha512-NOnmBpt5Y2RWbuv0LMzsayp3lVylAHLPUTut412ZA3l+C4uw4ZVkQbjShYCQ8TCpUMdPapr4YjUqLYD6v68j+w==
 
-path-exists@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
-  integrity sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==
-
 path-exists@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
@@ -9808,13 +9569,6 @@ pkg-types@^2.0.1:
     exsolve "^1.0.1"
     pathe "^2.0.3"
 
-pkg-up@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5"
-  integrity sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==
-  dependencies:
-    find-up "^3.0.0"
-
 points-on-curve@0.2.0, points-on-curve@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/points-on-curve/-/points-on-curve-0.2.0.tgz#7dbb98c43791859434284761330fa893cb81b4d1"
@@ -9855,15 +9609,15 @@ postcss-clamp@^4.1.0:
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-color-functional-notation@^7.0.8:
-  version "7.0.8"
-  resolved "https://registry.yarnpkg.com/postcss-color-functional-notation/-/postcss-color-functional-notation-7.0.8.tgz#b62a253d478f69b41e9343c983876a592578581c"
-  integrity sha512-S/TpMKVKofNvsxfau/+bw+IA6cSfB6/kmzFj5szUofHOVnFFMB2WwK+Zu07BeMD8T0n+ZnTO5uXiMvAKe2dPkA==
+postcss-color-functional-notation@^7.0.10:
+  version "7.0.10"
+  resolved "https://registry.yarnpkg.com/postcss-color-functional-notation/-/postcss-color-functional-notation-7.0.10.tgz#f1e9c3e4371889dcdfeabfa8515464fd8338cedc"
+  integrity sha512-k9qX+aXHBiLTRrWoCJuUFI6F1iF6QJQUXNVWJVSbqZgj57jDhBlOvD8gNUGl35tgqDivbGLhZeW3Ongz4feuKA==
   dependencies:
-    "@csstools/css-color-parser" "^3.0.8"
-    "@csstools/css-parser-algorithms" "^3.0.4"
-    "@csstools/css-tokenizer" "^3.0.3"
-    "@csstools/postcss-progressive-custom-properties" "^4.0.0"
+    "@csstools/css-color-parser" "^3.0.10"
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-tokenizer" "^3.0.4"
+    "@csstools/postcss-progressive-custom-properties" "^4.1.0"
     "@csstools/utilities" "^2.0.0"
 
 postcss-color-hex-alpha@^10.0.0:
@@ -9900,35 +9654,35 @@ postcss-convert-values@^6.1.0:
     browserslist "^4.23.0"
     postcss-value-parser "^4.2.0"
 
-postcss-custom-media@^11.0.5:
-  version "11.0.5"
-  resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-11.0.5.tgz#2fcd88a9b1d4da41c67dac6f2def903063a3377d"
-  integrity sha512-SQHhayVNgDvSAdX9NQ/ygcDQGEY+aSF4b/96z7QUX6mqL5yl/JgG/DywcF6fW9XbnCRE+aVYk+9/nqGuzOPWeQ==
+postcss-custom-media@^11.0.6:
+  version "11.0.6"
+  resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-11.0.6.tgz#6b450e5bfa209efb736830066682e6567bd04967"
+  integrity sha512-C4lD4b7mUIw+RZhtY7qUbf4eADmb7Ey8BFA2px9jUbwg7pjTZDl4KY4bvlUV+/vXQvzQRfiGEVJyAbtOsCMInw==
   dependencies:
-    "@csstools/cascade-layer-name-parser" "^2.0.4"
-    "@csstools/css-parser-algorithms" "^3.0.4"
-    "@csstools/css-tokenizer" "^3.0.3"
-    "@csstools/media-query-list-parser" "^4.0.2"
+    "@csstools/cascade-layer-name-parser" "^2.0.5"
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-tokenizer" "^3.0.4"
+    "@csstools/media-query-list-parser" "^4.0.3"
 
-postcss-custom-properties@^14.0.4:
-  version "14.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-14.0.4.tgz#de9c663285a98833a946d7003a34369d3ce373a9"
-  integrity sha512-QnW8FCCK6q+4ierwjnmXF9Y9KF8q0JkbgVfvQEMa93x1GT8FvOiUevWCN2YLaOWyByeDX8S6VFbZEeWoAoXs2A==
+postcss-custom-properties@^14.0.6:
+  version "14.0.6"
+  resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-14.0.6.tgz#1af73a650bf115ba052cf915287c9982825fc90e"
+  integrity sha512-fTYSp3xuk4BUeVhxCSJdIPhDLpJfNakZKoiTDx7yRGCdlZrSJR7mWKVOBS4sBF+5poPQFMj2YdXx1VHItBGihQ==
   dependencies:
-    "@csstools/cascade-layer-name-parser" "^2.0.4"
-    "@csstools/css-parser-algorithms" "^3.0.4"
-    "@csstools/css-tokenizer" "^3.0.3"
+    "@csstools/cascade-layer-name-parser" "^2.0.5"
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-tokenizer" "^3.0.4"
     "@csstools/utilities" "^2.0.0"
     postcss-value-parser "^4.2.0"
 
-postcss-custom-selectors@^8.0.4:
-  version "8.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-custom-selectors/-/postcss-custom-selectors-8.0.4.tgz#95ef8268fdbbbd84f34cf84a4517c9d99d419c5a"
-  integrity sha512-ASOXqNvDCE0dAJ/5qixxPeL1aOVGHGW2JwSy7HyjWNbnWTQCl+fDc968HY1jCmZI0+BaYT5CxsOiUhavpG/7eg==
+postcss-custom-selectors@^8.0.5:
+  version "8.0.5"
+  resolved "https://registry.yarnpkg.com/postcss-custom-selectors/-/postcss-custom-selectors-8.0.5.tgz#9448ed37a12271d7ab6cb364b6f76a46a4a323e8"
+  integrity sha512-9PGmckHQswiB2usSO6XMSswO2yFWVoCAuih1yl9FVcwkscLjRKjwsjM3t+NIWpSU2Jx3eOiK2+t4vVTQaoCHHg==
   dependencies:
-    "@csstools/cascade-layer-name-parser" "^2.0.4"
-    "@csstools/css-parser-algorithms" "^3.0.4"
-    "@csstools/css-tokenizer" "^3.0.3"
+    "@csstools/cascade-layer-name-parser" "^2.0.5"
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-tokenizer" "^3.0.4"
     postcss-selector-parser "^7.0.0"
 
 postcss-dir-pseudo-class@^9.0.1:
@@ -9965,12 +9719,12 @@ postcss-discard-unused@^6.0.5:
   dependencies:
     postcss-selector-parser "^6.0.16"
 
-postcss-double-position-gradients@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-double-position-gradients/-/postcss-double-position-gradients-6.0.0.tgz#eddd424ec754bb543d057d4d2180b1848095d4d2"
-  integrity sha512-JkIGah3RVbdSEIrcobqj4Gzq0h53GG4uqDPsho88SgY84WnpkTpI0k50MFK/sX7XqVisZ6OqUfFnoUO6m1WWdg==
+postcss-double-position-gradients@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-double-position-gradients/-/postcss-double-position-gradients-6.0.2.tgz#185f8eab2db9cf4e34be69b5706c905895bb52ae"
+  integrity sha512-7qTqnL7nfLRyJK/AHSVrrXOuvDDzettC+wGoienURV8v2svNbu6zJC52ruZtHaO6mfcagFmuTGFdzRsJKB3k5Q==
   dependencies:
-    "@csstools/postcss-progressive-custom-properties" "^4.0.0"
+    "@csstools/postcss-progressive-custom-properties" "^4.1.0"
     "@csstools/utilities" "^2.0.0"
     postcss-value-parser "^4.2.0"
 
@@ -10006,18 +9760,18 @@ postcss-image-set-function@^7.0.0:
     "@csstools/utilities" "^2.0.0"
     postcss-value-parser "^4.2.0"
 
-postcss-lab-function@^7.0.8:
-  version "7.0.8"
-  resolved "https://registry.yarnpkg.com/postcss-lab-function/-/postcss-lab-function-7.0.8.tgz#ab0b210c5f6552347efa0311f7a7dfe34af9e6b4"
-  integrity sha512-plV21I86Hg9q8omNz13G9fhPtLopIWH06bt/Cb5cs1XnaGU2kUtEitvVd4vtQb/VqCdNUHK5swKn3QFmMRbpDg==
+postcss-lab-function@^7.0.10:
+  version "7.0.10"
+  resolved "https://registry.yarnpkg.com/postcss-lab-function/-/postcss-lab-function-7.0.10.tgz#0537bd7245b935fc133298c8896bcbd160540cae"
+  integrity sha512-tqs6TCEv9tC1Riq6fOzHuHcZyhg4k3gIAMB8GGY/zA1ssGdm6puHMVE7t75aOSoFg7UD2wyrFFhbldiCMyyFTQ==
   dependencies:
-    "@csstools/css-color-parser" "^3.0.8"
-    "@csstools/css-parser-algorithms" "^3.0.4"
-    "@csstools/css-tokenizer" "^3.0.3"
-    "@csstools/postcss-progressive-custom-properties" "^4.0.0"
+    "@csstools/css-color-parser" "^3.0.10"
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-tokenizer" "^3.0.4"
+    "@csstools/postcss-progressive-custom-properties" "^4.1.0"
     "@csstools/utilities" "^2.0.0"
 
-postcss-loader@^7.3.3:
+postcss-loader@^7.3.4:
   version "7.3.4"
   resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-7.3.4.tgz#aed9b79ce4ed7e9e89e56199d25ad1ec8f606209"
   integrity sha512-iW5WTTBSC5BfsBJ9daFMPVrLT36MrNiC6fqOZTTaHjBNX6Pfd5p+hSBqe/fEeNd7pc13QiAyGt7VdGMw4eRC4A==
@@ -10119,12 +9873,12 @@ postcss-modules-values@^4.0.0:
   dependencies:
     icss-utils "^5.0.0"
 
-postcss-nesting@^13.0.1:
-  version "13.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-13.0.1.tgz#c405796d7245a3e4c267a9956cacfe9670b5d43e"
-  integrity sha512-VbqqHkOBOt4Uu3G8Dm8n6lU5+9cJFxiuty9+4rcoyRPO9zZS1JIs6td49VIoix3qYqELHlJIn46Oih9SAKo+yQ==
+postcss-nesting@^13.0.2:
+  version "13.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-13.0.2.tgz#fde0d4df772b76d03b52eccc84372e8d1ca1402e"
+  integrity sha512-1YCI290TX+VP0U/K/aFxzHzQWHWURL+CtHMSbex1lCdpXD1SoR2sYuxDu5aNI9lPoXpKTCggFZiDJbwylU0LEQ==
   dependencies:
-    "@csstools/selector-resolve-nested" "^3.0.0"
+    "@csstools/selector-resolve-nested" "^3.1.0"
     "@csstools/selector-specificity" "^5.0.0"
     postcss-selector-parser "^7.0.0"
 
@@ -10222,67 +9976,68 @@ postcss-place@^10.0.0:
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-preset-env@^10.1.0:
-  version "10.1.5"
-  resolved "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-10.1.5.tgz#1e12d050a5dbebc4230cc73c0d2e122c30a6a937"
-  integrity sha512-LQybafF/K7H+6fAs4SIkgzkSCixJy0/h0gubDIAP3Ihz+IQBRwsjyvBnAZ3JUHD+A/ITaxVRPDxn//a3Qy4pDw==
+postcss-preset-env@^10.2.1:
+  version "10.2.3"
+  resolved "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-10.2.3.tgz#3a84bde7205b48f1304a656b25841bd3f40fb3cb"
+  integrity sha512-zlQN1yYmA7lFeM1wzQI14z97mKoM8qGng+198w1+h6sCud/XxOjcKtApY9jWr7pXNS3yHDEafPlClSsWnkY8ow==
   dependencies:
     "@csstools/postcss-cascade-layers" "^5.0.1"
-    "@csstools/postcss-color-function" "^4.0.8"
-    "@csstools/postcss-color-mix-function" "^3.0.8"
-    "@csstools/postcss-content-alt-text" "^2.0.4"
-    "@csstools/postcss-exponential-functions" "^2.0.7"
+    "@csstools/postcss-color-function" "^4.0.10"
+    "@csstools/postcss-color-mix-function" "^3.0.10"
+    "@csstools/postcss-color-mix-variadic-function-arguments" "^1.0.0"
+    "@csstools/postcss-content-alt-text" "^2.0.6"
+    "@csstools/postcss-exponential-functions" "^2.0.9"
     "@csstools/postcss-font-format-keywords" "^4.0.0"
-    "@csstools/postcss-gamut-mapping" "^2.0.8"
-    "@csstools/postcss-gradients-interpolation-method" "^5.0.8"
-    "@csstools/postcss-hwb-function" "^4.0.8"
-    "@csstools/postcss-ic-unit" "^4.0.0"
+    "@csstools/postcss-gamut-mapping" "^2.0.10"
+    "@csstools/postcss-gradients-interpolation-method" "^5.0.10"
+    "@csstools/postcss-hwb-function" "^4.0.10"
+    "@csstools/postcss-ic-unit" "^4.0.2"
     "@csstools/postcss-initial" "^2.0.1"
-    "@csstools/postcss-is-pseudo-class" "^5.0.1"
-    "@csstools/postcss-light-dark-function" "^2.0.7"
+    "@csstools/postcss-is-pseudo-class" "^5.0.3"
+    "@csstools/postcss-light-dark-function" "^2.0.9"
     "@csstools/postcss-logical-float-and-clear" "^3.0.0"
     "@csstools/postcss-logical-overflow" "^2.0.0"
     "@csstools/postcss-logical-overscroll-behavior" "^2.0.0"
     "@csstools/postcss-logical-resize" "^3.0.0"
-    "@csstools/postcss-logical-viewport-units" "^3.0.3"
-    "@csstools/postcss-media-minmax" "^2.0.7"
-    "@csstools/postcss-media-queries-aspect-ratio-number-values" "^3.0.4"
+    "@csstools/postcss-logical-viewport-units" "^3.0.4"
+    "@csstools/postcss-media-minmax" "^2.0.9"
+    "@csstools/postcss-media-queries-aspect-ratio-number-values" "^3.0.5"
     "@csstools/postcss-nested-calc" "^4.0.0"
     "@csstools/postcss-normalize-display-values" "^4.0.0"
-    "@csstools/postcss-oklab-function" "^4.0.8"
-    "@csstools/postcss-progressive-custom-properties" "^4.0.0"
-    "@csstools/postcss-random-function" "^1.0.3"
-    "@csstools/postcss-relative-color-syntax" "^3.0.8"
+    "@csstools/postcss-oklab-function" "^4.0.10"
+    "@csstools/postcss-progressive-custom-properties" "^4.1.0"
+    "@csstools/postcss-random-function" "^2.0.1"
+    "@csstools/postcss-relative-color-syntax" "^3.0.10"
     "@csstools/postcss-scope-pseudo-class" "^4.0.1"
-    "@csstools/postcss-sign-functions" "^1.1.2"
-    "@csstools/postcss-stepped-value-functions" "^4.0.7"
+    "@csstools/postcss-sign-functions" "^1.1.4"
+    "@csstools/postcss-stepped-value-functions" "^4.0.9"
     "@csstools/postcss-text-decoration-shorthand" "^4.0.2"
-    "@csstools/postcss-trigonometric-functions" "^4.0.7"
+    "@csstools/postcss-trigonometric-functions" "^4.0.9"
     "@csstools/postcss-unset-value" "^4.0.0"
-    autoprefixer "^10.4.19"
-    browserslist "^4.24.4"
+    autoprefixer "^10.4.21"
+    browserslist "^4.25.0"
     css-blank-pseudo "^7.0.1"
     css-has-pseudo "^7.0.2"
     css-prefers-color-scheme "^10.0.0"
-    cssdb "^8.2.3"
+    cssdb "^8.3.0"
     postcss-attribute-case-insensitive "^7.0.1"
     postcss-clamp "^4.1.0"
-    postcss-color-functional-notation "^7.0.8"
+    postcss-color-functional-notation "^7.0.10"
     postcss-color-hex-alpha "^10.0.0"
     postcss-color-rebeccapurple "^10.0.0"
-    postcss-custom-media "^11.0.5"
-    postcss-custom-properties "^14.0.4"
-    postcss-custom-selectors "^8.0.4"
+    postcss-custom-media "^11.0.6"
+    postcss-custom-properties "^14.0.6"
+    postcss-custom-selectors "^8.0.5"
     postcss-dir-pseudo-class "^9.0.1"
-    postcss-double-position-gradients "^6.0.0"
+    postcss-double-position-gradients "^6.0.2"
     postcss-focus-visible "^10.0.1"
     postcss-focus-within "^9.0.1"
     postcss-font-variant "^5.0.0"
     postcss-gap-properties "^6.0.0"
     postcss-image-set-function "^7.0.0"
-    postcss-lab-function "^7.0.8"
+    postcss-lab-function "^7.0.10"
     postcss-logical "^8.1.0"
-    postcss-nesting "^13.0.1"
+    postcss-nesting "^13.0.2"
     postcss-opacity-percentage "^3.0.0"
     postcss-overflow-shorthand "^6.0.0"
     postcss-page-break "^3.0.4"
@@ -10380,7 +10135,7 @@ postcss-zindex@^6.0.2:
   resolved "https://registry.yarnpkg.com/postcss-zindex/-/postcss-zindex-6.0.2.tgz#e498304b83a8b165755f53db40e2ea65a99b56e1"
   integrity sha512-5BxW9l1evPB/4ZIc+2GobEBoKC+h8gPGCMi+jxsYvd2x0mjq7wazk6DrP71pStqxE9Foxh5TVnonbWpFZzXaYg==
 
-postcss@^8.4.21, postcss@^8.4.24, postcss@^8.4.26, postcss@^8.4.33, postcss@^8.4.38:
+postcss@^8.4.21, postcss@^8.4.24, postcss@^8.4.33:
   version "8.5.3"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.5.3.tgz#1463b6f1c7fb16fe258736cba29a2de35237eafb"
   integrity sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==
@@ -10389,6 +10144,15 @@ postcss@^8.4.21, postcss@^8.4.24, postcss@^8.4.26, postcss@^8.4.33, postcss@^8.4
     picocolors "^1.1.1"
     source-map-js "^1.2.1"
 
+postcss@^8.5.4:
+  version "8.5.6"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.5.6.tgz#2825006615a619b4f62a9e7426cc120b349a8f3c"
+  integrity sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==
+  dependencies:
+    nanoid "^3.3.11"
+    picocolors "^1.1.1"
+    source-map-js "^1.2.1"
+
 prelude-ls@^1.2.1:
   version "1.2.1"
   resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz"
@@ -10427,19 +10191,14 @@ prism-react-renderer@^2.3.0, prism-react-renderer@^2.4.1:
     "@types/prismjs" "^1.26.0"
     clsx "^2.0.0"
 
-prismjs@^1.27.0:
-  version "1.29.0"
-  resolved "https://registry.npmjs.org/prismjs/-/prismjs-1.29.0.tgz"
-  integrity sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==
-
-prismjs@^1.29.0:
+prismjs@^1.27.0, prismjs@^1.29.0:
   version "1.30.0"
   resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.30.0.tgz#d9709969d9d4e16403f6f348c63553b19f0975a9"
   integrity sha512-DEvV2ZF2r2/63V+tK8hQvrR2ZGn10srHbXviTlcv7Kpzw8jWiNTqbVgjO3IY8RxrrOUF8VPMQQFysYYYv0YZxw==
 
 prismjs@~1.27.0:
   version "1.27.0"
-  resolved "https://registry.npmjs.org/prismjs/-/prismjs-1.27.0.tgz"
+  resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.27.0.tgz#bb6ee3138a0b438a3653dd4d6ce0cc6510a45057"
   integrity sha512-t13BGPUlFDR7wRB5kQDG4jjl7XeuH6jbJGt11JHPL96qwsEHNX2+68tFXqc1/k+/jALsbSWJKUOT/hcYAZ5LkA==
 
 process-nextick-args@~2.0.0:
@@ -10543,13 +10302,6 @@ queue-microtask@^1.2.2:
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
   integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
 
-queue@6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/queue/-/queue-6.0.2.tgz#b91525283e2315c7553d2efa18d83e76432fed65"
-  integrity sha512-iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA==
-  dependencies:
-    inherits "~2.0.3"
-
 quick-lru@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932"
@@ -10646,10 +10398,10 @@ rc-dialog@~9.6.0:
     rc-motion "^2.3.0"
     rc-util "^5.21.0"
 
-rc-drawer@~7.2.0:
-  version "7.2.0"
-  resolved "https://registry.npmjs.org/rc-drawer/-/rc-drawer-7.2.0.tgz"
-  integrity sha512-9lOQ7kBekEJRdEpScHvtmEtXnAsy+NGDXiRWc2ZVC7QXAazNVbeT4EraQKYwCME8BJLa8Bxqxvs5swwyOepRwg==
+rc-drawer@~7.3.0:
+  version "7.3.0"
+  resolved "https://registry.yarnpkg.com/rc-drawer/-/rc-drawer-7.3.0.tgz#1bb5fe5f9da38b6a2b2a7dffc9fcb647252a328f"
+  integrity sha512-DX6CIgiBWNpJIMGFO8BAISFkxiuKitoizooj4BDyee8/SnBn0zwO2FHrNDpqqepj0E/TFTDpmEBCyFuTgC7MOg==
   dependencies:
     "@babel/runtime" "^7.23.9"
     "@rc-component/portal" "^1.1.1"
@@ -10821,7 +10573,7 @@ rc-segmented@~2.7.0:
     rc-motion "^2.4.4"
     rc-util "^5.17.0"
 
-rc-select@~14.16.2, rc-select@~14.16.7:
+rc-select@~14.16.2, rc-select@~14.16.8:
   version "14.16.8"
   resolved "https://registry.yarnpkg.com/rc-select/-/rc-select-14.16.8.tgz#78e6782f1ccc1f03d9003bc3effa4ed609d29a97"
   integrity sha512-NOV5BZa1wZrsdkKaiK7LHRuo5ZjZYMDxPP6/1+09+FB4KoNi8jcG1ZqLE3AVCxEsYMBe65OBx71wFoHRTP3LRg==
@@ -10861,10 +10613,10 @@ rc-switch@~4.1.0:
     classnames "^2.2.1"
     rc-util "^5.30.0"
 
-rc-table@~7.50.4:
-  version "7.50.4"
-  resolved "https://registry.yarnpkg.com/rc-table/-/rc-table-7.50.4.tgz#687b5bf76d1a94168f75481cbc83be9442010432"
-  integrity sha512-Y+YuncnQqoS5e7yHvfvlv8BmCvwDYDX/2VixTBEhkMDk9itS9aBINp4nhzXFKiBP/frG4w0pS9d9Rgisl0T1Bw==
+rc-table@~7.51.1:
+  version "7.51.1"
+  resolved "https://registry.yarnpkg.com/rc-table/-/rc-table-7.51.1.tgz#cd69ae3262d3b61e4c93c979c12786906e944691"
+  integrity sha512-5iq15mTHhvC42TlBLRCoCBLoCmGlbRZAlyF21FonFnS/DIC8DeRqnmdyVREwt2CFbPceM0zSNdEeVfiGaqYsKw==
   dependencies:
     "@babel/runtime" "^7.10.1"
     "@rc-component/context" "^1.4.0"
@@ -10929,10 +10681,10 @@ rc-tree@~5.13.0, rc-tree@~5.13.1:
     rc-util "^5.16.1"
     rc-virtual-list "^3.5.1"
 
-rc-upload@~4.9.0:
-  version "4.9.0"
-  resolved "https://registry.yarnpkg.com/rc-upload/-/rc-upload-4.9.0.tgz#911963ab5a0b538c743765371c05e2de9e3f5436"
-  integrity sha512-pAzlPnyiFn1GCtEybEG2m9nXNzQyWXqWV2xFYCmDxjN9HzyjS5Pz2F+pbNdYw8mMJsixLEKLG0wVy9vOGxJMJA==
+rc-upload@~4.9.2:
+  version "4.9.2"
+  resolved "https://registry.yarnpkg.com/rc-upload/-/rc-upload-4.9.2.tgz#297f52fd1b1c2a4b570c3e42444609b7530531bb"
+  integrity sha512-nHx+9rbd1FKMiMRYsqQ3NkXUv7COHPBo3X1Obwq9SWS6/diF/A0aJ5OHubvwUAIDs+4RMleljV0pcrNUc823GQ==
   dependencies:
     "@babel/runtime" "^7.18.3"
     classnames "^2.2.5"
@@ -10982,36 +10734,6 @@ react-debounce-input@=3.3.0:
     lodash.debounce "^4"
     prop-types "^15.8.1"
 
-react-dev-utils@^12.0.1:
-  version "12.0.1"
-  resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-12.0.1.tgz#ba92edb4a1f379bd46ccd6bcd4e7bc398df33e73"
-  integrity sha512-84Ivxmr17KjUupyqzFode6xKhjwuEJDROWKJy/BthkL7Wn6NJ8h4WE6k/exAv6ImS+0oZLRRW5j/aINMHyeGeQ==
-  dependencies:
-    "@babel/code-frame" "^7.16.0"
-    address "^1.1.2"
-    browserslist "^4.18.1"
-    chalk "^4.1.2"
-    cross-spawn "^7.0.3"
-    detect-port-alt "^1.1.6"
-    escape-string-regexp "^4.0.0"
-    filesize "^8.0.6"
-    find-up "^5.0.0"
-    fork-ts-checker-webpack-plugin "^6.5.0"
-    global-modules "^2.0.0"
-    globby "^11.0.4"
-    gzip-size "^6.0.0"
-    immer "^9.0.7"
-    is-root "^2.1.0"
-    loader-utils "^3.2.0"
-    open "^8.4.0"
-    pkg-up "^3.1.0"
-    prompts "^2.4.2"
-    react-error-overlay "^6.0.11"
-    recursive-readdir "^2.2.2"
-    shell-quote "^1.7.3"
-    strip-ansi "^6.0.1"
-    text-table "^0.2.0"
-
 react-dom@^18.3.1:
   version "18.3.1"
   resolved "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz"
@@ -11020,11 +10742,6 @@ react-dom@^18.3.1:
     loose-envify "^1.1.0"
     scheduler "^0.23.2"
 
-react-error-overlay@^6.0.11:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.1.0.tgz#22b86256beb1c5856f08a9a228adb8121dd985f2"
-  integrity sha512-SN/U6Ytxf1QGkw/9ve5Y+NxBbZM6Ht95tuXNMKs8EJyFa/Vy/+Co3stop3KBHARfn/giv+Lj1uUnTfOJ3moFEQ==
-
 react-fast-compare@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.2.tgz#929a97a532304ce9fee4bcae44234f1ce2c21d49"
@@ -11037,7 +10754,7 @@ react-github-btn@^1.4.0:
   dependencies:
     github-buttons "^2.22.0"
 
-"react-helmet-async@npm:@slorber/react-helmet-async@*", "react-helmet-async@npm:@slorber/react-helmet-async@1.3.0":
+"react-helmet-async@npm:@slorber/react-helmet-async@1.3.0":
   version "1.3.0"
   resolved "https://registry.npmjs.org/react-helmet-async/-/react-helmet-async-1.3.0.tgz"
   integrity sha512-9jZ57/dAn9t3q6hneQS0wukqC2ENOBgMNVEhb/ZG9ZSxUetzVIw4iAmEU38IaVg3QGYauQPhSeUTuIUtFglWpg==
@@ -11075,10 +10792,10 @@ react-is@^18.2.0:
   resolved "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz"
   integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==
 
-react-json-view-lite@^1.2.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/react-json-view-lite/-/react-json-view-lite-1.5.0.tgz#377cc302821717ac79a1b6d099e1891df54c8662"
-  integrity sha512-nWqA1E4jKPklL2jvHWs6s+7Na0qNgw9HCP6xehdQJeg6nPBTFZgGwyko9Q0oj+jQWKTTVRS30u0toM5wiuL3iw==
+react-json-view-lite@^2.3.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/react-json-view-lite/-/react-json-view-lite-2.4.1.tgz#0d06696a06aaf4a74e890302b76cf8cddcc45d60"
+  integrity sha512-fwFYknRIBxjbFm0kBDrzgBy1xa5tDg2LyXXBepC5f1b+MY3BUClMCsvanMPn089JbV1Eg3nZcrp0VCuH43aXnA==
 
 react-loadable-ssr-addon-v5-slorber@^1.0.1:
   version "1.0.1"
@@ -11193,18 +10910,6 @@ readdirp@~3.6.0:
   dependencies:
     picomatch "^2.2.1"
 
-reading-time@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/reading-time/-/reading-time-1.5.0.tgz#d2a7f1b6057cb2e169beaf87113cc3411b5bc5bb"
-  integrity sha512-onYyVhBNr4CmAxFsKS7bz+uTLRakypIe4R+5A824vBSkQy/hB3fZepoVEf8OVAxzLvK+H/jm9TzpI3ETSm64Kg==
-
-rechoir@^0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
-  integrity sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==
-  dependencies:
-    resolve "^1.1.6"
-
 recma-build-jsx@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/recma-build-jsx/-/recma-build-jsx-1.0.0.tgz#c02f29e047e103d2fab2054954e1761b8ea253c4"
@@ -11245,13 +10950,6 @@ recma-stringify@^1.0.0:
     unified "^11.0.0"
     vfile "^6.0.0"
 
-recursive-readdir@^2.2.2:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/recursive-readdir/-/recursive-readdir-2.2.3.tgz#e726f328c0d69153bcabd5c322d3195252379372"
-  integrity sha512-8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA==
-  dependencies:
-    minimatch "^3.0.5"
-
 redux-immutable@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/redux-immutable/-/redux-immutable-4.0.0.tgz"
@@ -11527,7 +11225,7 @@ resolve-pathname@^3.0.0:
   resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-3.0.0.tgz#99d02224d3cf263689becbb393bc560313025dcd"
   integrity sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng==
 
-resolve@^1.1.6, resolve@^1.12.0, resolve@^1.14.2:
+resolve@^1.12.0, resolve@^1.14.2:
   version "1.22.10"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.10.tgz#b663e83ffb09bbf2386944736baae803029b8b39"
   integrity sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==
@@ -11666,14 +11364,10 @@ scheduler@^0.23.2:
   dependencies:
     loose-envify "^1.1.0"
 
-schema-utils@2.7.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7"
-  integrity sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==
-  dependencies:
-    "@types/json-schema" "^7.0.4"
-    ajv "^6.12.2"
-    ajv-keywords "^3.4.1"
+schema-dts@^1.1.2:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/schema-dts/-/schema-dts-1.1.5.tgz#9237725d305bac3469f02b292a035107595dc324"
+  integrity sha512-RJr9EaCmsLzBX2NDiO5Z3ux2BVosNZN5jo0gWgsyKvxKIUL5R3swNvoorulAeL9kLB0iTSX7V6aokhla2m7xbg==
 
 schema-utils@^3.0.0:
   version "3.3.0"
@@ -11739,7 +11433,7 @@ semver@^6.3.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.3.2, semver@^7.3.5, semver@^7.3.7, semver@^7.5.4:
+semver@^7.3.5, semver@^7.3.7, semver@^7.5.4:
   version "7.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.1.tgz#abd5098d82b18c6c81f6074ff2647fd3e7220c9f"
   integrity sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==
@@ -11886,24 +11580,15 @@ shebang-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
-shell-quote@^1.7.3, shell-quote@^1.8.1:
+shell-quote@^1.8.1:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.2.tgz#d2d83e057959d53ec261311e9e9b8f51dcb2934a"
   integrity sha512-AzqKpGKjrj7EM6rKVQEPpB288oCfnrEIuyoT9cyF4nmGa7V8Zk6f7RRqYisX8X9m+Q7bd632aZW4ky7EhbQztA==
 
-shelljs@^0.8.5:
-  version "0.8.5"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.5.tgz#de055408d8361bed66c669d2f000538ced8ee20c"
-  integrity sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==
-  dependencies:
-    glob "^7.0.0"
-    interpret "^1.0.0"
-    rechoir "^0.6.2"
-
-short-unique-id@^5.0.2:
-  version "5.2.0"
-  resolved "https://registry.npmjs.org/short-unique-id/-/short-unique-id-5.2.0.tgz"
-  integrity sha512-cMGfwNyfDZ/nzJ2k2M+ClthBIh//GlZl1JEf47Uoa9XR11bz8Pa2T2wQO4bVrRdH48LrIDWJahQziKo3MjhsWg==
+short-unique-id@^5.3.2:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/short-unique-id/-/short-unique-id-5.3.2.tgz#6fea1b8fcaac44455abd1fa25840ebdb9c0a8ae7"
+  integrity sha512-KRT/hufMSxXKEDSQujfVE0Faa/kZ51ihUcZQAcmP04t00DvPj7Ox5anHke1sJYUtzSuiT/Y5uyzg/W7bBEGhCg==
 
 side-channel-list@^1.0.0:
   version "1.0.0"
@@ -12310,18 +11995,18 @@ svgo@^3.0.2, svgo@^3.2.0:
     csso "^5.0.5"
     picocolors "^1.0.0"
 
-swagger-client@^3.34.4:
-  version "3.34.4"
-  resolved "https://registry.yarnpkg.com/swagger-client/-/swagger-client-3.34.4.tgz#034cb241af39b988ca10c39e7add2596c480075d"
-  integrity sha512-Qvtu8DtARAx5GwefA0eV1WRLa4Q9bhczrtNAsiBMOx3HkxAOczy1APQhrcblJdLys0xEGQ4xYizYFXfIL9BhpA==
+swagger-client@^3.35.5:
+  version "3.35.5"
+  resolved "https://registry.yarnpkg.com/swagger-client/-/swagger-client-3.35.5.tgz#5660aa5fbe42007b30601ed57a4219e4c0bd7634"
+  integrity sha512-ayCrpDAgm5jIdq1kmcVWJRfp27cqU9tSRiAfKg3BKeplOmvu3+lKTPPtz4x1uI8v5l5/92Aopvq0EzRkXEr7Rw==
   dependencies:
     "@babel/runtime-corejs3" "^7.22.15"
     "@scarf/scarf" "=1.4.0"
-    "@swagger-api/apidom-core" ">=1.0.0-beta.13 <1.0.0-rc.0"
-    "@swagger-api/apidom-error" ">=1.0.0-beta.13 <1.0.0-rc.0"
-    "@swagger-api/apidom-json-pointer" ">=1.0.0-beta.13 <1.0.0-rc.0"
-    "@swagger-api/apidom-ns-openapi-3-1" ">=1.0.0-beta.13 <1.0.0-rc.0"
-    "@swagger-api/apidom-reference" ">=1.0.0-beta.13 <1.0.0-rc.0"
+    "@swagger-api/apidom-core" ">=1.0.0-beta.41 <1.0.0-rc.0"
+    "@swagger-api/apidom-error" ">=1.0.0-beta.41 <1.0.0-rc.0"
+    "@swagger-api/apidom-json-pointer" ">=1.0.0-beta.41 <1.0.0-rc.0"
+    "@swagger-api/apidom-ns-openapi-3-1" ">=1.0.0-beta.41 <1.0.0-rc.0"
+    "@swagger-api/apidom-reference" ">=1.0.0-beta.41 <1.0.0-rc.0"
     "@swaggerexpert/cookie" "^2.0.2"
     deepmerge "~4.3.0"
     fast-json-patch "^3.0.0-1"
@@ -12334,12 +12019,12 @@ swagger-client@^3.34.4:
     ramda "^0.30.1"
     ramda-adjunct "^5.1.0"
 
-swagger-ui-react@^5.21.0:
-  version "5.21.0"
-  resolved "https://registry.yarnpkg.com/swagger-ui-react/-/swagger-ui-react-5.21.0.tgz#a9b22a24247c23eafb39b776bee5a4d5b56c57fe"
-  integrity sha512-lS5paITM1kkcBb/BTTSMHKelh8elHfcuUP4T3R3mO80tDR0AYJL2HR5UdQD6nV1LwdvekzRM8gKjJA6hVayi0A==
+swagger-ui-react@^5.26.0:
+  version "5.26.0"
+  resolved "https://registry.yarnpkg.com/swagger-ui-react/-/swagger-ui-react-5.26.0.tgz#b15a903d556cc0ec2a56a969beb9d5bc9ea52910"
+  integrity sha512-4e6bP9bdJyh+SqQW0lxulPn/SDno4+oWrKXsuon5Z9kjtV0zeoWEJ1c70Qxp8kN/c3caFwec8OyxDNhvo14pkw==
   dependencies:
-    "@babel/runtime-corejs3" "^7.26.10"
+    "@babel/runtime-corejs3" "^7.27.1"
     "@scarf/scarf" "=1.4.0"
     base64-js "^1.5.1"
     classnames "^2.5.1"
@@ -12367,17 +12052,12 @@ swagger-ui-react@^5.21.0:
     reselect "^5.1.1"
     serialize-error "^8.1.0"
     sha.js "^2.4.11"
-    swagger-client "^3.34.4"
+    swagger-client "^3.35.5"
     url-parse "^1.5.10"
     xml "=1.0.1"
     xml-but-prettier "^1.0.1"
     zenscroll "^4.0.2"
 
-tapable@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
-  integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
-
 tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0, tapable@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
@@ -12434,6 +12114,11 @@ tinyexec@^0.3.2:
   resolved "https://registry.yarnpkg.com/tinyexec/-/tinyexec-0.3.2.tgz#941794e657a85e496577995c6eef66f53f42b3d2"
   integrity sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==
 
+tinypool@^1.0.2:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/tinypool/-/tinypool-1.1.1.tgz#059f2d042bd37567fbc017d3d426bdd2a2612591"
+  integrity sha512-Zba82s87IFq9A9XmjiX5uZA/ARWDrB03OHlq+Vw1fSdt0I+4/Kutwy8BP4Y/y/aORMo61FQ0vIb5j44vSo5Pkg==
+
 to-regex-range@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
@@ -12477,13 +12162,13 @@ tree-sitter@=0.21.1:
     node-addon-api "^8.0.0"
     node-gyp-build "^4.8.0"
 
-tree-sitter@=0.22.1:
-  version "0.22.1"
-  resolved "https://registry.yarnpkg.com/tree-sitter/-/tree-sitter-0.22.1.tgz#5a5296fc0898b21443657e071b050c95c0d7afbd"
-  integrity sha512-gRO+jk2ljxZlIn20QRskIvpLCMtzuLl5T0BY6L9uvPYD17uUrxlxWkvYCiVqED2q2q7CVtY52Uex4WcYo2FEXw==
+tree-sitter@=0.22.4:
+  version "0.22.4"
+  resolved "https://registry.yarnpkg.com/tree-sitter/-/tree-sitter-0.22.4.tgz#7d29547f663ff6f49ee8d1ac444e6fa169c72b77"
+  integrity sha512-usbHZP9/oxNsUY65MQUsduGRqDHQOou1cagUSwjhoSYAmSahjQDAVsh9s+SlZkn8X8+O1FULRGwHu7AFP3kjzg==
   dependencies:
-    node-addon-api "^8.2.1"
-    node-gyp-build "^4.8.2"
+    node-addon-api "^8.3.0"
+    node-gyp-build "^4.8.4"
 
 trim-lines@^3.0.0:
   version "3.0.1"
@@ -12754,7 +12439,7 @@ unraw@^3.0.0:
   resolved "https://registry.npmjs.org/unraw/-/unraw-3.0.0.tgz"
   integrity sha512-08/DA66UF65OlpUDIQtbJyrqTR0jTAlJ+jsnkQ4jxR7+K5g5YG1APZKQSMCE1vqqmD+2pv6+IdEjmopFatacvg==
 
-update-browserslist-db@^1.1.1:
+update-browserslist-db@^1.1.1, update-browserslist-db@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz#348377dd245216f9e7060ff50b15a1b740b75420"
   integrity sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==
@@ -12935,11 +12620,6 @@ web-streams-polyfill@^3.0.3:
   resolved "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz"
   integrity sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==
 
-web-tree-sitter@=0.24.3:
-  version "0.24.3"
-  resolved "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.24.3.tgz"
-  integrity sha512-uR9YNewr1S2EzPKE+y39nAwaTyobBaZRG/IsfkB/OT4v0lXtNj5WjtHKgn2h7eOYUWIZh5rK9Px7tI6S9CRKdA==
-
 web-tree-sitter@=0.24.5:
   version "0.24.5"
   resolved "https://registry.yarnpkg.com/web-tree-sitter/-/web-tree-sitter-0.24.5.tgz#16cea449da63012f23ca7b83bd32817dd0520400"
@@ -13033,10 +12713,10 @@ webpack-sources@^3.2.3:
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
   integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
 
-webpack@^5.88.1, webpack@^5.95.0, webpack@^5.99.8:
-  version "5.99.8"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.99.8.tgz#dd31a020b7c092d30c4c6d9a4edb95809e7f5946"
-  integrity sha512-lQ3CPiSTpfOnrEGeXDwoq5hIGzSjmwD72GdfVzF7CQAI7t47rJG9eDWvcEkEn3CUQymAElVvDg3YNTlCYj+qUQ==
+webpack@^5.88.1, webpack@^5.95.0, webpack@^5.99.9:
+  version "5.99.9"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.99.9.tgz#d7de799ec17d0cce3c83b70744b4aedb537d8247"
+  integrity sha512-brOPwM3JnmOa+7kd3NsmOUOwbDAj8FT9xDsG3IW0MgbN9yZV7Oi/s/+MNQ/EcSMqw7qfoRyXPoeEWT8zLVdVGg==
   dependencies:
     "@types/eslint-scope" "^3.7.7"
     "@types/estree" "^1.0.6"
@@ -13143,13 +12823,6 @@ which-typed-array@^1.1.16, which-typed-array@^1.1.18:
     gopd "^1.2.0"
     has-tostringtag "^1.0.2"
 
-which@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
-  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
-  dependencies:
-    isexe "^2.0.0"
-
 which@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
diff --git a/pyproject.toml b/pyproject.toml
index 6596fb6c920..792de0fa9db 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -60,11 +60,12 @@ dependencies = [
     # known issue with holidays 0.26.0 and above related to prophet lib #25017
     "holidays>=0.25, <0.26",
     "humanize",
-    "importlib_metadata",
     "isodate",
     "jsonpath-ng>=1.6.1, <2",
     "Mako>=1.2.2",
     "markdown>=3.0",
+    # marshmallow>=4 has issues: https://github.com/apache/superset/issues/33162
+    "marshmallow>=3.0, <4",
     "msgpack>=1.0.0, <1.1",
     "nh3>=0.2.11, <0.3",
     "numpy>1.23.5, <2.3",
@@ -165,7 +166,7 @@ presto = ["pyhive[presto]>=0.6.5"]
 trino = ["trino>=0.328.0"]
 prophet = ["prophet>=1.1.5, <2"]
 redshift = ["sqlalchemy-redshift>=0.8.1, <0.9"]
-rockset = ["rockset-sqlalchemy>=0.0.1, <1"]
+risingwave = ["sqlalchemy-risingwave"]
 shillelagh = ["shillelagh[all]>=1.2.18, <2"]
 singlestore = ["sqlalchemy-singlestoredb>=1.1.1, <2"]
 snowflake = ["snowflake-sqlalchemy>=1.2.4, <2"]
@@ -199,6 +200,7 @@ development = [
     "psutil",
     "pyfakefs",
     "pyinstrument>=4.0.2,<5",
+    "pylint",
     "pytest<8.0.0", # hairy issue with pytest >=8 where current_app proxies are not set in time
     "pytest-cov",
     "pytest-mock",
diff --git a/requirements/base.in b/requirements/base.in
index e531ff644b2..d110fa89314 100644
--- a/requirements/base.in
+++ b/requirements/base.in
@@ -16,7 +16,7 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-urllib3>=1.26.19, <2.0.0
+urllib3==2.5.0
 werkzeug>=3.0.1
 numexpr>=2.9.0
 
diff --git a/requirements/base.txt b/requirements/base.txt
index 34968f54260..77c5a23893a 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -8,7 +8,7 @@ apispec==6.6.1
     # via
     #   -r requirements/base.in
     #   flask-appbuilder
-apsw==3.49.2.0
+apsw==3.50.1.0
     # via shillelagh
 async-timeout==4.0.3
     # via -r requirements/base.in
@@ -40,11 +40,11 @@ cachelib==0.13.0
     #   flask-session
 cachetools==5.5.2
     # via google-auth
-cattrs==24.1.3
+cattrs==25.1.1
     # via requests-cache
 celery==5.5.2
     # via apache-superset (pyproject.toml)
-certifi==2025.4.26
+certifi==2025.6.15
     # via
     #   requests
     #   selenium
@@ -54,7 +54,7 @@ cffi==1.17.1
     #   pynacl
 charset-normalizer==3.4.2
     # via requests
-click==8.2.0
+click==8.2.1
     # via
     #   apache-superset (pyproject.toml)
     #   celery
@@ -145,7 +145,7 @@ geographiclib==2.0
     # via geopy
 geopy==2.4.1
     # via apache-superset (pyproject.toml)
-google-auth==2.40.1
+google-auth==2.40.3
     # via shillelagh
 greenlet==3.1.1
     # via
@@ -167,8 +167,6 @@ idna==3.10
     #   requests
     #   trio
     #   url-normalize
-importlib-metadata==8.7.0
-    # via apache-superset (pyproject.toml)
 isodate==0.7.2
     # via apache-superset (pyproject.toml)
 itsdangerous==2.2.0
@@ -211,6 +209,7 @@ markupsafe==3.0.2
     #   wtforms
 marshmallow==3.26.1
     # via
+    #   apache-superset (pyproject.toml)
     #   flask-appbuilder
     #   marshmallow-sqlalchemy
 marshmallow-sqlalchemy==1.4.0
@@ -293,7 +292,7 @@ pyjwt==2.10.1
     #   flask-jwt-extended
 pynacl==1.5.0
     # via paramiko
-pyopenssl==25.0.0
+pyopenssl==25.1.0
     # via shillelagh
 pyparsing==3.2.3
     # via apache-superset (pyproject.toml)
@@ -329,7 +328,7 @@ referencing==0.36.2
     # via
     #   jsonschema
     #   jsonschema-specifications
-requests==2.32.3
+requests==2.32.4
     # via
     #   requests-cache
     #   shillelagh
@@ -356,7 +355,6 @@ six==1.17.0
     #   prison
     #   python-dateutil
     #   rfc3339-validator
-    #   url-normalize
     #   wtforms-json
 slack-sdk==3.35.0
     # via apache-superset (pyproject.toml)
@@ -377,7 +375,7 @@ sqlalchemy-utils==0.38.3
     # via
     #   apache-superset (pyproject.toml)
     #   flask-appbuilder
-sqlglot==26.17.1
+sqlglot==26.28.1
     # via apache-superset (pyproject.toml)
 sshtunnel==0.4.0
     # via apache-superset (pyproject.toml)
@@ -389,10 +387,11 @@ trio==0.30.0
     #   trio-websocket
 trio-websocket==0.12.2
     # via selenium
-typing-extensions==4.13.2
+typing-extensions==4.14.0
     # via
     #   apache-superset (pyproject.toml)
     #   alembic
+    #   cattrs
     #   limits
     #   pyopenssl
     #   referencing
@@ -404,7 +403,7 @@ tzdata==2025.2
     #   pandas
 url-normalize==2.2.1
     # via requests-cache
-urllib3==1.26.20
+urllib3==2.5.0
     # via
     #   -r requirements/base.in
     #   requests
@@ -444,7 +443,5 @@ xlsxwriter==3.0.9
     # via
     #   apache-superset (pyproject.toml)
     #   pandas
-zipp==3.21.0
-    # via importlib-metadata
 zstandard==0.23.0
     # via flask-compress
diff --git a/requirements/development.txt b/requirements/development.txt
index 4466fc684d9..e09b972e68c 100644
--- a/requirements/development.txt
+++ b/requirements/development.txt
@@ -1,26 +1,19 @@
 # This file was autogenerated by uv via the following command:
-#    uv pip compile requirements/development.in -c requirements/base.txt -o requirements/development.txt
+#    uv pip compile pyproject.toml requirements/development.in -o requirements/development.txt
 -e .
     # via -r requirements/development.in
 alembic==1.15.2
-    # via
-    #   -c requirements/base.txt
-    #   flask-migrate
+    # via flask-migrate
 amqp==5.3.1
-    # via
-    #   -c requirements/base.txt
-    #   kombu
+    # via kombu
 apispec==6.6.1
-    # via
-    #   -c requirements/base.txt
-    #   flask-appbuilder
-apsw==3.49.2.0
-    # via
-    #   -c requirements/base.txt
-    #   shillelagh
+    # via flask-appbuilder
+apsw==3.50.1.0
+    # via shillelagh
+astroid==3.3.10
+    # via pylint
 attrs==25.3.0
     # via
-    #   -c requirements/base.txt
     #   cattrs
     #   jsonschema
     #   outcome
@@ -28,69 +21,50 @@ attrs==25.3.0
     #   requests-cache
     #   trio
 babel==2.17.0
-    # via
-    #   -c requirements/base.txt
-    #   flask-babel
+    # via flask-babel
 backoff==2.2.1
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
 bcrypt==4.3.0
-    # via
-    #   -c requirements/base.txt
-    #   paramiko
+    # via paramiko
 billiard==4.2.1
-    # via
-    #   -c requirements/base.txt
-    #   celery
+    # via celery
 blinker==1.9.0
-    # via
-    #   -c requirements/base.txt
-    #   flask
+    # via flask
 bottleneck==1.5.0
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
 brotli==1.1.0
-    # via
-    #   -c requirements/base.txt
-    #   flask-compress
+    # via flask-compress
 cachelib==0.13.0
     # via
-    #   -c requirements/base.txt
     #   flask-caching
     #   flask-session
 cachetools==5.5.2
-    # via
-    #   -c requirements/base.txt
-    #   google-auth
-cattrs==24.1.3
-    # via
-    #   -c requirements/base.txt
-    #   requests-cache
+    # via google-auth
+cattrs==25.1.1
+    # via requests-cache
 celery==5.5.2
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
-certifi==2025.4.26
+certifi==2025.6.15
     # via
-    #   -c requirements/base.txt
     #   requests
     #   selenium
 cffi==1.17.1
     # via
-    #   -c requirements/base.txt
     #   cryptography
     #   pynacl
 cfgv==3.4.0
     # via pre-commit
 charset-normalizer==3.4.2
+    # via requests
+click==8.2.1
     # via
-    #   -c requirements/base.txt
-    #   requests
-click==8.2.0
-    # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
     #   celery
     #   click-didyoumean
@@ -100,26 +74,20 @@ click==8.2.0
     #   flask
     #   flask-appbuilder
 click-didyoumean==0.3.1
-    # via
-    #   -c requirements/base.txt
-    #   celery
+    # via celery
 click-option-group==0.5.7
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
 click-plugins==1.1.1
-    # via
-    #   -c requirements/base.txt
-    #   celery
+    # via celery
 click-repl==0.3.0
-    # via
-    #   -c requirements/base.txt
-    #   celery
+    # via celery
 cmdstanpy==1.1.0
     # via prophet
 colorama==0.4.6
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
     #   flask-appbuilder
 contourpy==1.0.7
@@ -128,15 +96,15 @@ coverage==7.6.8
     # via pytest-cov
 cron-descriptor==1.4.5
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
 croniter==6.0.0
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
 cryptography==44.0.3
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
     #   paramiko
     #   pyopenssl
@@ -145,38 +113,30 @@ cycler==0.12.1
 db-dtypes==1.3.1
     # via pandas-gbq
 defusedxml==0.7.1
-    # via
-    #   -c requirements/base.txt
-    #   odfpy
+    # via odfpy
 deprecated==1.2.18
-    # via
-    #   -c requirements/base.txt
-    #   limits
+    # via limits
 deprecation==2.1.0
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
+dill==0.4.0
+    # via pylint
 distlib==0.3.8
     # via virtualenv
 dnspython==2.7.0
-    # via
-    #   -c requirements/base.txt
-    #   email-validator
+    # via email-validator
 docker==7.0.0
     # via apache-superset
 email-validator==2.2.0
-    # via
-    #   -c requirements/base.txt
-    #   flask-appbuilder
+    # via flask-appbuilder
 et-xmlfile==2.0.0
-    # via
-    #   -c requirements/base.txt
-    #   openpyxl
+    # via openpyxl
 filelock==3.12.2
     # via virtualenv
 flask==2.3.3
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
     #   flask-appbuilder
     #   flask-babel
@@ -193,57 +153,50 @@ flask==2.3.3
     #   flask-wtf
 flask-appbuilder==4.7.0
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
 flask-babel==2.0.0
-    # via
-    #   -c requirements/base.txt
-    #   flask-appbuilder
+    # via flask-appbuilder
 flask-caching==2.3.1
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
 flask-compress==1.17
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
 flask-cors==4.0.2
     # via apache-superset
 flask-jwt-extended==4.7.1
-    # via
-    #   -c requirements/base.txt
-    #   flask-appbuilder
+    # via flask-appbuilder
 flask-limiter==3.12
-    # via
-    #   -c requirements/base.txt
-    #   flask-appbuilder
+    # via flask-appbuilder
 flask-login==0.6.3
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
     #   flask-appbuilder
 flask-migrate==3.1.0
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
 flask-session==0.8.0
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
 flask-sqlalchemy==2.5.1
     # via
-    #   -c requirements/base.txt
     #   flask-appbuilder
     #   flask-migrate
 flask-talisman==1.1.0
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
 flask-testing==0.8.1
     # via apache-superset
 flask-wtf==1.2.2
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
     #   flask-appbuilder
 fonttools==4.55.0
@@ -253,12 +206,10 @@ freezegun==1.5.1
 future==1.0.0
     # via pyhive
 geographiclib==2.0
-    # via
-    #   -c requirements/base.txt
-    #   geopy
+    # via geopy
 geopy==2.4.1
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
 gevent==24.2.1
     # via apache-superset
@@ -269,9 +220,8 @@ google-api-core==2.23.0
     #   google-cloud-core
     #   pandas-gbq
     #   sqlalchemy-bigquery
-google-auth==2.40.1
+google-auth==2.40.3
     # via
-    #   -c requirements/base.txt
     #   google-api-core
     #   google-auth-oauthlib
     #   google-cloud-bigquery
@@ -303,7 +253,7 @@ googleapis-common-protos==1.66.0
     #   grpcio-status
 greenlet==3.1.1
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
     #   gevent
     #   shillelagh
@@ -316,63 +266,55 @@ grpcio-status==1.60.1
     # via google-api-core
 gunicorn==23.0.0
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
 h11==0.16.0
-    # via
-    #   -c requirements/base.txt
-    #   wsproto
+    # via wsproto
 hashids==1.3.1
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
 holidays==0.25
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
     #   prophet
 humanize==4.12.3
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
 identify==2.5.36
     # via pre-commit
 idna==3.10
     # via
-    #   -c requirements/base.txt
     #   email-validator
     #   requests
     #   trio
     #   url-normalize
-importlib-metadata==8.7.0
-    # via
-    #   -c requirements/base.txt
-    #   apache-superset
 importlib-resources==6.5.2
     # via prophet
 iniconfig==2.0.0
     # via pytest
 isodate==0.7.2
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
+isort==6.0.1
+    # via pylint
 itsdangerous==2.2.0
     # via
-    #   -c requirements/base.txt
     #   flask
     #   flask-wtf
 jinja2==3.1.6
     # via
-    #   -c requirements/base.txt
     #   flask
     #   flask-babel
 jsonpath-ng==1.7.0
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
 jsonschema==4.23.0
     # via
-    #   -c requirements/base.txt
     #   flask-appbuilder
     #   openapi-schema-validator
     #   openapi-spec-validator
@@ -380,79 +322,66 @@ jsonschema-path==0.3.4
     # via openapi-spec-validator
 jsonschema-specifications==2025.4.1
     # via
-    #   -c requirements/base.txt
     #   jsonschema
     #   openapi-schema-validator
 kiwisolver==1.4.7
     # via matplotlib
 kombu==5.5.3
-    # via
-    #   -c requirements/base.txt
-    #   celery
+    # via celery
 korean-lunar-calendar==0.3.1
-    # via
-    #   -c requirements/base.txt
-    #   holidays
+    # via holidays
 lazy-object-proxy==1.10.0
     # via openapi-spec-validator
 limits==5.1.0
-    # via
-    #   -c requirements/base.txt
-    #   flask-limiter
+    # via flask-limiter
 mako==1.3.10
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   alembic
     #   apache-superset
 markdown==3.8
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
 markdown-it-py==3.0.0
-    # via
-    #   -c requirements/base.txt
-    #   rich
+    # via rich
 markupsafe==3.0.2
     # via
-    #   -c requirements/base.txt
     #   jinja2
     #   mako
     #   werkzeug
     #   wtforms
 marshmallow==3.26.1
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
+    #   apache-superset
     #   flask-appbuilder
     #   marshmallow-sqlalchemy
 marshmallow-sqlalchemy==1.4.0
-    # via
-    #   -c requirements/base.txt
-    #   flask-appbuilder
+    # via flask-appbuilder
 matplotlib==3.9.0
     # via prophet
+mccabe==0.7.0
+    # via pylint
 mdurl==0.1.2
-    # via
-    #   -c requirements/base.txt
-    #   markdown-it-py
+    # via markdown-it-py
 msgpack==1.0.8
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
 msgspec==0.19.0
-    # via
-    #   -c requirements/base.txt
-    #   flask-session
+    # via flask-session
 mysqlclient==2.2.6
     # via apache-superset
 nh3==0.2.21
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
 nodeenv==1.8.0
     # via pre-commit
 numpy==1.26.4
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
     #   bottleneck
     #   cmdstanpy
@@ -465,31 +394,22 @@ numpy==1.26.4
 oauthlib==3.2.2
     # via requests-oauthlib
 odfpy==1.4.1
-    # via
-    #   -c requirements/base.txt
-    #   pandas
+    # via pandas
 openapi-schema-validator==0.6.3
-    # via
-    #   -c requirements/base.txt
-    #   openapi-spec-validator
+    # via openapi-spec-validator
 openapi-spec-validator==0.7.1
     # via apache-superset
 openpyxl==3.1.5
-    # via
-    #   -c requirements/base.txt
-    #   pandas
+    # via pandas
 ordered-set==4.1.0
-    # via
-    #   -c requirements/base.txt
-    #   flask-limiter
+    # via flask-limiter
 outcome==1.3.0.post0
     # via
-    #   -c requirements/base.txt
     #   trio
     #   trio-websocket
 packaging==25.0
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
     #   apispec
     #   db-dtypes
@@ -505,7 +425,7 @@ packaging==25.0
     #   sqlalchemy-bigquery
 pandas==2.0.3
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
     #   cmdstanpy
     #   db-dtypes
@@ -517,18 +437,18 @@ parameterized==0.9.0
     # via apache-superset
 paramiko==3.5.1
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
     #   sshtunnel
 parsedatetime==2.6
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
 pathable==0.4.3
     # via jsonschema-path
 pgsanity==0.2.9
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
 pillow==10.3.0
     # via
@@ -536,31 +456,25 @@ pillow==10.3.0
     #   matplotlib
 platformdirs==4.3.8
     # via
-    #   -c requirements/base.txt
+    #   pylint
     #   requests-cache
     #   virtualenv
 pluggy==1.5.0
     # via pytest
 ply==3.11
-    # via
-    #   -c requirements/base.txt
-    #   jsonpath-ng
+    # via jsonpath-ng
 polyline==2.0.2
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
 pre-commit==4.1.0
     # via apache-superset
 prison==0.2.1
-    # via
-    #   -c requirements/base.txt
-    #   flask-appbuilder
+    # via flask-appbuilder
 progress==1.6
     # via apache-superset
 prompt-toolkit==3.0.51
-    # via
-    #   -c requirements/base.txt
-    #   click-repl
+    # via click-repl
 prophet==1.1.5
     # via apache-superset
 proto-plus==1.25.0
@@ -580,25 +494,21 @@ psycopg2-binary==2.9.6
     # via apache-superset
 pyarrow==18.1.0
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
     #   db-dtypes
     #   pandas-gbq
 pyasn1==0.6.1
     # via
-    #   -c requirements/base.txt
     #   pyasn1-modules
     #   python-ldap
     #   rsa
 pyasn1-modules==0.4.2
     # via
-    #   -c requirements/base.txt
     #   google-auth
     #   python-ldap
 pycparser==2.22
-    # via
-    #   -c requirements/base.txt
-    #   cffi
+    # via cffi
 pydata-google-auth==1.9.0
     # via pandas-gbq
 pydruid==0.6.9
@@ -606,36 +516,30 @@ pydruid==0.6.9
 pyfakefs==5.3.5
     # via apache-superset
 pygments==2.19.1
-    # via
-    #   -c requirements/base.txt
-    #   rich
+    # via rich
 pyhive==0.7.0
     # via apache-superset
 pyinstrument==4.4.0
     # via apache-superset
 pyjwt==2.10.1
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
     #   flask-appbuilder
     #   flask-jwt-extended
+pylint==3.3.7
+    # via apache-superset
 pynacl==1.5.0
-    # via
-    #   -c requirements/base.txt
-    #   paramiko
-pyopenssl==25.0.0
-    # via
-    #   -c requirements/base.txt
-    #   shillelagh
+    # via paramiko
+pyopenssl==25.1.0
+    # via shillelagh
 pyparsing==3.2.3
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
     #   matplotlib
 pysocks==1.7.1
-    # via
-    #   -c requirements/base.txt
-    #   urllib3
+    # via urllib3
 pytest==7.4.4
     # via
     #   apache-superset
@@ -647,7 +551,7 @@ pytest-mock==3.10.0
     # via apache-superset
 python-dateutil==2.9.0.post0
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
     #   celery
     #   croniter
@@ -662,45 +566,40 @@ python-dateutil==2.9.0.post0
     #   trino
 python-dotenv==1.1.0
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
 python-geohash==0.8.5
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
 python-ldap==3.4.4
     # via apache-superset
 pytz==2025.2
     # via
-    #   -c requirements/base.txt
     #   croniter
     #   flask-babel
     #   pandas
     #   trino
 pyxlsb==1.0.10
-    # via
-    #   -c requirements/base.txt
-    #   pandas
+    # via pandas
 pyyaml==6.0.2
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
     #   apispec
     #   jsonschema-path
     #   pre-commit
 redis==4.6.0
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
 referencing==0.36.2
     # via
-    #   -c requirements/base.txt
     #   jsonschema
     #   jsonschema-path
     #   jsonschema-specifications
-requests==2.32.3
+requests==2.32.4
     # via
-    #   -c requirements/base.txt
     #   docker
     #   google-api-core
     #   google-cloud-bigquery
@@ -712,33 +611,24 @@ requests==2.32.3
     #   shillelagh
     #   trino
 requests-cache==1.2.1
-    # via
-    #   -c requirements/base.txt
-    #   shillelagh
+    # via shillelagh
 requests-oauthlib==2.0.0
     # via google-auth-oauthlib
 rfc3339-validator==0.1.4
-    # via
-    #   -c requirements/base.txt
-    #   openapi-schema-validator
+    # via openapi-schema-validator
 rich==13.9.4
-    # via
-    #   -c requirements/base.txt
-    #   flask-limiter
+    # via flask-limiter
 rpds-py==0.25.0
     # via
-    #   -c requirements/base.txt
     #   jsonschema
     #   referencing
 rsa==4.9.1
-    # via
-    #   -c requirements/base.txt
-    #   google-auth
+    # via google-auth
 ruff==0.8.0
     # via apache-superset
 selenium==4.32.0
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
 setuptools==80.7.1
     # via
@@ -749,34 +639,29 @@ setuptools==80.7.1
     #   zope-interface
 shillelagh==1.3.5
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
 simplejson==3.20.1
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
 six==1.17.0
     # via
-    #   -c requirements/base.txt
     #   prison
     #   python-dateutil
     #   rfc3339-validator
     #   wtforms-json
 slack-sdk==3.35.0
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
 sniffio==1.3.1
-    # via
-    #   -c requirements/base.txt
-    #   trio
+    # via trio
 sortedcontainers==2.4.0
-    # via
-    #   -c requirements/base.txt
-    #   trio
+    # via trio
 sqlalchemy==1.4.54
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   alembic
     #   apache-superset
     #   flask-appbuilder
@@ -789,25 +674,27 @@ sqlalchemy-bigquery==1.12.0
     # via apache-superset
 sqlalchemy-utils==0.38.3
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
     #   flask-appbuilder
-sqlglot==26.17.1
+sqlglot==26.28.1
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
 sqloxide==0.1.51
     # via apache-superset
 sshtunnel==0.4.0
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
 statsd==4.0.1
     # via apache-superset
 tabulate==0.9.0
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
+tomlkit==0.13.3
+    # via pylint
 tqdm==4.67.1
     # via
     #   cmdstanpy
@@ -816,18 +703,16 @@ trino==0.330.0
     # via apache-superset
 trio==0.30.0
     # via
-    #   -c requirements/base.txt
     #   selenium
     #   trio-websocket
 trio-websocket==0.12.2
+    # via selenium
+typing-extensions==4.14.0
     # via
-    #   -c requirements/base.txt
-    #   selenium
-typing-extensions==4.13.2
-    # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   alembic
     #   apache-superset
+    #   cattrs
     #   limits
     #   pyopenssl
     #   referencing
@@ -835,82 +720,60 @@ typing-extensions==4.13.2
     #   shillelagh
 tzdata==2025.2
     # via
-    #   -c requirements/base.txt
     #   kombu
     #   pandas
 tzlocal==5.2
     # via trino
 url-normalize==2.2.1
+    # via requests-cache
+urllib3==2.5.0
     # via
-    #   -c requirements/base.txt
-    #   requests-cache
-urllib3==1.26.20
-    # via
-    #   -c requirements/base.txt
     #   docker
     #   requests
     #   requests-cache
     #   selenium
 vine==5.1.0
     # via
-    #   -c requirements/base.txt
     #   amqp
     #   celery
     #   kombu
 virtualenv==20.29.2
     # via pre-commit
 wcwidth==0.2.13
-    # via
-    #   -c requirements/base.txt
-    #   prompt-toolkit
+    # via prompt-toolkit
 websocket-client==1.8.0
-    # via
-    #   -c requirements/base.txt
-    #   selenium
+    # via selenium
 werkzeug==3.1.3
     # via
-    #   -c requirements/base.txt
     #   flask
     #   flask-appbuilder
     #   flask-jwt-extended
     #   flask-login
 wrapt==1.17.2
-    # via
-    #   -c requirements/base.txt
-    #   deprecated
+    # via deprecated
 wsproto==1.2.0
-    # via
-    #   -c requirements/base.txt
-    #   trio-websocket
+    # via trio-websocket
 wtforms==3.2.1
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
     #   flask-appbuilder
     #   flask-wtf
     #   wtforms-json
 wtforms-json==0.3.5
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
 xlrd==2.0.1
-    # via
-    #   -c requirements/base.txt
-    #   pandas
+    # via pandas
 xlsxwriter==3.0.9
     # via
-    #   -c requirements/base.txt
+    #   apache-superset (pyproject.toml)
     #   apache-superset
     #   pandas
-zipp==3.21.0
-    # via
-    #   -c requirements/base.txt
-    #   importlib-metadata
 zope-event==5.0
     # via gevent
 zope-interface==5.4.0
     # via gevent
 zstandard==0.23.0
-    # via
-    #   -c requirements/base.txt
-    #   flask-compress
+    # via flask-compress
diff --git a/requirements/translations.txt b/requirements/translations.txt
index 1cd3ce84d76..a767b0baf95 100644
--- a/requirements/translations.txt
+++ b/requirements/translations.txt
@@ -1,4 +1,430 @@
 # This file was autogenerated by uv via the following command:
-#    uv pip compile requirements/translations.in -o requirements/translations.txt
+#    uv pip compile pyproject.toml requirements/translations.in -o requirements/translations.txt
+alembic==1.16.2
+    # via flask-migrate
+amqp==5.3.1
+    # via kombu
+apispec==6.8.2
+    # via flask-appbuilder
+apsw==3.50.2.0
+    # via shillelagh
+attrs==25.3.0
+    # via
+    #   cattrs
+    #   jsonschema
+    #   outcome
+    #   referencing
+    #   requests-cache
+    #   trio
 babel==2.17.0
-    # via -r requirements/translations.in
+    # via
+    #   -r requirements/translations.in
+    #   flask-babel
+backoff==2.2.1
+    # via apache-superset (pyproject.toml)
+bcrypt==4.3.0
+    # via paramiko
+billiard==4.2.1
+    # via celery
+blinker==1.9.0
+    # via flask
+bottleneck==1.5.0
+    # via apache-superset (pyproject.toml)
+brotli==1.1.0
+    # via flask-compress
+cachelib==0.13.0
+    # via
+    #   flask-caching
+    #   flask-session
+cachetools==5.5.2
+    # via google-auth
+cattrs==25.1.1
+    # via requests-cache
+celery==5.5.3
+    # via apache-superset (pyproject.toml)
+certifi==2025.6.15
+    # via
+    #   requests
+    #   selenium
+cffi==1.17.1
+    # via
+    #   cryptography
+    #   pynacl
+charset-normalizer==3.4.2
+    # via requests
+click==8.2.1
+    # via
+    #   apache-superset (pyproject.toml)
+    #   celery
+    #   click-didyoumean
+    #   click-option-group
+    #   click-plugins
+    #   click-repl
+    #   flask
+    #   flask-appbuilder
+click-didyoumean==0.3.1
+    # via celery
+click-option-group==0.5.7
+    # via apache-superset (pyproject.toml)
+click-plugins==1.1.1.2
+    # via celery
+click-repl==0.3.0
+    # via celery
+colorama==0.4.6
+    # via
+    #   apache-superset (pyproject.toml)
+    #   flask-appbuilder
+cron-descriptor==1.4.5
+    # via apache-superset (pyproject.toml)
+croniter==6.0.0
+    # via apache-superset (pyproject.toml)
+cryptography==44.0.3
+    # via
+    #   apache-superset (pyproject.toml)
+    #   paramiko
+    #   pyopenssl
+defusedxml==0.7.1
+    # via odfpy
+deprecated==1.2.18
+    # via limits
+deprecation==2.1.0
+    # via apache-superset (pyproject.toml)
+dnspython==2.7.0
+    # via email-validator
+email-validator==2.2.0
+    # via flask-appbuilder
+et-xmlfile==2.0.0
+    # via openpyxl
+flask==2.3.3
+    # via
+    #   apache-superset (pyproject.toml)
+    #   flask-appbuilder
+    #   flask-babel
+    #   flask-caching
+    #   flask-compress
+    #   flask-jwt-extended
+    #   flask-limiter
+    #   flask-login
+    #   flask-migrate
+    #   flask-session
+    #   flask-sqlalchemy
+    #   flask-wtf
+flask-appbuilder==4.7.0
+    # via apache-superset (pyproject.toml)
+flask-babel==2.0.0
+    # via flask-appbuilder
+flask-caching==2.3.1
+    # via apache-superset (pyproject.toml)
+flask-compress==1.17
+    # via apache-superset (pyproject.toml)
+flask-jwt-extended==4.7.1
+    # via flask-appbuilder
+flask-limiter==3.12
+    # via flask-appbuilder
+flask-login==0.6.3
+    # via
+    #   apache-superset (pyproject.toml)
+    #   flask-appbuilder
+flask-migrate==3.1.0
+    # via apache-superset (pyproject.toml)
+flask-session==0.8.0
+    # via apache-superset (pyproject.toml)
+flask-sqlalchemy==2.5.1
+    # via
+    #   flask-appbuilder
+    #   flask-migrate
+flask-talisman==1.1.0
+    # via apache-superset (pyproject.toml)
+flask-wtf==1.2.2
+    # via
+    #   apache-superset (pyproject.toml)
+    #   flask-appbuilder
+geographiclib==2.0
+    # via geopy
+geopy==2.4.1
+    # via apache-superset (pyproject.toml)
+google-auth==2.40.3
+    # via shillelagh
+greenlet==3.1.1
+    # via
+    #   apache-superset (pyproject.toml)
+    #   shillelagh
+gunicorn==23.0.0
+    # via apache-superset (pyproject.toml)
+h11==0.16.0
+    # via wsproto
+hashids==1.3.1
+    # via apache-superset (pyproject.toml)
+holidays==0.25
+    # via apache-superset (pyproject.toml)
+humanize==4.12.3
+    # via apache-superset (pyproject.toml)
+idna==3.10
+    # via
+    #   email-validator
+    #   requests
+    #   trio
+    #   url-normalize
+isodate==0.7.2
+    # via apache-superset (pyproject.toml)
+itsdangerous==2.2.0
+    # via
+    #   flask
+    #   flask-wtf
+jinja2==3.1.6
+    # via
+    #   flask
+    #   flask-babel
+jsonpath-ng==1.7.0
+    # via apache-superset (pyproject.toml)
+jsonschema==4.24.0
+    # via flask-appbuilder
+jsonschema-specifications==2025.4.1
+    # via jsonschema
+kombu==5.5.4
+    # via celery
+korean-lunar-calendar==0.3.1
+    # via holidays
+limits==5.4.0
+    # via flask-limiter
+mako==1.3.10
+    # via
+    #   apache-superset (pyproject.toml)
+    #   alembic
+markdown==3.8.2
+    # via apache-superset (pyproject.toml)
+markdown-it-py==3.0.0
+    # via rich
+markupsafe==3.0.2
+    # via
+    #   jinja2
+    #   mako
+    #   werkzeug
+    #   wtforms
+marshmallow==3.26.1
+    # via
+    #   apache-superset (pyproject.toml)
+    #   flask-appbuilder
+    #   marshmallow-sqlalchemy
+marshmallow-sqlalchemy==1.4.2
+    # via flask-appbuilder
+mdurl==0.1.2
+    # via markdown-it-py
+msgpack==1.0.8
+    # via apache-superset (pyproject.toml)
+msgspec==0.19.0
+    # via flask-session
+nh3==0.2.21
+    # via apache-superset (pyproject.toml)
+numpy==2.2.6
+    # via
+    #   apache-superset (pyproject.toml)
+    #   bottleneck
+    #   pandas
+odfpy==1.4.1
+    # via pandas
+openpyxl==3.1.5
+    # via pandas
+ordered-set==4.1.0
+    # via flask-limiter
+outcome==1.3.0.post0
+    # via
+    #   trio
+    #   trio-websocket
+packaging==25.0
+    # via
+    #   apache-superset (pyproject.toml)
+    #   apispec
+    #   deprecation
+    #   gunicorn
+    #   kombu
+    #   limits
+    #   marshmallow
+    #   shillelagh
+pandas==2.0.3
+    # via apache-superset (pyproject.toml)
+paramiko==3.5.1
+    # via
+    #   apache-superset (pyproject.toml)
+    #   sshtunnel
+parsedatetime==2.6
+    # via apache-superset (pyproject.toml)
+pgsanity==0.2.9
+    # via apache-superset (pyproject.toml)
+platformdirs==4.3.8
+    # via requests-cache
+ply==3.11
+    # via jsonpath-ng
+polyline==2.0.2
+    # via apache-superset (pyproject.toml)
+prison==0.2.1
+    # via flask-appbuilder
+prompt-toolkit==3.0.51
+    # via click-repl
+pyarrow==18.1.0
+    # via apache-superset (pyproject.toml)
+pyasn1==0.6.1
+    # via
+    #   pyasn1-modules
+    #   rsa
+pyasn1-modules==0.4.2
+    # via google-auth
+pycparser==2.22
+    # via cffi
+pygments==2.19.2
+    # via rich
+pyjwt==2.10.1
+    # via
+    #   apache-superset (pyproject.toml)
+    #   flask-appbuilder
+    #   flask-jwt-extended
+pynacl==1.5.0
+    # via paramiko
+pyopenssl==25.1.0
+    # via shillelagh
+pyparsing==3.2.3
+    # via apache-superset (pyproject.toml)
+pysocks==1.7.1
+    # via urllib3
+python-dateutil==2.9.0.post0
+    # via
+    #   apache-superset (pyproject.toml)
+    #   celery
+    #   croniter
+    #   flask-appbuilder
+    #   holidays
+    #   pandas
+    #   shillelagh
+python-dotenv==1.1.1
+    # via apache-superset (pyproject.toml)
+python-geohash==0.8.5
+    # via apache-superset (pyproject.toml)
+pytz==2025.2
+    # via
+    #   croniter
+    #   flask-babel
+    #   pandas
+pyxlsb==1.0.10
+    # via pandas
+pyyaml==6.0.2
+    # via
+    #   apache-superset (pyproject.toml)
+    #   apispec
+redis==4.6.0
+    # via apache-superset (pyproject.toml)
+referencing==0.36.2
+    # via
+    #   jsonschema
+    #   jsonschema-specifications
+requests==2.32.4
+    # via
+    #   requests-cache
+    #   shillelagh
+requests-cache==1.2.1
+    # via shillelagh
+rich==13.9.4
+    # via flask-limiter
+rpds-py==0.25.1
+    # via
+    #   jsonschema
+    #   referencing
+rsa==4.9.1
+    # via google-auth
+selenium==4.34.0
+    # via apache-superset (pyproject.toml)
+shillelagh==1.3.5
+    # via apache-superset (pyproject.toml)
+simplejson==3.20.1
+    # via apache-superset (pyproject.toml)
+six==1.17.0
+    # via
+    #   prison
+    #   python-dateutil
+    #   wtforms-json
+slack-sdk==3.35.0
+    # via apache-superset (pyproject.toml)
+sniffio==1.3.1
+    # via trio
+sortedcontainers==2.4.0
+    # via trio
+sqlalchemy==1.4.54
+    # via
+    #   apache-superset (pyproject.toml)
+    #   alembic
+    #   flask-appbuilder
+    #   flask-sqlalchemy
+    #   marshmallow-sqlalchemy
+    #   shillelagh
+    #   sqlalchemy-utils
+sqlalchemy-utils==0.38.3
+    # via
+    #   apache-superset (pyproject.toml)
+    #   flask-appbuilder
+sqlglot==26.31.0
+    # via apache-superset (pyproject.toml)
+sshtunnel==0.4.0
+    # via apache-superset (pyproject.toml)
+tabulate==0.9.0
+    # via apache-superset (pyproject.toml)
+trio==0.30.0
+    # via
+    #   selenium
+    #   trio-websocket
+trio-websocket==0.12.2
+    # via selenium
+typing-extensions==4.14.0
+    # via
+    #   apache-superset (pyproject.toml)
+    #   alembic
+    #   cattrs
+    #   limits
+    #   pyopenssl
+    #   referencing
+    #   selenium
+    #   shillelagh
+tzdata==2025.2
+    # via
+    #   kombu
+    #   pandas
+url-normalize==2.2.1
+    # via requests-cache
+urllib3==2.4.0
+    # via
+    #   requests
+    #   requests-cache
+    #   selenium
+vine==5.1.0
+    # via
+    #   amqp
+    #   celery
+    #   kombu
+wcwidth==0.2.13
+    # via prompt-toolkit
+websocket-client==1.8.0
+    # via selenium
+werkzeug==3.1.3
+    # via
+    #   flask
+    #   flask-appbuilder
+    #   flask-jwt-extended
+    #   flask-login
+wrapt==1.17.2
+    # via deprecated
+wsproto==1.2.0
+    # via trio-websocket
+wtforms==3.2.1
+    # via
+    #   apache-superset (pyproject.toml)
+    #   flask-appbuilder
+    #   flask-wtf
+    #   wtforms-json
+wtforms-json==0.3.5
+    # via apache-superset (pyproject.toml)
+xlrd==2.0.2
+    # via pandas
+xlsxwriter==3.0.9
+    # via
+    #   apache-superset (pyproject.toml)
+    #   pandas
+zstandard==0.23.0
+    # via flask-compress
diff --git a/superset-embedded-sdk/README.md b/superset-embedded-sdk/README.md
index 63d8e706183..f9250fd1920 100644
--- a/superset-embedded-sdk/README.md
+++ b/superset-embedded-sdk/README.md
@@ -116,8 +116,11 @@ Example `POST /security/guest_token` payload:
 }
 ```
 
-Alternatively, a guest token can be created directly in your app with a json like the following, and then signed
-with the secret set in configuration variable `GUEST_TOKEN_JWT_SECRET` (see configuration file config.py)
+Alternatively, a guest token can be created directly in your app without interacting with the Superset API.
+To do this, you should update the `GUEST_TOKEN_JWT_SECRET`
+in the Superset [config.py](https://github.com/apache/superset/blob/master/superset/config.py). Also set the
+`GUEST_TOKEN_JWT_AUDIENCE` variable that matches what is set for the `aud` in the JSON payload:
+
 ```
 {
   "user": {
@@ -139,6 +142,13 @@ with the secret set in configuration variable `GUEST_TOKEN_JWT_SECRET` (see conf
 }
 ```
 
+In this example, the configuration file includes the following setting:
+
+```python
+GUEST_TOKEN_JWT_AUDIENCE="superset"
+```
+
+
 ### Sandbox iframe
 
 The Embedded SDK creates an iframe with [sandbox](https://developer.mozilla.org/es/docs/Web/HTML/Element/iframe#sandbox) mode by default
diff --git a/superset-embedded-sdk/package-lock.json b/superset-embedded-sdk/package-lock.json
index fc03f865291..cbbdb210357 100644
--- a/superset-embedded-sdk/package-lock.json
+++ b/superset-embedded-sdk/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@superset-ui/embedded-sdk",
-  "version": "0.1.3",
+  "version": "0.2.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@superset-ui/embedded-sdk",
-      "version": "0.1.3",
+      "version": "0.2.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@superset-ui/switchboard": "^0.20.3",
diff --git a/superset-embedded-sdk/package.json b/superset-embedded-sdk/package.json
index c18fab803a8..336b0b926da 100644
--- a/superset-embedded-sdk/package.json
+++ b/superset-embedded-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/embedded-sdk",
-  "version": "0.1.3",
+  "version": "0.2.0",
   "description": "SDK for embedding resources from Superset into your own application",
   "access": "public",
   "keywords": [
diff --git a/superset-embedded-sdk/src/index.ts b/superset-embedded-sdk/src/index.ts
index f0ae1cab42e..9332e876e82 100644
--- a/superset-embedded-sdk/src/index.ts
+++ b/superset-embedded-sdk/src/index.ts
@@ -89,6 +89,7 @@ export type EmbeddedDashboard = {
     callbackFn: ObserveDataMaskCallbackFn,
   ) => void;
   getDataMask: () => Record<string, any>;
+  setThemeConfig: (themeConfig: Record<string, any>) => void;
 };
 
 /**
@@ -245,6 +246,18 @@ export async function embedDashboard({
     ourPort.start();
     ourPort.defineMethod('observeDataMask', callbackFn);
   };
+  // TODO: Add proper types once theming branch is merged
+  const setThemeConfig = async (themeConfig: Record<string, any>): Promise<void> => {
+    try {
+      ourPort.emit('setThemeConfig', { themeConfig });
+      log('Theme config sent successfully (or at least message dispatched)');
+    } catch (error) {
+      log(
+        'Error sending theme config. Ensure the iframe side implements the "setThemeConfig" method.',
+      );
+      throw error;
+    }
+  };
 
   return {
     getScrollSize,
@@ -253,5 +266,6 @@ export async function embedDashboard({
     getActiveTabs,
     observeDataMask,
     getDataMask,
+    setThemeConfig
   };
 }
diff --git a/superset-frontend/.eslintignore b/superset-frontend/.eslintignore
index 0ef97d6e3b0..794f3b68c1e 100644
--- a/superset-frontend/.eslintignore
+++ b/superset-frontend/.eslintignore
@@ -19,7 +19,6 @@
 coverage/**
 dist/*
 src/assets/images/*
-src/assets/stylesheets/*
 node_modules/*
 node_modules*/*
 vendor/*
diff --git a/superset-frontend/.eslintrc.js b/superset-frontend/.eslintrc.js
index 65cdd18a2c7..bd87c8c6a47 100644
--- a/superset-frontend/.eslintrc.js
+++ b/superset-frontend/.eslintrc.js
@@ -52,7 +52,7 @@ const restrictedImportsRules = {
     message: 'Lodash Memoize is unsafe! Please use memoize-one instead',
   },
   'no-testing-library-react': {
-    name: '@testing-library/react',
+    name: '@superset-ui/core/spec',
     message: 'Please use spec/helpers/testing-library instead',
   },
   'no-testing-library-react-dom-utils': {
@@ -63,16 +63,16 @@ const restrictedImportsRules = {
     name: 'antd',
     message: 'Please import Ant components from the index of src/components',
   },
-  'no-antd-v5': {
-    name: 'antd-v5',
-    message: 'Please import Ant v5 components from the index of src/components',
-  },
   'no-superset-theme': {
     name: '@superset-ui/core',
     importNames: ['supersetTheme'],
     message:
       'Please use the theme directly from the ThemeProvider rather than importing supersetTheme.',
   },
+  'no-query-string': {
+    name: 'query-string',
+    message: 'Please use the URLSearchParams API instead of query-string.',
+  },
 };
 
 module.exports = {
@@ -86,9 +86,7 @@ module.exports = {
   ],
   parser: '@babel/eslint-parser',
   parserOptions: {
-    ecmaFeatures: {
-      experimentalObjectRestSpread: true,
-    },
+    ecmaVersion: 2018,
   },
   env: {
     browser: true,
@@ -101,6 +99,15 @@ module.exports = {
         // resolve modules from `/superset_frontend/node_modules` and `/superset_frontend`
         moduleDirectory: ['node_modules', '.'],
       },
+      typescript: {
+        alwaysTryTypes: true,
+        project: [
+          './tsconfig.json',
+          './packages/superset-ui-core/tsconfig.json',
+          './packages/superset-ui-chart-controls/',
+          './plugins/*/tsconfig.json',
+        ],
+      },
     },
     // only allow import from top level of module
     'import/core-modules': importCoreModules,
@@ -118,6 +125,11 @@ module.exports = {
     'react-prefer-function-component',
     'prettier',
   ],
+  // Add this TS ESlint rule in separate `rules` section to avoid breakages with JS/TS files in /cypress-base.
+  // TODO(hainenber): merge it to below `rules` section.
+  rules: {
+    '@typescript-eslint/prefer-optional-chain': 'error',
+  },
   overrides: [
     {
       files: ['*.ts', '*.tsx'],
@@ -151,7 +163,7 @@ module.exports = {
         '@typescript-eslint/no-non-null-assertion': 0, // disabled temporarily
         '@typescript-eslint/explicit-function-return-type': 0,
         '@typescript-eslint/explicit-module-boundary-types': 0, // re-enable up for discussion
-        '@typescript-eslint/prefer-optional-chain': 2,
+        '@typescript-eslint/no-unused-vars': 'warn', // downgrade to Warning severity for Jest v30 upgrade
         camelcase: 0,
         'class-methods-use-this': 0,
         'func-names': 0,
@@ -295,9 +307,9 @@ module.exports = {
           'error',
           {
             paths: Object.values(restrictedImportsRules).filter(
-              r => r.name !== 'antd-v5',
+              r => r.name !== 'antd',
             ),
-            patterns: ['antd/*'],
+            patterns: [],
           },
         ],
       },
@@ -330,7 +342,9 @@ module.exports = {
       rules: {
         'import/no-extraneous-dependencies': [
           'error',
-          { devDependencies: true },
+          {
+            devDependencies: true,
+          },
         ],
         'no-only-tests/no-only-tests': 'error',
         'max-classes-per-file': 0,
@@ -373,7 +387,7 @@ module.exports = {
         'fixtures.*',
         'cypress-base/cypress/**/*',
         'Stories.tsx',
-        'packages/superset-ui-core/src/style/index.tsx',
+        'packages/superset-ui-core/src/theme/index.tsx',
       ],
       rules: {
         'theme-colors/no-literal-colors': 0,
@@ -384,6 +398,7 @@ module.exports = {
       },
     },
   ],
+  // eslint-disable-next-line no-dupe-keys
   rules: {
     'theme-colors/no-literal-colors': 'error',
     'icons/no-fa-icons-usage': 'error',
diff --git a/superset-frontend/.storybook/main.js b/superset-frontend/.storybook/main.js
index 884c73ef94b..0a5181d0393 100644
--- a/superset-frontend/.storybook/main.js
+++ b/superset-frontend/.storybook/main.js
@@ -24,6 +24,7 @@ module.exports = {
   stories: [
     '../src/@(components|common|filters|explore|views|dashboard|features)/**/*.stories.@(tsx|jsx)',
     '../packages/superset-ui-demo/storybook/stories/**/*.*.@(tsx|jsx)',
+    '../packages/superset-ui-core/src/components/**/*.stories.@(tsx|jsx)',
   ],
 
   addons: [
diff --git a/superset-frontend/.storybook/preview.jsx b/superset-frontend/.storybook/preview.jsx
index ef27f3591e8..3d407191c72 100644
--- a/superset-frontend/.storybook/preview.jsx
+++ b/superset-frontend/.storybook/preview.jsx
@@ -17,31 +17,75 @@
  * under the License.
  */
 import { withJsx } from '@mihkeleidast/storybook-addon-source';
-import { supersetTheme, ThemeProvider } from '@superset-ui/core';
-import { AntdThemeProvider } from '../src/components/AntdThemeProvider';
+import { themeObject, css, exampleThemes } from '@superset-ui/core';
 import { combineReducers, createStore, applyMiddleware, compose } from 'redux';
 import thunk from 'redux-thunk';
 import { Provider } from 'react-redux';
 import reducerIndex from 'spec/helpers/reducerIndex';
-import { GlobalStyles } from '../src/GlobalStyles';
+import { Global } from '@emotion/react';
+import { App, Layout, Space, Content } from 'antd';
 
 import 'src/theme.ts';
 import './storybook.css';
 
+export const GlobalStylesOverrides = () => (
+  <Global
+    styles={css`
+      html,
+      body,
+      #storybook-root {
+        margin: 0 !important;
+        padding: 0 !important;
+        min-height: 100vh !important;
+      }
+
+      .ant-app {
+        min-height: 100vh !important;
+      }
+    `}
+  />
+);
+
 const store = createStore(
   combineReducers(reducerIndex),
   {},
   compose(applyMiddleware(thunk)),
 );
 
-const themeDecorator = Story => (
-  <ThemeProvider theme={supersetTheme}>
-    <AntdThemeProvider>
-      <GlobalStyles />
-      <Story />
-    </AntdThemeProvider>
-  </ThemeProvider>
-);
+export const globalTypes = {
+  theme: {
+    name: 'Theme',
+    description: 'Global theme for components',
+    defaultValue: 'superset',
+    toolbar: {
+      icon: 'paintbrush',
+      items: Object.keys(exampleThemes),
+    },
+  },
+};
+
+const themeDecorator = (Story, context) => {
+  const themeKey = context.globals.theme || 'superset';
+  themeObject.setConfig(exampleThemes[themeKey]);
+
+  return (
+    <themeObject.SupersetThemeProvider>
+      <App>
+        <GlobalStylesOverrides />
+        <Layout
+          style={{
+            minHeight: '100vh',
+            width: '100%',
+            padding: 24,
+            backgroundColor: themeObject.theme.colorBgBase,
+          }}
+        >
+          <Story {...context} />
+        </Layout>
+      </App>
+    </themeObject.SupersetThemeProvider>
+  );
+};
 
 const providerDecorator = Story => (
   <Provider store={store}>
@@ -81,5 +125,5 @@ export const parameters = {
       ],
     },
   },
-  controls: { expanded: true, sort: 'alpha' },
+  controls: { expanded: true, sort: 'alpha', disableSaveFromUI: true },
 };
diff --git a/superset-frontend/.storybook/storybook.css b/superset-frontend/.storybook/storybook.css
index b4e2fce55b7..25fa51c5a8b 100644
--- a/superset-frontend/.storybook/storybook.css
+++ b/superset-frontend/.storybook/storybook.css
@@ -1,3 +1,2 @@
 body {
-  background: transparent;
 }
diff --git a/superset-frontend/cypress-base/cypress/e2e/alerts_and_reports/reports.test.ts b/superset-frontend/cypress-base/cypress/e2e/alerts_and_reports/reports.test.ts
deleted file mode 100644
index a227fa03d7d..00000000000
--- a/superset-frontend/cypress-base/cypress/e2e/alerts_and_reports/reports.test.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 { REPORT_LIST } from 'cypress/utils/urls';
-
-describe('Report list view', () => {
-  before(() => {
-    cy.visit(REPORT_LIST);
-  });
-
-  it('should load report lists', () => {
-    cy.getBySel('listview-table').should('be.visible');
-    cy.getBySel('sort-header').eq(1).contains('Last run');
-    cy.getBySel('sort-header').eq(2).contains('Name');
-    cy.getBySel('sort-header').eq(3).contains('Schedule');
-    cy.getBySel('sort-header').eq(4).contains('Notification method');
-    cy.getBySel('sort-header').eq(5).contains('Owners');
-    cy.getBySel('sort-header').eq(6).contains('Last modified');
-    cy.getBySel('sort-header').eq(7).contains('Active');
-    // TODO Cypress won't recognize the Actions column
-    // cy.getBySel('sort-header').eq(9).contains('Actions');
-  });
-});
diff --git a/superset-frontend/cypress-base/cypress/e2e/auth/login.test.ts b/superset-frontend/cypress-base/cypress/e2e/auth/login.test.ts
new file mode 100644
index 00000000000..2f14145cd70
--- /dev/null
+++ b/superset-frontend/cypress-base/cypress/e2e/auth/login.test.ts
@@ -0,0 +1,56 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { LOGIN } from 'cypress/utils/urls';
+
+function interceptLogin() {
+  cy.intercept('POST', '/login/').as('login');
+}
+
+describe('Login view', () => {
+  beforeEach(() => {
+    cy.visit(LOGIN);
+  });
+
+  it('should load login page', () => {
+    cy.getBySel('login-form').should('be.visible');
+    cy.getBySel('username-input').should('be.visible');
+    cy.getBySel('password-input').should('be.visible');
+    cy.getBySel('login-button').should('be.visible');
+  });
+
+  it('should redirect to login with incorrect username and password', () => {
+    interceptLogin();
+    cy.getBySel('login-form').should('be.visible');
+    cy.getBySel('username-input').type('admin');
+    cy.getBySel('password-input').type('wrongpassword');
+    cy.getBySel('login-button').click();
+    cy.wait('@login');
+    cy.url().should('include', LOGIN);
+  });
+
+  it('should login with correct username and password', () => {
+    interceptLogin();
+    cy.getBySel('login-form').should('be.visible');
+    cy.getBySel('username-input').type('admin');
+    cy.getBySel('password-input').type('general');
+    cy.getBySel('login-button').click();
+    cy.wait('@login');
+    cy.getCookies().should('have.length', 1);
+  });
+});
diff --git a/superset-frontend/src/components/Table/cell-renderers/NullCell/NullCell.test.tsx b/superset-frontend/cypress-base/cypress/e2e/auth/register.test.ts
similarity index 56%
rename from superset-frontend/src/components/Table/cell-renderers/NullCell/NullCell.test.tsx
rename to superset-frontend/cypress-base/cypress/e2e/auth/register.test.ts
index f2a2bcbf83c..3b036aba010 100644
--- a/superset-frontend/src/components/Table/cell-renderers/NullCell/NullCell.test.tsx
+++ b/superset-frontend/cypress-base/cypress/e2e/auth/register.test.ts
@@ -16,19 +16,22 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { render, screen } from 'spec/helpers/testing-library';
-import { supersetTheme } from '@superset-ui/core';
-import { NULL_DISPLAY } from 'src/constants';
-import NullCell from '.';
 
-test('renders null value', async () => {
-  render(<NullCell />);
-  expect(screen.getByText(NULL_DISPLAY)).toBeInTheDocument();
-});
+import { REGISTER } from 'cypress/utils/urls';
 
-test('renders with gray font', async () => {
-  render(<NullCell />);
-  expect(screen.getByText(NULL_DISPLAY)).toHaveStyle(
-    `color: ${supersetTheme.colors.grayscale.light1}`,
-  );
+describe('Register view', () => {
+  beforeEach(() => {
+    cy.visit(REGISTER);
+  });
+
+  it('should load register page', () => {
+    cy.getBySel('register-form').should('be.visible');
+    cy.getBySel('username-input').should('be.visible');
+    cy.getBySel('first-name-input').should('be.visible');
+    cy.getBySel('last-name-input').should('be.visible');
+    cy.getBySel('email-input').should('be.visible');
+    cy.getBySel('password-input').should('be.visible');
+    cy.getBySel('confirm-password-input').should('be.visible');
+    cy.getBySel('register-button').should('be.visible');
+  });
 });
diff --git a/superset-frontend/cypress-base/cypress/e2e/chart_list/list.test.ts b/superset-frontend/cypress-base/cypress/e2e/chart_list/list.test.ts
index cd99250a9e5..80832f40580 100644
--- a/superset-frontend/cypress-base/cypress/e2e/chart_list/list.test.ts
+++ b/superset-frontend/cypress-base/cypress/e2e/chart_list/list.test.ts
@@ -35,12 +35,12 @@ function orderAlphabetical() {
 }
 
 function openProperties() {
-  cy.get('[aria-label="more"]').eq(1).click();
+  cy.get('[aria-label="more"]').eq(0).click();
   cy.getBySel('chart-list-edit-option').click();
 }
 
 function openMenu() {
-  cy.get('[aria-label="more"]').eq(1).click();
+  cy.get('[aria-label="more"]').eq(0).click();
 }
 
 function confirmDelete() {
@@ -81,12 +81,13 @@ describe('Charts list', () => {
       cy.wait('@get');
     });
 
-    it.only('should show the newly added dashboards in a tooltip', () => {
+    it('should show the newly added dashboards in a tooltip', () => {
       interceptDashboardGet();
       visitSampleChartFromList('1 - Sample chart');
-      saveChartToDashboard('1 - Sample dashboard');
-      saveChartToDashboard('2 - Sample dashboard');
-      saveChartToDashboard('3 - Sample dashboard');
+      saveChartToDashboard('1 - Sample chart', '1 - Sample dashboard');
+      saveChartToDashboard('1 - Sample chart', '2 - Sample dashboard');
+      saveChartToDashboard('1 - Sample chart', '3 - Sample dashboard');
+      saveChartToDashboard('1 - Sample chart', '4 - Sample dashboard');
       visitChartList();
 
       cy.getBySel('count-crosslinks').should('be.visible');
@@ -95,8 +96,6 @@ describe('Charts list', () => {
 
   describe('list mode', () => {
     before(() => {
-      cy.createSampleDashboards([0, 1, 2, 3]);
-      cy.createSampleCharts([0]);
       visitChartList();
       setGridMode('list');
     });
@@ -112,18 +111,10 @@ describe('Charts list', () => {
       cy.getBySel('sort-header').eq(7).contains('Actions');
     });
 
-    it('should sort correctly in list mode', () => {
-      cy.getBySel('sort-header').eq(1).click();
-      cy.getBySel('table-row').first().contains('Area Chart');
-      cy.getBySel('sort-header').eq(1).click();
-      cy.getBySel('table-row').first().contains("World's Population");
-      cy.getBySel('sort-header').eq(1).click();
-    });
-
     it('should bulk select in list mode', () => {
       toggleBulkSelect();
-      cy.get('#header-toggle-all').click();
-      cy.get('[aria-label="checkbox-on"]').should('have.length', 26);
+      cy.get('[aria-label="Select all"]').click();
+      cy.get('input[type="checkbox"]:checked').should('have.length', 26);
       cy.getBySel('bulk-select-copy').contains('25 Selected');
       cy.getBySel('bulk-select-action')
         .should('have.length', 2)
@@ -132,7 +123,7 @@ describe('Charts list', () => {
           expect($btns).to.contain('Export');
         });
       cy.getBySel('bulk-select-deselect-all').click();
-      cy.get('[aria-label="checkbox-on"]').should('have.length', 0);
+      cy.get('input[type="checkbox"]:checked').should('have.length', 0);
       cy.getBySel('bulk-select-copy').contains('0 Selected');
       cy.getBySel('bulk-select-action').should('not.exist');
     });
@@ -164,11 +155,6 @@ describe('Charts list', () => {
       cy.getBySel('bulk-select-action').should('not.exist');
     });
 
-    it('should sort in card mode', () => {
-      orderAlphabetical();
-      cy.getBySel('styled-card').first().contains('% Rural');
-    });
-
     it('should preserve other filters when sorting', () => {
       cy.getBySel('styled-card').should('have.length', 25);
       setFilter('Type', 'Big Number');
@@ -179,40 +165,12 @@ describe('Charts list', () => {
 
   describe('common actions', () => {
     beforeEach(() => {
-      cy.createSampleCharts([0, 1, 2, 3]);
       visitChartList();
     });
 
-    it('should allow to favorite/unfavorite', () => {
-      cy.intercept({ url: `**/api/v1/chart/*/favorites/`, method: 'POST' }).as(
-        'select',
-      );
-      cy.intercept({
-        url: `**/api/v1/chart/*/favorites/`,
-        method: 'DELETE',
-      }).as('unselect');
-
-      setGridMode('card');
-      orderAlphabetical();
-
-      cy.getBySel('styled-card').first().contains('% Rural');
-      cy.getBySel('styled-card')
-        .first()
-        .find("[aria-label='favorite-unselected']")
-        .click();
-      cy.wait('@select');
-      cy.getBySel('styled-card')
-        .first()
-        .find("[aria-label='favorite-selected']")
-        .click();
-      cy.wait('@unselect');
-      cy.getBySel('styled-card')
-        .first()
-        .find("[aria-label='favorite-selected']")
-        .should('not.exist');
-    });
-
     it('should bulk delete correctly', () => {
+      cy.createSampleCharts([0, 1, 2, 3]);
+
       interceptBulkDelete();
       toggleBulkSelect();
 
@@ -220,9 +178,10 @@ describe('Charts list', () => {
       setGridMode('card');
       orderAlphabetical();
 
-      cy.getBySel('styled-card').eq(1).contains('1 - Sample chart').click();
-      cy.getBySel('styled-card').eq(2).contains('2 - Sample chart').click();
-      cy.getBySel('bulk-select-action').eq(0).contains('Delete').click();
+      cy.getBySel('skeleton-card').should('not.exist');
+      cy.getBySel('styled-card').contains('1 - Sample chart').click();
+      cy.getBySel('styled-card').contains('2 - Sample chart').click();
+      cy.getBySel('bulk-select-action').contains('Delete').click();
       confirmDelete();
       cy.wait('@bulkDelete');
       cy.getBySel('styled-card')
@@ -234,56 +193,71 @@ describe('Charts list', () => {
 
       // bulk deletes in list-view
       setGridMode('list');
-      cy.getBySel('table-row').eq(1).contains('3 - Sample chart');
-      cy.getBySel('table-row').eq(2).contains('4 - Sample chart');
+      cy.get('.loading').should('not.exist');
+      cy.getBySel('table-row').contains('3 - Sample chart').should('exist');
+      cy.getBySel('table-row').contains('4 - Sample chart').should('exist');
+      cy.get('[data-test="table-row"] input[type="checkbox"]').eq(0).click();
       cy.get('[data-test="table-row"] input[type="checkbox"]').eq(1).click();
-      cy.get('[data-test="table-row"] input[type="checkbox"]').eq(2).click();
       cy.getBySel('bulk-select-action').eq(0).contains('Delete').click();
       confirmDelete();
       cy.wait('@bulkDelete');
-      cy.getBySel('table-row').eq(1).should('not.contain', '3 - Sample chart');
-      cy.getBySel('table-row').eq(2).should('not.contain', '4 - Sample chart');
+      cy.get('.loading').should('exist');
+      cy.get('.loading').should('not.exist');
+      cy.getBySel('table-row').eq(0).should('not.contain', '3 - Sample chart');
+      cy.getBySel('table-row').eq(1).should('not.contain', '4 - Sample chart');
     });
 
-    it('should delete correctly', () => {
+    it('should delete correctly in card mode', () => {
+      cy.createSampleCharts([0, 1]);
       interceptDelete();
 
       // deletes in card-view
       setGridMode('card');
       orderAlphabetical();
 
-      cy.getBySel('styled-card').eq(1).contains('1 - Sample chart');
+      cy.getBySel('styled-card').contains('1 - Sample chart');
       openMenu();
       cy.getBySel('chart-list-delete-option').click();
       confirmDelete();
       cy.wait('@delete');
       cy.getBySel('styled-card')
-        .eq(1)
-        .should('not.contain', '1 - Sample chart');
+        .contains('1 - Sample chart')
+        .should('not.exist');
+    });
 
-      // deletes in list-view
-      setGridMode('list');
-      cy.getBySel('table-row').eq(1).contains('2 - Sample chart');
-      cy.getBySel('delete').eq(1).click();
+    it('should delete correctly in list mode', () => {
+      cy.createSampleCharts([2, 3]);
+      interceptDelete();
+      cy.getBySel('sort-header').contains('Name').click();
+
+      // Modal closes immediatly without this
+      cy.wait(2000);
+
+      cy.getBySel('table-row').eq(0).contains('3 - Sample chart');
+      cy.getBySel('delete').eq(0).click();
       confirmDelete();
       cy.wait('@delete');
-      cy.getBySel('table-row').eq(1).should('not.contain', '2 - Sample chart');
+      cy.get('.loading').should('exist');
+      cy.get('.loading').should('not.exist');
+      cy.getBySel('table-row').eq(0).should('not.contain', '3 - Sample chart');
     });
 
     it('should edit correctly', () => {
+      cy.createSampleCharts([0]);
       interceptUpdate();
 
       // edits in card-view
       setGridMode('card');
       orderAlphabetical();
-      cy.getBySel('styled-card').eq(1).contains('1 - Sample chart');
+      cy.getBySel('skeleton-card').should('not.exist');
+      cy.getBySel('styled-card').eq(0).contains('1 - Sample chart');
 
       // change title
       openProperties();
       cy.getBySel('properties-modal-name-input').type(' | EDITED');
       cy.get('button:contains("Save")').click();
       cy.wait('@update');
-      cy.getBySel('styled-card').eq(1).contains('1 - Sample chart | EDITED');
+      cy.getBySel('styled-card').eq(0).contains('1 - Sample chart | EDITED');
 
       // edits in list-view
       setGridMode('list');
diff --git a/superset-frontend/cypress-base/cypress/e2e/dashboard/_skip.controls.test.ts b/superset-frontend/cypress-base/cypress/e2e/dashboard/_skip.controls.test.ts
index e527fcda759..3f5bf3188a7 100644
--- a/superset-frontend/cypress-base/cypress/e2e/dashboard/_skip.controls.test.ts
+++ b/superset-frontend/cypress-base/cypress/e2e/dashboard/_skip.controls.test.ts
@@ -47,12 +47,12 @@ describe.skip('Dashboard top-level controls', () => {
       // Solution: pause the network before clicking, assert, then unpause network.
       cy.get('[data-test="refresh-chart-menu-item"]').should(
         'have.class',
-        'antd5-dropdown-menu-item-disabled',
+        'ant-dropdown-menu-item-disabled',
       );
       waitForChartLoad(mapSpec);
       cy.get('[data-test="refresh-chart-menu-item"]').should(
         'not.have.class',
-        'antd5-dropdown-menu-item-disabled',
+        'ant-dropdown-menu-item-disabled',
       );
     });
   });
@@ -65,7 +65,7 @@ describe.skip('Dashboard top-level controls', () => {
       cy.get('[aria-label="ellipsis"]').click();
       cy.get('[data-test="refresh-dashboard-menu-item"]').should(
         'not.have.class',
-        'antd5-dropdown-menu-item-disabled',
+        'ant-dropdown-menu-item-disabled',
       );
 
       cy.get('[data-test="refresh-dashboard-menu-item"]').click({
@@ -73,7 +73,7 @@ describe.skip('Dashboard top-level controls', () => {
       });
       cy.get('[data-test="refresh-dashboard-menu-item"]').should(
         'have.class',
-        'antd5-dropdown-menu-item-disabled',
+        'ant-dropdown-menu-item-disabled',
       );
 
       // wait all charts force refreshed.
@@ -94,7 +94,7 @@ describe.skip('Dashboard top-level controls', () => {
     cy.get('[aria-label="ellipsis"]').click();
     cy.get('[data-test="refresh-dashboard-menu-item"]').and(
       'not.have.class',
-      'antd5-dropdown-menu-item-disabled',
+      'ant-dropdown-menu-item-disabled',
     );
   });
 });
diff --git a/superset-frontend/cypress-base/cypress/e2e/dashboard/actions.test.js b/superset-frontend/cypress-base/cypress/e2e/dashboard/actions.test.js
index 7da3cc84ee8..487d3253bef 100644
--- a/superset-frontend/cypress-base/cypress/e2e/dashboard/actions.test.js
+++ b/superset-frontend/cypress-base/cypress/e2e/dashboard/actions.test.js
@@ -62,6 +62,6 @@ describe('Dashboard actions', () => {
     // Verify the color of the outlined star (gray)
     cy.get('@starIconOutlinedAfter')
       .should('have.css', 'color')
-      .and('eq', 'rgb(178, 178, 178)');
+      .and('eq', 'rgba(0, 0, 0, 0.45)');
   });
 });
diff --git a/superset-frontend/cypress-base/cypress/e2e/dashboard/drillby.test.ts b/superset-frontend/cypress-base/cypress/e2e/dashboard/drillby.test.ts
index 2f8254310ca..f6e29bb0fa7 100644
--- a/superset-frontend/cypress-base/cypress/e2e/dashboard/drillby.test.ts
+++ b/superset-frontend/cypress-base/cypress/e2e/dashboard/drillby.test.ts
@@ -54,14 +54,14 @@ const drillBy = (targetDrillByColumn: string, isLegacy = false) => {
     interceptV1ChartData();
   }
 
-  cy.get('.antd5-dropdown:not(.antd5-dropdown-hidden)')
+  cy.get('.ant-dropdown:not(.ant-dropdown-hidden)')
     .should('be.visible')
     .find("[role='menu'] [role='menuitem']")
     .contains(/^Drill by$/)
     .trigger('mouseover', { force: true });
 
   cy.get(
-    '.antd5-dropdown-menu-submenu:not(.antd5-dropdown-menu-submenu-hidden) [data-test="drill-by-submenu"]',
+    '.ant-dropdown-menu-submenu:not(.ant-dropdown-menu-submenu-hidden) [data-test="drill-by-submenu"]',
   )
     .should('be.visible')
     .find('[role="menuitem"]')
diff --git a/superset-frontend/cypress-base/cypress/e2e/dashboard/drilltodetail.test.ts b/superset-frontend/cypress-base/cypress/e2e/dashboard/drilltodetail.test.ts
index e3250506bc0..e6f882beb09 100644
--- a/superset-frontend/cypress-base/cypress/e2e/dashboard/drilltodetail.test.ts
+++ b/superset-frontend/cypress-base/cypress/e2e/dashboard/drilltodetail.test.ts
@@ -34,8 +34,8 @@ function openModalFromMenu(chartType: string) {
   cy.get(
     `[data-test-viz-type='${chartType}'] [aria-label='More Options']`,
   ).click();
-  cy.get('.antd5-dropdown')
-    .not('.antd5-dropdown-hidden')
+  cy.get('.ant-dropdown')
+    .not('.ant-dropdown-hidden')
     .find("[role='menu'] [role='menuitem']")
     .eq(5)
     .should('contain', 'Drill to detail')
@@ -46,8 +46,8 @@ function openModalFromMenu(chartType: string) {
 function drillToDetail(targetMenuItem: string) {
   interceptSamples();
 
-  cy.get('.antd5-dropdown')
-    .not('.antd5-dropdown-hidden')
+  cy.get('.ant-dropdown')
+    .not('.ant-dropdown-hidden')
     .first()
     .find("[role='menu'] [role='menuitem']")
     .contains(new RegExp(`^${targetMenuItem}$`))
@@ -61,14 +61,14 @@ function drillToDetail(targetMenuItem: string) {
 const drillToDetailBy = (targetDrill: string) => {
   interceptSamples();
 
-  cy.get('.antd5-dropdown:not(.antd5-dropdown-hidden)')
+  cy.get('.ant-dropdown:not(.ant-dropdown-hidden)')
     .should('be.visible')
     .find("[role='menu'] [role='menuitem']")
     .contains(/^Drill to detail by$/)
     .trigger('mouseover', { force: true });
 
   cy.get(
-    '.antd5-dropdown-menu-submenu:not(.antd5-dropdown-menu-submenu-hidden) [data-test="drill-to-detail-by-submenu"]',
+    '.ant-dropdown-menu-submenu:not(.ant-dropdown-menu-submenu-hidden) [data-test="drill-to-detail-by-submenu"]',
   )
     .should('be.visible')
     .find('[role="menuitem"]')
@@ -121,7 +121,10 @@ function testTimeChart(vizType: string) {
   });
 }
 
-describe('Drill to detail modal', () => {
+// TODO fix this test, it has issues with autoscrolling and the locked title
+// flakes intricately when the righClick is obstructed by the title.
+// Tried many option around scrollIntoView, force, etc. but no luck.
+describe.skip('Drill to detail modal', () => {
   beforeEach(() => {
     closeModal();
   });
@@ -463,7 +466,7 @@ describe('Drill to detail modal', () => {
             });
 
           // close the filter and test that data was reloaded
-          cy.getBySel('filter-col').find("[aria-label='close']").click();
+          cy.getBySel('filter-col').find("[aria-label='Close']").click();
           cy.wait('@samples');
           cy.getBySel('row-count-label').should('contain', '75.7k rows');
           cy.get('.ant-pagination-item-active').should('contain', '1');
diff --git a/superset-frontend/cypress-base/cypress/e2e/dashboard/editmode.test.ts b/superset-frontend/cypress-base/cypress/e2e/dashboard/editmode.test.ts
index aaa047f601b..af3bba92c2f 100644
--- a/superset-frontend/cypress-base/cypress/e2e/dashboard/editmode.test.ts
+++ b/superset-frontend/cypress-base/cypress/e2e/dashboard/editmode.test.ts
@@ -17,7 +17,12 @@
  * under the License.
  */
 import { SAMPLE_DASHBOARD_1, TABBED_DASHBOARD } from 'cypress/utils/urls';
-import { drag, resize, waitForChartLoad } from 'cypress/utils';
+import {
+  drag,
+  resize,
+  setSelectSearchInput,
+  waitForChartLoad,
+} from 'cypress/utils';
 import { edit } from 'brace';
 import {
   interceptExploreUpdate,
@@ -34,21 +39,12 @@ function editDashboard() {
   cy.getBySel('edit-dashboard-button').click();
 }
 
-function closeModal() {
-  cy.getBySel('properties-modal-cancel-button').click({ force: true });
-}
-
 function openProperties() {
-  cy.get('body').then($body => {
-    if ($body.find('[data-test="properties-modal-cancel-button"]').length) {
-      closeModal();
-    }
-    cy.getBySel('actions-trigger').click({ force: true });
-    cy.getBySel('header-actions-menu')
-      .contains('Edit properties')
-      .click({ force: true });
-    cy.get('.antd5-modal-body').should('be.visible');
-  });
+  cy.getBySel('actions-trigger').click({ force: true });
+  cy.getBySel('header-actions-menu')
+    .contains('Edit properties')
+    .click({ force: true });
+  cy.get('.ant-modal-body').should('be.visible');
 }
 
 function assertMetadata(text: string) {
@@ -65,7 +61,7 @@ function assertMetadata(text: string) {
 }
 
 function openAdvancedProperties() {
-  cy.get('.antd5-modal-body')
+  cy.get('.ant-modal-body')
     .contains('Advanced')
     .should('be.visible')
     .click({ force: true });
@@ -150,12 +146,10 @@ function selectColorScheme(
   target = 'dashboard-edit-properties-form',
 ) {
   cy.get(`[data-test="${target}"] input[aria-label="Select color scheme"]`)
-    .first()
+    .should('exist')
     .then($input => {
-      cy.wrap($input).click({ force: true });
-      cy.wrap($input).type(color.slice(0, 5), { force: true });
+      setSelectSearchInput($input, color.slice(0, 5));
     });
-  cy.getBySel(color).click({ force: true });
 }
 
 function saveAndGo(dashboard = 'Tabbed Dashboard') {
@@ -1095,7 +1089,7 @@ describe('Dashboard edit', () => {
       cy.allowConsoleErrors(['Error: A valid color scheme is required']);
       writeMetadata('{"color_scheme":"wrongcolorscheme"}');
       applyChanges();
-      cy.get('.antd5-modal-body')
+      cy.get('.ant-modal-body')
         .contains('A valid color scheme is required')
         .should('be.visible');
     });
@@ -1130,7 +1124,7 @@ describe('Dashboard edit', () => {
 
     it('should filter charts', () => {
       interceptCharts();
-      cy.get('[role="checkbox"]').click();
+      cy.get('input[type="checkbox"]').click();
       cy.getBySel('dashboard-charts-filter-search-input').type('Unicode');
       cy.wait('@filtering');
       cy.getBySel('chart-card')
@@ -1140,8 +1134,8 @@ describe('Dashboard edit', () => {
     });
 
     // TODO fix this test! This was the #1 flaky test as of 4/21/23 according to cypress dashboard.
-    xit('should disable the Save button when undoing', () => {
-      cy.get('[role="checkbox"]').click();
+    it.skip('should disable the Save button when undoing', () => {
+      cy.get('input[type="checkbox"]').click();
       dragComponent('Unicode Cloud', 'card-title', false);
       cy.getBySel('header-save-button').should('be.enabled');
       discardChanges();
@@ -1155,13 +1149,13 @@ describe('Dashboard edit', () => {
     });
 
     it('should add charts', () => {
-      cy.get('[role="checkbox"]').click();
+      cy.get('input[type="checkbox"]').click();
       dragComponent();
       cy.getBySel('dashboard-component-chart-holder').should('have.length', 1);
     });
 
     it.skip('should remove added charts', () => {
-      cy.get('[role="checkbox"]').click();
+      cy.get('input[type="checkbox"]').click();
       dragComponent('Unicode Cloud');
       cy.getBySel('dashboard-component-chart-holder').should('have.length', 1);
       cy.getBySel('dashboard-delete-component-button').click();
@@ -1204,7 +1198,7 @@ describe('Dashboard edit', () => {
     });
 
     it('should save', () => {
-      cy.get('[role="checkbox"]').click();
+      cy.get('input[type="checkbox"]').click();
       dragComponent();
       cy.getBySel('header-save-button').should('be.enabled');
       saveChanges();
diff --git a/superset-frontend/cypress-base/cypress/e2e/dashboard/horizontalFilterBar.test.ts b/superset-frontend/cypress-base/cypress/e2e/dashboard/horizontalFilterBar.test.ts
index e55c6ac18d3..a5513645390 100644
--- a/superset-frontend/cypress-base/cypress/e2e/dashboard/horizontalFilterBar.test.ts
+++ b/superset-frontend/cypress-base/cypress/e2e/dashboard/horizontalFilterBar.test.ts
@@ -57,16 +57,16 @@ function setFilterBarOrientation(orientation: 'vertical' | 'horizontal') {
     .trigger('mouseover');
 
   if (orientation === 'vertical') {
-    cy.get('.antd5-dropdown-menu-item-selected')
+    cy.get('.ant-dropdown-menu-item-selected')
       .contains('Horizontal (Top)')
       .should('exist');
-    cy.get('.antd5-dropdown-menu-item').contains('Vertical (Left)').click();
+    cy.get('.ant-dropdown-menu-item').contains('Vertical (Left)').click();
     cy.getBySel('dashboard-filters-panel').should('exist');
   } else {
-    cy.get('.antd5-dropdown-menu-item-selected')
+    cy.get('.ant-dropdown-menu-item-selected')
       .contains('Vertical (Left)')
       .should('exist');
-    cy.get('.antd5-dropdown-menu-item').contains('Horizontal (Top)').click();
+    cy.get('.ant-dropdown-menu-item').contains('Horizontal (Top)').click();
     cy.getBySel('loading-indicator').should('exist');
     cy.getBySel('filter-bar').should('exist');
     cy.getBySel('dashboard-filters-panel').should('not.exist');
@@ -138,7 +138,7 @@ describe('Horizontal FilterBar', () => {
     cy.getBySel('dropdown-container-btn').should('not.exist');
   });
 
-  it('should show "more filters" and scroll', () => {
+  it.only('should show "more filters" and scroll', () => {
     prepareDashboardFilters([
       { name: 'test_1', column: 'country_name', datasetId: 2 },
       { name: 'test_2', column: 'country_code', datasetId: 2 },
@@ -157,11 +157,11 @@ describe('Horizontal FilterBar', () => {
     cy.get('.filter-item-wrapper').should('have.length', 3);
     openMoreFilters();
     cy.getBySel('form-item-value').should('have.length', 12);
-    cy.getBySel('filter-control-name').contains('test_10').should('be.visible');
+    cy.getBySel('filter-control-name').contains('test_3').should('be.visible');
     cy.getBySel('filter-control-name')
       .contains('test_12')
       .should('not.be.visible');
-    cy.get('.antd5-popover-inner').scrollTo('bottom');
+    cy.getBySel('filter-control-name').contains('test_12').scrollIntoView();
     cy.getBySel('filter-control-name').contains('test_12').should('be.visible');
   });
 
@@ -197,7 +197,7 @@ describe('Horizontal FilterBar', () => {
     applyNativeFilterValueWithIndex(8, testItems.filterDefaultValue);
     cy.get(nativeFilters.applyFilter).click({ force: true });
     cy.wait('@chart');
-    cy.get('.antd5-scroll-number.antd5-badge-count').should(
+    cy.get('.ant-scroll-number.ant-badge-count').should(
       'have.attr',
       'title',
       '1',
diff --git a/superset-frontend/cypress-base/cypress/e2e/dashboard/nativeFilters.noInitState.test.ts b/superset-frontend/cypress-base/cypress/e2e/dashboard/nativeFilters.noInitState.test.ts
index 8f3c5b024ff..6ca48c68c60 100644
--- a/superset-frontend/cypress-base/cypress/e2e/dashboard/nativeFilters.noInitState.test.ts
+++ b/superset-frontend/cypress-base/cypress/e2e/dashboard/nativeFilters.noInitState.test.ts
@@ -21,30 +21,21 @@ import qs from 'querystring';
 import {
   dashboardView,
   nativeFilters,
-  exploreView,
   dataTestChartName,
 } from 'cypress/support/directories';
 
 import {
   addCountryNameFilter,
-  addParentFilterWithValue,
   applyAdvancedTimeRangeFilterOnDashboard,
   applyNativeFilterValueWithIndex,
   cancelNativeFilterSettings,
-  checkNativeFilterTooltip,
-  clickOnAddFilterInModal,
-  collapseFilterOnLeftPanel,
   deleteNativeFilter,
   enterNativeFilterEditModal,
-  expandFilterOnLeftPanel,
   fillNativeFilterForm,
-  getNativeFilterPlaceholderWithIndex,
   inputNativeFilterDefaultValue,
   saveNativeFilterSettings,
-  nativeFilterTooltips,
   undoDeleteNativeFilter,
   validateFilterContentOnDashboard,
-  valueNativeFilterOptions,
   validateFilterNameOnDashboard,
   testItems,
   WORLD_HEALTH_CHARTS,
@@ -55,19 +46,19 @@ import {
   visitDashboard,
 } from './shared_dashboard_functions';
 
-function selectFilter(index: number) {
-  cy.get("[data-test='filter-title-container'] [draggable='true']")
-    .eq(index)
-    .click();
-}
+// function selectFilter(index: number) {
+//   cy.get("[data-test='filter-title-container'] [draggable='true']")
+//     .eq(index)
+//     .click();
+// }
 
-function closeFilterModal() {
-  cy.get('body').then($body => {
-    if ($body.find('[data-test="native-filter-modal-cancel-button"]').length) {
-      cy.getBySel('native-filter-modal-cancel-button').click();
-    }
-  });
-}
+// function closeFilterModal() {
+//   cy.get('body').then($body => {
+//     if ($body.find('[data-test="native-filter-modal-cancel-button"]').length) {
+//       cy.getBySel('native-filter-modal-cancel-button').click();
+//     }
+//   });
+// }
 
 describe('Native filters', () => {
   describe('Nativefilters initial state not required', () => {
@@ -183,44 +174,139 @@ describe('Native filters', () => {
       validateFilterContentOnDashboard(testItems.topTenChart.filterColumnYear);
     });
 
-    it('User can create a numerical range filter', () => {
-      visitDashboard();
-      enterNativeFilterEditModal(false);
-      fillNativeFilterForm(
-        testItems.filterType.numerical,
-        testItems.filterNumericalColumn,
-        testItems.datasetForNativeFilter,
-        testItems.filterNumericalColumn,
-      );
-      saveNativeFilterSettings([]);
+    describe.only('Numerical Range Filter - Display Modes', () => {
+      beforeEach(() => {
+        visitDashboard();
+      });
 
-      // Assertions
-      cy.get('[data-test="range-filter-from-input"]')
-        .should('be.visible')
-        .click();
+      const expandFilterConfiguration = () => {
+        cy.get('.ant-collapse-header')
+          .contains('Filter Configuration')
+          .should('be.visible')
+          .then($header => {
+            cy.wrap($header)
+              .closest('.ant-collapse-item')
+              .invoke('hasClass', 'ant-collapse-item-active')
+              .then(isExpanded => {
+                if (!isExpanded) cy.wrap($header).click();
+              });
+          });
 
-      cy.get('[data-test="range-filter-from-input"]').type('{selectall}5');
+        cy.get('.ant-collapse-content-box').should('be.visible');
+      };
 
-      cy.get('[data-test="range-filter-to-input"]')
-        .should('be.visible')
-        .click();
+      const selectRangeTypeOption = (label: string) => {
+        cy.contains('Range Type')
+          .should('be.visible')
+          .closest('.ant-form-item')
+          .within(() => {
+            cy.get('.ant-select-selector').click();
+          });
 
-      cy.get('[data-test="range-filter-to-input"]').type('{selectall}50');
-      cy.get(nativeFilters.applyFilter).click();
+        cy.get('.ant-select-dropdown:visible')
+          .contains('.ant-select-item-option', label)
+          .click();
+      };
 
-      // Assert that the URL contains 'native_filters'
-      cy.url().then(u => {
-        const ur = new URL(u);
-        expect(ur.search).to.include('native_filters');
+      const applyAndAssertInputs = (from: string, to: string) => {
+        // Set 'from' input
+        cy.get('[data-test="range-filter-from-input"]').clear();
+        cy.get('[data-test="range-filter-from-input"]').type(from);
+        cy.get('[data-test="range-filter-from-input"]').blur();
 
+        // Set 'to' input
+        cy.get('[data-test="range-filter-to-input"]').clear();
+        cy.get('[data-test="range-filter-to-input"]').type(to);
+        cy.get('[data-test="range-filter-to-input"]').blur();
+
+        // Assert values without chaining after .invoke()
         cy.get('[data-test="range-filter-from-input"]')
           .invoke('val')
-          .should('equal', '5');
+          .then(val => {
+            expect(val).to.equal(from);
+          });
 
-        // Assert that the "To" input has the correct value
         cy.get('[data-test="range-filter-to-input"]')
           .invoke('val')
-          .should('equal', '50');
+          .then(val => {
+            expect(val).to.equal(to);
+          });
+      };
+
+      it('User can create a numerical range filter with "Range Inputs" display mode', () => {
+        enterNativeFilterEditModal(false);
+
+        fillNativeFilterForm(
+          testItems.filterType.numerical,
+          testItems.filterNumericalColumn,
+          testItems.datasetForNativeFilter,
+          testItems.filterNumericalColumn,
+        );
+
+        expandFilterConfiguration();
+        selectRangeTypeOption('Range Inputs');
+
+        saveNativeFilterSettings([]);
+        cy.wait(500); // allow filter to mount
+
+        applyAndAssertInputs('40', '70');
+      });
+
+      it('User can change the display mode to "Slider"', () => {
+        enterNativeFilterEditModal(false);
+
+        fillNativeFilterForm(
+          testItems.filterType.numerical,
+          testItems.filterNumericalColumn,
+          testItems.datasetForNativeFilter,
+          testItems.filterNumericalColumn,
+        );
+
+        expandFilterConfiguration();
+
+        cy.contains('Range Type')
+          .should('be.visible')
+          .closest('.ant-form-item')
+          .within(() => {
+            cy.get('.ant-select-selector').click({ force: true });
+          });
+
+        cy.get('.ant-select-dropdown:visible .ant-select-item-option')
+          .contains(/^Slider$/)
+          .click({ force: true });
+
+        cy.get('.ant-select-selector').should('contain.text', 'Slider');
+
+        saveNativeFilterSettings([]);
+
+        cy.get('.ant-slider', { timeout: 10000 }).should('be.visible');
+
+        cy.get('[data-test="range-filter-from-input"]', {
+          timeout: 5000,
+        }).should('not.exist');
+        cy.get('[data-test="range-filter-to-input"]', { timeout: 5000 }).should(
+          'not.exist',
+        );
+      });
+
+      it('User can change the display mode to "Slider and range input"', () => {
+        enterNativeFilterEditModal(false);
+
+        // Re-create filter
+        fillNativeFilterForm(
+          testItems.filterType.numerical,
+          testItems.filterNumericalColumn,
+          testItems.datasetForNativeFilter,
+          testItems.filterNumericalColumn,
+        );
+
+        expandFilterConfiguration();
+        selectRangeTypeOption('Slider and range input');
+
+        saveNativeFilterSettings([]);
+        cy.wait(500);
+
+        applyAndAssertInputs('40', '70');
       });
     });
 
diff --git a/superset-frontend/cypress-base/cypress/e2e/dashboard/nativeFilters.test.ts b/superset-frontend/cypress-base/cypress/e2e/dashboard/nativeFilters.test.ts
index 67578c79d6a..818d6ebda6e 100644
--- a/superset-frontend/cypress-base/cypress/e2e/dashboard/nativeFilters.test.ts
+++ b/superset-frontend/cypress-base/cypress/e2e/dashboard/nativeFilters.test.ts
@@ -16,37 +16,29 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import qs from 'querystring';
 import {
-  dashboardView,
   nativeFilters,
   exploreView,
   dataTestChartName,
 } from 'cypress/support/directories';
 
 import {
-  addCountryNameFilter,
   addParentFilterWithValue,
-  applyAdvancedTimeRangeFilterOnDashboard,
   applyNativeFilterValueWithIndex,
   cancelNativeFilterSettings,
   checkNativeFilterTooltip,
   clickOnAddFilterInModal,
   collapseFilterOnLeftPanel,
-  deleteNativeFilter,
   enterNativeFilterEditModal,
   expandFilterOnLeftPanel,
-  fillNativeFilterForm,
   getNativeFilterPlaceholderWithIndex,
   inputNativeFilterDefaultValue,
   saveNativeFilterSettings,
   nativeFilterTooltips,
-  undoDeleteNativeFilter,
   validateFilterContentOnDashboard,
   valueNativeFilterOptions,
   validateFilterNameOnDashboard,
   testItems,
-  WORLD_HEALTH_CHARTS,
 } from './utils';
 import {
   prepareDashboardFilters,
@@ -293,7 +285,11 @@ describe('Native filters', () => {
 
     it('Verify setting options and tooltips for value filter', () => {
       enterNativeFilterEditModal(false);
-      cy.contains('Filter value is required').should('be.visible').click();
+      cy.contains('Filter value is required').scrollIntoView();
+
+      cy.contains('Filter value is required').should('be.visible').click({
+        force: true,
+      });
       checkNativeFilterTooltip(0, nativeFilterTooltips.preFilter);
       checkNativeFilterTooltip(1, nativeFilterTooltips.defaultValue);
       cy.get(nativeFilters.modal.container).should('be.visible');
diff --git a/superset-frontend/cypress-base/cypress/e2e/dashboard/utils.ts b/superset-frontend/cypress-base/cypress/e2e/dashboard/utils.ts
index 40c1d382720..8ed39621ba3 100644
--- a/superset-frontend/cypress-base/cypress/e2e/dashboard/utils.ts
+++ b/superset-frontend/cypress-base/cypress/e2e/dashboard/utils.ts
@@ -18,7 +18,11 @@
  */
 
 import { dashboardView, nativeFilters } from 'cypress/support/directories';
-import { ChartSpec, waitForChartLoad } from 'cypress/utils';
+import {
+  ChartSpec,
+  setSelectSearchInput,
+  waitForChartLoad,
+} from 'cypress/utils';
 
 export const WORLD_HEALTH_CHARTS = [
   { name: '% Rural', viz: 'world_map' },
@@ -189,8 +193,10 @@ export function interceptFilterState() {
 export function setFilter(filter: string, option: string) {
   interceptFiltering();
 
-  cy.get(`[aria-label="${filter}"]`).first().click();
-  cy.get(`[aria-label="${filter}"] [title="${option}"]`).click();
+  cy.get(`[aria-label^="${filter}"]`).first().click();
+  cy.get(`.ant-select-item-option[title="${option}"]`).first().click({
+    force: true,
+  });
 
   cy.wait('@filtering');
 }
@@ -264,10 +270,11 @@ export function fillNativeFilterForm(
   dataset?: string,
   filterColumn?: string,
 ) {
-  cy.get(nativeFilters.filtersPanel.filterTypeInput)
-    .find(nativeFilters.filtersPanel.filterTypeItem)
-    .click({ multiple: true, force: true });
-  cy.get(`[label="${type}"]`).click({ multiple: true, force: true });
+  cy.get(nativeFilters.filtersPanel.filterTypeInput).within(() => {
+    cy.get('input').then($input => {
+      setSelectSearchInput($input, type);
+    });
+  });
   cy.get(nativeFilters.modal.container)
     .find(nativeFilters.filtersPanel.filterName)
     .last()
@@ -280,31 +287,23 @@ export function fillNativeFilterForm(
     .find(nativeFilters.filtersPanel.filterName)
     .last()
     .type(name, { scrollBehavior: false, force: true });
+
   if (dataset) {
-    cy.get(nativeFilters.modal.container)
-      .find(nativeFilters.filtersPanel.datasetName)
-      .last()
-      .click({ force: true, scrollBehavior: false });
-    cy.get(nativeFilters.modal.container)
-      .find(nativeFilters.filtersPanel.datasetName)
-      .type(`${dataset}`, { scrollBehavior: false });
+    cy.get('div[aria-label="Dataset"]').within(() => {
+      cy.get('input').then($input => {
+        setSelectSearchInput($input, dataset, true);
+      });
+    });
     cy.get(nativeFilters.silentLoading).should('not.exist');
-    cy.get(`[label="${dataset}"]`).click({ multiple: true, force: true });
   }
-  cy.get(nativeFilters.silentLoading).should('not.exist');
+
   if (filterColumn) {
-    cy.get(nativeFilters.filtersPanel.filterInfoInput)
-      .last()
-      .click({ force: true });
-    cy.get(nativeFilters.filtersPanel.filterInfoInput)
-      .last()
-      .type(filterColumn);
-    cy.get(nativeFilters.filtersPanel.inputDropdown)
-      .should('be.visible', { timeout: 20000 })
-      .last()
-      .click();
+    cy.get('div[aria-label="Column select"]').within(() => {
+      cy.get('input').then($input => {
+        setSelectSearchInput($input, filterColumn, true);
+      });
+    });
   }
-  cy.get(nativeFilters.silentLoading).should('not.exist');
 }
 
 /** ************************************************************************
@@ -346,8 +345,10 @@ export function addParentFilterWithValue(index: number, value: string) {
   return cy
     .get(nativeFilters.filterConfigurationSections.displayedSection)
     .within(() => {
-      cy.get('input[aria-label="Limit type"]').eq(index).click({ force: true });
-      cy.get('input[aria-label="Limit type"]')
+      cy.get('input[aria-label^="Limit type"]')
+        .eq(index)
+        .click({ force: true });
+      cy.get('input[aria-label^="Limit type"]')
         .eq(index)
         .type(`${value}{enter}`, { delay: 30, force: true });
     });
@@ -362,9 +363,26 @@ export function saveNativeFilterSettings(charts: ChartSpec[]) {
   cy.get(nativeFilters.modal.footer)
     .contains('Save')
     .should('be.visible')
-    .click();
+    .click({ force: true });
+
+  // Wait for modal to either close or remain open
+  cy.get('body').should($body => {
+    const modalExists = $body.find(nativeFilters.modal.container).length > 0;
+    if (modalExists) {
+      cy.get(nativeFilters.modal.footer)
+        .contains('Save')
+        .should('be.visible')
+        .click({ force: true });
+    }
+  });
+
+  // Ensure modal is closed
   cy.get(nativeFilters.modal.container).should('not.exist');
-  charts.forEach(waitForChartLoad);
+
+  // Wait for all charts to load
+  charts.forEach(chart => {
+    waitForChartLoad(chart);
+  });
 }
 
 /** ************************************************************************
@@ -442,6 +460,9 @@ export function checkNativeFilterTooltip(index: number, value: string) {
     .eq(index)
     .trigger('mouseover');
   cy.contains(`${value}`);
+  cy.get(nativeFilters.filterConfigurationSections.infoTooltip)
+    .eq(index)
+    .trigger('mouseout');
 }
 
 /** ************************************************************************
@@ -455,20 +476,20 @@ export function applyAdvancedTimeRangeFilterOnDashboard(
   startRange?: string,
   endRange?: string,
 ) {
-  cy.get('.control-label').contains('RANGE TYPE').should('be.visible');
-  cy.get('.antd5-popover-content .ant-select-selector')
+  cy.get('.control-label').contains('Range type').should('be.visible');
+  cy.get('.ant-popover-content .ant-select-selector')
     .should('be.visible')
     .click();
   cy.get(`[label="Advanced"]`).should('be.visible').click();
   cy.get('.section-title').contains('Advanced Time Range').should('be.visible');
   if (startRange) {
-    cy.get('.antd5-popover-inner-content')
+    cy.get('.ant-popover-inner-content')
       .find('[class^=ant-input]')
       .first()
       .type(`${startRange}`);
   }
   if (endRange) {
-    cy.get('.antd5-popover-inner-content')
+    cy.get('.ant-popover-inner-content')
       .find('[class^=ant-input]')
       .last()
       .type(`${endRange}`);
diff --git a/superset-frontend/cypress-base/cypress/e2e/dashboard_list/list.test.ts b/superset-frontend/cypress-base/cypress/e2e/dashboard_list/list.test.ts
index 322306a4c64..859cd5de355 100644
--- a/superset-frontend/cypress-base/cypress/e2e/dashboard_list/list.test.ts
+++ b/superset-frontend/cypress-base/cypress/e2e/dashboard_list/list.test.ts
@@ -79,16 +79,20 @@ describe('Dashboards list', () => {
 
     it('should sort correctly in list mode', () => {
       cy.getBySel('sort-header').eq(1).click();
+      cy.getBySel('loading-indicator').should('not.exist');
       cy.getBySel('table-row').first().contains('Supported Charts Dashboard');
       cy.getBySel('sort-header').eq(1).click();
+      cy.getBySel('loading-indicator').should('not.exist');
       cy.getBySel('table-row').first().contains("World Bank's Data");
       cy.getBySel('sort-header').eq(1).click();
     });
 
     it('should bulk select in list mode', () => {
       toggleBulkSelect();
-      cy.get('#header-toggle-all').click();
-      cy.get('[aria-label="checkbox-on"]').should('have.length', 6);
+      cy.get('[aria-label="Select all"]').click();
+      cy.get('.ant-checkbox-input')
+        .should('be.checked')
+        .should('have.length', 6);
       cy.getBySel('bulk-select-copy').contains('5 Selected');
       cy.getBySel('bulk-select-action')
         .should('have.length', 2)
@@ -97,7 +101,7 @@ describe('Dashboards list', () => {
           expect($btns).to.contain('Export');
         });
       cy.getBySel('bulk-select-deselect-all').click();
-      cy.get('[aria-label="checkbox-on"]').should('have.length', 0);
+      cy.get('input[type="checkbox"]:checked').should('have.length', 0);
       cy.getBySel('bulk-select-copy').contains('0 Selected');
       cy.getBySel('bulk-select-action').should('not.exist');
     });
@@ -195,6 +199,8 @@ describe('Dashboards list', () => {
       cy.get('[data-test="table-row"] input[type="checkbox"]').eq(1).click();
       cy.getBySel('bulk-select-action').eq(0).contains('Delete').click();
       confirmDelete(true);
+      cy.getBySel('loading-indicator').should('exist');
+      cy.getBySel('loading-indicator').should('not.exist');
       cy.getBySel('table-row')
         .eq(0)
         .should('not.contain', '3 - Sample dashboard');
diff --git a/superset-frontend/cypress-base/cypress/e2e/database/modal.test.ts b/superset-frontend/cypress-base/cypress/e2e/database/modal.test.ts
index 87a0bb92304..340fb7392c5 100644
--- a/superset-frontend/cypress-base/cypress/e2e/database/modal.test.ts
+++ b/superset-frontend/cypress-base/cypress/e2e/database/modal.test.ts
@@ -32,53 +32,87 @@ describe('Add database', () => {
   });
 
   beforeEach(() => {
+    cy.intercept('POST', '**/api/v1/database/validate_parameters/**').as(
+      'validateParams',
+    );
+    cy.intercept('POST', '**/api/v1/database/').as('createDb');
+
     closeModal();
     cy.getBySel('btn-create-database').click();
   });
 
   it('should open dynamic form', () => {
-    // click postgres dynamic form
     cy.get('.preferred > :nth-child(1)').click();
 
-    // make sure all the fields are rendering
     cy.get('input[name="host"]').should('have.value', '');
     cy.get('input[name="port"]').should('have.value', '');
     cy.get('input[name="database"]').should('have.value', '');
+    cy.get('input[name="username"]').should('have.value', '');
     cy.get('input[name="password"]').should('have.value', '');
     cy.get('input[name="database_name"]').should('have.value', '');
   });
 
   it('should open sqlalchemy form', () => {
-    // click postgres dynamic form
     cy.get('.preferred > :nth-child(1)').click();
-
     cy.getBySel('sqla-connect-btn').click();
 
-    // check if the sqlalchemy form is showing up
     cy.getBySel('database-name-input').should('be.visible');
     cy.getBySel('sqlalchemy-uri-input').should('be.visible');
   });
 
   it('show error alerts on dynamic form for bad host', () => {
-    // click postgres dynamic form
     cy.get('.preferred > :nth-child(1)').click();
-    cy.get('input[name="host"]').focus();
-    cy.focused().type('badhost', { force: true });
-    cy.get('input[name="port"]').focus();
-    cy.focused().type('5432', { force: true });
-    cy.get('.ant-form-item-explain-error').contains(
-      "The hostname provided can't be resolved",
-    );
+
+    cy.get('input[name="host"]').type('badhost', { force: true });
+    cy.get('input[name="port"]').type('5432', { force: true });
+    cy.get('input[name="username"]').type('testusername', { force: true });
+    cy.get('input[name="database"]').type('testdb', { force: true });
+    cy.get('input[name="password"]').type('testpass', { force: true });
+
+    cy.get('body').click(0, 0);
+
+    cy.wait('@validateParams', { timeout: 30000 });
+
+    cy.getBySel('btn-submit-connection').should('not.be.disabled');
+    cy.getBySel('btn-submit-connection').click({ force: true });
+
+    cy.wait('@validateParams', { timeout: 30000 }).then(() => {
+      cy.wait('@createDb', { timeout: 60000 }).then(() => {
+        cy.contains(
+          '.ant-form-item-explain-error',
+          "The hostname provided can't be resolved",
+        ).should('exist');
+      });
+    });
   });
 
   it('show error alerts on dynamic form for bad port', () => {
-    // click postgres dynamic form
     cy.get('.preferred > :nth-child(1)').click();
-    cy.get('input[name="host"]').focus();
-    cy.focused().type('localhost', { force: true });
-    cy.get('input[name="port"]').focus();
-    cy.focused().type('123', { force: true });
-    cy.get('input[name="database"]').focus();
-    cy.get('.ant-form-item-explain-error').contains('The port is closed');
+
+    cy.get('input[name="host"]').type('localhost', { force: true });
+    cy.get('body').click(0, 0);
+    cy.wait('@validateParams', { timeout: 30000 });
+
+    cy.get('input[name="port"]').type('5430', { force: true });
+    cy.get('input[name="database"]').type('testdb', { force: true });
+    cy.get('input[name="username"]').type('testusername', { force: true });
+
+    cy.wait('@validateParams', { timeout: 30000 });
+
+    cy.get('input[name="password"]').type('testpass', { force: true });
+    cy.wait('@validateParams');
+
+    cy.getBySel('btn-submit-connection').should('not.be.disabled');
+    cy.getBySel('btn-submit-connection').click({ force: true });
+    cy.wait('@validateParams', { timeout: 30000 }).then(() => {
+      cy.get('body').click(0, 0);
+      cy.getBySel('btn-submit-connection').click({ force: true });
+      cy.wait('@createDb', { timeout: 60000 }).then(() => {
+        cy.contains(
+          '.ant-form-item-explain-error',
+          'The port is closed',
+        ).should('exist');
+      });
+    });
   });
 });
diff --git a/superset-frontend/cypress-base/cypress/e2e/explore/chart.test.js b/superset-frontend/cypress-base/cypress/e2e/explore/chart.test.js
index abe5a0c51d7..b4cc177deff 100644
--- a/superset-frontend/cypress-base/cypress/e2e/explore/chart.test.js
+++ b/superset-frontend/cypress-base/cypress/e2e/explore/chart.test.js
@@ -30,36 +30,36 @@ import {
 const SAMPLE_DASHBOARDS_INDEXES = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
 
 function openDashboardsAddedTo() {
-  cy.getBySel('actions-trigger').click();
-  cy.get('.antd5-dropdown-menu-submenu-title')
+  cy.getBySel('actions-trigger').should('be.visible').click();
+  cy.get('.ant-dropdown-menu-submenu-title')
     .contains('On dashboards')
     .trigger('mouseover', { force: true });
 }
 
 function closeDashboardsAddedTo() {
-  cy.get('.antd5-dropdown-menu-submenu-title')
+  cy.get('.ant-dropdown-menu-submenu-title')
     .contains('On dashboards')
     .trigger('mouseout', { force: true });
   cy.getBySel('actions-trigger').click();
 }
 
 function verifyDashboardsSubmenuItem(dashboardName) {
-  cy.get('.antd5-dropdown-menu-submenu-popup').contains(dashboardName);
+  cy.get('.ant-dropdown-menu-submenu-popup').contains(dashboardName);
   closeDashboardsAddedTo();
 }
 
 function verifyDashboardSearch() {
   openDashboardsAddedTo();
-  cy.get('.antd5-dropdown-menu-submenu-popup').trigger('mouseover');
-  cy.get('.antd5-dropdown-menu-submenu-popup')
+  cy.get('.ant-dropdown-menu-submenu-popup').trigger('mouseover');
+  cy.get('.ant-dropdown-menu-submenu-popup')
     .find('input[placeholder="Search"]')
     .type('1');
-  cy.get('.antd5-dropdown-menu-submenu-popup').contains('1 - Sample dashboard');
-  cy.get('.antd5-dropdown-menu-submenu-popup')
+  cy.get('.ant-dropdown-menu-submenu-popup').contains('1 - Sample dashboard');
+  cy.get('.ant-dropdown-menu-submenu-popup')
     .find('input[placeholder="Search"]')
     .type('Blahblah');
-  cy.get('.antd5-dropdown-menu-submenu-popup').contains('No results found');
-  cy.get('.antd5-dropdown-menu-submenu-popup')
+  cy.get('.ant-dropdown-menu-submenu-popup').contains('No results found');
+  cy.get('.ant-dropdown-menu-submenu-popup')
     .find('[aria-label="close-circle"]')
     .click();
   closeDashboardsAddedTo();
@@ -68,8 +68,8 @@ function verifyDashboardSearch() {
 function verifyDashboardLink() {
   interceptDashboardGet();
   openDashboardsAddedTo();
-  cy.get('.antd5-dropdown-menu-submenu-popup').trigger('mouseover');
-  cy.get('.antd5-dropdown-menu-submenu-popup a')
+  cy.get('.ant-dropdown-menu-submenu-popup').trigger('mouseover');
+  cy.get('.ant-dropdown-menu-submenu-popup a')
     .first()
     .invoke('removeAttr', 'target')
     .click();
@@ -80,8 +80,8 @@ function verifyMetabar(text) {
   cy.getBySel('metadata-bar').contains(text);
 }
 
-function saveAndVerifyDashboard(number) {
-  saveChartToDashboard(`${number} - Sample dashboard`);
+function saveAndVerifyDashboard(chartName, number) {
+  saveChartToDashboard(chartName, `${number} - Sample dashboard`);
   verifyMetabar(
     number > 1 ? `Added to ${number} dashboards` : 'Added to 1 dashboard',
   );
@@ -106,17 +106,17 @@ describe('Cross-referenced dashboards', () => {
     openDashboardsAddedTo();
     verifyDashboardsSubmenuItem('None');
 
-    saveAndVerifyDashboard('1');
-    saveAndVerifyDashboard('2');
-    saveAndVerifyDashboard('3');
-    saveAndVerifyDashboard('4');
-    saveAndVerifyDashboard('5');
-    saveAndVerifyDashboard('6');
-    saveAndVerifyDashboard('7');
-    saveAndVerifyDashboard('8');
-    saveAndVerifyDashboard('9');
-    saveAndVerifyDashboard('10');
-    saveAndVerifyDashboard('11');
+    saveAndVerifyDashboard('1 - Sample chart', '1');
+    saveAndVerifyDashboard('1 - Sample chart', '2');
+    saveAndVerifyDashboard('1 - Sample chart', '3');
+    saveAndVerifyDashboard('1 - Sample chart', '4');
+    saveAndVerifyDashboard('1 - Sample chart', '5');
+    saveAndVerifyDashboard('1 - Sample chart', '6');
+    saveAndVerifyDashboard('1 - Sample chart', '7');
+    saveAndVerifyDashboard('1 - Sample chart', '8');
+    saveAndVerifyDashboard('1 - Sample chart', '9');
+    saveAndVerifyDashboard('1 - Sample chart', '10');
+    saveAndVerifyDashboard('1 - Sample chart', '11');
 
     verifyDashboardSearch();
     verifyDashboardLink();
diff --git a/superset-frontend/cypress-base/cypress/e2e/explore/control.test.ts b/superset-frontend/cypress-base/cypress/e2e/explore/control.test.ts
index bd56b6f76e7..c6a308393e8 100644
--- a/superset-frontend/cypress-base/cypress/e2e/explore/control.test.ts
+++ b/superset-frontend/cypress-base/cypress/e2e/explore/control.test.ts
@@ -19,7 +19,7 @@
 // ***********************************************
 // Tests for setting controls in the UI
 // ***********************************************
-import { interceptChart } from 'cypress/utils';
+import { interceptChart, setSelectSearchInput } from 'cypress/utils';
 
 describe('Datasource control', () => {
   const newMetricName = `abc${Date.now()}`;
@@ -40,44 +40,44 @@ describe('Datasource control', () => {
     // create new metric
     cy.get('[data-test="crud-add-table-item"]', { timeout: 10000 }).click();
     cy.wait(1000);
-    cy.get(
-      '[data-test="table-content-rows"] [data-test="editable-title-input"]',
-    )
+    cy.get('.ant-table-body [data-test="textarea-editable-title-input"]')
       .first()
       .click();
 
-    cy.get(
-      '[data-test="table-content-rows"] [data-test="editable-title-input"]',
-    )
+    cy.get('.ant-table-body [data-test="textarea-editable-title-input"]')
       .first()
       .focus();
     cy.focused().clear({ force: true });
     cy.focused().type(`${newMetricName}{enter}`, { force: true });
 
     cy.get('[data-test="datasource-modal-save"]').click();
-    cy.get('.antd5-modal-confirm-btns button').contains('OK').click();
+    cy.get('.ant-modal-confirm-btns button').contains('OK').click();
     // select new metric
     cy.get('[data-test=metrics]')
       .contains('Drop columns/metrics here or click')
       .click();
 
-    cy.get('input[aria-label="Select saved metrics"]').type(
-      `${newMetricName}{enter}`,
-    );
+    cy.get('input[aria-label="Select saved metrics"]')
+      .should('exist')
+      .then($input => {
+        setSelectSearchInput($input, newMetricName);
+      });
+
     // delete metric
     cy.get('[data-test="datasource-menu-trigger"]').click();
     cy.get('[data-test="edit-dataset"]').click();
-    cy.get('.antd5-modal-content').within(() => {
+    cy.get('.ant-modal-content').within(() => {
       cy.get('[data-test="collection-tab-Metrics"]')
         .contains('Metrics')
         .click();
     });
-    cy.get(`input[value="${newMetricName}"]`)
+    cy.get(`[data-test="textarea-editable-title-input"]`)
+      .contains(newMetricName)
       .closest('tr')
       .find('[data-test="crud-delete-icon"]')
       .click();
     cy.get('[data-test="datasource-modal-save"]').click();
-    cy.get('.antd5-modal-confirm-btns button').contains('OK').click();
+    cy.get('.ant-modal-confirm-btns button').contains('OK').click();
     cy.get('[data-test="metrics"]').contains(newMetricName).should('not.exist');
   });
 });
@@ -91,7 +91,7 @@ describe('Color scheme control', () => {
   });
 
   it('should show color options with and without tooltips', () => {
-    cy.get('#controlSections-tab-display').click();
+    cy.get('#controlSections-tab-CUSTOMIZE').click();
     cy.get('.ant-select-selection-item .color-scheme-label').contains(
       'Superset Colors',
     );
@@ -102,10 +102,19 @@ describe('Color scheme control', () => {
     cy.get('.color-scheme-tooltip').contains('Superset Colors');
     cy.get('.Control[data-test="color_scheme"]').scrollIntoView();
     cy.get('.Control[data-test="color_scheme"] input[type="search"]').focus();
+
+    cy.get('.color-scheme-label')
+      .contains('Superset Colors')
+      .trigger('mouseover');
+
+    cy.get('.color-scheme-label')
+      .contains('Superset Colors')
+      .trigger('mouseout');
+
     cy.focused().type('lyftColors');
     cy.getBySel('lyftColors').should('exist');
-    cy.getBySel('lyftColors').trigger('mouseover');
-    cy.get('.color-scheme-tooltip').should('not.exist');
+    cy.getBySel('lyftColors').trigger('mouseover', { force: true });
+    cy.get('.color-scheme-tooltip').should('not.be.visible');
   });
 });
 describe('VizType control', () => {
@@ -120,7 +129,7 @@ describe('VizType control', () => {
 
     cy.contains('View all charts').click();
 
-    cy.get('.antd5-modal-content').within(() => {
+    cy.get('.ant-modal-content').within(() => {
       cy.get('button').contains('KPI').click(); // change categories
       cy.get('[role="button"]').contains('Big Number').click();
       cy.get('button').contains('Select').click();
diff --git a/superset-frontend/cypress-base/cypress/e2e/explore/link.test.ts b/superset-frontend/cypress-base/cypress/e2e/explore/link.test.ts
index e768e5a8c9c..9a5f1ee5789 100644
--- a/superset-frontend/cypress-base/cypress/e2e/explore/link.test.ts
+++ b/superset-frontend/cypress-base/cypress/e2e/explore/link.test.ts
@@ -42,8 +42,8 @@ describe('Test explore links', () => {
     cy.wait('@chartData').then(() => {
       cy.get('code');
     });
-    cy.get('.antd5-modal-content').within(() => {
-      cy.get('button.antd5-modal-close').first().click({ force: true });
+    cy.get('.ant-modal-content').within(() => {
+      cy.get('button.ant-modal-close').first().click({ force: true });
     });
   });
 
@@ -124,7 +124,7 @@ describe('Test explore links', () => {
       .find('input[aria-label="Select a dashboard"]')
       .type(`${dashboardTitle}`, { force: true });
 
-    cy.get(`.ant-select-item[label="${dashboardTitle}"]`).click({
+    cy.get(`.ant-select-item[title="${dashboardTitle}"]`).click({
       force: true,
     });
 
@@ -154,10 +154,10 @@ describe('Test explore links', () => {
     // This time around, typing the same dashboard name
     // will select the existing one
     cy.get('[data-test="save-chart-modal-select-dashboard-form"]')
-      .find('input[aria-label="Select a dashboard"]')
+      .find('input[aria-label^="Select a dashboard"]')
       .type(`${dashboardTitle}{enter}`, { force: true });
 
-    cy.get(`.ant-select-item[label="${dashboardTitle}"]`).click({
+    cy.get(`.ant-select-item[title="${dashboardTitle}"]`).click({
       force: true,
     });
 
diff --git a/superset-frontend/cypress-base/cypress/e2e/explore/utils.ts b/superset-frontend/cypress-base/cypress/e2e/explore/utils.ts
index 8bc17aa2bc3..93dbe99baa2 100644
--- a/superset-frontend/cypress-base/cypress/e2e/explore/utils.ts
+++ b/superset-frontend/cypress-base/cypress/e2e/explore/utils.ts
@@ -61,13 +61,15 @@ export function interceptExploreGet() {
 export function setFilter(filter: string, option: string) {
   interceptFiltering();
 
-  cy.get(`[aria-label="${filter}"]`).first().click();
-  cy.get(`[aria-label="${filter}"] [title="${option}"]`).click();
+  cy.get(`[aria-label^="${filter}"]`).first().click();
+  cy.get(`.ant-select-item-option[title="${option}"]`).first().click({
+    force: true,
+  });
 
   cy.wait('@filtering');
 }
 
-export function saveChartToDashboard(dashboardName: string) {
+export function saveChartToDashboard(chartName: string, dashboardName: string) {
   interceptDashboardGet();
   interceptUpdate();
   interceptExploreGet();
@@ -75,23 +77,30 @@ export function saveChartToDashboard(dashboardName: string) {
   cy.getBySel('query-save-button')
     .should('be.enabled')
     .should('not.be.disabled')
-    .click();
-  cy.getBySelLike('chart-modal').should('be.visible');
-  cy.get(
-    '[data-test="save-chart-modal-select-dashboard-form"] [aria-label="Select a dashboard"]',
-  )
-    .first()
-    .click();
-  cy.get(
-    '.ant-select-selection-search-input[aria-label="Select a dashboard"]',
-  ).type(dashboardName, { force: true });
-  cy.get(`.ant-select-item-option[title="${dashboardName}"]`).click();
-  cy.getBySel('btn-modal-save').click();
+    .click({ force: true });
 
-  cy.wait('@update');
+  cy.getBySel('save-modal-body')
+    .should('be.visible')
+    .then($modal => {
+      cy.wait(500);
+      cy.wrap($modal)
+        .find(
+          '.ant-select-selection-search-input[aria-label*="Select a dashboard"]',
+        )
+        .type(dashboardName, { force: true });
+      cy.wrap($modal)
+        .find(`.ant-select-item-option[title="${dashboardName}"]`)
+        .click();
+      cy.getBySel('btn-modal-save').click();
+      cy.wait('@update');
+    });
+  cy.getBySel('save-modal-body').should('not.exist');
+  cy.getBySel('query-save-button').should('be.disabled');
   cy.wait('@get');
   cy.wait('@getExplore');
   cy.contains(`was added to dashboard [${dashboardName}]`);
+  cy.contains(`Chart [${chartName}] has been overwritten`);
+  cy.getBySel('query-save-button').should('be.enabled');
 }
 
 export function visitSampleChartFromList(chartName: string) {
diff --git a/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/box_plot.test.js b/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/box_plot.test.js
index be52c08d8bc..71232ca6dd4 100644
--- a/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/box_plot.test.js
+++ b/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/box_plot.test.js
@@ -49,7 +49,7 @@ describe('Visualization > Box Plot', () => {
   it('should allow type to search color schemes', () => {
     verify(BOX_PLOT_FORM_DATA);
 
-    cy.get('#controlSections-tab-display').click();
+    cy.get('#controlSections-tab-CUSTOMIZE').click();
     cy.get('.Control[data-test="color_scheme"]').scrollIntoView();
     cy.get('.Control[data-test="color_scheme"] input[type="search"]').focus();
     cy.focused().type('supersetColors{enter}');
diff --git a/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/compare.test.js b/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/compare.test.js
index 347b54502d2..c177adaefdd 100644
--- a/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/compare.test.js
+++ b/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/compare.test.js
@@ -89,7 +89,7 @@ describe('Visualization > Compare', () => {
   it('should allow type to search color schemes and apply the scheme', () => {
     verify(COMPARE_FORM_DATA);
 
-    cy.get('#controlSections-tab-display').click();
+    cy.get('#controlSections-tab-CUSTOMIZE').click();
     cy.get('.Control[data-test="color_scheme"]').scrollIntoView();
     cy.get('.Control[data-test="color_scheme"] input[type="search"]').focus();
     cy.focused().type('supersetColors{enter}');
diff --git a/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/download_chart.test.js b/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/download_chart.test.js
index 804f35ca7b0..fdede555bde 100644
--- a/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/download_chart.test.js
+++ b/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/download_chart.test.js
@@ -36,10 +36,10 @@ describe('Download Chart > Bar chart', () => {
     };
 
     cy.visitChartByParams(formData);
-    cy.get('.header-with-actions .antd5-dropdown-trigger').click();
-    cy.get(':nth-child(3) > .antd5-dropdown-menu-submenu-title').click();
+    cy.get('.header-with-actions .ant-dropdown-trigger').click();
+    cy.get(':nth-child(3) > .ant-dropdown-menu-submenu-title').click();
     cy.get(
-      '.antd5-dropdown-menu-submenu > .antd5-dropdown-menu li:nth-child(3)',
+      '.ant-dropdown-menu-submenu > .ant-dropdown-menu li:nth-child(3)',
     ).click();
     cy.verifyDownload('.jpg', {
       contains: true,
diff --git a/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/gauge.test.js b/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/gauge.test.js
index e9e6ba39558..6b4df5a590a 100644
--- a/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/gauge.test.js
+++ b/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/gauge.test.js
@@ -64,7 +64,7 @@ describe('Visualization > Gauge', () => {
   it('should allow type to search color schemes', () => {
     verify(GAUGE_FORM_DATA);
 
-    cy.get('#controlSections-tab-display').click();
+    cy.get('#controlSections-tab-CUSTOMIZE').click();
     cy.get('.Control[data-test="color_scheme"]').scrollIntoView();
     cy.get('.Control[data-test="color_scheme"] input[type="search"]').focus();
     cy.focused().type('bnbColors{enter}');
diff --git a/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/graph.test.ts b/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/graph.test.ts
index eb038f1d3f5..1ae7f5648af 100644
--- a/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/graph.test.ts
+++ b/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/graph.test.ts
@@ -80,7 +80,7 @@ describe('Visualization > Graph', () => {
   it('should allow type to search color schemes', () => {
     verify(GRAPH_FORM_DATA);
 
-    cy.get('#controlSections-tab-display').click();
+    cy.get('#controlSections-tab-CUSTOMIZE').click();
     cy.get('.Control[data-test="color_scheme"]').scrollIntoView();
     cy.get('.Control[data-test="color_scheme"] input[type="search"]').focus();
     cy.focused().type('bnbColors{enter}');
diff --git a/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/pie.test.js b/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/pie.test.js
index 5b8af481f66..0d06ada4aac 100644
--- a/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/pie.test.js
+++ b/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/pie.test.js
@@ -71,7 +71,7 @@ describe('Visualization > Pie', () => {
   it('should allow type to search color schemes', () => {
     verify(PIE_FORM_DATA);
 
-    cy.get('#controlSections-tab-display').click();
+    cy.get('#controlSections-tab-CUSTOMIZE').click();
     cy.get('.Control[data-test="color_scheme"]').scrollIntoView();
     cy.get('.Control[data-test="color_scheme"] input[type="search"]').focus();
     cy.focused().type('supersetColors{enter}');
diff --git a/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/sunburst.test.js b/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/sunburst.test.js
index ddadae15c21..ad06cd3c84f 100644
--- a/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/sunburst.test.js
+++ b/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/sunburst.test.js
@@ -86,7 +86,7 @@ describe('Visualization > Sunburst', () => {
   it('should allow type to search color schemes', () => {
     verify(SUNBURST_FORM_DATA);
 
-    cy.get('#controlSections-tab-display').click();
+    cy.get('#controlSections-tab-CUSTOMIZE').click();
     cy.get('.Control[data-test="color_scheme"]').scrollIntoView();
     cy.get('.Control[data-test="color_scheme"] input[type="search"]').focus();
     cy.focused().type('supersetColors{enter}');
diff --git a/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/table.test.ts b/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/table.test.ts
index 319938b95e7..fc7e2243fad 100644
--- a/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/table.test.ts
+++ b/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/table.test.ts
@@ -193,7 +193,9 @@ describe('Visualization > Table', () => {
     });
 
     // should display in raw records mode
-    cy.get('div[data-test="query_mode"] .btn.active').contains('Raw records');
+    cy.get(
+      'div[data-test="query_mode"] .ant-radio-button-wrapper-checked',
+    ).contains('Raw records');
     cy.get('div[data-test="all_columns"]').should('be.visible');
     cy.get('div[data-test="groupby"]').should('not.exist');
 
@@ -201,8 +203,12 @@ describe('Visualization > Table', () => {
     cy.get('[data-test="row-count-label"]').contains('100 rows');
 
     // should allow switch back to aggregate mode
-    cy.get('div[data-test="query_mode"] .btn').contains('Aggregate').click();
-    cy.get('div[data-test="query_mode"] .btn.active').contains('Aggregate');
+    cy.get('div[data-test="query_mode"] .ant-radio-button-wrapper')
+      .contains('Aggregate')
+      .click();
+    cy.get(
+      'div[data-test="query_mode"] .ant-radio-button-wrapper-checked',
+    ).contains('Aggregate');
     cy.get('div[data-test="all_columns"]').should('not.exist');
     cy.get('div[data-test="groupby"]').should('be.visible');
   });
@@ -254,6 +260,8 @@ describe('Visualization > Table', () => {
   });
 
   it('Test row limit with server pagination toggle', () => {
+    const serverPaginationSelector =
+      '[data-test="server_pagination-header"] div.pull-left [type="checkbox"]';
     cy.visitChartByParams({
       ...VIZ_DEFAULTS,
       metrics: ['count'],
@@ -261,7 +269,7 @@ describe('Visualization > Table', () => {
     });
 
     // Enable server pagination
-    cy.get('[data-test="server_pagination-header"] div.pull-left').click();
+    cy.get(serverPaginationSelector).click();
 
     // Click row limit control and select high value (200k)
     cy.get('div[aria-label="Row limit"]').click();
@@ -275,7 +283,7 @@ describe('Visualization > Table', () => {
     cy.get('[data-test="error-tooltip"]').should('not.exist');
 
     // Disable server pagination
-    cy.get('[data-test="server_pagination-header"] div.pull-left').click();
+    cy.get(serverPaginationSelector).click();
 
     // Verify error tooltip appears
     cy.get('[data-test="error-tooltip"]').should('be.visible');
@@ -284,17 +292,17 @@ describe('Visualization > Table', () => {
     cy.get('[data-test="error-tooltip"]').trigger('mouseover');
 
     // Verify tooltip content
-    cy.get('.antd5-tooltip-inner').should('be.visible');
-    cy.get('.antd5-tooltip-inner').should(
+    cy.get('.ant-tooltip-inner').should('be.visible');
+    cy.get('.ant-tooltip-inner').should(
       'contain',
       'Server pagination needs to be enabled for values over',
     );
 
     // Hide the tooltip by adding display:none style
-    cy.get('.antd5-tooltip').invoke('attr', 'style', 'display: none');
+    cy.get('.ant-tooltip').invoke('attr', 'style', 'display: none');
 
     // Enable server pagination again
-    cy.get('[data-test="server_pagination-header"] div.pull-left').click();
+    cy.get(serverPaginationSelector).click();
 
     cy.get('[data-test="error-tooltip"]').should('not.exist');
 
@@ -319,11 +327,11 @@ describe('Visualization > Table', () => {
       .trigger('mouseover');
 
     // Wait for tooltip content and verify
-    cy.get('.antd5-tooltip-inner').should('exist');
-    cy.get('.antd5-tooltip-inner').should('be.visible');
+    cy.get('.ant-tooltip-inner').should('exist');
+    cy.get('.ant-tooltip-inner').should('be.visible');
 
     // Verify tooltip content separately
-    cy.get('.antd5-tooltip-inner').should('contain', 'Value cannot exceed');
+    cy.get('.ant-tooltip-inner').should('contain', 'Value cannot exceed');
   });
 
   it('Test sorting with server pagination enabled', () => {
@@ -393,12 +401,12 @@ describe('Visualization > Table', () => {
 
     cy.wait('@chartData');
 
-    // Basic search test
-    cy.get('span.dt-global-filter input.form-control.input-sm').should(
-      'be.visible',
-    );
+    const searchInputSelector = '.dt-global-filter input';
 
-    cy.get('span.dt-global-filter input.form-control.input-sm').type('John');
+    // Basic search test
+    cy.get(searchInputSelector).should('be.visible');
+
+    cy.get(searchInputSelector).type('John');
 
     cy.wait('@chartData');
 
@@ -407,11 +415,11 @@ describe('Visualization > Table', () => {
     });
 
     // Clear and test case-insensitive search
-    cy.get('span.dt-global-filter input.form-control.input-sm').clear();
+    cy.get(searchInputSelector).clear();
 
     cy.wait('@chartData');
 
-    cy.get('span.dt-global-filter input.form-control.input-sm').type('mary');
+    cy.get(searchInputSelector).type('mary');
 
     cy.wait('@chartData');
 
@@ -420,9 +428,9 @@ describe('Visualization > Table', () => {
     });
 
     // Test special characters
-    cy.get('span.dt-global-filter input.form-control.input-sm').clear();
+    cy.get(searchInputSelector).clear();
 
-    cy.get('span.dt-global-filter input.form-control.input-sm').type('Nicole');
+    cy.get(searchInputSelector).type('Nicole');
 
     cy.wait('@chartData');
 
@@ -431,9 +439,9 @@ describe('Visualization > Table', () => {
     });
 
     // Test no results
-    cy.get('span.dt-global-filter input.form-control.input-sm').clear();
+    cy.get(searchInputSelector).clear();
 
-    cy.get('span.dt-global-filter input.form-control.input-sm').type('XYZ123');
+    cy.get(searchInputSelector).type('XYZ123');
 
     cy.wait('@chartData');
 
@@ -450,9 +458,9 @@ describe('Visualization > Table', () => {
 
     cy.get('.ant-select-item-option').contains('state').click();
 
-    cy.get('span.dt-global-filter input.form-control.input-sm').clear();
+    cy.get(searchInputSelector).clear();
 
-    cy.get('span.dt-global-filter input.form-control.input-sm').type('CA');
+    cy.get(searchInputSelector).type('CA');
 
     cy.wait('@chartData');
     cy.wait(1000);
diff --git a/superset-frontend/cypress-base/cypress/e2e/sqllab/tabs.test.ts b/superset-frontend/cypress-base/cypress/e2e/sqllab/tabs.test.ts
index ef97eb1c19f..56724e6e9ed 100644
--- a/superset-frontend/cypress-base/cypress/e2e/sqllab/tabs.test.ts
+++ b/superset-frontend/cypress-base/cypress/e2e/sqllab/tabs.test.ts
@@ -22,7 +22,7 @@ describe('SqlLab query tabs', () => {
   });
 
   const tablistSelector = '[data-test="sql-editor-tabs"] > [role="tablist"]';
-  const tabSelector = `${tablistSelector} [role="tab"]`;
+  const tabSelector = `${tablistSelector} [role="tab"]:not([type="button"])`;
 
   it('allows you to create and close a tab', () => {
     cy.get(tabSelector).then(tabs => {
@@ -80,9 +80,9 @@ describe('SqlLab query tabs', () => {
       // configure some editor settings
       cy.get(editorInput).type('some random query string', { force: true });
       cy.get(queryLimitSelector).parent().click({ force: true });
-      cy.get('.antd5-dropdown-menu')
+      cy.get('.ant-dropdown-menu')
         .last()
-        .find('.antd5-dropdown-menu-item')
+        .find('.ant-dropdown-menu-item')
         .first()
         .click({ force: true });
 
diff --git a/superset-frontend/cypress-base/cypress/support/directories.ts b/superset-frontend/cypress-base/cypress/support/directories.ts
index 3c8e8eb3671..cf62240caf8 100644
--- a/superset-frontend/cypress-base/cypress/support/directories.ts
+++ b/superset-frontend/cypress-base/cypress/support/directories.ts
@@ -25,16 +25,16 @@ export function dataTestChartName(chartName: string): string {
 
 export const pageHeader = {
   logo: '.navbar-brand > img',
-  headerNavigationItem: '.antd5-menu-submenu-title',
+  headerNavigationItem: '.ant-menu-submenu-title',
   headerNavigationDropdown: "[aria-label='triangle-down']",
-  headerNavigationItemMenu: '.antd5-menu-item-group-list',
-  plusIcon: ':nth-child(2) > .antd5-menu-submenu-title',
+  headerNavigationItemMenu: '.ant-menu-item-group-list',
+  plusIcon: ':nth-child(2) > .ant-menu-submenu-title',
   plusIconMenuOptions: {
     sqlQueryOption: dataTestLocator('menu-item-SQL query'),
     chartOption: dataTestLocator('menu-item-Chart'),
     dashboardOption: dataTestLocator('menu-item-Dashboard'),
   },
-  plusMenu: '.antd5-menu-submenu-popup',
+  plusMenu: '.ant-menu-submenu-popup',
   barButtons: '[role="presentation"]',
   sqlLabMenu: '[id="item_3$Menu"]',
   dataMenu: '[id="item_4$Menu"]',
@@ -48,12 +48,12 @@ export const profile = {
   favoritesSpace: '#rc-tabs-0-panel-2',
 };
 export const securityAccess = {
-  rolesBubble: '.antd5-badge-count',
+  rolesBubble: '.ant-badge-count',
 };
 export const homePage = {
   homeSection: {
     sectionArea: '.ant-collapse-content-box',
-    sectionElement: '.antd5-card-meta-title',
+    sectionElement: '.ant-card-meta-title',
   },
   sections: {
     expandedSection: '.ant-collapse-item-active',
@@ -94,19 +94,19 @@ export const databasesPage = {
     dbDropdown: '[class="ant-select-selection-search-input"]',
     dbDropdownMenu: '.rc-virtual-list-holder-inner',
     dbDropdownMenuItem: '[class="ant-select-item-option-content"]',
-    infoAlert: '.antd5-alert',
+    infoAlert: '.ant-alert',
     serviceAccountInput: '[name="credentials_info"]',
     connectionStep: {
-      modal: '.antd5-modal-content',
-      modalBody: '.antd5-modal-body',
+      modal: '.ant-modal-content',
+      modalBody: '.ant-modal-body',
       stepTitle: '.css-7x6kk > h4',
       helperBottom: '.helper-bottom',
       postgresDatabase: '[name="database"]',
       dbInput: '[name="database_name"]',
-      alertMessage: '.antd5-alert-message',
+      alertMessage: '.ant-alert-message',
       errorField: '[role="alert"]',
       uploadJson: '[title="Upload JSON file"]',
-      chooseFile: '[class="antd5-btn input-upload-btn"]',
+      chooseFile: '[class="ant-btn input-upload-btn"]',
       additionalParameters: '[name="query_input"]',
       sqlAlchemyUriInput: dataTestLocator('sqlalchemy-uri-input'),
       advancedTab: '#rc-tabs-0-tab-2',
@@ -140,7 +140,7 @@ export const sqlLabView = {
   tabsNavList: "[class='ant-tabs-nav-list']",
   tab: "[class='ant-tabs-tab-btn']",
   addTabButton: dataTestLocator('add-tab-icon'),
-  tooltip: '.antd5-tooltip-content',
+  tooltip: '.ant-tooltip-content',
   tabName: '.css-1suejie',
   schemaInput: '[data-test=DatabaseSelector] > :nth-child(2)',
   loadingIndicator: '.Select__loading-indicator',
@@ -148,9 +148,9 @@ export const sqlLabView = {
   examplesMenuItem: '[title="examples"]',
   tableInput: ':nth-child(4) > .select > :nth-child(1)',
   sqlEditor: '#brace-editor textarea',
-  saveAsButton: '.SaveQuery > .antd5-btn',
+  saveAsButton: '.SaveQuery > .ant-btn',
   saveAsModal: {
-    footer: '.antd5-modal-footer',
+    footer: '.ant-modal-footer',
     queryNameInput: 'input[class^="ant-input"]',
   },
   sqlToolbar: {
@@ -158,15 +158,15 @@ export const sqlLabView = {
     runButton: '.css-d3dxop',
   },
   rowsLimit: {
-    dropdown: '.antd5-dropdown-menu',
-    limitButton: '.antd5-dropdown-menu-item',
+    dropdown: '.ant-dropdown-menu',
+    limitButton: '.ant-dropdown-menu-item',
     limitButtonText: '.css-151uxnz',
-    limitTextWithValue: '[class="antd5-dropdown-trigger"]',
+    limitTextWithValue: '[class="ant-dropdown-trigger"]',
   },
   renderedTableHeader: '.ReactVirtualized__Table__headerRow',
   renderedTableRow: '.ReactVirtualized__Table__row',
   errorBody: '.error-body',
-  alertMessage: '.antd5-alert-message',
+  alertMessage: '.ant-alert-message',
   historyTable: {
     header: '[role=columnheader]',
     table: '.QueryTable',
@@ -195,16 +195,16 @@ export const savedQuery = {
 export const annotationLayersView = {
   emptyDescription: {
     description: '.ant-empty-description',
-    addAnnotationLayerButton: '.ant-empty-footer > .antd5-btn',
+    addAnnotationLayerButton: '.ant-empty-footer > .ant-btn',
   },
   modal: {
     content: {
-      content: '.antd5-modal-body',
-      title: '.antd5-modal-body > :nth-child(2) > input',
+      content: '.ant-modal-body',
+      title: '.ant-modal-body > :nth-child(2) > input',
       description: "[name='descr']",
     },
     footer: {
-      footer: '.antd5-modal-footer',
+      footer: '.ant-modal-footer',
       addButton: dataTestLocator('modal-confirm-button'),
       cancelButton: dataTestLocator('modal-cancel-button'),
     },
@@ -216,7 +216,7 @@ export const datasetsList = {
   newDatasetModal: {
     inputField: '[class="section"]',
     addButton: dataTestLocator('modal-confirm-button'),
-    body: '.antd5-modal-body',
+    body: '.ant-modal-body',
   },
   table: {
     tableRow: {
@@ -261,7 +261,7 @@ export const datasetsList = {
     },
   },
   deleteDatasetModal: {
-    modal: '.antd5-modal-content',
+    modal: '.ant-modal-content',
     deleteInput: dataTestLocator('delete-modal-input'),
     deleteButton: dataTestLocator('modal-confirm-button'),
     text: '.css-kxmt87',
@@ -275,8 +275,8 @@ export const chartListView = {
     bulkSelect: dataTestLocator('bulk-select'),
   },
   header: {
-    cardView: '[aria-label="appstore"]',
-    listView: '[aria-label="unordered-list"]',
+    cardView: '[aria-label="card-view"]',
+    listView: '[aria-label="list-view"]',
     sort: '[class="ant-select-selection-search-input"][aria-label="Sort"]',
     sortRecentlyModifiedMenuOption: '[label="Recently modified"]',
     sortAlphabeticalMenuOption: '[label="Alphabetical"]',
@@ -284,7 +284,7 @@ export const chartListView = {
   },
   card: {
     card: dataTestLocator('styled-card'),
-    cardCover: '[class="antd5-card-cover"]',
+    cardCover: '[class="ant-card-cover"]',
     cardImage: '[class="gradient-container"]',
     starIcon: dataTestLocator('fave-unfave-icon'),
   },
@@ -294,8 +294,8 @@ export const chartListView = {
   },
   table: {
     bulkSelect: {
-      checkboxOff: '[aria-label="checkbox-off"]',
-      checkboxOn: '[aria-label="checkbox-on"]',
+      checkboxOff: 'input[type="checkbox"]:checked',
+      checkboxOn: 'input[type="checkbox"]:not(:checked)',
       action: dataTestLocator('bulk-select-action'),
     },
     tableList: dataTestLocator('listview-table'),
@@ -316,14 +316,14 @@ export const chartListView = {
 };
 export const nativeFilters = {
   modal: {
-    container: '.antd5-modal',
-    footer: '.antd5-modal-footer',
+    container: '.ant-modal',
+    footer: '.ant-modal-footer',
     saveButton: dataTestLocator('native-filter-modal-save-button'),
     cancelButton: dataTestLocator('native-filter-modal-cancel-button'),
     confirmCancelButton: dataTestLocator(
       'native-filter-modal-confirm-cancel-button',
     ),
-    alertXUnsavedFilters: '.antd5-alert-message',
+    alertXUnsavedFilters: '.ant-alert-message',
     tabsList: {
       filterItemsContainer: dataTestLocator('filter-title-container'),
       tabsContainer: '[class="ant-tabs-nav-list"]',
@@ -398,7 +398,7 @@ export const dashboardListView = {
   },
   card: {
     card: dataTestLocator('styled-card'),
-    cardCover: '[class="antd5-card-cover"]',
+    cardCover: '[class="ant-card-cover"]',
     cardImage: '[class="gradient-container"]',
     selectedStarIcon: "[aria-label='star']",
     unselectedStarIcon: "[aria-label='star']",
@@ -432,7 +432,7 @@ export const dashboardListView = {
     newDashboardButton: '.css-yff34v',
   },
   importModal: {
-    selectFileButton: '.ant-upload > .antd5-btn > span',
+    selectFileButton: '.ant-upload > .ant-btn > span',
     importButton: dataTestLocator('modal-confirm-button'),
   },
   header: {
@@ -474,15 +474,15 @@ export const exploreView = {
   },
   chartAreaItem: '.nv-legend-text',
   viewQueryModal: {
-    container: '.antd5-modal-content',
-    closeButton: 'button.antd5-modal-close',
+    container: '.ant-modal-content',
+    closeButton: 'button.ant-modal-close',
   },
   embedCodeModal: {
     container: dataTestLocator('embed-code-popover'),
     textfield: dataTestLocator('embed-code-textarea'),
   },
   saveModal: {
-    modal: '.antd5-modal-content',
+    modal: '.ant-modal-content',
     chartNameInput: dataTestLocator('new-chart-name'),
     dashboardNameInput: '.ant-select-selection-search-input',
     addToDashboardInput: dataTestLocator(
@@ -553,7 +553,7 @@ export const exploreView = {
     timeSection: {
       timeRangeFilter: dataTestLocator('time-range-trigger'),
       timeRangeFilterModal: {
-        container: '.antd5-popover-content',
+        container: '.ant-popover-content',
         footer: '.footer',
         cancelButton: dataTestLocator('cancel-button'),
         configureLastTimeRange: {
@@ -578,15 +578,15 @@ export const exploreView = {
     },
   },
   editDatasetModal: {
-    container: '.antd5-modal-content',
+    container: '.ant-modal-content',
     datasetTabsContainer: dataTestLocator('edit-dataset-tabs'),
     saveButton: dataTestLocator('datasource-modal-save'),
     metricsTab: {
       addItem: dataTestLocator('crud-add-table-item'),
-      rowsContainer: dataTestLocator('table-content-rows'),
+      rowsContainer: '.ant-table-body',
     },
     confirmModal: {
-      okButton: '.antd5-modal-confirm-btns .antd5-btn-primary',
+      okButton: '.ant-modal-confirm-btns .ant-btn-primary',
     },
   },
   visualizationTypeModal: {
@@ -617,12 +617,12 @@ export const dashboardView = {
     closeButton: dataTestLocator('close-button'),
   },
   saveModal: {
-    modal: '.antd5-modal-content',
+    modal: '.ant-modal-content',
     dashboardNameInput: '.ant-input',
     saveButton: dataTestLocator('modal-save-dashboard-button'),
   },
   dashboardProperties: {
-    modal: '.antd5-modal-content',
+    modal: '.ant-modal-content',
     dashboardTitleInput: dataTestLocator('dashboard-title-input'),
     modalButton: '[type="button"]',
   },
@@ -631,7 +631,7 @@ export const dashboardView = {
     refreshChart: dataTestLocator('refresh-chart-menu-item'),
   },
   threeDotsMenuIcon:
-    '.header-with-actions .right-button-panel .antd5-dropdown-trigger',
+    '.header-with-actions .right-button-panel .ant-dropdown-trigger',
   threeDotsMenuDropdown: dataTestLocator('header-actions-menu'),
   refreshDashboard: dataTestLocator('refresh-dashboard-menu-item'),
   saveAsMenuOption: dataTestLocator('save-as-menu-item'),
diff --git a/superset-frontend/cypress-base/cypress/support/e2e.ts b/superset-frontend/cypress-base/cypress/support/e2e.ts
index 18572b6ab2e..70255c4803d 100644
--- a/superset-frontend/cypress-base/cypress/support/e2e.ts
+++ b/superset-frontend/cypress-base/cypress/support/e2e.ts
@@ -18,7 +18,6 @@
  */
 import '@cypress/code-coverage/support';
 import '@applitools/eyes-cypress/commands';
-import failOnConsoleError from 'cypress-fail-on-console-error';
 import { expect } from 'chai';
 import rison from 'rison';
 
@@ -69,7 +68,21 @@ Cypress.Commands.add('loadDashboardFixtures', () =>
   }),
 );
 
+const PATHS_TO_SKIP_LOGIN = ['login', 'register'];
+
+const skipLogin = () => {
+  for (const path of PATHS_TO_SKIP_LOGIN) {
+    if (Cypress.currentTest.title.toLowerCase().includes(path)) {
+      return true;
+    }
+  }
+  return false;
+};
+
 before(() => {
+  if (skipLogin()) {
+    return;
+  }
   cy.login();
   Cypress.Cookies.defaults({ preserve: 'session' });
   cy.loadChartFixtures();
@@ -77,6 +90,9 @@ before(() => {
 });
 
 beforeEach(() => {
+  if (skipLogin()) {
+    return;
+  }
   cy.cleanDashboards();
   cy.cleanCharts();
 });
diff --git a/superset-frontend/cypress-base/cypress/utils/index.ts b/superset-frontend/cypress-base/cypress/utils/index.ts
index 2c8255ee6e2..00ff58ab9aa 100644
--- a/superset-frontend/cypress-base/cypress/utils/index.ts
+++ b/superset-frontend/cypress-base/cypress/utils/index.ts
@@ -143,3 +143,29 @@ export function resize(selector: string) {
     },
   };
 }
+
+export const setSelectSearchInput = (
+  $input: any,
+  value: string,
+  async = false,
+) => {
+  // Ant Design 5 Select crashes Chromium with type/click events when showSearch is true.
+  // This copies the value directly to the input element as a workaround.
+  const nativeInputValueSetter = Object.getOwnPropertyDescriptor(
+    window.HTMLInputElement.prototype,
+    'value',
+  )?.set;
+  nativeInputValueSetter?.call($input[0], value);
+
+  // Trigger the input and change events
+  if (async) {
+    $input[0].dispatchEvent(new Event('mousedown', { bubbles: true }));
+  }
+
+  $input[0].dispatchEvent(new Event('input', { bubbles: true }));
+  $input[0].dispatchEvent(new Event('change', { bubbles: true }));
+
+  cy.get('.ant-select-item-option-content').should('exist').first().click({
+    force: true,
+  });
+};
diff --git a/superset-frontend/cypress-base/cypress/utils/urls.ts b/superset-frontend/cypress-base/cypress/utils/urls.ts
index ee35c3088c0..1a585f40479 100644
--- a/superset-frontend/cypress-base/cypress/utils/urls.ts
+++ b/superset-frontend/cypress-base/cypress/utils/urls.ts
@@ -28,3 +28,5 @@ export const DATABASE_LIST = '/databaseview/list';
 export const DATASET_LIST_PATH = 'tablemodelview/list';
 export const ALERT_LIST = '/alert/list/';
 export const REPORT_LIST = '/report/list/';
+export const LOGIN = '/login/';
+export const REGISTER = '/register/';
diff --git a/superset-frontend/cypress-base/tsconfig.json b/superset-frontend/cypress-base/tsconfig.json
index 9249195c0cd..4dff9ae0c44 100644
--- a/superset-frontend/cypress-base/tsconfig.json
+++ b/superset-frontend/cypress-base/tsconfig.json
@@ -10,7 +10,7 @@
     "allowJs": true,
     "noEmit": true
   },
-  "files": ["cypress/support/index.d.ts", "./node_modules/@applitools/eyes-cypress/eyes-index.d.ts"],
+  "files": ["cypress/support/index.d.ts", "./node_modules/@applitools/eyes-cypress/types/index.d.ts"],
   "include": ["cypress/**/*.ts", "./cypress.config.ts"],
   "exclude": ["node_modules"]
 }
diff --git a/superset-frontend/jest.config.js b/superset-frontend/jest.config.js
index 634221c2423..55536df049e 100644
--- a/superset-frontend/jest.config.js
+++ b/superset-frontend/jest.config.js
@@ -16,10 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 // timezone for unit tests
 process.env.TZ = 'America/New_York';
-
 module.exports = {
   testRegex:
     '\\/superset-frontend\\/(spec|src|plugins|packages|tools)\\/.*(_spec|\\.test)\\.[jt]sx?$',
@@ -30,13 +28,16 @@ module.exports = {
     '^src/(.*)$': '<rootDir>/src/$1',
     '^spec/(.*)$': '<rootDir>/spec/$1',
     // mapping plugins of superset-ui to source code
-    '@superset-ui/(.*)$': '<rootDir>/node_modules/@superset-ui/$1/src',
+    '^@superset-ui/([^/]+)/(.*)$':
+      '<rootDir>/node_modules/@superset-ui/$1/src/$2',
+    '^@superset-ui/([^/]+)$': '<rootDir>/node_modules/@superset-ui/$1/src',
   },
-  testEnvironment: 'jsdom',
+  testEnvironment: '<rootDir>/spec/helpers/jsDomWithFetchAPI.ts',
   modulePathIgnorePatterns: ['<rootDir>/packages/generator-superset'],
   setupFilesAfterEnv: ['<rootDir>/spec/helpers/setup.ts'],
   snapshotSerializers: ['@emotion/jest/serializer'],
   testEnvironmentOptions: {
+    globalsCleanup: true,
     url: 'http://localhost',
   },
   collectCoverageFrom: [
@@ -55,7 +56,7 @@ module.exports = {
   ],
   coverageReporters: ['lcov', 'json-summary', 'html', 'text'],
   transformIgnorePatterns: [
-    'node_modules/(?!d3-(interpolate|color|time)|remark-gfm|markdown-table|micromark-*.|decode-named-character-reference|character-entities|mdast-util-*.|unist-util-*.|ccount|escape-string-regexp|nanoid|@rjsf/*.|sinon|echarts|zrender|fetch-mock|pretty-ms|parse-ms|ol|@babel/runtime|@emotion|cheerio|cheerio/lib|parse5|dom-serializer|entities|htmlparser2|rehype-sanitize|hast-util-sanitize|unified|unist-.*|hast-.*|rehype-.*|remark-.*|mdast-.*|micromark-.*|parse-entities|property-information|space-separated-tokens|comma-separated-tokens|bail|devlop|zwitch|longest-streak|jest-enzyme)',
+    'node_modules/(?!d3-(interpolate|color|time)|remark-gfm|markdown-table|micromark-*.|decode-named-character-reference|character-entities|mdast-util-*.|unist-util-*.|ccount|escape-string-regexp|nanoid|@rjsf/*.|sinon|echarts|zrender|fetch-mock|pretty-ms|parse-ms|ol|@babel/runtime|@emotion|cheerio|cheerio/lib|parse5|dom-serializer|entities|htmlparser2|rehype-sanitize|hast-util-sanitize|unified|unist-.*|hast-.*|rehype-.*|remark-.*|mdast-.*|micromark-.*|parse-entities|property-information|space-separated-tokens|comma-separated-tokens|bail|devlop|zwitch|longest-streak|jest-enzyme|geostyler|geostyler-.*)',
   ],
   preset: 'ts-jest',
   transform: {
diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json
index 5074acd03b1..2af1b0f1572 100644
--- a/superset-frontend/package-lock.json
+++ b/superset-frontend/package-lock.json
@@ -14,12 +14,9 @@
         "src/setup/*"
       ],
       "dependencies": {
-        "@ant-design/icons": "^5.2.6",
         "@emotion/cache": "^11.4.0",
-        "@emotion/react": "^11.13.3",
-        "@emotion/styled": "^11.3.0",
-        "@fontsource/fira-code": "^5.0.18",
-        "@fontsource/inter": "^5.0.20",
+        "@emotion/react": "^11.14.0",
+        "@emotion/styled": "^11.14.1",
         "@reduxjs/toolkit": "^1.9.3",
         "@rjsf/core": "^5.21.1",
         "@rjsf/utils": "^5.24.3",
@@ -48,20 +45,16 @@
         "@superset-ui/switchboard": "file:./packages/superset-ui-switchboard",
         "@types/d3-format": "^3.0.1",
         "@types/d3-time-format": "^4.0.3",
+        "@types/react-google-recaptcha": "^2.1.9",
         "@visx/axis": "^3.8.0",
         "@visx/grid": "^3.5.0",
         "@visx/responsive": "^3.0.0",
         "@visx/scale": "^3.5.0",
         "@visx/tooltip": "^3.0.0",
         "@visx/xychart": "^3.5.1",
-        "abortcontroller-polyfill": "^1.7.8",
-        "ace-builds": "^1.41.0",
         "ag-grid-community": "33.1.1",
         "ag-grid-react": "33.1.1",
-        "antd": "4.10.3",
-        "antd-v5": "npm:antd@^5.18.0",
-        "bootstrap": "^3.4.1",
-        "brace": "^0.11.1",
+        "antd": "^5.24.6",
         "chrono-node": "^2.7.8",
         "classnames": "^2.2.5",
         "core-js": "^3.38.1",
@@ -71,7 +64,6 @@
         "dayjs": "^1.11.13",
         "dom-to-image-more": "^3.2.0",
         "dom-to-pdf": "^0.3.2",
-        "dompurify": "^3.2.4",
         "echarts": "^5.6.0",
         "emotion-rgba": "0.0.12",
         "eslint-plugin-i18n-strings": "file:eslint-rules/eslint-plugin-i18n-strings",
@@ -79,12 +71,14 @@
         "fs-extra": "^11.2.0",
         "fuse.js": "^7.0.0",
         "geolib": "^2.0.24",
-        "geostyler": "^12.0.2",
+        "geostyler": "^14.1.3",
         "geostyler-data": "^1.0.0",
         "geostyler-openlayers-parser": "^4.3.0",
-        "geostyler-style": "^7.5.0",
+        "geostyler-qgis-parser": "2.0.1",
+        "geostyler-style": "7.5.0",
         "geostyler-wfs-parser": "^2.0.3",
         "googleapis": "^130.0.0",
+        "html-webpack-plugin": "^5.6.3",
         "immer": "^10.1.1",
         "interweave": "^13.1.0",
         "jquery": "^3.7.1",
@@ -94,7 +88,7 @@
         "json-stringify-pretty-compact": "^2.0.0",
         "lodash": "^4.17.21",
         "luxon": "^3.5.0",
-        "mapbox-gl": "^2.10.0",
+        "mapbox-gl": "^3.13.0",
         "markdown-to-jsx": "^7.7.4",
         "match-sorter": "^6.3.4",
         "memoize-one": "^5.2.1",
@@ -104,8 +98,6 @@
         "ol": "^7.5.2",
         "polished": "^4.3.1",
         "prop-types": "^15.8.1",
-        "query-string": "^6.13.7",
-        "rc-trigger": "^5.3.4",
         "re-resizable": "^6.10.1",
         "react": "^18.2.0",
         "react-ace": "^10.1.0",
@@ -116,8 +108,8 @@
         "react-dnd-html5-backend": "^11.1.3",
         "react-dom": "^18.2.0",
         "react-draggable": "^4.4.6",
+        "react-google-recaptcha": "^3.1.0",
         "react-intersection-observer": "^9.16.0",
-        "react-js-cron": "^2.1.2",
         "react-json-tree": "^0.17.0",
         "react-lines-ellipsis": "^0.15.4",
         "react-loadable": "^5.5.0",
@@ -128,21 +120,18 @@
         "react-search-input": "^0.11.3",
         "react-sortable-hoc": "^2.0.0",
         "react-split": "^2.0.9",
-        "react-syntax-highlighter": "^15.4.5",
         "react-table": "^7.8.0",
         "react-transition-group": "^4.4.5",
-        "react-ultimate-pagination": "^1.3.2",
         "react-virtualized-auto-sizer": "^1.0.25",
         "react-window": "^1.8.10",
         "redux": "^4.2.1",
         "redux-localstorage": "^0.4.1",
         "redux-thunk": "^2.1.0",
         "redux-undo": "^1.0.0-beta9-9-7",
-        "regenerator-runtime": "^0.14.1",
-        "rimraf": "^6.0.1",
         "rison": "^0.1.1",
         "scroll-into-view-if-needed": "^3.1.0",
         "simple-zstd": "^1.4.2",
+        "stream-browserify": "^3.0.0",
         "tinycolor2": "^1.4.2",
         "urijs": "^1.19.8",
         "use-event-callback": "^0.1.0",
@@ -151,8 +140,8 @@
         "yargs": "^17.7.2"
       },
       "devDependencies": {
-        "@applitools/eyes-storybook": "^3.50.9",
-        "@babel/cli": "^7.22.6",
+        "@applitools/eyes-storybook": "^3.55.6",
+        "@babel/cli": "^7.27.2",
         "@babel/compat-data": "^7.26.8",
         "@babel/core": "^7.26.0",
         "@babel/eslint-parser": "^7.25.9",
@@ -191,13 +180,12 @@
         "@testing-library/user-event": "^12.8.3",
         "@types/classnames": "^2.2.10",
         "@types/dom-to-image": "^2.6.7",
-        "@types/fetch-mock": "^7.3.2",
-        "@types/jest": "^29.5.12",
-        "@types/jquery": "^3.5.8",
+        "@types/jest": "^29.5.14",
         "@types/js-levenshtein": "^1.1.3",
         "@types/json-bigint": "^1.0.4",
         "@types/math-expression-evaluator": "^1.3.3",
         "@types/mousetrap": "^1.6.15",
+        "@types/node": "^22.12.0",
         "@types/react": "^18.2.0",
         "@types/react-dom": "^18.2.0",
         "@types/react-gravatar": "^2.6.14",
@@ -206,8 +194,6 @@
         "@types/react-redux": "^7.1.10",
         "@types/react-resizable": "^3.0.8",
         "@types/react-router-dom": "^5.3.3",
-        "@types/react-syntax-highlighter": "^15.5.13",
-        "@types/react-table": "^7.7.20",
         "@types/react-transition-group": "^4.4.12",
         "@types/react-ultimate-pagination": "^1.2.4",
         "@types/react-virtualized-auto-sizer": "^1.0.4",
@@ -216,24 +202,25 @@
         "@types/redux-mock-store": "^1.0.6",
         "@types/rison": "0.1.0",
         "@types/sinon": "^17.0.3",
+        "@types/testing-library__jest-dom": "^5.14.9",
         "@types/tinycolor2": "^1.4.3",
-        "@types/yargs": "12 - 18",
-        "@typescript-eslint/eslint-plugin": "^5.62.0",
-        "@typescript-eslint/parser": "^5.62.0",
-        "babel-jest": "^29.7.0",
+        "@typescript-eslint/eslint-plugin": "^7.18.0",
+        "@typescript-eslint/parser": "^7.18.0",
+        "babel-jest": "^30.0.2",
         "babel-loader": "^10.0.0",
         "babel-plugin-dynamic-import-node": "^2.3.3",
         "babel-plugin-jsx-remove-data-test-id": "^3.0.0",
         "babel-plugin-lodash": "^3.3.4",
         "babel-plugin-typescript-to-proptypes": "^2.0.0",
-        "cheerio": "1.0.0-rc.10",
-        "copy-webpack-plugin": "^12.0.2",
+        "cheerio": "1.1.0",
+        "copy-webpack-plugin": "^13.0.0",
         "cross-env": "^7.0.3",
         "css-loader": "^7.1.2",
         "css-minimizer-webpack-plugin": "^7.0.2",
         "eslint": "^8.56.0",
         "eslint-config-airbnb": "^19.0.4",
         "eslint-config-prettier": "^7.2.0",
+        "eslint-import-resolver-alias": "^1.1.2",
         "eslint-import-resolver-typescript": "^3.7.0",
         "eslint-plugin-cypress": "^3.6.0",
         "eslint-plugin-file-progress": "^1.5.0",
@@ -251,19 +238,17 @@
         "eslint-plugin-storybook": "^0.8.0",
         "eslint-plugin-testing-library": "^6.4.0",
         "eslint-plugin-theme-colors": "file:eslint-rules/eslint-plugin-theme-colors",
-        "fetch-mock": "^9.1.0",
+        "fetch-mock": "^11.1.5",
         "fork-ts-checker-webpack-plugin": "^9.0.2",
         "history": "^5.3.0",
         "html-webpack-plugin": "^5.6.3",
         "imports-loader": "^5.0.0",
-        "jest": "^29.7.0",
+        "jest": "^30.0.2",
         "jest-environment-jsdom": "^29.7.0",
-        "jest-html-reporter": "^3.10.2",
+        "jest-html-reporter": "^4.3.0",
         "jest-websocket-mock": "^2.5.0",
         "jsdom": "^26.0.0",
         "lerna": "^8.2.1",
-        "less": "^4.2.0",
-        "less-loader": "^12.2.0",
         "mini-css-extract-plugin": "^2.9.0",
         "open-cli": "^8.0.0",
         "po2json": "^0.4.5",
@@ -279,22 +264,29 @@
         "storybook": "8.1.11",
         "style-loader": "^4.0.0",
         "thread-loader": "^4.0.4",
-        "ts-jest": "^29.2.5",
+        "ts-jest": "^29.4.0",
         "ts-loader": "^9.5.1",
         "tscw-config": "^1.1.2",
-        "typescript": "5.1.6",
+        "tsx": "^4.19.2",
+        "typescript": "5.4.5",
         "vm-browserify": "^1.1.2",
         "webpack": "^5.98.0",
         "webpack-bundle-analyzer": "^4.10.1",
         "webpack-cli": "^4.10.0",
-        "webpack-dev-server": "^4.15.1",
+        "webpack-dev-server": "^5.2.2",
         "webpack-manifest-plugin": "^5.0.0",
         "webpack-sources": "^3.2.3",
-        "webpack-visualizer-plugin2": "^1.1.0"
+        "webpack-visualizer-plugin2": "^1.2.0"
       },
       "engines": {
         "node": "^20.16.0",
         "npm": "^10.8.1"
+      },
+      "peerDependencies": {
+        "ace-builds": "^1.41.0",
+        "core-js": "^3.38.1",
+        "react-ace": "^10.1.0",
+        "regenerator-runtime": "^0.14.1"
       }
     },
     "eslint-rules/eslint-plugin-i18n-strings": {
@@ -318,15 +310,11 @@
       "license": "Apache-2.0"
     },
     "node_modules/@adobe/css-tools": {
-      "version": "4.4.3",
-      "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.4.3.tgz",
-      "integrity": "sha512-VQKMkwriZbaOgVCby1UDY/LDk5fIjhQicCvVPFqfe+69fWaPWydbWJ3wRt59/YzIwda1I81loas3oCoHxnqvdA==",
+      "version": "4.4.1",
       "license": "MIT"
     },
     "node_modules/@ampproject/remapping": {
       "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": {
@@ -339,8 +327,6 @@
     },
     "node_modules/@ant-design/colors": {
       "version": "7.2.1",
-      "resolved": "https://registry.npmjs.org/@ant-design/colors/-/colors-7.2.1.tgz",
-      "integrity": "sha512-lCHDcEzieu4GA3n8ELeZ5VQ8pKQAWcGGLRTQ50aQM2iqPpq2evTxER84jfdPvsPAtEcZ7m44NI45edFMo8oOYQ==",
       "license": "MIT",
       "dependencies": {
         "@ant-design/fast-color": "^2.0.6"
@@ -400,8 +386,6 @@
     },
     "node_modules/@ant-design/fast-color": {
       "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/@ant-design/fast-color/-/fast-color-2.0.6.tgz",
-      "integrity": "sha512-y2217gk4NqL35giHl72o6Zzqji9O7vHh9YmhUVkPtAOpoTCH4uWxo/pr4VE8t0+ChEPs0qo4eJRC5Q1eXWo3vA==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.24.7"
@@ -437,42 +421,40 @@
       "license": "MIT"
     },
     "node_modules/@ant-design/react-slick": {
-      "version": "0.28.4",
-      "resolved": "https://registry.npmjs.org/@ant-design/react-slick/-/react-slick-0.28.4.tgz",
-      "integrity": "sha512-j9eAHTn7GxbXUFNknJoHS2ceAsqrQi2j8XykjZE1IXCD8kJF+t28EvhBLniDpbOsBk/3kjalnhriTfZcjBHNqg==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@ant-design/react-slick/-/react-slick-1.1.2.tgz",
+      "integrity": "sha512-EzlvzE6xQUBrZuuhSAFTdsr4P2bBBHGZwKFemEfq8gIGyIQCxalYfZW/T2ORbtQx5rU69o+WycP3exY/7T1hGA==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.10.4",
         "classnames": "^2.2.5",
         "json2mq": "^0.2.0",
-        "lodash": "^4.17.21",
-        "resize-observer-polyfill": "^1.5.0"
+        "resize-observer-polyfill": "^1.5.1",
+        "throttle-debounce": "^5.0.0"
       },
       "peerDependencies": {
         "react": ">=16.9.0"
       }
     },
     "node_modules/@applitools/core": {
-      "version": "4.37.1",
-      "resolved": "https://registry.npmjs.org/@applitools/core/-/core-4.37.1.tgz",
-      "integrity": "sha512-P2r/0LmKK2LZ7DSOT04NOpeU6NgItwAq8WrdbjZhcBAbxqqKKi9r0DdksEikDBWSd/KO70Yn4+axJtNtxZMorA==",
+      "version": "4.40.0",
       "dev": true,
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
-        "@applitools/core-base": "1.24.0",
-        "@applitools/dom-capture": "11.5.5",
-        "@applitools/dom-snapshot": "4.11.19",
-        "@applitools/driver": "1.21.2",
-        "@applitools/ec-client": "1.10.10",
-        "@applitools/logger": "2.1.2",
-        "@applitools/nml-client": "1.9.2",
-        "@applitools/req": "1.7.10",
-        "@applitools/screenshoter": "3.11.2",
+        "@applitools/core-base": "1.25.4",
+        "@applitools/dom-capture": "11.5.6",
+        "@applitools/dom-snapshot": "4.11.22",
+        "@applitools/driver": "1.21.4",
+        "@applitools/ec-client": "1.10.15",
+        "@applitools/logger": "2.1.4",
+        "@applitools/nml-client": "1.9.5",
+        "@applitools/req": "1.7.13",
+        "@applitools/screenshoter": "3.11.5",
         "@applitools/snippets": "2.6.5",
-        "@applitools/socket": "1.2.3",
-        "@applitools/spec-driver-webdriver": "1.2.3",
-        "@applitools/ufg-client": "1.16.9",
-        "@applitools/utils": "1.8.0",
+        "@applitools/socket": "1.2.5",
+        "@applitools/spec-driver-webdriver": "1.2.6",
+        "@applitools/ufg-client": "1.16.12",
+        "@applitools/utils": "1.8.2",
         "@types/ws": "8.5.5",
         "abort-controller": "3.0.0",
         "chalk": "4.1.2",
@@ -492,16 +474,14 @@
       }
     },
     "node_modules/@applitools/core-base": {
-      "version": "1.24.0",
-      "resolved": "https://registry.npmjs.org/@applitools/core-base/-/core-base-1.24.0.tgz",
-      "integrity": "sha512-raqFFC5JPkgsz4nM2yVL9nvieMtBqB32omtpe+sOWeFPvRhscgEHIXXsccWm2Fsnj9yYKa4MLI4fS3oEAUwC+g==",
+      "version": "1.25.4",
       "dev": true,
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
-        "@applitools/image": "1.1.18",
-        "@applitools/logger": "2.1.2",
-        "@applitools/req": "1.7.10",
-        "@applitools/utils": "1.8.0",
+        "@applitools/image": "1.1.20",
+        "@applitools/logger": "2.1.4",
+        "@applitools/req": "1.7.13",
+        "@applitools/utils": "1.8.2",
         "abort-controller": "3.0.0",
         "throat": "6.0.2"
       },
@@ -511,8 +491,6 @@
     },
     "node_modules/@applitools/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,
       "license": "MIT",
       "dependencies": {
@@ -528,8 +506,6 @@
     },
     "node_modules/@applitools/css-tree": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/@applitools/css-tree/-/css-tree-1.1.4.tgz",
-      "integrity": "sha512-rH3aq/dkTweEUgS/MKuthD79CZDqpQVJlqmxqVxLZVAzbeFxYdTG/gnfG0zj6YJ025jzcPH2ktdW16Rl3QLutg==",
       "dev": true,
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
@@ -541,9 +517,7 @@
       }
     },
     "node_modules/@applitools/dom-capture": {
-      "version": "11.5.5",
-      "resolved": "https://registry.npmjs.org/@applitools/dom-capture/-/dom-capture-11.5.5.tgz",
-      "integrity": "sha512-LE/Ri1od93eT0m8mpqcbj1l/NJqG/1qr33731PXirMQIhXCs0knwm8BP+A+MAnMhFrOVmrmBi2klFC5yk1l+0A==",
+      "version": "11.5.6",
       "dev": true,
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
@@ -556,8 +530,6 @@
     },
     "node_modules/@applitools/dom-shared": {
       "version": "1.0.16",
-      "resolved": "https://registry.npmjs.org/@applitools/dom-shared/-/dom-shared-1.0.16.tgz",
-      "integrity": "sha512-P0JA5mq1f8rIi/xbh2+gCsEvv1CGenf0sGrC2UxXjmaFRpgoVS9BfpNg5aZyFJ9OPoi4qRMi9LCGsFiqZNNcTQ==",
       "dev": true,
       "license": "SEE LICENSE IN LICENSE",
       "engines": {
@@ -565,9 +537,7 @@
       }
     },
     "node_modules/@applitools/dom-snapshot": {
-      "version": "4.11.19",
-      "resolved": "https://registry.npmjs.org/@applitools/dom-snapshot/-/dom-snapshot-4.11.19.tgz",
-      "integrity": "sha512-Nb2A/CtwPvHLPBNdusk9YuFJ3kw5oepp97uMuhraH0fYGefSL8MEoEUKZ2EgiKxS4fzd99BT9VvN/ZqCorHJJA==",
+      "version": "4.11.22",
       "dev": true,
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
@@ -581,15 +551,13 @@
       }
     },
     "node_modules/@applitools/driver": {
-      "version": "1.21.2",
-      "resolved": "https://registry.npmjs.org/@applitools/driver/-/driver-1.21.2.tgz",
-      "integrity": "sha512-cDQewIdjL9qYbgOevVQcexreJ5smyCW3KwgC6xpJWd9nR4oAjijAdjZw+SAHVSmDxtLybf6FXgjuv5llLsOixg==",
+      "version": "1.21.4",
       "dev": true,
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
-        "@applitools/logger": "2.1.2",
+        "@applitools/logger": "2.1.4",
         "@applitools/snippets": "2.6.5",
-        "@applitools/utils": "1.8.0",
+        "@applitools/utils": "1.8.2",
         "semver": "7.6.2"
       },
       "engines": {
@@ -597,20 +565,18 @@
       }
     },
     "node_modules/@applitools/ec-client": {
-      "version": "1.10.10",
-      "resolved": "https://registry.npmjs.org/@applitools/ec-client/-/ec-client-1.10.10.tgz",
-      "integrity": "sha512-YpAVXcCa1cARzzE3MRVYS6WbsOH2/qAnc/9h9JHa2f6e0DnEnVBp/yCWYxG+db1EqPDTfKdpaqxkSKZUI4b4fg==",
+      "version": "1.10.15",
       "dev": true,
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
-        "@applitools/core-base": "1.24.0",
-        "@applitools/driver": "1.21.2",
-        "@applitools/logger": "2.1.2",
-        "@applitools/req": "1.7.10",
-        "@applitools/socket": "1.2.3",
-        "@applitools/spec-driver-webdriver": "1.2.3",
-        "@applitools/tunnel-client": "1.6.5",
-        "@applitools/utils": "1.8.0",
+        "@applitools/core-base": "1.25.4",
+        "@applitools/driver": "1.21.4",
+        "@applitools/logger": "2.1.4",
+        "@applitools/req": "1.7.13",
+        "@applitools/socket": "1.2.5",
+        "@applitools/spec-driver-webdriver": "1.2.6",
+        "@applitools/tunnel-client": "1.8.0",
+        "@applitools/utils": "1.8.2",
         "abort-controller": "3.0.0",
         "webdriver": "7.31.1",
         "yargs": "^17.7.2"
@@ -625,8 +591,6 @@
     },
     "node_modules/@applitools/eg-frpc": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@applitools/eg-frpc/-/eg-frpc-1.0.5.tgz",
-      "integrity": "sha512-9qUNiCK3R3VKxIAaLr5HO5QnUx6TioLFkJ2JcpU1ZqefApt1X2bdfS7eA4TGDXDWv/a0OIl2Lddzuo5/h3vbTw==",
       "dev": true,
       "license": "SEE LICENSE IN LICENSE",
       "engines": {
@@ -635,8 +599,6 @@
     },
     "node_modules/@applitools/eg-socks5-proxy-server": {
       "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/@applitools/eg-socks5-proxy-server/-/eg-socks5-proxy-server-0.5.6.tgz",
-      "integrity": "sha512-SjjDBFeiKspX3nHKOoSQ+l4JUiJK3xJiWAEaR8b+GuMvnGFLnrvAECHhuXXG00+LwBJM8WKmfxEe17nvZe+nhg==",
       "dev": true,
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
@@ -648,15 +610,13 @@
       }
     },
     "node_modules/@applitools/execution-grid-tunnel": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@applitools/execution-grid-tunnel/-/execution-grid-tunnel-3.0.8.tgz",
-      "integrity": "sha512-4S6NcpxELH4NXketD3g6VUhWDUCuwAm4F1sCZdZLpPWOSMu5QwQDYUoe6/4t5KuktTQ4K7N90NmTzQrxiFtDKA==",
+      "version": "3.1.0",
       "dev": true,
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@applitools/eg-frpc": "1.0.5",
         "@applitools/eg-socks5-proxy-server": "^0.5.5",
-        "@applitools/logger": "^1.0.12",
+        "@applitools/logger": "^2.1.4",
         "dotenv": "^16.0.0",
         "encoding": "^0.1.13",
         "fastify": "^4.28.0",
@@ -676,76 +636,14 @@
         "node": ">=14.0.0"
       }
     },
-    "node_modules/@applitools/execution-grid-tunnel/node_modules/@applitools/logger": {
-      "version": "1.1.53",
-      "resolved": "https://registry.npmjs.org/@applitools/logger/-/logger-1.1.53.tgz",
-      "integrity": "sha512-4mlzYxc0MgM3WIxEwKqIjn9W7G7kMtQc2bFRxozViKOXypTfr72j8iODs88wcetP0GsXtplhZQ5/6aZN5WY9ug==",
-      "dev": true,
-      "license": "SEE LICENSE IN LICENSE",
-      "dependencies": {
-        "@applitools/utils": "1.3.36",
-        "chalk": "4.1.2",
-        "debug": "4.3.3"
-      },
-      "engines": {
-        "node": ">=12.13.0"
-      }
-    },
-    "node_modules/@applitools/execution-grid-tunnel/node_modules/@applitools/utils": {
-      "version": "1.3.36",
-      "resolved": "https://registry.npmjs.org/@applitools/utils/-/utils-1.3.36.tgz",
-      "integrity": "sha512-eROEssh7wIW+V87PvLiHI2hUPxqoBxXFMRx3+z5qOZqXUPSR1Uz7EMFwxZcDDR7T6C3O3UDckB2aVB5fJAg5JA==",
-      "dev": true,
-      "license": "SEE LICENSE IN LICENSE",
-      "engines": {
-        "node": ">=12.13.0"
-      }
-    },
-    "node_modules/@applitools/execution-grid-tunnel/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/@applitools/execution-grid-tunnel/node_modules/debug": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@applitools/eyes": {
-      "version": "1.34.1",
-      "resolved": "https://registry.npmjs.org/@applitools/eyes/-/eyes-1.34.1.tgz",
-      "integrity": "sha512-mV7uCGziSFH1jviBBUTFolvLDJMqIZIljA7IfFjD9ylcqR5g5Ey4uvmu2L0cSg61XA+/OzvFjvYfDbiqRXkWtA==",
+      "version": "1.35.1",
       "dev": true,
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
-        "@applitools/core": "4.37.1",
-        "@applitools/logger": "2.1.2",
-        "@applitools/utils": "1.8.0",
+        "@applitools/core": "4.40.0",
+        "@applitools/logger": "2.1.4",
+        "@applitools/utils": "1.8.2",
         "chalk": "4.1.2",
         "yargs": "17.7.2"
       },
@@ -757,21 +655,19 @@
       }
     },
     "node_modules/@applitools/eyes-storybook": {
-      "version": "3.55.5",
-      "resolved": "https://registry.npmjs.org/@applitools/eyes-storybook/-/eyes-storybook-3.55.5.tgz",
-      "integrity": "sha512-aIkZu+jGSSW5KMgB8Jkl9bgZVUQ4bNl8599FZVOaJHhXE323HrFsRGnAvP9WArHp1BxoQwaGlWinXEnuVWUE1Q==",
+      "version": "3.55.6",
       "dev": true,
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
-        "@applitools/core": "4.37.1",
-        "@applitools/driver": "1.21.2",
-        "@applitools/eyes": "1.34.1",
+        "@applitools/core": "4.40.0",
+        "@applitools/driver": "1.21.4",
+        "@applitools/eyes": "1.35.1",
         "@applitools/functional-commons": "1.6.0",
-        "@applitools/logger": "2.1.2",
+        "@applitools/logger": "2.1.4",
         "@applitools/monitoring-commons": "1.0.19",
-        "@applitools/spec-driver-puppeteer": "1.4.28",
-        "@applitools/ufg-client": "1.16.9",
-        "@applitools/utils": "1.8.0",
+        "@applitools/spec-driver-puppeteer": "1.4.30",
+        "@applitools/ufg-client": "1.16.12",
+        "@applitools/utils": "1.8.2",
         "boxen": "4.2.0",
         "chalk": "3.0.0",
         "detect-port": "1.3.0",
@@ -792,8 +688,6 @@
     },
     "node_modules/@applitools/eyes/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": {
@@ -809,8 +703,6 @@
     },
     "node_modules/@applitools/functional-commons": {
       "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/@applitools/functional-commons/-/functional-commons-1.6.0.tgz",
-      "integrity": "sha512-fwiF0CbeYHDEOTD/NKaFgaI8LvRcGYG2GaJJiRwcedKko16sQ8F3TK5wXfj2Ytjf+8gjwHwsEEX550z3yvDWxA==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -818,13 +710,11 @@
       }
     },
     "node_modules/@applitools/image": {
-      "version": "1.1.18",
-      "resolved": "https://registry.npmjs.org/@applitools/image/-/image-1.1.18.tgz",
-      "integrity": "sha512-KLcg7otBIrXZ8u+/FofrxpBAqvQii0rKPoIdJKiIPtOKJMMwZLDwBoTR1k1fmbfc2Msoj91VL6jyBQMG6G13mw==",
+      "version": "1.1.20",
       "dev": true,
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
-        "@applitools/utils": "1.8.0",
+        "@applitools/utils": "1.8.2",
         "bmpimagejs": "1.0.4",
         "jpeg-js": "0.4.4",
         "omggif": "1.0.10",
@@ -835,13 +725,11 @@
       }
     },
     "node_modules/@applitools/logger": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@applitools/logger/-/logger-2.1.2.tgz",
-      "integrity": "sha512-0e/Rr/cZLGg8OOytTlFht1fQCLO2k3XKxodzsFO+IxTrEp53mXPA8r+tHA5BLO9YnqvKx4AiieFMRGbPyBuSWg==",
+      "version": "2.1.4",
       "dev": true,
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
-        "@applitools/utils": "1.8.0",
+        "@applitools/utils": "1.8.2",
         "chalk": "4.1.2",
         "debug": "4.3.4"
       },
@@ -851,8 +739,6 @@
     },
     "node_modules/@applitools/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,
       "license": "MIT",
       "dependencies": {
@@ -868,8 +754,6 @@
     },
     "node_modules/@applitools/monitoring-commons": {
       "version": "1.0.19",
-      "resolved": "https://registry.npmjs.org/@applitools/monitoring-commons/-/monitoring-commons-1.0.19.tgz",
-      "integrity": "sha512-rzEOvGoiEF4KnK0PJ9I0btdwnaNlIPLYhjF1vTEG15PoucbbKpix9fYusxWlDG7kMiZya8ZycVPc0woVlNaHRQ==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -880,28 +764,27 @@
       }
     },
     "node_modules/@applitools/nml-client": {
-      "version": "1.9.2",
-      "resolved": "https://registry.npmjs.org/@applitools/nml-client/-/nml-client-1.9.2.tgz",
-      "integrity": "sha512-tZLGp3NqWPNl/ROJecUbJQDwmKP9s6MYvZrT/Tdk22YfPctxoDbG2euGMBYEhJUM8JRHpeIJJn9lf7zCLqEHPg==",
+      "version": "1.9.5",
       "dev": true,
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
-        "@applitools/logger": "2.1.2",
-        "@applitools/req": "1.7.10",
-        "@applitools/utils": "1.8.0"
+        "@applitools/logger": "2.1.4",
+        "@applitools/req": "1.7.13",
+        "@applitools/utils": "1.8.2"
       },
       "engines": {
         "node": ">=12.13.0"
+      },
+      "peerDependencies": {
+        "@applitools/core-base": "1.25.4"
       }
     },
     "node_modules/@applitools/req": {
-      "version": "1.7.10",
-      "resolved": "https://registry.npmjs.org/@applitools/req/-/req-1.7.10.tgz",
-      "integrity": "sha512-KcK6P2oinKb3wGsCvzyxjAIrBnqr0l8eShw6bNDfDUNzY2mVR9ZxgY+br7xNwymI2dht6QN7Dw1bYfX+zTX1Mw==",
+      "version": "1.7.13",
       "dev": true,
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
-        "@applitools/utils": "1.8.0",
+        "@applitools/utils": "1.8.2",
         "abort-controller": "3.0.0",
         "http-proxy-agent": "5.0.0",
         "https-proxy-agent": "5.0.1",
@@ -913,8 +796,6 @@
     },
     "node_modules/@applitools/req/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,
       "license": "MIT",
       "engines": {
@@ -923,8 +804,6 @@
     },
     "node_modules/@applitools/req/node_modules/node-fetch": {
       "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.1.tgz",
-      "integrity": "sha512-cRVc/kyto/7E5shrWca1Wsea4y6tL9iYJE5FBCius3JQfb/4P4I295PfhgbJQBLTx6lATE4z+wK0rPM4VS2uow==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -941,16 +820,14 @@
       }
     },
     "node_modules/@applitools/screenshoter": {
-      "version": "3.11.2",
-      "resolved": "https://registry.npmjs.org/@applitools/screenshoter/-/screenshoter-3.11.2.tgz",
-      "integrity": "sha512-cJDN5rqI6CNi5K4VcoA73Q14RpcXlcZlmFYYqvkiwi1ZJ8WWy+qPf1LkwlBachVdlK0xN4/yacIU+E533qM4xg==",
+      "version": "3.11.5",
       "dev": true,
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
-        "@applitools/image": "1.1.18",
-        "@applitools/logger": "2.1.2",
+        "@applitools/image": "1.1.20",
+        "@applitools/logger": "2.1.4",
         "@applitools/snippets": "2.6.5",
-        "@applitools/utils": "1.8.0"
+        "@applitools/utils": "1.8.2"
       },
       "engines": {
         "node": ">=12.13.0"
@@ -958,8 +835,6 @@
     },
     "node_modules/@applitools/snippets": {
       "version": "2.6.5",
-      "resolved": "https://registry.npmjs.org/@applitools/snippets/-/snippets-2.6.5.tgz",
-      "integrity": "sha512-sfWOKkJ4sBnlTMLKlXy308EnFbetp2Cg0Rlop21VPs+Mi5sPiln+6LX9VvRt+qNd5Q0xTavDXCUYMK2b5k4mOg==",
       "dev": true,
       "license": "SEE LICENSE IN LICENSE",
       "engines": {
@@ -967,28 +842,24 @@
       }
     },
     "node_modules/@applitools/socket": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/@applitools/socket/-/socket-1.2.3.tgz",
-      "integrity": "sha512-VRX4C9uPUvRlntFinIv8+DvOkleehIxsBz5RthWROXZFWscSqFqCpEDhChGYl6YMI8jm4amtc2F4oVVDR7CIqA==",
+      "version": "1.2.5",
       "dev": true,
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
-        "@applitools/logger": "2.1.2",
-        "@applitools/utils": "1.8.0"
+        "@applitools/logger": "2.1.4",
+        "@applitools/utils": "1.8.2"
       },
       "engines": {
         "node": ">=12.13.0"
       }
     },
     "node_modules/@applitools/spec-driver-puppeteer": {
-      "version": "1.4.28",
-      "resolved": "https://registry.npmjs.org/@applitools/spec-driver-puppeteer/-/spec-driver-puppeteer-1.4.28.tgz",
-      "integrity": "sha512-q2cgkH1rfUKhgqr/RuRHLDwNb4yXQQgDH3O2vBeQKqpS1SOZg7FOnj6HKTmtxCEnFSR2lhsM9AG80ewlzMcQog==",
+      "version": "1.4.30",
       "dev": true,
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
-        "@applitools/driver": "1.21.2",
-        "@applitools/utils": "1.8.0"
+        "@applitools/driver": "1.21.4",
+        "@applitools/utils": "1.8.2"
       },
       "engines": {
         "node": ">=12.13.0"
@@ -998,14 +869,12 @@
       }
     },
     "node_modules/@applitools/spec-driver-webdriver": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/@applitools/spec-driver-webdriver/-/spec-driver-webdriver-1.2.3.tgz",
-      "integrity": "sha512-nOYbNsq9A+NITSHiGcVNNyMrQpVReGUI86+vxmOK4hkBClP6X77aUNBMT0Rr9jmAdxiA0JBOEy1ih3UylwNVqw==",
+      "version": "1.2.6",
       "dev": true,
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
-        "@applitools/driver": "1.21.2",
-        "@applitools/utils": "1.8.0",
+        "@applitools/driver": "1.21.4",
+        "@applitools/utils": "1.8.2",
         "http-proxy-agent": "5.0.0",
         "https-proxy-agent": "5.0.1"
       },
@@ -1017,17 +886,15 @@
       }
     },
     "node_modules/@applitools/tunnel-client": {
-      "version": "1.6.5",
-      "resolved": "https://registry.npmjs.org/@applitools/tunnel-client/-/tunnel-client-1.6.5.tgz",
-      "integrity": "sha512-Kmf0bQTxw+FmkVJw3nzrQKzrW3ZVyUlgyVoz3sDJhhJsNSWsFzpPcP1jtGyKM9CsULSuBBrsTJNYY0RM2uhc3Q==",
+      "version": "1.8.0",
       "dev": true,
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
-        "@applitools/execution-grid-tunnel": "3.0.8",
-        "@applitools/logger": "2.1.2",
-        "@applitools/req": "1.7.10",
-        "@applitools/socket": "1.2.3",
-        "@applitools/utils": "1.8.0",
+        "@applitools/execution-grid-tunnel": "3.1.0",
+        "@applitools/logger": "2.1.4",
+        "@applitools/req": "1.7.13",
+        "@applitools/socket": "1.2.5",
+        "@applitools/utils": "1.8.2",
         "abort-controller": "3.0.0",
         "yargs": "17.7.2"
       },
@@ -1039,17 +906,15 @@
       }
     },
     "node_modules/@applitools/ufg-client": {
-      "version": "1.16.9",
-      "resolved": "https://registry.npmjs.org/@applitools/ufg-client/-/ufg-client-1.16.9.tgz",
-      "integrity": "sha512-haXkDyEaQeJtWjJq5UbRNnqC3ReNTV6A8fBdMUqVsfH5U1L0Op1l+xBxWVOqt9fg9unqnBLYpoA0hR4C2B4Xlw==",
+      "version": "1.16.12",
       "dev": true,
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@applitools/css-tree": "1.1.4",
-        "@applitools/image": "1.1.18",
-        "@applitools/logger": "2.1.2",
-        "@applitools/req": "1.7.10",
-        "@applitools/utils": "1.8.0",
+        "@applitools/image": "1.1.20",
+        "@applitools/logger": "2.1.4",
+        "@applitools/req": "1.7.13",
+        "@applitools/utils": "1.8.2",
         "@xmldom/xmldom": "0.8.10",
         "abort-controller": "3.0.0",
         "throat": "6.0.2"
@@ -1059,9 +924,7 @@
       }
     },
     "node_modules/@applitools/utils": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/@applitools/utils/-/utils-1.8.0.tgz",
-      "integrity": "sha512-W4rkXPN9/Q4yxJqeHkILGH9nO6qiilBF+d2RJcrgbKii9f2h+iX6hAd9ropnq60tO2PZtJCBaELzKPQ4b9b86g==",
+      "version": "1.8.2",
       "dev": true,
       "license": "SEE LICENSE IN LICENSE",
       "engines": {
@@ -1069,14 +932,12 @@
       }
     },
     "node_modules/@asamuzakjp/css-color": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-3.2.0.tgz",
-      "integrity": "sha512-K1A6z8tS3XsmCMM86xoWdn7Fkdn9m6RSVtocUrJYIwZnFVkng/PvkEoWtOWmP+Scc6saYWHWZYbndEEXxl24jw==",
+      "version": "2.8.3",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@csstools/css-calc": "^2.1.3",
-        "@csstools/css-color-parser": "^3.0.9",
+        "@csstools/css-calc": "^2.1.1",
+        "@csstools/css-color-parser": "^3.0.7",
         "@csstools/css-parser-algorithms": "^3.0.4",
         "@csstools/css-tokenizer": "^3.0.3",
         "lru-cache": "^10.4.3"
@@ -1084,15 +945,11 @@
     },
     "node_modules/@asamuzakjp/css-color/node_modules/lru-cache": {
       "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
-      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
       "dev": true,
       "license": "ISC"
     },
     "node_modules/@aw-web-design/x-default-browser": {
       "version": "1.4.126",
-      "resolved": "https://registry.npmjs.org/@aw-web-design/x-default-browser/-/x-default-browser-1.4.126.tgz",
-      "integrity": "sha512-Xk1sIhyNC/esHGGVjL/niHLowM0csl/kFO5uawBy4IrWwy0o1G8LGt3jP6nmWGz+USxeeqbihAmp/oVZju6wug==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1104,8 +961,6 @@
     },
     "node_modules/@babel/cli": {
       "version": "7.27.2",
-      "resolved": "https://registry.npmjs.org/@babel/cli/-/cli-7.27.2.tgz",
-      "integrity": "sha512-cfd7DnGlhH6OIyuPSSj3vcfIdnbXukhAyKY8NaZrFadC7pXyL9mOL5WgjcptiEJLi5k3j8aYvLIVCzezrWTaiA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1134,8 +989,6 @@
     },
     "node_modules/@babel/code-frame": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
-      "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==",
       "license": "MIT",
       "dependencies": {
         "@babel/helper-validator-identifier": "^7.27.1",
@@ -1147,9 +1000,7 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.27.5",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.27.5.tgz",
-      "integrity": "sha512-KiRAp/VoJaWkkte84TvUd9qjdbZAdiqyvMxrGl1N6vzFogKmaLgoM3L1kgtLicp2HP5fBJS8JrZKLVIZGVJAVg==",
+      "version": "7.27.2",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1157,22 +1008,20 @@
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.27.4",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.27.4.tgz",
-      "integrity": "sha512-bXYxrXFubeYdvB0NhD/NBB3Qi6aZeV20GOWVI47t2dkecCEoneR4NPVcb7abpXDEvejgrUfFtG6vG/zxAKmg+g==",
+      "version": "7.27.7",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.27.1",
-        "@babel/generator": "^7.27.3",
+        "@babel/generator": "^7.27.5",
         "@babel/helper-compilation-targets": "^7.27.2",
         "@babel/helper-module-transforms": "^7.27.3",
-        "@babel/helpers": "^7.27.4",
-        "@babel/parser": "^7.27.4",
+        "@babel/helpers": "^7.27.6",
+        "@babel/parser": "^7.27.7",
         "@babel/template": "^7.27.2",
-        "@babel/traverse": "^7.27.4",
-        "@babel/types": "^7.27.3",
+        "@babel/traverse": "^7.27.7",
+        "@babel/types": "^7.27.7",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -1189,8 +1038,6 @@
     },
     "node_modules/@babel/core/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": "ISC",
       "bin": {
@@ -1198,9 +1045,7 @@
       }
     },
     "node_modules/@babel/eslint-parser": {
-      "version": "7.27.5",
-      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.27.5.tgz",
-      "integrity": "sha512-HLkYQfRICudzcOtjGwkPvGc5nF1b4ljLZh1IRDj50lRZ718NAKVgQpIAUX8bfg6u/yuSKY3L7E0YzIV+OxrB8Q==",
+      "version": "7.26.5",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1218,8 +1063,6 @@
     },
     "node_modules/@babel/eslint-parser/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": "ISC",
       "bin": {
@@ -1228,8 +1071,6 @@
     },
     "node_modules/@babel/generator": {
       "version": "7.27.5",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.27.5.tgz",
-      "integrity": "sha512-ZGhA37l0e/g2s1Cnzdix0O3aLYm66eF8aufiVteOgnwxgnRP8GoyMj7VWsgWnQbVKXyge7hqrFh2K2TQM6t1Hw==",
       "license": "MIT",
       "dependencies": {
         "@babel/parser": "^7.27.5",
@@ -1243,13 +1084,11 @@
       }
     },
     "node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.27.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.3.tgz",
-      "integrity": "sha512-fXSwMQqitTGeHLBC08Eq5yXz2m37E4pJX1qAU1+2cNedz/ifv/bVXft90VeSav5nFO61EcNgwr0aJxbyPaWBPg==",
+      "version": "7.27.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.27.3"
+        "@babel/types": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1257,8 +1096,6 @@
     },
     "node_modules/@babel/helper-compilation-targets": {
       "version": "7.27.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.2.tgz",
-      "integrity": "sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1274,8 +1111,6 @@
     },
     "node_modules/@babel/helper-compilation-targets/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": "ISC",
       "bin": {
@@ -1284,8 +1119,6 @@
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.27.1.tgz",
-      "integrity": "sha512-QwGAmuvM17btKU5VqXfb+Giw4JcN0hjuufz3DYnpeVDvZLAObloM77bhMXiqry3Iio+Ai4phVRDwl6WU10+r5A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1306,8 +1139,6 @@
     },
     "node_modules/@babel/helper-create-class-features-plugin/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": "ISC",
       "bin": {
@@ -1316,8 +1147,6 @@
     },
     "node_modules/@babel/helper-create-regexp-features-plugin": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.27.1.tgz",
-      "integrity": "sha512-uVDC72XVf8UbrH5qQTc18Agb8emwjTiZrQE11Nv3CuBEZmVvTwwE9CBUEvHku06gQCAyYf8Nv6ja1IN+6LMbxQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1334,8 +1163,6 @@
     },
     "node_modules/@babel/helper-create-regexp-features-plugin/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": "ISC",
       "bin": {
@@ -1343,9 +1170,7 @@
       }
     },
     "node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.4.tgz",
-      "integrity": "sha512-jljfR1rGnXXNWnmQg2K3+bvhkxB51Rl32QRaOTuwwjviGrHzIbSc8+x9CpraDtbT7mfyjXObULP4w/adunNwAw==",
+      "version": "0.6.3",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1361,8 +1186,6 @@
     },
     "node_modules/@babel/helper-member-expression-to-functions": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.27.1.tgz",
-      "integrity": "sha512-E5chM8eWjTp/aNoVpcbfM7mLxu9XGLWYise2eBKGQomAk/Mb4XoxyqXTZbuTohbsl8EKqdlMhnDI2CCLfcs9wA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1375,8 +1198,6 @@
     },
     "node_modules/@babel/helper-module-imports": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.27.1.tgz",
-      "integrity": "sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==",
       "license": "MIT",
       "dependencies": {
         "@babel/traverse": "^7.27.1",
@@ -1388,8 +1209,6 @@
     },
     "node_modules/@babel/helper-module-transforms": {
       "version": "7.27.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.27.3.tgz",
-      "integrity": "sha512-dSOvYwvyLsWBeIRyOeHXp5vPj5l1I011r52FM1+r1jCERv+aFXYk4whgQccYEGYxK2H3ZAIA8nuPkQ0HaUo3qg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1406,8 +1225,6 @@
     },
     "node_modules/@babel/helper-optimise-call-expression": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.27.1.tgz",
-      "integrity": "sha512-URMGH08NzYFhubNSGJrpUEphGKQwMQYBySzat5cAByY1/YgIRkULnIy3tAMeszlL/so2HbeilYloUmSpd7GdVw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1419,8 +1236,6 @@
     },
     "node_modules/@babel/helper-plugin-utils": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.27.1.tgz",
-      "integrity": "sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1429,8 +1244,6 @@
     },
     "node_modules/@babel/helper-remap-async-to-generator": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.27.1.tgz",
-      "integrity": "sha512-7fiA521aVw8lSPeI4ZOD3vRFkoqkJcS+z4hFo82bFSH/2tNd6eJ5qCVMS5OzDmZh/kaHQeBaeyxK6wljcPtveA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1447,8 +1260,6 @@
     },
     "node_modules/@babel/helper-replace-supers": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.27.1.tgz",
-      "integrity": "sha512-7EHz6qDZc8RYS5ElPoShMheWvEgERonFCs7IAonWLLUTXW59DP14bCZt89/GKyreYn8g3S83m21FelHKbeDCKA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1465,8 +1276,6 @@
     },
     "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.27.1.tgz",
-      "integrity": "sha512-Tub4ZKEXqbPjXgWLl2+3JpQAYBJ8+ikpQ2Ocj/q/r0LwE3UhENh7EUabyHjz2kCEsrRY83ew2DQdHluuiDQFzg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1479,8 +1288,6 @@
     },
     "node_modules/@babel/helper-string-parser": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
-      "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
@@ -1488,8 +1295,6 @@
     },
     "node_modules/@babel/helper-validator-identifier": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz",
-      "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
@@ -1497,8 +1302,6 @@
     },
     "node_modules/@babel/helper-validator-option": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz",
-      "integrity": "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1507,8 +1310,6 @@
     },
     "node_modules/@babel/helper-wrap-function": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.27.1.tgz",
-      "integrity": "sha512-NFJK2sHUvrjo8wAU/nQTWU890/zB2jj0qBcCbZbbf+005cAsv6tMjXz31fBign6M5ov1o0Bllu+9nbqkfsjjJQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1522,8 +1323,6 @@
     },
     "node_modules/@babel/helpers": {
       "version": "7.27.6",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.6.tgz",
-      "integrity": "sha512-muE8Tt8M22638HU31A3CgfSUciwz1fhATfoVai05aPXGor//CdWDCbnlY1yvBPo07njuVOCNGCSp/GTt12lIug==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1535,13 +1334,11 @@
       }
     },
     "node_modules/@babel/node": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/node/-/node-7.27.1.tgz",
-      "integrity": "sha512-ef8ZrhxIku9LrphvyNywpiMf1UJsYQll7S4eKa228ivswPcwmObp98o5h5wL2n9FrSAuo1dsMwJ8cS1LEcBSog==",
+      "version": "7.26.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/register": "^7.27.1",
+        "@babel/register": "^7.25.9",
         "commander": "^6.2.0",
         "core-js": "^3.30.2",
         "node-environment-flags": "^1.0.5",
@@ -1559,12 +1356,10 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.27.5",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.5.tgz",
-      "integrity": "sha512-OsQd175SxWkGlzbny8J3K8TnnDD0N3lrIUtB92xwyRpzaenGZhxDvxN/JgU00U3CDZNj9tPuDJ5H0WS4Nt3vKg==",
+      "version": "7.27.7",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.27.3"
+        "@babel/types": "^7.27.7"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -1575,8 +1370,6 @@
     },
     "node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.27.1.tgz",
-      "integrity": "sha512-QPG3C9cCVRQLxAVwmefEmwdTanECuUBMQZ/ym5kiw3XKCGA7qkuQLcjWWHcrD/GKbn/WmJwaezfuuAOcyKlRPA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1592,8 +1385,6 @@
     },
     "node_modules/@babel/plugin-bugfix-safari-class-field-initializer-scope": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.27.1.tgz",
-      "integrity": "sha512-qNeq3bCKnGgLkEXUuFry6dPlGfCdQNZbn7yUAPCInwAJHMU7THJfrBSozkcWq5sNM6RcF3S8XyQL2A52KNR9IA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1608,8 +1399,6 @@
     },
     "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.27.1.tgz",
-      "integrity": "sha512-g4L7OYun04N1WyqMNjldFwlfPCLVkgB54A/YCXICZYBsvJJE3kByKv9c9+R/nAfmIfjl2rKYLNyMHboYbZaWaA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1624,8 +1413,6 @@
     },
     "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.27.1.tgz",
-      "integrity": "sha512-oO02gcONcD5O1iTLi/6frMJBIwWEHceWGSGqrpCmEL8nogiS6J9PBlE48CaK20/Jx1LuRml9aDftLgdjXT8+Cw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1642,8 +1429,6 @@
     },
     "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.27.1.tgz",
-      "integrity": "sha512-6BpaYGDavZqkI6yT+KSPdpZFfpnd68UKXbcjI9pJ13pvHhPrCKWOOLp+ysvMeA+DxnhuPpgIaRpxRxo5A9t5jw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1659,9 +1444,6 @@
     },
     "node_modules/@babel/plugin-proposal-class-properties": {
       "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz",
-      "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==",
-      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-class-properties instead.",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1677,9 +1459,6 @@
     },
     "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": {
       "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz",
-      "integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==",
-      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-nullish-coalescing-operator instead.",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1695,9 +1474,6 @@
     },
     "node_modules/@babel/plugin-proposal-optional-chaining": {
       "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz",
-      "integrity": "sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==",
-      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-optional-chaining instead.",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1714,9 +1490,6 @@
     },
     "node_modules/@babel/plugin-proposal-private-methods": {
       "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz",
-      "integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==",
-      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-private-methods instead.",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1732,8 +1505,6 @@
     },
     "node_modules/@babel/plugin-proposal-private-property-in-object": {
       "version": "7.21.0-placeholder-for-preset-env.2",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
-      "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1745,8 +1516,6 @@
     },
     "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==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1758,8 +1527,6 @@
     },
     "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": {
@@ -1771,8 +1538,6 @@
     },
     "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==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1784,8 +1549,6 @@
     },
     "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==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1800,8 +1563,6 @@
     },
     "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==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1812,13 +1573,11 @@
       }
     },
     "node_modules/@babel/plugin-syntax-flow": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.27.1.tgz",
-      "integrity": "sha512-p9OkPbZ5G7UT1MofwYFigGebnrzGJacoBSQM0/6bi/PUMVE+qlWDD/OalvQKbwgQzU6dl0xAv6r4X7Jme0RYxA==",
+      "version": "7.26.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1829,8 +1588,6 @@
     },
     "node_modules/@babel/plugin-syntax-import-assertions": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.27.1.tgz",
-      "integrity": "sha512-UT/Jrhw57xg4ILHLFnzFpPDlMbcdEicaAtjPQpbj9wa8T4r5KVWCimHcL/460g8Ht0DMxDyjsLgiWSkVjnwPFg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1845,8 +1602,6 @@
     },
     "node_modules/@babel/plugin-syntax-import-attributes": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.27.1.tgz",
-      "integrity": "sha512-oFT0FrKHgF53f4vOsZGi2Hh3I35PfSmVs4IBFLFj4dnafP+hIWDLg3VyKmUHfLoLHlyxY4C7DGtmHuJgn+IGww==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1861,8 +1616,6 @@
     },
     "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": {
@@ -1874,8 +1627,6 @@
     },
     "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==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1887,8 +1638,6 @@
     },
     "node_modules/@babel/plugin-syntax-jsx": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.27.1.tgz",
-      "integrity": "sha512-y8YTNIeKoyhGd9O0Jiyzyyqk8gdjnumGTQPsz0xOZOQ2RmkVJeZ1vmmfIvFEKqucBG6axJGBZDE/7iI5suUI/w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1903,8 +1652,6 @@
     },
     "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,
       "license": "MIT",
       "dependencies": {
@@ -1916,8 +1663,6 @@
     },
     "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==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1929,8 +1674,6 @@
     },
     "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==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1942,8 +1685,6 @@
     },
     "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==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1955,8 +1696,6 @@
     },
     "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==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1968,8 +1707,6 @@
     },
     "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==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1981,8 +1718,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==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1997,8 +1732,6 @@
     },
     "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==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2013,8 +1746,6 @@
     },
     "node_modules/@babel/plugin-syntax-typescript": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.27.1.tgz",
-      "integrity": "sha512-xfYCBMxveHrRMnAWl1ZlPXOZjzkN82THFvLhQhFXFt81Z5HnN+EtUkZhv/zcKpmT3fzmWZB0ywiBrbC3vogbwQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2029,8 +1760,6 @@
     },
     "node_modules/@babel/plugin-syntax-unicode-sets-regex": {
       "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz",
-      "integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2046,8 +1775,6 @@
     },
     "node_modules/@babel/plugin-transform-arrow-functions": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.27.1.tgz",
-      "integrity": "sha512-8Z4TGic6xW70FKThA5HYEKKyBpOOsucTOD1DjU3fZxDg+K3zBJcXMFnt/4yQiZnf5+MiOMSXQ9PaEK/Ilh1DeA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2062,8 +1789,6 @@
     },
     "node_modules/@babel/plugin-transform-async-generator-functions": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.27.1.tgz",
-      "integrity": "sha512-eST9RrwlpaoJBDHShc+DS2SG4ATTi2MYNb4OxYkf3n+7eb49LWpnS+HSpVfW4x927qQwgk8A2hGNVaajAEw0EA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2080,8 +1805,6 @@
     },
     "node_modules/@babel/plugin-transform-async-to-generator": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.27.1.tgz",
-      "integrity": "sha512-NREkZsZVJS4xmTr8qzE5y8AfIPqsdQfRuUiLRTEzb7Qii8iFWCyDKaUV2c0rCuh4ljDZ98ALHP/PetiBV2nddA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2098,8 +1821,6 @@
     },
     "node_modules/@babel/plugin-transform-block-scoped-functions": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.27.1.tgz",
-      "integrity": "sha512-cnqkuOtZLapWYZUYM5rVIdv1nXYuFVIltZ6ZJ7nIj585QsjKM5dhL2Fu/lICXZ1OyIAFc7Qy+bvDAtTXqGrlhg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2113,9 +1834,7 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.27.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.27.5.tgz",
-      "integrity": "sha512-JF6uE2s67f0y2RZcm2kpAUEbD50vH62TyWVebxwHAlbSdM49VqPz8t4a1uIjp4NIOIZ4xzLfjY5emt/RCyC7TQ==",
+      "version": "7.27.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2130,8 +1849,6 @@
     },
     "node_modules/@babel/plugin-transform-class-properties": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.27.1.tgz",
-      "integrity": "sha512-D0VcalChDMtuRvJIu3U/fwWjf8ZMykz5iZsg77Nuj821vCKI3zCyRLwRdWbsuJ/uRwZhZ002QtCqIkwC/ZkvbA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2147,8 +1864,6 @@
     },
     "node_modules/@babel/plugin-transform-class-static-block": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.27.1.tgz",
-      "integrity": "sha512-s734HmYU78MVzZ++joYM+NkJusItbdRcbm+AGRgJCt3iA+yux0QpD9cBVdz3tKyrjVYWRl7j0mHSmv4lhV0aoA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2164,8 +1879,6 @@
     },
     "node_modules/@babel/plugin-transform-classes": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.27.1.tgz",
-      "integrity": "sha512-7iLhfFAubmpeJe/Wo2TVuDrykh/zlWXLzPNdL0Jqn/Xu8R3QQ8h9ff8FQoISZOsw74/HFqFI7NX63HN7QFIHKA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2185,8 +1898,6 @@
     },
     "node_modules/@babel/plugin-transform-computed-properties": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.27.1.tgz",
-      "integrity": "sha512-lj9PGWvMTVksbWiDT2tW68zGS/cyo4AkZ/QTp0sQT0mjPopCmrSkzxeXkznjqBxzDI6TclZhOJbBmbBLjuOZUw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2201,9 +1912,7 @@
       }
     },
     "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.27.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.27.3.tgz",
-      "integrity": "sha512-s4Jrok82JpiaIprtY2nHsYmrThKvvwgHwjgd7UMiYhZaN0asdXNLr0y+NjTfkA7SyQE5i2Fb7eawUOZmLvyqOA==",
+      "version": "7.27.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2218,8 +1927,6 @@
     },
     "node_modules/@babel/plugin-transform-dotall-regex": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.27.1.tgz",
-      "integrity": "sha512-gEbkDVGRvjj7+T1ivxrfgygpT7GUd4vmODtYpbs0gZATdkX8/iSnOtZSxiZnsgm1YjTgjI6VKBGSJJevkrclzw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2235,8 +1942,6 @@
     },
     "node_modules/@babel/plugin-transform-duplicate-keys": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.27.1.tgz",
-      "integrity": "sha512-MTyJk98sHvSs+cvZ4nOauwTTG1JeonDjSGvGGUNHreGQns+Mpt6WX/dVzWBHgg+dYZhkC4X+zTDfkTU+Vy9y7Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2251,8 +1956,6 @@
     },
     "node_modules/@babel/plugin-transform-duplicate-named-capturing-groups-regex": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.27.1.tgz",
-      "integrity": "sha512-hkGcueTEzuhB30B3eJCbCYeCaaEQOmQR0AdvzpD4LoN0GXMWzzGSuRrxR2xTnCrvNbVwK9N6/jQ92GSLfiZWoQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2268,8 +1971,6 @@
     },
     "node_modules/@babel/plugin-transform-dynamic-import": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.27.1.tgz",
-      "integrity": "sha512-MHzkWQcEmjzzVW9j2q8LGjwGWpG2mjwaaB0BNQwst3FIjqsg8Ct/mIZlvSPJvfi9y2AC8mi/ktxbFVL9pZ1I4A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2284,8 +1985,6 @@
     },
     "node_modules/@babel/plugin-transform-exponentiation-operator": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.27.1.tgz",
-      "integrity": "sha512-uspvXnhHvGKf2r4VVtBpeFnuDWsJLQ6MF6lGJLC89jBR1uoVeqM416AZtTuhTezOfgHicpJQmoD5YUakO/YmXQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2300,8 +1999,6 @@
     },
     "node_modules/@babel/plugin-transform-export-namespace-from": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.27.1.tgz",
-      "integrity": "sha512-tQvHWSZ3/jH2xuq/vZDy0jNn+ZdXJeM8gHvX4lnJmsc3+50yPlWdZXIc5ay+umX+2/tJIqHqiEqcJvxlmIvRvQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2315,14 +2012,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-flow-strip-types": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.27.1.tgz",
-      "integrity": "sha512-G5eDKsu50udECw7DL2AcsysXiQyB7Nfg521t2OAJ4tbfTJ27doHLeF/vlI1NZGlLdbb/v+ibvtL1YBQqYOwJGg==",
+      "version": "7.26.5",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1",
-        "@babel/plugin-syntax-flow": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.26.5",
+        "@babel/plugin-syntax-flow": "^7.26.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2333,8 +2028,6 @@
     },
     "node_modules/@babel/plugin-transform-for-of": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.27.1.tgz",
-      "integrity": "sha512-BfbWFFEJFQzLCQ5N8VocnCtA8J1CLkNTe2Ms2wocj75dd6VpiqS5Z5quTYcUoo4Yq+DN0rtikODccuv7RU81sw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2350,8 +2043,6 @@
     },
     "node_modules/@babel/plugin-transform-function-name": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.27.1.tgz",
-      "integrity": "sha512-1bQeydJF9Nr1eBCMMbC+hdwmRlsv5XYOMu03YSWFwNs0HsAmtSxxF1fyuYPqemVldVyFmlCU7w8UE14LupUSZQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2368,8 +2059,6 @@
     },
     "node_modules/@babel/plugin-transform-json-strings": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.27.1.tgz",
-      "integrity": "sha512-6WVLVJiTjqcQauBhn1LkICsR2H+zm62I3h9faTDKt1qP4jn2o72tSvqMwtGFKGTpojce0gJs+76eZ2uCHRZh0Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2384,8 +2073,6 @@
     },
     "node_modules/@babel/plugin-transform-literals": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.27.1.tgz",
-      "integrity": "sha512-0HCFSepIpLTkLcsi86GG3mTUzxV5jpmbv97hTETW3yzrAij8aqlD36toB1D0daVFJM8NK6GvKO0gslVQmm+zZA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2400,8 +2087,6 @@
     },
     "node_modules/@babel/plugin-transform-logical-assignment-operators": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.27.1.tgz",
-      "integrity": "sha512-SJvDs5dXxiae4FbSL1aBJlG4wvl594N6YEVVn9e3JGulwioy6z3oPjx/sQBO3Y4NwUu5HNix6KJ3wBZoewcdbw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2416,8 +2101,6 @@
     },
     "node_modules/@babel/plugin-transform-member-expression-literals": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.27.1.tgz",
-      "integrity": "sha512-hqoBX4dcZ1I33jCSWcXrP+1Ku7kdqXf1oeah7ooKOIiAdKQ+uqftgCFNOSzA5AMS2XIHEYeGFg4cKRCdpxzVOQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2432,8 +2115,6 @@
     },
     "node_modules/@babel/plugin-transform-modules-amd": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.27.1.tgz",
-      "integrity": "sha512-iCsytMg/N9/oFq6n+gFTvUYDZQOMK5kEdeYxmxt91fcJGycfxVP9CnrxoliM0oumFERba2i8ZtwRUCMhvP1LnA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2449,8 +2130,6 @@
     },
     "node_modules/@babel/plugin-transform-modules-commonjs": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.27.1.tgz",
-      "integrity": "sha512-OJguuwlTYlN0gBZFRPqwOGNWssZjfIUdS7HMYtN8c1KmwpwHFBwTeFZrg9XZa+DFTitWOW5iTAG7tyCUPsCCyw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2466,8 +2145,6 @@
     },
     "node_modules/@babel/plugin-transform-modules-systemjs": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.27.1.tgz",
-      "integrity": "sha512-w5N1XzsRbc0PQStASMksmUeqECuzKuTJer7kFagK8AXgpCMkeDMO5S+aaFb7A51ZYDF7XI34qsTX+fkHiIm5yA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2485,8 +2162,6 @@
     },
     "node_modules/@babel/plugin-transform-modules-umd": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.27.1.tgz",
-      "integrity": "sha512-iQBE/xC5BV1OxJbp6WG7jq9IWiD+xxlZhLrdwpPkTX3ydmXdvoCpyfJN7acaIBZaOqTfr76pgzqBJflNbeRK+w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2502,8 +2177,6 @@
     },
     "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.27.1.tgz",
-      "integrity": "sha512-SstR5JYy8ddZvD6MhV0tM/j16Qds4mIpJTOd1Yu9J9pJjH93bxHECF7pgtc28XvkzTD6Pxcm/0Z73Hvk7kb3Ng==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2519,8 +2192,6 @@
     },
     "node_modules/@babel/plugin-transform-new-target": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.27.1.tgz",
-      "integrity": "sha512-f6PiYeqXQ05lYq3TIfIDu/MtliKUbNwkGApPUvyo6+tc7uaR4cPjPe7DFPr15Uyycg2lZU6btZ575CuQoYh7MQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2535,8 +2206,6 @@
     },
     "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.27.1.tgz",
-      "integrity": "sha512-aGZh6xMo6q9vq1JGcw58lZ1Z0+i0xB2x0XaauNIUXd6O1xXc3RwoWEBlsTQrY4KQ9Jf0s5rgD6SiNkaUdJegTA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2551,8 +2220,6 @@
     },
     "node_modules/@babel/plugin-transform-numeric-separator": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.27.1.tgz",
-      "integrity": "sha512-fdPKAcujuvEChxDBJ5c+0BTaS6revLV7CJL08e4m3de8qJfNIuCc2nc7XJYOjBoTMJeqSmwXJ0ypE14RCjLwaw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2566,15 +2233,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-rest-spread": {
-      "version": "7.27.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.27.3.tgz",
-      "integrity": "sha512-7ZZtznF9g4l2JCImCo5LNKFHB5eXnN39lLtLY5Tg+VkR0jwOt7TBciMckuiQIOIW7L5tkQOCh3bVGYeXgMx52Q==",
+      "version": "7.27.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-compilation-targets": "^7.27.2",
         "@babel/helper-plugin-utils": "^7.27.1",
-        "@babel/plugin-transform-destructuring": "^7.27.3",
+        "@babel/plugin-transform-destructuring": "^7.27.1",
         "@babel/plugin-transform-parameters": "^7.27.1"
       },
       "engines": {
@@ -2586,8 +2251,6 @@
     },
     "node_modules/@babel/plugin-transform-object-super": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.27.1.tgz",
-      "integrity": "sha512-SFy8S9plRPbIcxlJ8A6mT/CxFdJx/c04JEctz4jf8YZaVS2px34j7NXRrlGlHkN/M2gnpL37ZpGRGVFLd3l8Ng==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2603,8 +2266,6 @@
     },
     "node_modules/@babel/plugin-transform-optional-catch-binding": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.27.1.tgz",
-      "integrity": "sha512-txEAEKzYrHEX4xSZN4kJ+OfKXFVSWKB2ZxM9dpcE3wT7smwkNmXo5ORRlVzMVdJbD+Q8ILTgSD7959uj+3Dm3Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2619,8 +2280,6 @@
     },
     "node_modules/@babel/plugin-transform-optional-chaining": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.27.1.tgz",
-      "integrity": "sha512-BQmKPPIuc8EkZgNKsv0X4bPmOoayeu4F1YCwx2/CfmDSXDbp7GnzlUH+/ul5VGfRg1AoFPsrIThlEBj2xb4CAg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2636,8 +2295,6 @@
     },
     "node_modules/@babel/plugin-transform-parameters": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.27.1.tgz",
-      "integrity": "sha512-018KRk76HWKeZ5l4oTj2zPpSh+NbGdt0st5S6x0pga6HgrjBOJb24mMDHorFopOOd6YHkLgOZ+zaCjZGPO4aKg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2652,8 +2309,6 @@
     },
     "node_modules/@babel/plugin-transform-private-methods": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.27.1.tgz",
-      "integrity": "sha512-10FVt+X55AjRAYI9BrdISN9/AQWHqldOeZDUoLyif1Kn05a56xVBXb8ZouL8pZ9jem8QpXaOt8TS7RHUIS+GPA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2669,8 +2324,6 @@
     },
     "node_modules/@babel/plugin-transform-private-property-in-object": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.27.1.tgz",
-      "integrity": "sha512-5J+IhqTi1XPa0DXF83jYOaARrX+41gOewWbkPyjMNRDqgOCqdffGh8L3f/Ek5utaEBZExjSAzcyjmV9SSAWObQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2687,8 +2340,6 @@
     },
     "node_modules/@babel/plugin-transform-property-literals": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.27.1.tgz",
-      "integrity": "sha512-oThy3BCuCha8kDZ8ZkgOg2exvPYUlprMukKQXI1r1pJ47NCvxfkEy8vK+r/hT9nF0Aa4H1WUPZZjHTFtAhGfmQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2702,13 +2353,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-constant-elements": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.27.1.tgz",
-      "integrity": "sha512-edoidOjl/ZxvYo4lSBOQGDSyToYVkTAwyVoa2tkuYTSmjrB1+uAedoL5iROVLXkxH+vRgA7uP4tMg2pUJpZ3Ug==",
+      "version": "7.25.9",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2718,13 +2367,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-display-name": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.27.1.tgz",
-      "integrity": "sha512-p9+Vl3yuHPmkirRrg021XiP+EETmPMQTLr6Ayjj85RLNEbb3Eya/4VI0vAdzQG9SEAl2Lnt7fy5lZyMzjYoZQQ==",
+      "version": "7.25.9",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2734,17 +2381,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-jsx": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.27.1.tgz",
-      "integrity": "sha512-2KH4LWGSrJIkVf5tSiBFYuXDAoWRq2MMwgivCf+93dd0GQi8RXLjKA/0EvRnVV5G0hrHczsquXuD01L8s6dmBw==",
+      "version": "7.25.9",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.27.1",
-        "@babel/helper-module-imports": "^7.27.1",
-        "@babel/helper-plugin-utils": "^7.27.1",
-        "@babel/plugin-syntax-jsx": "^7.27.1",
-        "@babel/types": "^7.27.1"
+        "@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"
@@ -2754,13 +2399,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-jsx-development": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.27.1.tgz",
-      "integrity": "sha512-ykDdF5yI4f1WrAolLqeF3hmYU12j9ntLQl/AOG1HAS21jxyg1Q0/J/tpREuYLfatGdGmXp/3yS0ZA76kOlVq9Q==",
+      "version": "7.25.9",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/plugin-transform-react-jsx": "^7.27.1"
+        "@babel/plugin-transform-react-jsx": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2770,14 +2413,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-pure-annotations": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.27.1.tgz",
-      "integrity": "sha512-JfuinvDOsD9FVMTHpzA/pBLisxpv1aSf+OIV8lgH3MuWrks19R27e6a6DipIg4aX1Zm9Wpb04p8wljfKrVSnPA==",
+      "version": "7.25.9",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.27.1",
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2787,9 +2428,7 @@
       }
     },
     "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.27.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.27.5.tgz",
-      "integrity": "sha512-uhB8yHerfe3MWnuLAhEbeQ4afVoqv8BQsPqrTv7e/jZ9y00kJL6l9a/f4OWaKxotmjzewfEyXE1vgDJenkQ2/Q==",
+      "version": "7.27.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2804,8 +2443,6 @@
     },
     "node_modules/@babel/plugin-transform-regexp-modifiers": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regexp-modifiers/-/plugin-transform-regexp-modifiers-7.27.1.tgz",
-      "integrity": "sha512-TtEciroaiODtXvLZv4rmfMhkCv8jx3wgKpL68PuiPh2M4fvz5jhsA7697N1gMvkvr/JTF13DrFYyEbY9U7cVPA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2821,8 +2458,6 @@
     },
     "node_modules/@babel/plugin-transform-reserved-words": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.27.1.tgz",
-      "integrity": "sha512-V2ABPHIJX4kC7HegLkYoDpfg9PVmuWy/i6vUM5eGK22bx4YVFD3M5F0QQnWQoDs6AGsUWTVOopBiMFQgHaSkVw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2836,9 +2471,7 @@
       }
     },
     "node_modules/@babel/plugin-transform-runtime": {
-      "version": "7.27.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.27.4.tgz",
-      "integrity": "sha512-D68nR5zxU64EUzV8i7T3R5XP0Xhrou/amNnddsRQssx6GrTLdZl1rLxyjtVZBd+v/NVX4AbTPOB5aU8thAZV1A==",
+      "version": "7.27.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2858,8 +2491,6 @@
     },
     "node_modules/@babel/plugin-transform-runtime/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": "ISC",
       "bin": {
@@ -2868,8 +2499,6 @@
     },
     "node_modules/@babel/plugin-transform-shorthand-properties": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.27.1.tgz",
-      "integrity": "sha512-N/wH1vcn4oYawbJ13Y/FxcQrWk63jhfNa7jef0ih7PHSIHX2LB7GWE1rkPrOnka9kwMxb6hMl19p7lidA+EHmQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2884,8 +2513,6 @@
     },
     "node_modules/@babel/plugin-transform-spread": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.27.1.tgz",
-      "integrity": "sha512-kpb3HUqaILBJcRFVhFUs6Trdd4mkrzcGXss+6/mxUd273PfbWqSDHRzMT2234gIg2QYfAjvXLSquP1xECSg09Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2901,8 +2528,6 @@
     },
     "node_modules/@babel/plugin-transform-sticky-regex": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.27.1.tgz",
-      "integrity": "sha512-lhInBO5bi/Kowe2/aLdBAawijx+q1pQzicSgnkB6dUPc1+RC8QmJHKf2OjvU+NZWitguJHEaEmbV6VWEouT58g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2917,8 +2542,6 @@
     },
     "node_modules/@babel/plugin-transform-template-literals": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.27.1.tgz",
-      "integrity": "sha512-fBJKiV7F2DxZUkg5EtHKXQdbsbURW3DZKQUWphDum0uRP6eHGGa/He9mc0mypL680pb+e/lDIthRohlv8NCHkg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2933,8 +2556,6 @@
     },
     "node_modules/@babel/plugin-transform-typeof-symbol": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.27.1.tgz",
-      "integrity": "sha512-RiSILC+nRJM7FY5srIyc4/fGIwUhyDuuBSdWn4y6yT6gm652DpCHZjIipgn6B7MQ1ITOUnAKWixEUjQRIBIcLw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2948,17 +2569,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-typescript": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.27.1.tgz",
-      "integrity": "sha512-Q5sT5+O4QUebHdbwKedFBEwRLb02zJ7r4A5Gg2hUoLuU3FjdMcyqcywqUrLCaDsFCxzokf7u9kuy7qz51YUuAg==",
+      "version": "7.26.5",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.27.1",
-        "@babel/helper-create-class-features-plugin": "^7.27.1",
-        "@babel/helper-plugin-utils": "^7.27.1",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1",
-        "@babel/plugin-syntax-typescript": "^7.27.1"
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-create-class-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.26.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
+        "@babel/plugin-syntax-typescript": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2969,8 +2588,6 @@
     },
     "node_modules/@babel/plugin-transform-unicode-escapes": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.27.1.tgz",
-      "integrity": "sha512-Ysg4v6AmF26k9vpfFuTZg8HRfVWzsh1kVfowA23y9j/Gu6dOuahdUVhkLqpObp3JIv27MLSii6noRnuKN8H0Mg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2985,8 +2602,6 @@
     },
     "node_modules/@babel/plugin-transform-unicode-property-regex": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.27.1.tgz",
-      "integrity": "sha512-uW20S39PnaTImxp39O5qFlHLS9LJEmANjMG7SxIhap8rCHqu0Ik+tLEPX5DKmHn6CsWQ7j3lix2tFOa5YtL12Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3002,8 +2617,6 @@
     },
     "node_modules/@babel/plugin-transform-unicode-regex": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.27.1.tgz",
-      "integrity": "sha512-xvINq24TRojDuyt6JGtHmkVkrfVV3FPT16uytxImLeBZqW3/H52yN+kM1MGuyPkIQxrzKwPHs5U/MP3qKyzkGw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3019,8 +2632,6 @@
     },
     "node_modules/@babel/plugin-transform-unicode-sets-regex": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.27.1.tgz",
-      "integrity": "sha512-EtkOujbc4cgvb0mlpQefi4NTPBzhSIevblFevACNLUspmrALgmEBdL/XfnyyITfd8fKBZrZys92zOWcik7j9Tw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3036,9 +2647,6 @@
     },
     "node_modules/@babel/polyfill": {
       "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.12.1.tgz",
-      "integrity": "sha512-X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g==",
-      "deprecated": "🚨 This package has been deprecated in favor of separate inclusion of a polyfill and regenerator-runtime (when needed). See the @babel/polyfill docs (https://babeljs.io/docs/en/babel-polyfill) for more information.",
       "license": "MIT",
       "dependencies": {
         "core-js": "^2.6.5",
@@ -3047,14 +2655,10 @@
     },
     "node_modules/@babel/polyfill/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==",
       "license": "MIT"
     },
     "node_modules/@babel/preset-env": {
       "version": "7.27.2",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.27.2.tgz",
-      "integrity": "sha512-Ma4zSuYSlGNRlCLO+EAzLnCmJK2vdstgv+n7aUP+/IKZrOfWHOJVdSJtuub8RzHTj3ahD37k5OKJWvzf16TQyQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3137,8 +2741,6 @@
     },
     "node_modules/@babel/preset-env/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": "ISC",
       "bin": {
@@ -3146,15 +2748,13 @@
       }
     },
     "node_modules/@babel/preset-flow": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.27.1.tgz",
-      "integrity": "sha512-ez3a2it5Fn6P54W8QkbfIyyIbxlXvcxyWHHvno1Wg0Ej5eiJY5hBb8ExttoIOJJk7V2dZE6prP7iby5q2aQ0Lg==",
+      "version": "7.25.9",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1",
-        "@babel/helper-validator-option": "^7.27.1",
-        "@babel/plugin-transform-flow-strip-types": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-validator-option": "^7.25.9",
+        "@babel/plugin-transform-flow-strip-types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3165,8 +2765,6 @@
     },
     "node_modules/@babel/preset-modules": {
       "version": "0.1.6-no-external-plugins",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz",
-      "integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3179,18 +2777,16 @@
       }
     },
     "node_modules/@babel/preset-react": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.27.1.tgz",
-      "integrity": "sha512-oJHWh2gLhU9dW9HHr42q0cI0/iHHXTLGe39qvpAZZzagHy0MzYLCnCVV0symeRvzmjHyVU7mw2K06E6u/JwbhA==",
+      "version": "7.26.3",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1",
-        "@babel/helper-validator-option": "^7.27.1",
-        "@babel/plugin-transform-react-display-name": "^7.27.1",
-        "@babel/plugin-transform-react-jsx": "^7.27.1",
-        "@babel/plugin-transform-react-jsx-development": "^7.27.1",
-        "@babel/plugin-transform-react-pure-annotations": "^7.27.1"
+        "@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"
@@ -3200,17 +2796,15 @@
       }
     },
     "node_modules/@babel/preset-typescript": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.27.1.tgz",
-      "integrity": "sha512-l7WfQfX0WK4M0v2RudjuQK4u99BS6yLHYEmdtVPP7lKV013zr9DygFuWNlnbvQ9LR+LS0Egz/XAvGx5U9MX0fQ==",
+      "version": "7.26.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1",
-        "@babel/helper-validator-option": "^7.27.1",
-        "@babel/plugin-syntax-jsx": "^7.27.1",
-        "@babel/plugin-transform-modules-commonjs": "^7.27.1",
-        "@babel/plugin-transform-typescript": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-validator-option": "^7.25.9",
+        "@babel/plugin-syntax-jsx": "^7.25.9",
+        "@babel/plugin-transform-modules-commonjs": "^7.25.9",
+        "@babel/plugin-transform-typescript": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3220,9 +2814,7 @@
       }
     },
     "node_modules/@babel/register": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/register/-/register-7.27.1.tgz",
-      "integrity": "sha512-K13lQpoV54LATKkzBpBAEu1GGSIRzxR9f4IN4V8DCDgiUMo2UDGagEZr3lPeVNJPLkWUi5JE4hCHKneVTwQlYQ==",
+      "version": "7.25.9",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3240,22 +2832,22 @@
       }
     },
     "node_modules/@babel/runtime": {
-      "version": "7.27.6",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.6.tgz",
-      "integrity": "sha512-vbavdySgbTTrmFE+EsiqUTzlOr5bzlnJtUv9PynGCAKvfQqjIXbvFdumPM/GxMDfyuGMJaJAU6TO4zc1Jf1i8Q==",
+      "version": "7.26.10",
       "license": "MIT",
+      "dependencies": {
+        "regenerator-runtime": "^0.14.0"
+      },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/runtime-corejs3": {
-      "version": "7.27.6",
-      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.27.6.tgz",
-      "integrity": "sha512-vDVrlmRAY8z9Ul/HxT+8ceAru95LQgkSKiXkSYZvqtbkPSfhZJgpRp45Cldbh1GJ1kxzQkI70AqyrTI58KpaWQ==",
+      "version": "7.26.7",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "core-js-pure": "^3.30.2"
+        "core-js-pure": "^3.30.2",
+        "regenerator-runtime": "^0.14.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3263,8 +2855,6 @@
     },
     "node_modules/@babel/template": {
       "version": "7.27.2",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz",
-      "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==",
       "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.27.1",
@@ -3276,16 +2866,14 @@
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.27.4",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.27.4.tgz",
-      "integrity": "sha512-oNcu2QbHqts9BtOWJosOVJapWjBDSxGCpFvikNR5TGDYDQf3JwpIoMzIKrvfoti93cLfPJEG4tH9SPVeyCGgdA==",
+      "version": "7.27.7",
       "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.27.1",
-        "@babel/generator": "^7.27.3",
-        "@babel/parser": "^7.27.4",
+        "@babel/generator": "^7.27.5",
+        "@babel/parser": "^7.27.7",
         "@babel/template": "^7.27.2",
-        "@babel/types": "^7.27.3",
+        "@babel/types": "^7.27.7",
         "debug": "^4.3.1",
         "globals": "^11.1.0"
       },
@@ -3294,9 +2882,7 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.27.6",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.6.tgz",
-      "integrity": "sha512-ETyHEk2VHHvl9b9jZP5IHPavHYk57EhanlRRuae9XCpb/j5bDCbPPMOBfCWhnl/7EDJz0jEMCi/RhccCE8r1+Q==",
+      "version": "7.27.7",
       "license": "MIT",
       "dependencies": {
         "@babel/helper-string-parser": "^7.27.1",
@@ -3314,15 +2900,474 @@
     },
     "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,
       "license": "MIT"
     },
+    "node_modules/@colors/colors": {
+      "version": "1.5.0",
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.1.90"
+      }
+    },
+    "node_modules/@commitlint/cli": {
+      "version": "19.8.1",
+      "license": "MIT",
+      "dependencies": {
+        "@commitlint/format": "^19.8.1",
+        "@commitlint/lint": "^19.8.1",
+        "@commitlint/load": "^19.8.1",
+        "@commitlint/read": "^19.8.1",
+        "@commitlint/types": "^19.8.1",
+        "tinyexec": "^1.0.0",
+        "yargs": "^17.0.0"
+      },
+      "bin": {
+        "commitlint": "cli.js"
+      },
+      "engines": {
+        "node": ">=v18"
+      }
+    },
+    "node_modules/@commitlint/config-conventional": {
+      "version": "19.8.1",
+      "license": "MIT",
+      "dependencies": {
+        "@commitlint/types": "^19.8.1",
+        "conventional-changelog-conventionalcommits": "^7.0.2"
+      },
+      "engines": {
+        "node": ">=v18"
+      }
+    },
+    "node_modules/@commitlint/config-validator": {
+      "version": "19.8.1",
+      "license": "MIT",
+      "dependencies": {
+        "@commitlint/types": "^19.8.1",
+        "ajv": "^8.11.0"
+      },
+      "engines": {
+        "node": ">=v18"
+      }
+    },
+    "node_modules/@commitlint/ensure": {
+      "version": "19.8.1",
+      "license": "MIT",
+      "dependencies": {
+        "@commitlint/types": "^19.8.1",
+        "lodash.camelcase": "^4.3.0",
+        "lodash.kebabcase": "^4.1.1",
+        "lodash.snakecase": "^4.1.1",
+        "lodash.startcase": "^4.4.0",
+        "lodash.upperfirst": "^4.3.1"
+      },
+      "engines": {
+        "node": ">=v18"
+      }
+    },
+    "node_modules/@commitlint/execute-rule": {
+      "version": "19.8.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=v18"
+      }
+    },
+    "node_modules/@commitlint/format": {
+      "version": "19.8.1",
+      "license": "MIT",
+      "dependencies": {
+        "@commitlint/types": "^19.8.1",
+        "chalk": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=v18"
+      }
+    },
+    "node_modules/@commitlint/format/node_modules/chalk": {
+      "version": "5.4.1",
+      "license": "MIT",
+      "engines": {
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@commitlint/is-ignored": {
+      "version": "19.8.1",
+      "license": "MIT",
+      "dependencies": {
+        "@commitlint/types": "^19.8.1",
+        "semver": "^7.6.0"
+      },
+      "engines": {
+        "node": ">=v18"
+      }
+    },
+    "node_modules/@commitlint/lint": {
+      "version": "19.8.1",
+      "license": "MIT",
+      "dependencies": {
+        "@commitlint/is-ignored": "^19.8.1",
+        "@commitlint/parse": "^19.8.1",
+        "@commitlint/rules": "^19.8.1",
+        "@commitlint/types": "^19.8.1"
+      },
+      "engines": {
+        "node": ">=v18"
+      }
+    },
+    "node_modules/@commitlint/load": {
+      "version": "19.8.1",
+      "license": "MIT",
+      "dependencies": {
+        "@commitlint/config-validator": "^19.8.1",
+        "@commitlint/execute-rule": "^19.8.1",
+        "@commitlint/resolve-extends": "^19.8.1",
+        "@commitlint/types": "^19.8.1",
+        "chalk": "^5.3.0",
+        "cosmiconfig": "^9.0.0",
+        "cosmiconfig-typescript-loader": "^6.1.0",
+        "lodash.isplainobject": "^4.0.6",
+        "lodash.merge": "^4.6.2",
+        "lodash.uniq": "^4.5.0"
+      },
+      "engines": {
+        "node": ">=v18"
+      }
+    },
+    "node_modules/@commitlint/load/node_modules/argparse": {
+      "version": "2.0.1",
+      "license": "Python-2.0"
+    },
+    "node_modules/@commitlint/load/node_modules/chalk": {
+      "version": "5.4.1",
+      "license": "MIT",
+      "engines": {
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@commitlint/load/node_modules/cosmiconfig": {
+      "version": "9.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "env-paths": "^2.2.1",
+        "import-fresh": "^3.3.0",
+        "js-yaml": "^4.1.0",
+        "parse-json": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/d-fischer"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.9.5"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@commitlint/load/node_modules/cosmiconfig-typescript-loader": {
+      "version": "6.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "jiti": "^2.4.1"
+      },
+      "engines": {
+        "node": ">=v18"
+      },
+      "peerDependencies": {
+        "@types/node": "*",
+        "cosmiconfig": ">=9",
+        "typescript": ">=5"
+      }
+    },
+    "node_modules/@commitlint/load/node_modules/js-yaml": {
+      "version": "4.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/@commitlint/message": {
+      "version": "19.8.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=v18"
+      }
+    },
+    "node_modules/@commitlint/parse": {
+      "version": "19.8.1",
+      "license": "MIT",
+      "dependencies": {
+        "@commitlint/types": "^19.8.1",
+        "conventional-changelog-angular": "^7.0.0",
+        "conventional-commits-parser": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=v18"
+      }
+    },
+    "node_modules/@commitlint/parse/node_modules/conventional-commits-parser": {
+      "version": "5.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "is-text-path": "^2.0.0",
+        "JSONStream": "^1.3.5",
+        "meow": "^12.0.1",
+        "split2": "^4.0.0"
+      },
+      "bin": {
+        "conventional-commits-parser": "cli.mjs"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@commitlint/parse/node_modules/is-text-path": {
+      "version": "2.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "text-extensions": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@commitlint/parse/node_modules/meow": {
+      "version": "12.1.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=16.10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@commitlint/parse/node_modules/split2": {
+      "version": "4.2.0",
+      "license": "ISC",
+      "engines": {
+        "node": ">= 10.x"
+      }
+    },
+    "node_modules/@commitlint/parse/node_modules/text-extensions": {
+      "version": "2.4.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@commitlint/read": {
+      "version": "19.8.1",
+      "license": "MIT",
+      "dependencies": {
+        "@commitlint/top-level": "^19.8.1",
+        "@commitlint/types": "^19.8.1",
+        "git-raw-commits": "^4.0.0",
+        "minimist": "^1.2.8",
+        "tinyexec": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=v18"
+      }
+    },
+    "node_modules/@commitlint/read/node_modules/dargs": {
+      "version": "8.1.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@commitlint/read/node_modules/git-raw-commits": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "dargs": "^8.0.0",
+        "meow": "^12.0.1",
+        "split2": "^4.0.0"
+      },
+      "bin": {
+        "git-raw-commits": "cli.mjs"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@commitlint/read/node_modules/meow": {
+      "version": "12.1.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=16.10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@commitlint/read/node_modules/split2": {
+      "version": "4.2.0",
+      "license": "ISC",
+      "engines": {
+        "node": ">= 10.x"
+      }
+    },
+    "node_modules/@commitlint/resolve-extends": {
+      "version": "19.8.1",
+      "license": "MIT",
+      "dependencies": {
+        "@commitlint/config-validator": "^19.8.1",
+        "@commitlint/types": "^19.8.1",
+        "global-directory": "^4.0.1",
+        "import-meta-resolve": "^4.0.0",
+        "lodash.mergewith": "^4.6.2",
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=v18"
+      }
+    },
+    "node_modules/@commitlint/rules": {
+      "version": "19.8.1",
+      "license": "MIT",
+      "dependencies": {
+        "@commitlint/ensure": "^19.8.1",
+        "@commitlint/message": "^19.8.1",
+        "@commitlint/to-lines": "^19.8.1",
+        "@commitlint/types": "^19.8.1"
+      },
+      "engines": {
+        "node": ">=v18"
+      }
+    },
+    "node_modules/@commitlint/to-lines": {
+      "version": "19.8.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=v18"
+      }
+    },
+    "node_modules/@commitlint/top-level": {
+      "version": "19.8.1",
+      "license": "MIT",
+      "dependencies": {
+        "find-up": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=v18"
+      }
+    },
+    "node_modules/@commitlint/top-level/node_modules/find-up": {
+      "version": "7.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "locate-path": "^7.2.0",
+        "path-exists": "^5.0.0",
+        "unicorn-magic": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@commitlint/top-level/node_modules/locate-path": {
+      "version": "7.2.0",
+      "license": "MIT",
+      "dependencies": {
+        "p-locate": "^6.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@commitlint/top-level/node_modules/p-limit": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "yocto-queue": "^1.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@commitlint/top-level/node_modules/p-locate": {
+      "version": "6.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "p-limit": "^4.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@commitlint/top-level/node_modules/path-exists": {
+      "version": "5.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      }
+    },
+    "node_modules/@commitlint/top-level/node_modules/yocto-queue": {
+      "version": "1.2.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@commitlint/types": {
+      "version": "19.8.1",
+      "license": "MIT",
+      "dependencies": {
+        "@types/conventional-commits-parser": "^5.0.0",
+        "chalk": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=v18"
+      }
+    },
+    "node_modules/@commitlint/types/node_modules/chalk": {
+      "version": "5.4.1",
+      "license": "MIT",
+      "engines": {
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
     "node_modules/@cspotcode/source-map-support": {
       "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
-      "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
       "license": "MIT",
       "dependencies": {
         "@jridgewell/trace-mapping": "0.3.9"
@@ -3333,8 +3378,6 @@
     },
     "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": {
       "version": "0.3.9",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
-      "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
       "license": "MIT",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.0.3",
@@ -3342,9 +3385,7 @@
       }
     },
     "node_modules/@csstools/color-helpers": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-5.0.2.tgz",
-      "integrity": "sha512-JqWH1vsgdGcw2RR6VliXXdA0/59LttzlU8UlRT/iUUsEeWfYq8I+K0yhihEUTTHLRm1EXvpsCx3083EU15ecsA==",
+      "version": "5.0.1",
       "dev": true,
       "funding": [
         {
@@ -3362,9 +3403,7 @@
       }
     },
     "node_modules/@csstools/css-calc": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-2.1.4.tgz",
-      "integrity": "sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ==",
+      "version": "2.1.1",
       "dev": true,
       "funding": [
         {
@@ -3381,14 +3420,12 @@
         "node": ">=18"
       },
       "peerDependencies": {
-        "@csstools/css-parser-algorithms": "^3.0.5",
-        "@csstools/css-tokenizer": "^3.0.4"
+        "@csstools/css-parser-algorithms": "^3.0.4",
+        "@csstools/css-tokenizer": "^3.0.3"
       }
     },
     "node_modules/@csstools/css-color-parser": {
-      "version": "3.0.10",
-      "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.0.10.tgz",
-      "integrity": "sha512-TiJ5Ajr6WRd1r8HSiwJvZBiJOqtH86aHpUjq5aEKWHiII2Qfjqd/HCWKPOW8EP4vcspXbHnXrwIDlu5savQipg==",
+      "version": "3.0.7",
       "dev": true,
       "funding": [
         {
@@ -3402,21 +3439,19 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "@csstools/color-helpers": "^5.0.2",
-        "@csstools/css-calc": "^2.1.4"
+        "@csstools/color-helpers": "^5.0.1",
+        "@csstools/css-calc": "^2.1.1"
       },
       "engines": {
         "node": ">=18"
       },
       "peerDependencies": {
-        "@csstools/css-parser-algorithms": "^3.0.5",
-        "@csstools/css-tokenizer": "^3.0.4"
+        "@csstools/css-parser-algorithms": "^3.0.4",
+        "@csstools/css-tokenizer": "^3.0.3"
       }
     },
     "node_modules/@csstools/css-parser-algorithms": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.5.tgz",
-      "integrity": "sha512-DaDeUkXZKjdGhgYaHNJTV9pV7Y9B3b644jCLs9Upc3VeNGg6LWARAT6O+Q+/COo+2gg/bM5rhpMAtf70WqfBdQ==",
+      "version": "3.0.4",
       "dev": true,
       "funding": [
         {
@@ -3433,13 +3468,11 @@
         "node": ">=18"
       },
       "peerDependencies": {
-        "@csstools/css-tokenizer": "^3.0.4"
+        "@csstools/css-tokenizer": "^3.0.3"
       }
     },
     "node_modules/@csstools/css-tokenizer": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.4.tgz",
-      "integrity": "sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw==",
+      "version": "3.0.3",
       "dev": true,
       "funding": [
         {
@@ -3456,15 +3489,6 @@
         "node": ">=18"
       }
     },
-    "node_modules/@ctrl/tinycolor": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/@ctrl/tinycolor/-/tinycolor-3.6.1.tgz",
-      "integrity": "sha512-SITSV6aIXsuVNV3f3O0f2n/cgyEDWoSqtZMYiAmcsYHydcKrOz3gUxB/iXd/Qf08+IZX4KpgNbvUdMBmWz+kcA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/@cypress/request": {
       "version": "3.0.8",
       "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.8.tgz",
@@ -3505,8 +3529,6 @@
     },
     "node_modules/@cypress/xvfb": {
       "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@cypress/xvfb/-/xvfb-1.2.4.tgz",
-      "integrity": "sha512-skbBzPggOVYCbnGgV+0dmBdW/s77ZkAOXIC1knS8NagwDjBrNC1LuXtQJeiN6l+m7lzmHtaoUw/ctJKdqkG57Q==",
       "license": "MIT",
       "dependencies": {
         "debug": "^3.1.0",
@@ -3515,45 +3537,22 @@
     },
     "node_modules/@cypress/xvfb/node_modules/debug": {
       "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "license": "MIT",
       "dependencies": {
         "ms": "^2.1.1"
       }
     },
-    "node_modules/@deck.gl/aggregation-layers": {
-      "version": "9.1.12",
-      "resolved": "https://registry.npmjs.org/@deck.gl/aggregation-layers/-/aggregation-layers-9.1.12.tgz",
-      "integrity": "sha512-41u5ZBnpIUzUQ+S8u/8JBWN9BHTerRUcOv+1QmjWsp8noNWZN69cvOy3/AaaPA8UgSEycdnv+y8GGIMspBLHZQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@luma.gl/constants": "^9.1.5",
-        "@luma.gl/shadertools": "^9.1.5",
-        "@math.gl/core": "^4.1.0",
-        "@math.gl/web-mercator": "^4.1.0",
-        "d3-hexbin": "^0.2.1"
-      },
-      "peerDependencies": {
-        "@deck.gl/core": "^9.1.0",
-        "@deck.gl/layers": "^9.1.0",
-        "@luma.gl/core": "^9.1.5",
-        "@luma.gl/engine": "^9.1.5"
-      }
-    },
     "node_modules/@deck.gl/core": {
-      "version": "9.1.12",
-      "resolved": "https://registry.npmjs.org/@deck.gl/core/-/core-9.1.12.tgz",
-      "integrity": "sha512-N9ZCHgn0CCekOCYmXYG/JHqFJLLeS5/HN1dh+N4a1EyLk0bPhN7CfTJ9ypEK9fQvyiX1sdVgu1bkGWo3eazf9A==",
+      "version": "9.1.0",
       "license": "MIT",
       "dependencies": {
         "@loaders.gl/core": "^4.2.0",
         "@loaders.gl/images": "^4.2.0",
-        "@luma.gl/constants": "^9.1.5",
-        "@luma.gl/core": "^9.1.5",
-        "@luma.gl/engine": "^9.1.5",
-        "@luma.gl/shadertools": "^9.1.5",
-        "@luma.gl/webgl": "^9.1.5",
+        "@luma.gl/constants": "^9.1.0",
+        "@luma.gl/core": "^9.1.0",
+        "@luma.gl/engine": "^9.1.0",
+        "@luma.gl/shadertools": "^9.1.0",
+        "@luma.gl/webgl": "^9.1.0",
         "@math.gl/core": "^4.1.0",
         "@math.gl/sun": "^4.1.0",
         "@math.gl/types": "^4.1.0",
@@ -3567,14 +3566,11 @@
       }
     },
     "node_modules/@deck.gl/layers": {
-      "version": "9.1.12",
-      "resolved": "https://registry.npmjs.org/@deck.gl/layers/-/layers-9.1.12.tgz",
-      "integrity": "sha512-szRPS7W3jCMp3jPjQYleIJGE9nkcMIXbUGi7Wc/4reU1WLayo8wvDnRbyyW/TaU6TTUPuI/K5raCnG+xoj67KQ==",
+      "version": "9.1.0",
       "license": "MIT",
       "dependencies": {
         "@loaders.gl/images": "^4.2.0",
         "@loaders.gl/schema": "^4.2.0",
-        "@luma.gl/shadertools": "^9.1.5",
         "@mapbox/tiny-sdf": "^2.0.5",
         "@math.gl/core": "^4.1.0",
         "@math.gl/polygon": "^4.1.0",
@@ -3584,14 +3580,12 @@
       "peerDependencies": {
         "@deck.gl/core": "^9.1.0",
         "@loaders.gl/core": "^4.2.0",
-        "@luma.gl/core": "^9.1.5",
-        "@luma.gl/engine": "^9.1.5"
+        "@luma.gl/core": "^9.1.0",
+        "@luma.gl/engine": "^9.1.0"
       }
     },
     "node_modules/@deck.gl/react": {
-      "version": "9.1.12",
-      "resolved": "https://registry.npmjs.org/@deck.gl/react/-/react-9.1.12.tgz",
-      "integrity": "sha512-0M7w8qVXJ2nLcaur+hC3CxZfmqCvoM+/CRWiuICVOkgdkrcO3nCj+x/YObYYn/dhI3l9xVnTm9cFNq1tOFf9KQ==",
+      "version": "9.1.4",
       "license": "MIT",
       "peerDependencies": {
         "@deck.gl/core": "^9.1.0",
@@ -3601,9 +3595,7 @@
       }
     },
     "node_modules/@deck.gl/widgets": {
-      "version": "9.1.12",
-      "resolved": "https://registry.npmjs.org/@deck.gl/widgets/-/widgets-9.1.12.tgz",
-      "integrity": "sha512-/bDO3u3N7nLDehLsWCeMNzAFuOd/PKndffeSsYI8DhJpN4H1qH9E5S13gxu65HXDD8+6+ApNN4Z1bWlmTpSp+A==",
+      "version": "9.1.0",
       "license": "MIT",
       "peer": true,
       "dependencies": {
@@ -3615,8 +3607,6 @@
     },
     "node_modules/@discoveryjs/json-ext": {
       "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
-      "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3651,23 +3641,21 @@
       }
     },
     "node_modules/@dnd-kit/sortable": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/@dnd-kit/sortable/-/sortable-7.0.2.tgz",
-      "integrity": "sha512-wDkBHHf9iCi1veM834Gbk1429bd4lHX4RpAwT0y2cHLf246GAvU2sVw/oxWNpPKQNQRQaeGXhAVgrOl1IT+iyA==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@dnd-kit/sortable/-/sortable-8.0.0.tgz",
+      "integrity": "sha512-U3jk5ebVXe1Lr7c2wU7SBZjcWdQP+j7peHJfCspnA81enlu88Mgd7CC8Q+pub9ubP7eKVETzJW+IBAhsqbSu/g==",
       "license": "MIT",
       "dependencies": {
-        "@dnd-kit/utilities": "^3.2.0",
+        "@dnd-kit/utilities": "^3.2.2",
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
-        "@dnd-kit/core": "^6.0.7",
+        "@dnd-kit/core": "^6.1.0",
         "react": ">=16.8.0"
       }
     },
     "node_modules/@dnd-kit/utilities": {
       "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/@dnd-kit/utilities/-/utilities-3.2.2.tgz",
-      "integrity": "sha512-+MKAJEOfaBe5SmV6t34p80MMKhjvUz0vRrvVJbPT0WElzaOJ/1xs+D+KDv+tD/NE5ujfrChEcshd4fLn0wpiqg==",
       "license": "MIT",
       "dependencies": {
         "tslib": "^2.0.0"
@@ -3678,8 +3666,6 @@
     },
     "node_modules/@emnapi/core": {
       "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.4.3.tgz",
-      "integrity": "sha512-4m62DuCE07lw01soJwPiBGC0nAww0Q+RY70VZ+n49yDIO13yyinhbWCeNnaob0lakDtWQzSdtNWzJeOJt2ma+g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3689,8 +3675,6 @@
     },
     "node_modules/@emnapi/runtime": {
       "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.4.3.tgz",
-      "integrity": "sha512-pBPWdu6MLKROBX05wSNKcNb++m5Er+KQ9QkB+WVM+pW2Kx9hoSrVTnu3BdkI5eBLZoKu/J6mW/B6i6bJB2ytXQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3699,8 +3683,6 @@
     },
     "node_modules/@emnapi/wasi-threads": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.0.2.tgz",
-      "integrity": "sha512-5n3nTJblwRi8LlXkJ9eBzu+kZR8Yxcc7ubakyQTFzPMtIhFpUBRbsnc2Dv88IZDIbCDlBiWrknhB4Lsz7mg6BA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3709,8 +3691,6 @@
     },
     "node_modules/@emotion/babel-plugin": {
       "version": "11.13.5",
-      "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.13.5.tgz",
-      "integrity": "sha512-pxHCpT2ex+0q+HH91/zsdHkw/lXd468DIN2zvfvLtPKLLMo6gQj7oLObq8PhkrxOZb/gGCq03S3Z7PDhS8pduQ==",
       "license": "MIT",
       "dependencies": {
         "@babel/helper-module-imports": "^7.16.7",
@@ -3728,14 +3708,10 @@
     },
     "node_modules/@emotion/babel-plugin/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==",
       "license": "MIT"
     },
     "node_modules/@emotion/babel-plugin/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==",
       "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
@@ -3743,8 +3719,6 @@
     },
     "node_modules/@emotion/cache": {
       "version": "11.14.0",
-      "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.14.0.tgz",
-      "integrity": "sha512-L/B1lc/TViYk4DcpGxtAVbx0ZyiKM5ktoIyafGkH6zg/tj+mA+NE//aPYKG0k8kCHSHVJrpLpcAlOBEXQ3SavA==",
       "license": "MIT",
       "dependencies": {
         "@emotion/memoize": "^0.9.0",
@@ -3756,8 +3730,6 @@
     },
     "node_modules/@emotion/css": {
       "version": "11.13.5",
-      "resolved": "https://registry.npmjs.org/@emotion/css/-/css-11.13.5.tgz",
-      "integrity": "sha512-wQdD0Xhkn3Qy2VNcIzbLP9MR8TafI0MJb7BEAXKp+w4+XqErksWR4OXomuDzPsN4InLdGhVe6EYcn2ZIUCpB8w==",
       "license": "MIT",
       "dependencies": {
         "@emotion/babel-plugin": "^11.13.5",
@@ -3769,8 +3741,6 @@
     },
     "node_modules/@emotion/css-prettifier": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@emotion/css-prettifier/-/css-prettifier-1.2.0.tgz",
-      "integrity": "sha512-p+9m/5fp61i90CGUT+516glGBXWoEHgSelybqR+5vlX6Kb+Z0rkOfEMFqTBwYMRxXZTitibZERl32n2yPma7Dw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3780,14 +3750,10 @@
     },
     "node_modules/@emotion/hash": {
       "version": "0.9.2",
-      "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.2.tgz",
-      "integrity": "sha512-MyqliTZGuOm3+5ZRSaaBGP3USLw6+EGykkwZns2EPC5g8jJ4z9OrdZY9apkl3+UP9+sdz76YYkwCKP5gh8iY3g==",
       "license": "MIT"
     },
     "node_modules/@emotion/is-prop-valid": {
       "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.3.1.tgz",
-      "integrity": "sha512-/ACwoqx7XQi9knQs/G0qKvv5teDMhD7bXYns9N/wM8ah8iNb8jZ2uNO0YOgiq2o2poIvVtJS2YALasQuMSQ7Kw==",
       "license": "MIT",
       "dependencies": {
         "@emotion/memoize": "^0.9.0"
@@ -3795,8 +3761,6 @@
     },
     "node_modules/@emotion/jest": {
       "version": "11.13.0",
-      "resolved": "https://registry.npmjs.org/@emotion/jest/-/jest-11.13.0.tgz",
-      "integrity": "sha512-XyoUbJ9fthKdlXjTvjzd6aQ8yVWe68InZawFdGTFkJQRW44rsLHK1qjKB/+L7RiGgdm0BYFv7+tz8znQzRQOBw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3821,8 +3785,6 @@
     },
     "node_modules/@emotion/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": {
@@ -3838,14 +3800,10 @@
     },
     "node_modules/@emotion/memoize": {
       "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.9.0.tgz",
-      "integrity": "sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ==",
       "license": "MIT"
     },
     "node_modules/@emotion/react": {
       "version": "11.14.0",
-      "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.14.0.tgz",
-      "integrity": "sha512-O000MLDBDdk/EohJPFUqvnp4qnHeYkVP5B0xEG0D/L7cOKP9kefu2DXn8dj74cQfsEzUqh+sr1RzFqiL1o+PpA==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.18.3",
@@ -3868,8 +3826,6 @@
     },
     "node_modules/@emotion/serialize": {
       "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.3.3.tgz",
-      "integrity": "sha512-EISGqt7sSNWHGI76hC7x1CksiXPahbxEOrC5RjmFRJTqLyEK9/9hZvBbiYn70dw4wuwMKiEMCUlR6ZXTSWQqxA==",
       "license": "MIT",
       "dependencies": {
         "@emotion/hash": "^0.9.2",
@@ -3881,14 +3837,10 @@
     },
     "node_modules/@emotion/sheet": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.4.0.tgz",
-      "integrity": "sha512-fTBW9/8r2w3dXWYM4HCB1Rdp8NLibOw2+XELH5m5+AkWiL/KqYX6dc0kKYlaYyKjrQ6ds33MCdMPEwgs2z1rqg==",
       "license": "MIT"
     },
     "node_modules/@emotion/styled": {
-      "version": "11.14.0",
-      "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.14.0.tgz",
-      "integrity": "sha512-XxfOnXFffatap2IyCeJyNov3kiDQWoR08gPUQxvbL7fxKryGBKUZUkG6Hz48DZwVrJSVh9sJboyV1Ds4OW6SgA==",
+      "version": "11.14.1",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.18.3",
@@ -3910,14 +3862,10 @@
     },
     "node_modules/@emotion/unitless": {
       "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.10.0.tgz",
-      "integrity": "sha512-dFoMUuQA20zvtVTuxZww6OHoJYgrzfKM1t52mVySDJnMSEa08ruEvdYQbhvyu6soU+NeLVd3yKfTfT0NeV6qGg==",
       "license": "MIT"
     },
     "node_modules/@emotion/use-insertion-effect-with-fallbacks": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.2.0.tgz",
-      "integrity": "sha512-yJMtVdH59sxi/aVJBpk9FQq+OR8ll5GT8oWd57UpeaKEVGab41JWaCFA7FRLoMLloOZF/c/wsPoe+bfGmRKgDg==",
       "license": "MIT",
       "peerDependencies": {
         "react": ">=16.8.0"
@@ -3925,20 +3873,14 @@
     },
     "node_modules/@emotion/utils": {
       "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.4.2.tgz",
-      "integrity": "sha512-3vLclRofFziIa3J2wDh9jjbkUz9qk5Vi3IZ/FSTKViB0k+ef0fPV7dYrUIugbgupYDx7v9ud/SjrtEP8Y4xLoA==",
       "license": "MIT"
     },
     "node_modules/@emotion/weak-memoize": {
       "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.4.0.tgz",
-      "integrity": "sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg==",
       "license": "MIT"
     },
     "node_modules/@encodable/color": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@encodable/color/-/color-1.1.1.tgz",
-      "integrity": "sha512-3QlHqsaD+D4W4T6E4Wq4mp7MBpt5yCkCmgTh6AfsoUfJeAEogA92d8r3Y67Zuppcs/eepHW0ip8zfehS2jZNkQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@encodable/registry": "^1.0.3",
@@ -3952,14 +3894,10 @@
     },
     "node_modules/@encodable/color/node_modules/@types/d3-color": {
       "version": "1.4.5",
-      "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-1.4.5.tgz",
-      "integrity": "sha512-5sNP3DmtSnSozxcjqmzQKsDOuVJXZkceo1KJScDc1982kk/TS9mTPc6lpli1gTu1MIBF1YWutpHpjucNWcIj5g==",
       "license": "MIT"
     },
     "node_modules/@encodable/color/node_modules/@types/d3-interpolate": {
       "version": "1.4.5",
-      "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-1.4.5.tgz",
-      "integrity": "sha512-k9L18hXXv7OvK4PqW1kSFYIzasGOvfhPUWmHFkoZ8/ci99EAmY4HoF6zMefrHl0SGV7XYc7Qq2MNh8dK3edg5A==",
       "license": "MIT",
       "dependencies": {
         "@types/d3-color": "^1"
@@ -3967,8 +3905,6 @@
     },
     "node_modules/@encodable/color/node_modules/@types/d3-scale": {
       "version": "3.3.5",
-      "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-3.3.5.tgz",
-      "integrity": "sha512-YOpKj0kIEusRf7ofeJcSZQsvKbnTwpe1DUF+P2qsotqG53kEsjm7EzzliqQxMkAWdkZcHrg5rRhB4JiDOQPX+A==",
       "license": "MIT",
       "dependencies": {
         "@types/d3-time": "^2"
@@ -3976,23 +3912,10 @@
     },
     "node_modules/@encodable/color/node_modules/@types/d3-time": {
       "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-2.1.4.tgz",
-      "integrity": "sha512-BTfLsxTeo7yFxI/haOOf1ZwJ6xKgQLT9dCp+EcmQv87Gox6X+oKl4mLKfO6fnWm3P22+A6DknMNEZany8ql2Rw==",
       "license": "MIT"
     },
-    "node_modules/@encodable/color/node_modules/d3-array": {
-      "version": "2.12.1",
-      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz",
-      "integrity": "sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==",
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "internmap": "^1.0.0"
-      }
-    },
     "node_modules/@encodable/color/node_modules/d3-interpolate": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-2.0.1.tgz",
-      "integrity": "sha512-c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ==",
       "license": "BSD-3-Clause",
       "dependencies": {
         "d3-color": "1 - 2"
@@ -4000,8 +3923,6 @@
     },
     "node_modules/@encodable/color/node_modules/d3-scale": {
       "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.3.0.tgz",
-      "integrity": "sha512-1JGp44NQCt5d1g+Yy+GeOnZP7xHo0ii8zsQp6PGzd+C1/dl0KGsp9A7Mxwp+1D1o4unbTTxVdU/ZOIEBoeZPbQ==",
       "license": "BSD-3-Clause",
       "dependencies": {
         "d3-array": "^2.3.0",
@@ -4013,8 +3934,6 @@
     },
     "node_modules/@encodable/color/node_modules/d3-time": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-2.1.1.tgz",
-      "integrity": "sha512-/eIQe/eR4kCQwq7yxi7z4c6qEXf2IYGcjoWB5OOQy4Tq9Uv39/947qlDcN2TLkiTzQWzvnsuYPB9TrWaNfipKQ==",
       "license": "BSD-3-Clause",
       "dependencies": {
         "d3-array": "2"
@@ -4022,23 +3941,13 @@
     },
     "node_modules/@encodable/color/node_modules/d3-time-format": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-3.0.0.tgz",
-      "integrity": "sha512-UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag==",
       "license": "BSD-3-Clause",
       "dependencies": {
         "d3-time": "1 - 2"
       }
     },
-    "node_modules/@encodable/color/node_modules/internmap": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/internmap/-/internmap-1.0.1.tgz",
-      "integrity": "sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw==",
-      "license": "ISC"
-    },
     "node_modules/@encodable/format": {
       "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/@encodable/format/-/format-1.0.6.tgz",
-      "integrity": "sha512-gtzLMQyw4AJ7m3TIANm2z2QfzZJLGLdhVmKbizRRu9MRMlYIVXhk+46zPm10RNxGv4ybpsfcCfkCd4nL3RlZRg==",
       "license": "Apache-2.0",
       "dependencies": {
         "@encodable/registry": "^1.0.3",
@@ -4052,41 +3961,22 @@
     },
     "node_modules/@encodable/format/node_modules/@types/d3-format": {
       "version": "1.4.5",
-      "resolved": "https://registry.npmjs.org/@types/d3-format/-/d3-format-1.4.5.tgz",
-      "integrity": "sha512-mLxrC1MSWupOSncXN/HOlWUAAIffAEBaI4+PKy2uMPsKe4FNZlk7qrbTjmzJXITQQqBHivaks4Td18azgqnotA==",
       "license": "MIT"
     },
     "node_modules/@encodable/format/node_modules/@types/d3-time": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-1.1.4.tgz",
-      "integrity": "sha512-JIvy2HjRInE+TXOmIGN5LCmeO0hkFZx5f9FZ7kiN+D+YTcc8pptsiLiuHsvwxwC7VVKmJ2ExHUgNlAiV7vQM9g==",
       "license": "MIT"
     },
     "node_modules/@encodable/format/node_modules/@types/d3-time-format": {
       "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/@types/d3-time-format/-/d3-time-format-2.3.4.tgz",
-      "integrity": "sha512-xdDXbpVO74EvadI3UDxjxTdR6QIxm1FKzEA/+F8tL4GWWUg/hgvBqf6chql64U5A9ZUGWo7pEu4eNlyLwbKdhg==",
       "license": "MIT"
     },
-    "node_modules/@encodable/format/node_modules/d3-array": {
-      "version": "2.12.1",
-      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz",
-      "integrity": "sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==",
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "internmap": "^1.0.0"
-      }
-    },
     "node_modules/@encodable/format/node_modules/d3-format": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-2.0.0.tgz",
-      "integrity": "sha512-Ab3S6XuE/Q+flY96HXT0jOXcM4EAClYFnRGY5zsjRGNy6qCYrQsMffs7cV5Q9xejb35zxW5hf/guKw34kvIKsA==",
       "license": "BSD-3-Clause"
     },
     "node_modules/@encodable/format/node_modules/d3-time": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-2.1.1.tgz",
-      "integrity": "sha512-/eIQe/eR4kCQwq7yxi7z4c6qEXf2IYGcjoWB5OOQy4Tq9Uv39/947qlDcN2TLkiTzQWzvnsuYPB9TrWaNfipKQ==",
       "license": "BSD-3-Clause",
       "dependencies": {
         "d3-array": "2"
@@ -4094,288 +3984,20 @@
     },
     "node_modules/@encodable/format/node_modules/d3-time-format": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-3.0.0.tgz",
-      "integrity": "sha512-UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag==",
       "license": "BSD-3-Clause",
       "dependencies": {
         "d3-time": "1 - 2"
       }
     },
-    "node_modules/@encodable/format/node_modules/internmap": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/internmap/-/internmap-1.0.1.tgz",
-      "integrity": "sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw==",
-      "license": "ISC"
-    },
     "node_modules/@encodable/registry": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@encodable/registry/-/registry-1.0.3.tgz",
-      "integrity": "sha512-YH2nSBZJKgbH/9MkQXzAEE9UwTaVcWiKgVFyEU/gvrfmNWqecYaHMTyObo+ADSTGF4kk0cZZkr7VqZgIQbvrUw==",
       "license": "Apache-2.0",
       "peerDependencies": {
         "global-box": "*"
       }
     },
-    "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz",
-      "integrity": "sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==",
-      "cpu": [
-        "ppc64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "aix"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/android-arm": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.2.tgz",
-      "integrity": "sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==",
-      "cpu": [
-        "arm"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/android-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz",
-      "integrity": "sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/android-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.2.tgz",
-      "integrity": "sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz",
-      "integrity": "sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/darwin-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz",
-      "integrity": "sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz",
-      "integrity": "sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz",
-      "integrity": "sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-arm": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz",
-      "integrity": "sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==",
-      "cpu": [
-        "arm"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz",
-      "integrity": "sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-ia32": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz",
-      "integrity": "sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==",
-      "cpu": [
-        "ia32"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-loong64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz",
-      "integrity": "sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==",
-      "cpu": [
-        "loong64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz",
-      "integrity": "sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==",
-      "cpu": [
-        "mips64el"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz",
-      "integrity": "sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==",
-      "cpu": [
-        "ppc64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz",
-      "integrity": "sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==",
-      "cpu": [
-        "riscv64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-s390x": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz",
-      "integrity": "sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==",
-      "cpu": [
-        "s390x"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/@esbuild/linux-x64": {
       "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz",
-      "integrity": "sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==",
       "cpu": [
         "x64"
       ],
@@ -4388,106 +4010,8 @@
         "node": ">=12"
       }
     },
-    "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz",
-      "integrity": "sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz",
-      "integrity": "sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/sunos-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz",
-      "integrity": "sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz",
-      "integrity": "sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-ia32": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz",
-      "integrity": "sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==",
-      "cpu": [
-        "ia32"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz",
-      "integrity": "sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz",
-      "integrity": "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==",
+      "version": "4.4.1",
       "license": "MIT",
       "dependencies": {
         "eslint-visitor-keys": "^3.4.3"
@@ -4504,8 +4028,6 @@
     },
     "node_modules/@eslint-community/eslint-utils/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==",
       "license": "Apache-2.0",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -4516,8 +4038,6 @@
     },
     "node_modules/@eslint-community/regexpp": {
       "version": "4.12.1",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
-      "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
       "license": "MIT",
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
@@ -4525,8 +4045,6 @@
     },
     "node_modules/@eslint/eslintrc": {
       "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
-      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
       "license": "MIT",
       "dependencies": {
         "ajv": "^6.12.4",
@@ -4548,8 +4066,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
@@ -4564,14 +4080,10 @@
     },
     "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==",
       "license": "Python-2.0"
     },
     "node_modules/@eslint/eslintrc/node_modules/globals": {
       "version": "13.24.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
-      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
       "license": "MIT",
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -4585,8 +4097,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "argparse": "^2.0.1"
@@ -4597,14 +4107,10 @@
     },
     "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==",
       "license": "MIT"
     },
     "node_modules/@eslint/eslintrc/node_modules/type-fest": {
       "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
       "license": "(MIT OR CC0-1.0)",
       "engines": {
         "node": ">=10"
@@ -4615,8 +4121,6 @@
     },
     "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==",
       "license": "MIT",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -4624,15 +4128,11 @@
     },
     "node_modules/@fal-works/esbuild-plugin-global-externals": {
       "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@fal-works/esbuild-plugin-global-externals/-/esbuild-plugin-global-externals-2.1.2.tgz",
-      "integrity": "sha512-cEee/Z+I12mZcFJshKcCqC8tuX5hG3s+d+9nZ3LabqKF1vKdF41B92pJVCBggjAGORAeOzyyDDKrZwIkLffeOQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@fastify/ajv-compiler": {
       "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/@fastify/ajv-compiler/-/ajv-compiler-3.6.0.tgz",
-      "integrity": "sha512-LwdXQJjmMD+GwLOkP7TVC68qa+pSSogeWWmznRJ/coyTcfe9qA05AHFSe1eZFwK6q+xVRpChnvFUkf1iYaSZsQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4643,22 +4143,16 @@
     },
     "node_modules/@fastify/ajv-compiler/node_modules/fast-uri": {
       "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-2.4.0.tgz",
-      "integrity": "sha512-ypuAmmMKInk5q7XcepxlnUWDLWv4GFtaJqAzWKqn62IpQ3pejtr5dTVbt3vwqVaMKmkNR55sTT+CqUKIaT21BA==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@fastify/error": {
       "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/@fastify/error/-/error-3.4.1.tgz",
-      "integrity": "sha512-wWSvph+29GR783IhmvdwWnN4bUxTD01Vm5Xad4i7i1VuAOItLvbPAb69sb0IQ2N57yprvhNIwAP5B6xfKTmjmQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@fastify/fast-json-stringify-compiler": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/@fastify/fast-json-stringify-compiler/-/fast-json-stringify-compiler-4.3.0.tgz",
-      "integrity": "sha512-aZAXGYo6m22Fk1zZzEUKBvut/CIIQe/BapEORnxiD5Qr0kPHqqI69NtEMCme74h+at72sPhbkb4ZrLd1W3KRLA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4667,8 +4161,6 @@
     },
     "node_modules/@fastify/merge-json-schemas": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/@fastify/merge-json-schemas/-/merge-json-schemas-0.1.1.tgz",
-      "integrity": "sha512-fERDVz7topgNjtXsJTTW1JKLy0rhuLRcquYqNR9rF7OcVpCa2OVW49ZPDIhaRRCaUuvVxI+N416xUoF76HNSXA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4676,28 +4168,15 @@
       }
     },
     "node_modules/@fontsource/fira-code": {
-      "version": "5.2.6",
-      "resolved": "https://registry.npmjs.org/@fontsource/fira-code/-/fira-code-5.2.6.tgz",
-      "integrity": "sha512-wCkIpPm0BqlkCPLYeY4Vui96ODmVUV0/GpEe3OfJ4v8EJn/BF2SlyxvarFsTs1CKiGjrO2cXlIZbBrKi9F+hUQ==",
-      "license": "OFL-1.1",
-      "funding": {
-        "url": "https://github.com/sponsors/ayuhito"
-      }
+      "version": "5.1.1",
+      "license": "OFL-1.1"
     },
     "node_modules/@fontsource/inter": {
-      "version": "5.2.5",
-      "resolved": "https://registry.npmjs.org/@fontsource/inter/-/inter-5.2.5.tgz",
-      "integrity": "sha512-kbsPKj0S4p44JdYRFiW78Td8Ge2sBVxi/PIBwmih+RpSXUdvS9nbs1HIiuUSPtRMi14CqLEZ/fbk7dj7vni1Sg==",
-      "license": "OFL-1.1",
-      "funding": {
-        "url": "https://github.com/sponsors/ayuhito"
-      }
+      "version": "5.1.1",
+      "license": "OFL-1.1"
     },
     "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",
       "license": "Apache-2.0",
       "dependencies": {
         "@humanwhocodes/object-schema": "^2.0.3",
@@ -4710,8 +4189,6 @@
     },
     "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==",
       "license": "Apache-2.0",
       "engines": {
         "node": ">=12.22"
@@ -4723,15 +4200,10 @@
     },
     "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",
       "license": "BSD-3-Clause"
     },
     "node_modules/@hutson/parse-repository-url": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@hutson/parse-repository-url/-/parse-repository-url-3.0.2.tgz",
-      "integrity": "sha512-H9XAx3hc0BQHY6l+IFSWHDySypcXsvsuLhgYLUGywmJ5pswRVQJUHpOsobnLYp2ZUaUlKiKDrgWWhosOwAEM8Q==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -4740,27 +4212,21 @@
     },
     "node_modules/@icons/material": {
       "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/@icons/material/-/material-0.2.4.tgz",
-      "integrity": "sha512-QPcGmICAPbGLGb6F/yNf/KzKqvFx8z5qx3D1yFqVAjoFmXK35EgyW+cJ57Te3CNsmzblwtzakLGFqHPqrfb4Tw==",
       "license": "MIT",
       "peerDependencies": {
         "react": "*"
       }
     },
     "node_modules/@inquirer/figures": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.12.tgz",
-      "integrity": "sha512-MJttijd8rMFcKJC8NYmprWr6hD3r9Gd9qUC0XwPNwoEPWSMVJwA2MlXxF+nhZZNMY+HXsWa+o7KY2emWYIn0jQ==",
-      "devOptional": true,
+      "version": "1.0.9",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=18"
       }
     },
     "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==",
       "license": "ISC",
       "dependencies": {
         "string-width": "^5.1.2",
@@ -4776,8 +4242,6 @@
     },
     "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
       "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
-      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
       "license": "MIT",
       "engines": {
         "node": ">=12"
@@ -4788,8 +4252,6 @@
     },
     "node_modules/@isaacs/cliui/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==",
       "license": "MIT",
       "engines": {
         "node": ">=12"
@@ -4800,8 +4262,6 @@
     },
     "node_modules/@isaacs/cliui/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==",
       "license": "MIT",
       "dependencies": {
         "eastasianwidth": "^0.2.0",
@@ -4817,8 +4277,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "ansi-regex": "^6.0.1"
@@ -4832,8 +4290,6 @@
     },
     "node_modules/@isaacs/cliui/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==",
       "license": "MIT",
       "dependencies": {
         "ansi-styles": "^6.1.0",
@@ -4849,15 +4305,11 @@
     },
     "node_modules/@isaacs/string-locale-compare": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@isaacs/string-locale-compare/-/string-locale-compare-1.1.0.tgz",
-      "integrity": "sha512-SQ7Kzhh9+D+ZW9MA0zkYv3VXhIDNx+LzM6EJ+/65I3QY+enU6Itte7E5XX7EWrqLW2FN4n06GWzBnPoC3th2aQ==",
       "dev": true,
       "license": "ISC"
     },
     "node_modules/@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
-      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -4873,8 +4325,6 @@
     },
     "node_modules/@istanbuljs/load-nyc-config/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,
       "license": "MIT",
       "engines": {
@@ -4883,8 +4333,6 @@
     },
     "node_modules/@istanbuljs/load-nyc-config/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,
       "license": "MIT",
       "dependencies": {
@@ -4897,8 +4345,6 @@
     },
     "node_modules/@istanbuljs/load-nyc-config/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,
       "license": "MIT",
       "dependencies": {
@@ -4910,8 +4356,6 @@
     },
     "node_modules/@istanbuljs/load-nyc-config/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,
       "license": "MIT",
       "dependencies": {
@@ -4926,8 +4370,6 @@
     },
     "node_modules/@istanbuljs/load-nyc-config/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,
       "license": "MIT",
       "dependencies": {
@@ -4939,8 +4381,6 @@
     },
     "node_modules/@istanbuljs/nyc-config-typescript": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/nyc-config-typescript/-/nyc-config-typescript-1.0.2.tgz",
-      "integrity": "sha512-iKGIyMoyJuFnJRSVTZ78POIRvNnwZaWIf8vG4ZS3rQq58MMDrqEX2nnzx0R28V2X8JvmKYiqY9FP2hlJsm8A0w==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -4955,8 +4395,6 @@
     },
     "node_modules/@istanbuljs/schema": {
       "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
-      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -4964,27 +4402,56 @@
       }
     },
     "node_modules/@jest/console": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz",
-      "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==",
+      "version": "30.0.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/types": "^29.6.3",
+        "@jest/types": "30.0.1",
         "@types/node": "*",
-        "chalk": "^4.0.0",
-        "jest-message-util": "^29.7.0",
-        "jest-util": "^29.7.0",
+        "chalk": "^4.1.2",
+        "jest-message-util": "30.0.2",
+        "jest-util": "30.0.2",
         "slash": "^3.0.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
+    "node_modules/@jest/console/node_modules/@jest/schemas": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@sinclair/typebox": "^0.34.0"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/console/node_modules/@jest/types": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/pattern": "30.0.1",
+        "@jest/schemas": "30.0.1",
+        "@types/istanbul-lib-coverage": "^2.0.6",
+        "@types/istanbul-reports": "^3.0.4",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.33",
+        "chalk": "^4.1.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/console/node_modules/@sinclair/typebox": {
+      "version": "0.34.37",
+      "dev": true,
+      "license": "MIT"
+    },
     "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==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4998,10 +4465,78 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
+    "node_modules/@jest/console/node_modules/jest-message-util": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.27.1",
+        "@jest/types": "30.0.1",
+        "@types/stack-utils": "^2.0.3",
+        "chalk": "^4.1.2",
+        "graceful-fs": "^4.2.11",
+        "micromatch": "^4.0.8",
+        "pretty-format": "30.0.2",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.6"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/console/node_modules/jest-util": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "chalk": "^4.1.2",
+        "ci-info": "^4.2.0",
+        "graceful-fs": "^4.2.11",
+        "picomatch": "^4.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/console/node_modules/picomatch": {
+      "version": "4.0.2",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/@jest/console/node_modules/pretty-format": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/schemas": "30.0.1",
+        "ansi-styles": "^5.2.0",
+        "react-is": "^18.3.1"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/console/node_modules/pretty-format/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
     "node_modules/@jest/console/node_modules/slash": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -5009,43 +4544,41 @@
       }
     },
     "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==",
+      "version": "30.0.3",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@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",
+        "@jest/console": "30.0.2",
+        "@jest/pattern": "30.0.1",
+        "@jest/reporters": "30.0.2",
+        "@jest/test-result": "30.0.2",
+        "@jest/transform": "30.0.2",
+        "@jest/types": "30.0.1",
         "@types/node": "*",
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.0.0",
-        "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",
-        "pretty-format": "^29.7.0",
-        "slash": "^3.0.0",
-        "strip-ansi": "^6.0.0"
+        "ansi-escapes": "^4.3.2",
+        "chalk": "^4.1.2",
+        "ci-info": "^4.2.0",
+        "exit-x": "^0.2.2",
+        "graceful-fs": "^4.2.11",
+        "jest-changed-files": "30.0.2",
+        "jest-config": "30.0.3",
+        "jest-haste-map": "30.0.2",
+        "jest-message-util": "30.0.2",
+        "jest-regex-util": "30.0.1",
+        "jest-resolve": "30.0.2",
+        "jest-resolve-dependencies": "30.0.3",
+        "jest-runner": "30.0.3",
+        "jest-runtime": "30.0.3",
+        "jest-snapshot": "30.0.3",
+        "jest-util": "30.0.2",
+        "jest-validate": "30.0.2",
+        "jest-watcher": "30.0.2",
+        "micromatch": "^4.0.8",
+        "pretty-format": "30.0.2",
+        "slash": "^3.0.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       },
       "peerDependencies": {
         "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
@@ -5056,10 +4589,41 @@
         }
       }
     },
+    "node_modules/@jest/core/node_modules/@jest/schemas": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@sinclair/typebox": "^0.34.0"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/core/node_modules/@jest/types": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/pattern": "30.0.1",
+        "@jest/schemas": "30.0.1",
+        "@types/istanbul-lib-coverage": "^2.0.6",
+        "@types/istanbul-reports": "^3.0.4",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.33",
+        "chalk": "^4.1.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/core/node_modules/@sinclair/typebox": {
+      "version": "0.34.37",
+      "dev": true,
+      "license": "MIT"
+    },
     "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,
       "license": "MIT",
       "dependencies": {
@@ -5073,41 +4637,67 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "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"
-        }
-      ],
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/core/node_modules/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==",
+    "node_modules/@jest/core/node_modules/jest-message-util": {
+      "version": "30.0.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
+        "@babel/code-frame": "^7.27.1",
+        "@jest/types": "30.0.1",
+        "@types/stack-utils": "^2.0.3",
+        "chalk": "^4.1.2",
+        "graceful-fs": "^4.2.11",
+        "micromatch": "^4.0.8",
+        "pretty-format": "30.0.2",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.6"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/core/node_modules/jest-util": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "chalk": "^4.1.2",
+        "ci-info": "^4.2.0",
+        "graceful-fs": "^4.2.11",
+        "picomatch": "^4.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/core/node_modules/picomatch": {
+      "version": "4.0.2",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/@jest/core/node_modules/pretty-format": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/schemas": "30.0.1",
+        "ansi-styles": "^5.2.0",
+        "react-is": "^18.3.1"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@jest/core/node_modules/pretty-format/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==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -5119,18 +4709,22 @@
     },
     "node_modules/@jest/core/node_modules/slash": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
       "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
+    "node_modules/@jest/diff-sequences": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
     "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,
       "license": "MIT",
       "dependencies": {
@@ -5144,23 +4738,19 @@
       }
     },
     "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==",
+      "version": "30.0.3",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "expect": "^29.7.0",
-        "jest-snapshot": "^29.7.0"
+        "expect": "30.0.3",
+        "jest-snapshot": "30.0.3"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "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": {
@@ -5170,10 +4760,202 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
+    "node_modules/@jest/expect/node_modules/@jest/expect-utils": {
+      "version": "30.0.3",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/get-type": "30.0.1"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/expect/node_modules/@jest/schemas": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@sinclair/typebox": "^0.34.0"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/expect/node_modules/@jest/types": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/pattern": "30.0.1",
+        "@jest/schemas": "30.0.1",
+        "@types/istanbul-lib-coverage": "^2.0.6",
+        "@types/istanbul-reports": "^3.0.4",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.33",
+        "chalk": "^4.1.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/expect/node_modules/@sinclair/typebox": {
+      "version": "0.34.37",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@jest/expect/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/@jest/expect/node_modules/expect": {
+      "version": "30.0.3",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/expect-utils": "30.0.3",
+        "@jest/get-type": "30.0.1",
+        "jest-matcher-utils": "30.0.3",
+        "jest-message-util": "30.0.2",
+        "jest-mock": "30.0.2",
+        "jest-util": "30.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/expect/node_modules/jest-diff": {
+      "version": "30.0.3",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/diff-sequences": "30.0.1",
+        "@jest/get-type": "30.0.1",
+        "chalk": "^4.1.2",
+        "pretty-format": "30.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/expect/node_modules/jest-matcher-utils": {
+      "version": "30.0.3",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/get-type": "30.0.1",
+        "chalk": "^4.1.2",
+        "jest-diff": "30.0.3",
+        "pretty-format": "30.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/expect/node_modules/jest-message-util": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.27.1",
+        "@jest/types": "30.0.1",
+        "@types/stack-utils": "^2.0.3",
+        "chalk": "^4.1.2",
+        "graceful-fs": "^4.2.11",
+        "micromatch": "^4.0.8",
+        "pretty-format": "30.0.2",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.6"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/expect/node_modules/jest-mock": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "jest-util": "30.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/expect/node_modules/jest-util": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "chalk": "^4.1.2",
+        "ci-info": "^4.2.0",
+        "graceful-fs": "^4.2.11",
+        "picomatch": "^4.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/expect/node_modules/picomatch": {
+      "version": "4.0.2",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/@jest/expect/node_modules/pretty-format": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/schemas": "30.0.1",
+        "ansi-styles": "^5.2.0",
+        "react-is": "^18.3.1"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/expect/node_modules/pretty-format/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@jest/expect/node_modules/slash": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "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": {
@@ -5188,56 +4970,248 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
+    "node_modules/@jest/get-type": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
     "node_modules/@jest/globals": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz",
-      "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==",
+      "version": "30.0.3",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/environment": "^29.7.0",
-        "@jest/expect": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "jest-mock": "^29.7.0"
+        "@jest/environment": "30.0.2",
+        "@jest/expect": "30.0.3",
+        "@jest/types": "30.0.1",
+        "jest-mock": "30.0.2"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/globals/node_modules/@jest/environment": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/fake-timers": "30.0.2",
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "jest-mock": "30.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/globals/node_modules/@jest/fake-timers": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "30.0.1",
+        "@sinonjs/fake-timers": "^13.0.0",
+        "@types/node": "*",
+        "jest-message-util": "30.0.2",
+        "jest-mock": "30.0.2",
+        "jest-util": "30.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/globals/node_modules/@jest/schemas": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@sinclair/typebox": "^0.34.0"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/globals/node_modules/@jest/types": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/pattern": "30.0.1",
+        "@jest/schemas": "30.0.1",
+        "@types/istanbul-lib-coverage": "^2.0.6",
+        "@types/istanbul-reports": "^3.0.4",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.33",
+        "chalk": "^4.1.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/globals/node_modules/@sinclair/typebox": {
+      "version": "0.34.37",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@jest/globals/node_modules/@sinonjs/fake-timers": {
+      "version": "13.0.5",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@sinonjs/commons": "^3.0.1"
+      }
+    },
+    "node_modules/@jest/globals/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/@jest/globals/node_modules/jest-message-util": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.27.1",
+        "@jest/types": "30.0.1",
+        "@types/stack-utils": "^2.0.3",
+        "chalk": "^4.1.2",
+        "graceful-fs": "^4.2.11",
+        "micromatch": "^4.0.8",
+        "pretty-format": "30.0.2",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.6"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/globals/node_modules/jest-mock": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "jest-util": "30.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/globals/node_modules/jest-util": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "chalk": "^4.1.2",
+        "ci-info": "^4.2.0",
+        "graceful-fs": "^4.2.11",
+        "picomatch": "^4.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/globals/node_modules/picomatch": {
+      "version": "4.0.2",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/@jest/globals/node_modules/pretty-format": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/schemas": "30.0.1",
+        "ansi-styles": "^5.2.0",
+        "react-is": "^18.3.1"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/globals/node_modules/pretty-format/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@jest/globals/node_modules/slash": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@jest/pattern": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*",
+        "jest-regex-util": "30.0.1"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@jest/reporters": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz",
-      "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==",
+      "version": "30.0.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@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",
+        "@jest/console": "30.0.2",
+        "@jest/test-result": "30.0.2",
+        "@jest/transform": "30.0.2",
+        "@jest/types": "30.0.1",
+        "@jridgewell/trace-mapping": "^0.3.25",
         "@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",
+        "chalk": "^4.1.2",
+        "collect-v8-coverage": "^1.0.2",
+        "exit-x": "^0.2.2",
+        "glob": "^10.3.10",
+        "graceful-fs": "^4.2.11",
         "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-lib-source-maps": "^5.0.0",
         "istanbul-reports": "^3.1.3",
-        "jest-message-util": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "jest-worker": "^29.7.0",
+        "jest-message-util": "30.0.2",
+        "jest-util": "30.0.2",
+        "jest-worker": "30.0.2",
         "slash": "^3.0.0",
-        "string-length": "^4.0.1",
-        "strip-ansi": "^6.0.0",
+        "string-length": "^4.0.2",
         "v8-to-istanbul": "^9.0.1"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       },
       "peerDependencies": {
         "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
@@ -5248,10 +5222,49 @@
         }
       }
     },
+    "node_modules/@jest/reporters/node_modules/@jest/schemas": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@sinclair/typebox": "^0.34.0"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/reporters/node_modules/@jest/types": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/pattern": "30.0.1",
+        "@jest/schemas": "30.0.1",
+        "@types/istanbul-lib-coverage": "^2.0.6",
+        "@types/istanbul-reports": "^3.0.4",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.33",
+        "chalk": "^4.1.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/reporters/node_modules/@sinclair/typebox": {
+      "version": "0.34.37",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@jest/reporters/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
     "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,
       "license": "MIT",
       "dependencies": {
@@ -5265,27 +5278,153 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@jest/reporters/node_modules/istanbul-lib-instrument": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz",
-      "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==",
+    "node_modules/@jest/reporters/node_modules/glob": {
+      "version": "10.4.5",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@jest/reporters/node_modules/istanbul-lib-source-maps": {
+      "version": "5.0.6",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
-        "@babel/core": "^7.23.9",
-        "@babel/parser": "^7.23.9",
-        "@istanbuljs/schema": "^0.1.3",
-        "istanbul-lib-coverage": "^3.2.0",
-        "semver": "^7.5.4"
+        "@jridgewell/trace-mapping": "^0.3.23",
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^3.0.0"
       },
       "engines": {
         "node": ">=10"
       }
     },
+    "node_modules/@jest/reporters/node_modules/jest-message-util": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.27.1",
+        "@jest/types": "30.0.1",
+        "@types/stack-utils": "^2.0.3",
+        "chalk": "^4.1.2",
+        "graceful-fs": "^4.2.11",
+        "micromatch": "^4.0.8",
+        "pretty-format": "30.0.2",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.6"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/reporters/node_modules/jest-util": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "chalk": "^4.1.2",
+        "ci-info": "^4.2.0",
+        "graceful-fs": "^4.2.11",
+        "picomatch": "^4.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/reporters/node_modules/jest-worker": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*",
+        "@ungap/structured-clone": "^1.3.0",
+        "jest-util": "30.0.2",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.1.1"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/reporters/node_modules/jest-worker/node_modules/supports-color": {
+      "version": "8.1.1",
+      "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/@jest/reporters/node_modules/minimatch": {
+      "version": "9.0.5",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@jest/reporters/node_modules/picomatch": {
+      "version": "4.0.2",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/@jest/reporters/node_modules/pretty-format": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/schemas": "30.0.1",
+        "ansi-styles": "^5.2.0",
+        "react-is": "^18.3.1"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/reporters/node_modules/pretty-format/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
     "node_modules/@jest/reporters/node_modules/slash": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -5294,8 +5433,6 @@
     },
     "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": {
@@ -5305,94 +5442,55 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "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==",
+    "node_modules/@jest/snapshot-utils": {
+      "version": "30.0.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.18",
-        "callsites": "^3.0.0",
-        "graceful-fs": "^4.2.9"
+        "@jest/types": "30.0.1",
+        "chalk": "^4.1.2",
+        "graceful-fs": "^4.2.11",
+        "natural-compare": "^1.4.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.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==",
+    "node_modules/@jest/snapshot-utils/node_modules/@jest/schemas": {
+      "version": "30.0.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/console": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "collect-v8-coverage": "^1.0.0"
+        "@sinclair/typebox": "^0.34.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
-    "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==",
+    "node_modules/@jest/snapshot-utils/node_modules/@jest/types": {
+      "version": "30.0.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/test-result": "^29.7.0",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.7.0",
-        "slash": "^3.0.0"
+        "@jest/pattern": "30.0.1",
+        "@jest/schemas": "30.0.1",
+        "@types/istanbul-lib-coverage": "^2.0.6",
+        "@types/istanbul-reports": "^3.0.4",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.33",
+        "chalk": "^4.1.2"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
-    "node_modules/@jest/test-sequencer/node_modules/slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+    "node_modules/@jest/snapshot-utils/node_modules/@sinclair/typebox": {
+      "version": "0.34.37",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
+      "license": "MIT"
     },
-    "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": {
-        "@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"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jest/transform/node_modules/chalk": {
+    "node_modules/@jest/snapshot-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==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5406,10 +5504,205 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
+    "node_modules/@jest/source-map": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.25",
+        "callsites": "^3.1.0",
+        "graceful-fs": "^4.2.11"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/test-result": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/console": "30.0.2",
+        "@jest/types": "30.0.1",
+        "@types/istanbul-lib-coverage": "^2.0.6",
+        "collect-v8-coverage": "^1.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/test-result/node_modules/@jest/schemas": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@sinclair/typebox": "^0.34.0"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/test-result/node_modules/@jest/types": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/pattern": "30.0.1",
+        "@jest/schemas": "30.0.1",
+        "@types/istanbul-lib-coverage": "^2.0.6",
+        "@types/istanbul-reports": "^3.0.4",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.33",
+        "chalk": "^4.1.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/test-result/node_modules/@sinclair/typebox": {
+      "version": "0.34.37",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@jest/test-result/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/@jest/test-sequencer": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/test-result": "30.0.2",
+        "graceful-fs": "^4.2.11",
+        "jest-haste-map": "30.0.2",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/test-sequencer/node_modules/slash": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@jest/transform": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/core": "^7.27.4",
+        "@jest/types": "30.0.1",
+        "@jridgewell/trace-mapping": "^0.3.25",
+        "babel-plugin-istanbul": "^7.0.0",
+        "chalk": "^4.1.2",
+        "convert-source-map": "^2.0.0",
+        "fast-json-stable-stringify": "^2.1.0",
+        "graceful-fs": "^4.2.11",
+        "jest-haste-map": "30.0.2",
+        "jest-regex-util": "30.0.1",
+        "jest-util": "30.0.2",
+        "micromatch": "^4.0.8",
+        "pirates": "^4.0.7",
+        "slash": "^3.0.0",
+        "write-file-atomic": "^5.0.1"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/transform/node_modules/@jest/schemas": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@sinclair/typebox": "^0.34.0"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/transform/node_modules/@jest/types": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/pattern": "30.0.1",
+        "@jest/schemas": "30.0.1",
+        "@types/istanbul-lib-coverage": "^2.0.6",
+        "@types/istanbul-reports": "^3.0.4",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.33",
+        "chalk": "^4.1.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/transform/node_modules/@sinclair/typebox": {
+      "version": "0.34.37",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@jest/transform/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/@jest/transform/node_modules/jest-util": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "chalk": "^4.1.2",
+        "ci-info": "^4.2.0",
+        "graceful-fs": "^4.2.11",
+        "picomatch": "^4.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/transform/node_modules/picomatch": {
+      "version": "4.0.2",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
     "node_modules/@jest/transform/node_modules/slash": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -5418,8 +5711,6 @@
     },
     "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": {
@@ -5436,8 +5727,6 @@
     },
     "node_modules/@jest/types/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": {
@@ -5453,8 +5742,6 @@
     },
     "node_modules/@jridgewell/gen-mapping": {
       "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz",
-      "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==",
       "license": "MIT",
       "dependencies": {
         "@jridgewell/set-array": "^1.2.1",
@@ -5467,8 +5754,6 @@
     },
     "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==",
       "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
@@ -5476,8 +5761,6 @@
     },
     "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==",
       "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
@@ -5485,8 +5768,6 @@
     },
     "node_modules/@jridgewell/source-map": {
       "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
-      "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5496,24 +5777,69 @@
     },
     "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==",
       "license": "MIT"
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
         "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
+    "node_modules/@jsonjoy.com/base64": {
+      "version": "1.1.2",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=10.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/streamich"
+      },
+      "peerDependencies": {
+        "tslib": "2"
+      }
+    },
+    "node_modules/@jsonjoy.com/json-pack": {
+      "version": "1.2.0",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@jsonjoy.com/base64": "^1.1.1",
+        "@jsonjoy.com/util": "^1.1.2",
+        "hyperdyperid": "^1.2.0",
+        "thingies": "^1.20.0"
+      },
+      "engines": {
+        "node": ">=10.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/streamich"
+      },
+      "peerDependencies": {
+        "tslib": "2"
+      }
+    },
+    "node_modules/@jsonjoy.com/util": {
+      "version": "1.6.0",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=10.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/streamich"
+      },
+      "peerDependencies": {
+        "tslib": "2"
+      }
+    },
     "node_modules/@kwsites/file-exists": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@kwsites/file-exists/-/file-exists-1.1.1.tgz",
-      "integrity": "sha512-m9/5YGR18lIwxSFDwfE3oA7bWuq9kdau6ugN4H2rJeyhFQZcG9AgSHkQtSD15a8WvTgfz9aikZMrKPHvbpqFiw==",
       "license": "MIT",
       "dependencies": {
         "debug": "^4.1.1"
@@ -5521,21 +5847,15 @@
     },
     "node_modules/@kwsites/promise-deferred": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@kwsites/promise-deferred/-/promise-deferred-1.1.1.tgz",
-      "integrity": "sha512-GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw==",
       "license": "MIT"
     },
     "node_modules/@leichtgewicht/ip-codec": {
       "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.5.tgz",
-      "integrity": "sha512-Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@lerna/create": {
-      "version": "8.2.2",
-      "resolved": "https://registry.npmjs.org/@lerna/create/-/create-8.2.2.tgz",
-      "integrity": "sha512-1yn1MvWn2Yz0SFgTTQnef2m1YedF7KwqLLVIOrGkgQrkVHzsveAIk1A1RcRa2yyUh+siKI1YcJ7lUZIEt+qQ3Q==",
+      "version": "8.2.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5616,15 +5936,11 @@
     },
     "node_modules/@lerna/create/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/@lerna/create/node_modules/chalk": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5638,10 +5954,16 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
+    "node_modules/@lerna/create/node_modules/cli-width": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">= 10"
+      }
+    },
     "node_modules/@lerna/create/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",
       "dependencies": {
@@ -5667,8 +5989,6 @@
     },
     "node_modules/@lerna/create/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": "MIT",
       "peerDependencies": {
@@ -5680,10 +6000,13 @@
         }
       }
     },
+    "node_modules/@lerna/create/node_modules/eventemitter3": {
+      "version": "4.0.7",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@lerna/create/node_modules/execa": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-5.0.0.tgz",
-      "integrity": "sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5706,8 +6029,6 @@
     },
     "node_modules/@lerna/create/node_modules/get-stream": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.0.tgz",
-      "integrity": "sha512-A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -5719,8 +6040,6 @@
     },
     "node_modules/@lerna/create/node_modules/glob": {
       "version": "9.3.5",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-9.3.5.tgz",
-      "integrity": "sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -5738,8 +6057,6 @@
     },
     "node_modules/@lerna/create/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": "ISC",
       "dependencies": {
@@ -5751,8 +6068,6 @@
     },
     "node_modules/@lerna/create/node_modules/glob/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": {
@@ -5761,8 +6076,6 @@
     },
     "node_modules/@lerna/create/node_modules/glob/node_modules/minimatch": {
       "version": "8.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-8.0.4.tgz",
-      "integrity": "sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -5777,25 +6090,70 @@
     },
     "node_modules/@lerna/create/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/@lerna/create/node_modules/inquirer": {
+      "version": "8.2.6",
+      "dev": true,
+      "license": "MIT",
+      "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.5.5",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0",
+        "through": "^2.3.6",
+        "wrap-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@lerna/create/node_modules/inquirer/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/@lerna/create/node_modules/is-stream": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
-      "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
       "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
+    "node_modules/@lerna/create/node_modules/is-unicode-supported": {
+      "version": "0.1.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/@lerna/create/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": {
@@ -5805,10 +6163,23 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
+    "node_modules/@lerna/create/node_modules/log-symbols": {
+      "version": "4.1.0",
+      "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/@lerna/create/node_modules/make-dir": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
-      "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5823,8 +6194,6 @@
     },
     "node_modules/@lerna/create/node_modules/minimatch": {
       "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz",
-      "integrity": "sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -5836,18 +6205,67 @@
     },
     "node_modules/@lerna/create/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": ">=8"
       }
     },
+    "node_modules/@lerna/create/node_modules/mute-stream": {
+      "version": "0.0.8",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/@lerna/create/node_modules/ora": {
+      "version": "5.4.1",
+      "dev": true,
+      "license": "MIT",
+      "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_modules/@lerna/create/node_modules/p-queue": {
+      "version": "6.6.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "eventemitter3": "^4.0.4",
+        "p-timeout": "^3.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@lerna/create/node_modules/p-timeout": {
+      "version": "3.2.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-finally": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/@lerna/create/node_modules/pify": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz",
-      "integrity": "sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -5859,8 +6277,6 @@
     },
     "node_modules/@lerna/create/node_modules/rimraf": {
       "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-4.4.1.tgz",
-      "integrity": "sha512-Gk8NlF062+T9CqNGn6h4tls3k6T1+/nXdOcSZVikNVtlRdYpA7wRJJMoXmuvOnLW844rPjdQ7JgXCYM6PPC/og==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -5876,10 +6292,16 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/@lerna/create/node_modules/run-async": {
+      "version": "2.4.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
     "node_modules/@lerna/create/node_modules/slash": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -5888,8 +6310,6 @@
     },
     "node_modules/@lerna/create/node_modules/uuid": {
       "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz",
-      "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==",
       "dev": true,
       "funding": [
         "https://github.com/sponsors/broofa",
@@ -5900,37 +6320,8 @@
         "uuid": "dist/bin/uuid"
       }
     },
-    "node_modules/@lerna/create/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": "ISC",
-      "dependencies": {
-        "imurmurhash": "^0.1.4",
-        "signal-exit": "^4.0.1"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@lerna/create/node_modules/write-file-atomic/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,
-      "license": "ISC",
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/@loaders.gl/core": {
       "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/@loaders.gl/core/-/core-4.3.3.tgz",
-      "integrity": "sha512-RaQ3uNg4ZaVqDRgvJ2CjaOjeeHdKvbKuzFFgbGnflVB9is5bu+h3EKc3Jke7NGVvLBsZ6oIXzkwHijVsMfxv8g==",
       "license": "MIT",
       "dependencies": {
         "@loaders.gl/loader-utils": "4.3.3",
@@ -5941,8 +6332,6 @@
     },
     "node_modules/@loaders.gl/images": {
       "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/@loaders.gl/images/-/images-4.3.3.tgz",
-      "integrity": "sha512-s4InjIXqEu0T7anZLj4OBUuDBt2BNnAD0GLzSexSkBfQZfpXY0XJNl4mMf5nUKb5NDfXhIKIqv8y324US+I28A==",
       "license": "MIT",
       "dependencies": {
         "@loaders.gl/loader-utils": "4.3.3"
@@ -5953,8 +6342,6 @@
     },
     "node_modules/@loaders.gl/loader-utils": {
       "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/@loaders.gl/loader-utils/-/loader-utils-4.3.3.tgz",
-      "integrity": "sha512-8erUIwWLiIsZX36fFa/seZsfTsWlLk72Sibh/YZJrPAefuVucV4mGGzMBZ96LE2BUfJhadn250eio/59TUFbNw==",
       "license": "MIT",
       "dependencies": {
         "@loaders.gl/schema": "4.3.3",
@@ -5968,8 +6355,6 @@
     },
     "node_modules/@loaders.gl/schema": {
       "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/@loaders.gl/schema/-/schema-4.3.3.tgz",
-      "integrity": "sha512-zacc9/8je+VbuC6N/QRfiTjRd+BuxsYlddLX1u5/X/cg9s36WZZBlU1oNKUgTYe8eO6+qLyYx77yi+9JbbEehw==",
       "license": "MIT",
       "dependencies": {
         "@types/geojson": "^7946.0.7"
@@ -5980,23 +6365,17 @@
     },
     "node_modules/@loaders.gl/worker-utils": {
       "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/@loaders.gl/worker-utils/-/worker-utils-4.3.3.tgz",
-      "integrity": "sha512-eg45Ux6xqsAfqPUqJkhmbFZh9qfmYuPfA+34VcLtfeXIwAngeP6o4SrTmm9LWLGUKiSh47anCEV1p7borDgvGQ==",
       "license": "MIT",
       "peerDependencies": {
         "@loaders.gl/core": "^4.3.0"
       }
     },
     "node_modules/@luma.gl/constants": {
-      "version": "9.1.9",
-      "resolved": "https://registry.npmjs.org/@luma.gl/constants/-/constants-9.1.9.tgz",
-      "integrity": "sha512-yc9fml04OeTTcwK+7gmDMxoLQ67j4ZiAFXjmYvPomYyBVzS0NZxTDuwcCBmnxjLOiroOZW8FRRrVc/yOiFug2w==",
+      "version": "9.1.0",
       "license": "MIT"
     },
     "node_modules/@luma.gl/core": {
-      "version": "9.1.9",
-      "resolved": "https://registry.npmjs.org/@luma.gl/core/-/core-9.1.9.tgz",
-      "integrity": "sha512-1i9N7+I/UbFjx3axSMlc3/NufA+C2iBv/7mw51gRE/ypQPgvFmY/QqXBVZRe+nthF+OhlUMhO19TBndzYFTWhA==",
+      "version": "9.1.0",
       "license": "MIT",
       "dependencies": {
         "@math.gl/types": "^4.1.0",
@@ -6007,9 +6386,7 @@
       }
     },
     "node_modules/@luma.gl/engine": {
-      "version": "9.1.9",
-      "resolved": "https://registry.npmjs.org/@luma.gl/engine/-/engine-9.1.9.tgz",
-      "integrity": "sha512-n1GLK1sUMFkWxdb+aZYn6ZBFltFEMi7X+6ZPxn2pBsNT6oeF4AyvH5AyqhOpvHvUnCLDt3Zsf1UIfx3MI//YSw==",
+      "version": "9.1.0",
       "license": "MIT",
       "dependencies": {
         "@math.gl/core": "^4.1.0",
@@ -6018,48 +6395,40 @@
         "@probe.gl/stats": "^4.0.8"
       },
       "peerDependencies": {
-        "@luma.gl/core": "^9.1.0",
-        "@luma.gl/shadertools": "^9.1.0"
+        "@luma.gl/core": "^9.1.0-beta.1",
+        "@luma.gl/shadertools": "^9.1.0-beta.1"
       }
     },
     "node_modules/@luma.gl/shadertools": {
-      "version": "9.1.9",
-      "resolved": "https://registry.npmjs.org/@luma.gl/shadertools/-/shadertools-9.1.9.tgz",
-      "integrity": "sha512-Uqp2xfgIEunRMLXTeCJ4uEMlWcUGcYMZGJ8GAOrAeDzn4bMKVRKmZDC71vkuTctnaodM3UdrI9W6s1sJlrXsxw==",
+      "version": "9.1.0",
       "license": "MIT",
       "dependencies": {
         "@math.gl/core": "^4.1.0",
         "@math.gl/types": "^4.1.0",
-        "wgsl_reflect": "^1.2.0"
+        "wgsl_reflect": "^1.0.1"
       },
       "peerDependencies": {
-        "@luma.gl/core": "^9.1.0"
+        "@luma.gl/core": "^9.1.0-beta.1"
       }
     },
     "node_modules/@luma.gl/webgl": {
-      "version": "9.1.9",
-      "resolved": "https://registry.npmjs.org/@luma.gl/webgl/-/webgl-9.1.9.tgz",
-      "integrity": "sha512-jecHjhNSWkXH0v62rM6G5fIIkOmsrND27099iKgdutFvHIvd4QS4UzGWEEa9AEPlP0rTLqXkA6y6YL7f42ZkVg==",
+      "version": "9.1.0",
       "license": "MIT",
       "dependencies": {
-        "@luma.gl/constants": "9.1.9",
+        "@luma.gl/constants": "9.1.0",
         "@math.gl/types": "^4.1.0",
         "@probe.gl/env": "^4.0.8"
       },
       "peerDependencies": {
-        "@luma.gl/core": "^9.1.0"
+        "@luma.gl/core": "^9.1.0-alpha.1"
       }
     },
     "node_modules/@mapbox/extent": {
       "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/@mapbox/extent/-/extent-0.4.0.tgz",
-      "integrity": "sha512-MSoKw3qPceGuupn04sdaJrFeLKvcSETVLZCGS8JA9x6zXQL3FWiKaIXYIZEDXd5jpXpWlRxinCZIN49yRy0C9A==",
       "license": "ISC"
     },
     "node_modules/@mapbox/geojson-coords": {
       "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/@mapbox/geojson-coords/-/geojson-coords-0.0.2.tgz",
-      "integrity": "sha512-YuVzpseee/P1T5BWyeVVPppyfmuXYHFwZHmybkqaMfu4BWlOf2cmMGKj2Rr92MwfSTOCSUA0PAsVGRG8akY0rg==",
       "license": "ISC",
       "dependencies": {
         "@mapbox/geojson-normalize": "0.0.1",
@@ -6068,8 +6437,6 @@
     },
     "node_modules/@mapbox/geojson-extent": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@mapbox/geojson-extent/-/geojson-extent-1.0.1.tgz",
-      "integrity": "sha512-hh8LEO3djT4fqfr8sSC6wKt+p0TMiu+KOLMBUiFOyj+zGq7+IXwQGl0ppCVDkyzCewyd9LoGe9zAvDxXrLfhLw==",
       "license": "ISC",
       "dependencies": {
         "@mapbox/extent": "0.4.0",
@@ -6083,8 +6450,6 @@
     },
     "node_modules/@mapbox/geojson-normalize": {
       "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/@mapbox/geojson-normalize/-/geojson-normalize-0.0.1.tgz",
-      "integrity": "sha512-82V7YHcle8lhgIGqEWwtXYN5cy0QM/OHq3ypGhQTbvHR57DF0vMHMjjVSQKFfVXBe/yWCBZTyOuzvK7DFFnx5Q==",
       "license": "ISC",
       "bin": {
         "geojson-normalize": "geojson-normalize"
@@ -6092,8 +6457,6 @@
     },
     "node_modules/@mapbox/geojson-rewind": {
       "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/@mapbox/geojson-rewind/-/geojson-rewind-0.5.2.tgz",
-      "integrity": "sha512-tJaT+RbYGJYStt7wI3cq4Nl4SXxG8W7JDG5DMJu97V25RnbNg3QtQtf+KD+VLjNpWKYsRvXDNmNrBgEETr1ifA==",
       "license": "ISC",
       "dependencies": {
         "get-stream": "^6.0.1",
@@ -6105,16 +6468,12 @@
     },
     "node_modules/@mapbox/jsonlint-lines-primitives": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@mapbox/jsonlint-lines-primitives/-/jsonlint-lines-primitives-2.0.2.tgz",
-      "integrity": "sha512-rY0o9A5ECsTQRVhv7tL/OyDpGAoUB4tTvLiW1DSzQGq4bvTPhNw1VpSNjDJc5GFZ2XuyOtSWSVN05qOtcD71qQ==",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/@mapbox/mapbox-gl-style-spec": {
       "version": "13.28.0",
-      "resolved": "https://registry.npmjs.org/@mapbox/mapbox-gl-style-spec/-/mapbox-gl-style-spec-13.28.0.tgz",
-      "integrity": "sha512-B8xM7Fp1nh5kejfIl4SWeY0gtIeewbuRencqO3cJDrCHZpaPg7uY+V8abuR+esMeuOjRl5cLhVTP40v+1ywxbg==",
       "license": "ISC",
       "dependencies": {
         "@mapbox/jsonlint-lines-primitives": "~2.0.2",
@@ -6135,44 +6494,30 @@
     },
     "node_modules/@mapbox/mapbox-gl-style-spec/node_modules/@mapbox/unitbezier": {
       "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/@mapbox/unitbezier/-/unitbezier-0.0.0.tgz",
-      "integrity": "sha512-HPnRdYO0WjFjRTSwO3frz1wKaU649OBFPX3Zo/2WZvuRi6zMiRGui8SnPQiQABgqCf8YikDe5t3HViTVw1WUzA==",
       "license": "BSD-2-Clause"
     },
     "node_modules/@mapbox/mapbox-gl-style-spec/node_modules/rw": {
       "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz",
-      "integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==",
       "license": "BSD-3-Clause"
     },
     "node_modules/@mapbox/mapbox-gl-supported": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@mapbox/mapbox-gl-supported/-/mapbox-gl-supported-2.0.1.tgz",
-      "integrity": "sha512-HP6XvfNIzfoMVfyGjBckjiAOQK9WfX0ywdLubuPMPv+Vqf5fj0uCbgBQYpiqcWZT6cbyyRnTSXDheT1ugvF6UQ==",
+      "version": "3.0.0",
       "license": "BSD-3-Clause"
     },
     "node_modules/@mapbox/point-geometry": {
       "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/@mapbox/point-geometry/-/point-geometry-0.1.0.tgz",
-      "integrity": "sha512-6j56HdLTwWGO0fJPlrZtdU/B13q8Uwmo18Ck2GnGgN9PCFyKTZ3UbXeEdRFh18i9XQ92eH2VdtpJHpBD3aripQ==",
       "license": "ISC"
     },
     "node_modules/@mapbox/tiny-sdf": {
       "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/@mapbox/tiny-sdf/-/tiny-sdf-2.0.6.tgz",
-      "integrity": "sha512-qMqa27TLw+ZQz5Jk+RcwZGH7BQf5G/TrutJhspsca/3SHwmgKQ1iq+d3Jxz5oysPVYTGP6aXxCo5Lk9Er6YBAA==",
       "license": "BSD-2-Clause"
     },
     "node_modules/@mapbox/unitbezier": {
       "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/@mapbox/unitbezier/-/unitbezier-0.0.1.tgz",
-      "integrity": "sha512-nMkuDXFv60aBr9soUG5q+GvZYL+2KZHVvsqFCzqnkGEf46U2fvmytHaEVc1/YZbiLn8X+eR3QzX1+dwDO1lxlw==",
       "license": "BSD-2-Clause"
     },
     "node_modules/@mapbox/vector-tile": {
       "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@mapbox/vector-tile/-/vector-tile-1.3.1.tgz",
-      "integrity": "sha512-MCEddb8u44/xfQ3oD+Srl/tNcQoqTw3goGk2oLsrFxOTc3dUp+kAnby3PvAeeBYSMSjSPD1nd1AJA6W49WnoUw==",
       "license": "BSD-3-Clause",
       "dependencies": {
         "@mapbox/point-geometry": "~0.1.0"
@@ -6180,8 +6525,6 @@
     },
     "node_modules/@mapbox/whoots-js": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz",
-      "integrity": "sha512-Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q==",
       "license": "ISC",
       "engines": {
         "node": ">=6.0.0"
@@ -6189,8 +6532,6 @@
     },
     "node_modules/@math.gl/core": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/@math.gl/core/-/core-4.1.0.tgz",
-      "integrity": "sha512-FrdHBCVG3QdrworwrUSzXIaK+/9OCRLscxI2OUy6sLOHyHgBMyfnEGs99/m3KNvs+95BsnQLWklVfpKfQzfwKA==",
       "license": "MIT",
       "dependencies": {
         "@math.gl/types": "4.1.0"
@@ -6198,8 +6539,6 @@
     },
     "node_modules/@math.gl/polygon": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/@math.gl/polygon/-/polygon-4.1.0.tgz",
-      "integrity": "sha512-YA/9PzaCRHbIP5/0E9uTYrqe+jsYTQoqoDWhf6/b0Ixz8bPZBaGDEafLg3z7ffBomZLacUty9U3TlPjqMtzPjA==",
       "license": "MIT",
       "dependencies": {
         "@math.gl/core": "4.1.0"
@@ -6207,20 +6546,14 @@
     },
     "node_modules/@math.gl/sun": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/@math.gl/sun/-/sun-4.1.0.tgz",
-      "integrity": "sha512-i3q6OCBLSZ5wgZVhXg+X7gsjY/TUtuFW/2KBiq/U1ypLso3S4sEykoU/MGjxUv1xiiGtr+v8TeMbO1OBIh/HmA==",
       "license": "MIT"
     },
     "node_modules/@math.gl/types": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/@math.gl/types/-/types-4.1.0.tgz",
-      "integrity": "sha512-clYZdHcmRvMzVK5fjeDkQlHUzXQSNdZ7s4xOqC3nJPgz4C/TZkUecTo9YS4PruZqtDda/ag4erndP0MIn40dGA==",
       "license": "MIT"
     },
     "node_modules/@math.gl/web-mercator": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/@math.gl/web-mercator/-/web-mercator-4.1.0.tgz",
-      "integrity": "sha512-HZo3vO5GCMkXJThxRJ5/QYUYRr3XumfT8CzNNCwoJfinxy5NtKUd7dusNTXn7yJ40UoB8FMIwkVwNlqaiRZZAw==",
       "license": "MIT",
       "dependencies": {
         "@math.gl/core": "4.1.0"
@@ -6228,8 +6561,6 @@
     },
     "node_modules/@mdx-js/react": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@mdx-js/react/-/react-3.1.0.tgz",
-      "integrity": "sha512-QjHtSaoameoalGnKDT3FoIl4+9RwyTmo9ZJGBdLOks/YOiWHoRDI3PUwEzOE7kEmGcV3AFcp9K6dYu9rEuKLAQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6246,8 +6577,6 @@
     },
     "node_modules/@mihkeleidast/storybook-addon-source": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@mihkeleidast/storybook-addon-source/-/storybook-addon-source-1.0.1.tgz",
-      "integrity": "sha512-/TRoq62doDiSmtp6pNiSgngZ9tjNAWMN117M8GBz2uvgYJOIU2Zk4WH8kaEUy4TYr+S35lvmuXzZKRa5KRJpng==",
       "license": "MIT"
     },
     "node_modules/@monaco-editor/loader": {
@@ -6275,8 +6604,6 @@
     },
     "node_modules/@napi-rs/wasm-runtime": {
       "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.4.tgz",
-      "integrity": "sha512-9zESzOO5aDByvhIAsOy9TbpZ0Ur2AJbUI7UT73kcUTS2mxAMHOBaa1st/jAymNoCtvrit99kkzT1FZuXVcgfIQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6287,8 +6614,6 @@
     },
     "node_modules/@ndelangen/get-tarball": {
       "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@ndelangen/get-tarball/-/get-tarball-3.0.9.tgz",
-      "integrity": "sha512-9JKTEik4vq+yGosHYhZ1tiH/3WpUS0Nh0kej4Agndhox8pAdWhEx5knFVRcb/ya9knCRCs1rPxNrSXTDdfVqpA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6299,15 +6624,11 @@
     },
     "node_modules/@ndelangen/get-tarball/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,
       "license": "ISC"
     },
     "node_modules/@ndelangen/get-tarball/node_modules/tar-fs": {
       "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.3.tgz",
-      "integrity": "sha512-090nwYJDmlhwFwEW3QQl+vaNnxsO2yVsd45eTKRBzSzu+hlb1w2K9inVq5b0ngXuLVqQ4ApvsUHHnu/zQNkWAg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6319,16 +6640,12 @@
     },
     "node_modules/@nicolo-ribaudo/chokidar-2": {
       "version": "2.1.8-no-fsevents.3",
-      "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.3.tgz",
-      "integrity": "sha512-s88O1aVtXftvp5bCPB7WnmXc5IwOZZ7YPuwNPt+GtOOXpPvad1LfbmjYv+qII7zP6RU2QGnqve27dnLycEnyEQ==",
       "dev": true,
       "license": "MIT",
       "optional": true
     },
     "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": {
       "version": "5.1.1-v1",
-      "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
-      "integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6337,8 +6654,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "@nodelib/fs.stat": "2.0.5",
@@ -6350,8 +6665,6 @@
     },
     "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==",
       "license": "MIT",
       "engines": {
         "node": ">= 8"
@@ -6359,8 +6672,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "@nodelib/fs.scandir": "2.1.5",
@@ -6372,8 +6683,6 @@
     },
     "node_modules/@nolyfill/is-core-module": {
       "version": "1.0.39",
-      "resolved": "https://registry.npmjs.org/@nolyfill/is-core-module/-/is-core-module-1.0.39.tgz",
-      "integrity": "sha512-nn5ozdjYQpUCZlWGuxcJY/KpxkWQs4DcbMCmKojjyrYDEAGy4Ce19NN4v5MduafTwJlbKc99UA8YhSVqq9yPZA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6382,8 +6691,6 @@
     },
     "node_modules/@npmcli/agent": {
       "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-2.2.2.tgz",
-      "integrity": "sha512-OrcNPXdpSl9UX7qPVRWbmWMCSXrcDa2M9DvrbOTj7ao1S4PlqVFYv9/yLKMkrJKZ/V5A/kDBC690or307i26Og==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -6399,8 +6706,6 @@
     },
     "node_modules/@npmcli/agent/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,
       "license": "MIT",
       "engines": {
@@ -6409,8 +6714,6 @@
     },
     "node_modules/@npmcli/agent/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": {
@@ -6423,8 +6726,6 @@
     },
     "node_modules/@npmcli/agent/node_modules/https-proxy-agent": {
       "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,
       "license": "MIT",
       "dependencies": {
@@ -6437,15 +6738,11 @@
     },
     "node_modules/@npmcli/agent/node_modules/lru-cache": {
       "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
-      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
       "dev": true,
       "license": "ISC"
     },
     "node_modules/@npmcli/arborist": {
       "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/@npmcli/arborist/-/arborist-7.5.4.tgz",
-      "integrity": "sha512-nWtIc6QwwoUORCRNzKx4ypHqCk3drI+5aeYdMTQQiRCcn4lOOgfQh7WyZobGYTxXPSq1VwV53lkpN/BRlRk08g==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -6494,8 +6791,6 @@
     },
     "node_modules/@npmcli/arborist/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": {
@@ -6504,15 +6799,11 @@
     },
     "node_modules/@npmcli/arborist/node_modules/lru-cache": {
       "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
-      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
       "dev": true,
       "license": "ISC"
     },
     "node_modules/@npmcli/arborist/node_modules/minimatch": {
       "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": {
@@ -6527,8 +6818,6 @@
     },
     "node_modules/@npmcli/fs": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz",
-      "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -6540,8 +6829,6 @@
     },
     "node_modules/@npmcli/git": {
       "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-5.0.8.tgz",
-      "integrity": "sha512-liASfw5cqhjNW9UFd+ruwwdEf/lbOAQjLL2XY2dFW/bkJheXDYZgOyul/4gVvEV4BWkTXjYGmDqMw9uegdbJNQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -6561,8 +6848,6 @@
     },
     "node_modules/@npmcli/git/node_modules/ini": {
       "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.3.tgz",
-      "integrity": "sha512-X7rqawQBvfdjS10YU1y1YVreA3SsLrW9dX2CewP2EbBJM4ypVNLDkO5y04gejPwKIY9lR+7r9gn3rFPt/kmWFg==",
       "dev": true,
       "license": "ISC",
       "engines": {
@@ -6571,8 +6856,6 @@
     },
     "node_modules/@npmcli/git/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,
       "license": "ISC",
       "engines": {
@@ -6581,15 +6864,11 @@
     },
     "node_modules/@npmcli/git/node_modules/lru-cache": {
       "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
-      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
       "dev": true,
       "license": "ISC"
     },
     "node_modules/@npmcli/git/node_modules/which": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
-      "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -6604,8 +6883,6 @@
     },
     "node_modules/@npmcli/installed-package-contents": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-2.1.0.tgz",
-      "integrity": "sha512-c8UuGLeZpm69BryRykLuKRyKFZYJsZSCT4aVY5ds4omyZqJ172ApzgfKJ5eV/r3HgLdUYgFVe54KSFVjKoe27w==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -6621,8 +6898,6 @@
     },
     "node_modules/@npmcli/map-workspaces": {
       "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/@npmcli/map-workspaces/-/map-workspaces-3.0.6.tgz",
-      "integrity": "sha512-tkYs0OYnzQm6iIRdfy+LcLBjcKuQCeE5YLb8KnrIlutJfheNaPvPpgoFEyEFgbjzl5PLZ3IA/BWAwRU0eHuQDA==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -6637,8 +6912,6 @@
     },
     "node_modules/@npmcli/map-workspaces/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": {
@@ -6647,8 +6920,6 @@
     },
     "node_modules/@npmcli/map-workspaces/node_modules/glob": {
       "version": "10.4.5",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
-      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -6668,8 +6939,6 @@
     },
     "node_modules/@npmcli/map-workspaces/node_modules/minimatch": {
       "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": {
@@ -6684,8 +6953,6 @@
     },
     "node_modules/@npmcli/metavuln-calculator": {
       "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/@npmcli/metavuln-calculator/-/metavuln-calculator-7.1.1.tgz",
-      "integrity": "sha512-Nkxf96V0lAx3HCpVda7Vw4P23RILgdi/5K1fmj2tZkWIYLpXAN8k2UVVOsW16TsS5F8Ws2I7Cm+PU1/rsVF47g==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -6701,8 +6968,6 @@
     },
     "node_modules/@npmcli/name-from-folder": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/name-from-folder/-/name-from-folder-2.0.0.tgz",
-      "integrity": "sha512-pwK+BfEBZJbKdNYpHHRTNBwBoqrN/iIMO0AiGvYsp3Hoaq0WbgGSWQR6SCldZovoDpY3yje5lkFUe6gsDgJ2vg==",
       "dev": true,
       "license": "ISC",
       "engines": {
@@ -6711,8 +6976,6 @@
     },
     "node_modules/@npmcli/node-gyp": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-3.0.0.tgz",
-      "integrity": "sha512-gp8pRXC2oOxu0DUE1/M3bYtb1b3/DbJ5aM113+XJBgfXdussRAsX0YOrOhdd8WvnAR6auDBvJomGAkLKA5ydxA==",
       "dev": true,
       "license": "ISC",
       "engines": {
@@ -6721,8 +6984,6 @@
     },
     "node_modules/@npmcli/package-json": {
       "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/package-json/-/package-json-5.2.0.tgz",
-      "integrity": "sha512-qe/kiqqkW0AGtvBjL8TJKZk/eBBSpnJkUWvHdQ9jM2lKHXRYYJuyNpJPlJw3c8QjC2ow6NZYiLExhUaeJelbxQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -6740,8 +7001,6 @@
     },
     "node_modules/@npmcli/package-json/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": {
@@ -6750,8 +7009,6 @@
     },
     "node_modules/@npmcli/package-json/node_modules/glob": {
       "version": "10.4.5",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
-      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -6771,8 +7028,6 @@
     },
     "node_modules/@npmcli/package-json/node_modules/minimatch": {
       "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": {
@@ -6787,8 +7042,6 @@
     },
     "node_modules/@npmcli/promise-spawn": {
       "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-7.0.2.tgz",
-      "integrity": "sha512-xhfYPXoV5Dy4UkY0D+v2KkwvnDfiA/8Mt3sWCGI/hM03NsYIH8ZaG6QzS9x7pje5vHZBZJ2v6VRFVTWACnqcmQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -6800,8 +7053,6 @@
     },
     "node_modules/@npmcli/promise-spawn/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,
       "license": "ISC",
       "engines": {
@@ -6810,8 +7061,6 @@
     },
     "node_modules/@npmcli/promise-spawn/node_modules/which": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
-      "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -6826,8 +7075,6 @@
     },
     "node_modules/@npmcli/query": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/query/-/query-3.1.0.tgz",
-      "integrity": "sha512-C/iR0tk7KSKGldibYIB9x8GtO/0Bd0I2mhOaDb8ucQL/bQVTmGoeREaFj64Z5+iCBRf3dQfed0CjJL7I8iTkiQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -6839,8 +7086,6 @@
     },
     "node_modules/@npmcli/redact": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@npmcli/redact/-/redact-2.0.1.tgz",
-      "integrity": "sha512-YgsR5jCQZhVmTJvjduTOIHph0L73pK8xwMVaDY0PatySqVM9AZj93jpoXYSJqfHFxFkN9dmqTw6OiqExsS3LPw==",
       "dev": true,
       "license": "ISC",
       "engines": {
@@ -6849,8 +7094,6 @@
     },
     "node_modules/@npmcli/run-script": {
       "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-8.1.0.tgz",
-      "integrity": "sha512-y7efHHwghQfk28G2z3tlZ67pLG0XdfYbcVG26r7YIXALRsrVQcTq4/tdenSmdOrEsNahIYA/eh8aEVROWGFUDg==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -6867,8 +7110,6 @@
     },
     "node_modules/@npmcli/run-script/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,
       "license": "ISC",
       "engines": {
@@ -6877,8 +7118,6 @@
     },
     "node_modules/@npmcli/run-script/node_modules/which": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
-      "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -6892,9 +7131,7 @@
       }
     },
     "node_modules/@nx/devkit": {
-      "version": "20.8.2",
-      "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-20.8.2.tgz",
-      "integrity": "sha512-rr9p2/tZDQivIpuBUpZaFBK6bZ+b5SAjZk75V4tbCUqGW3+5OPuVvBPm+X+7PYwUF6rwSpewxkjWNeGskfCe+Q==",
+      "version": "20.7.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6913,8 +7150,6 @@
     },
     "node_modules/@nx/devkit/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": {
@@ -6923,8 +7158,6 @@
     },
     "node_modules/@nx/devkit/node_modules/enquirer": {
       "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6936,8 +7169,6 @@
     },
     "node_modules/@nx/devkit/node_modules/minimatch": {
       "version": "9.0.3",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -6950,112 +7181,8 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/@nx/nx-darwin-arm64": {
-      "version": "20.8.2",
-      "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-20.8.2.tgz",
-      "integrity": "sha512-t+bmCn6sRPNGU6hnSyWNvbQYA/KgsxGZKYlaCLRwkNhI2akModcBUqtktJzCKd1XHDqs6EkEFBWjFr8/kBEkSg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@nx/nx-darwin-x64": {
-      "version": "20.8.2",
-      "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-20.8.2.tgz",
-      "integrity": "sha512-pt/wmDLM31Es8/EzazlyT5U+ou2l60rfMNFGCLqleHEQ0JUTc0KWnOciBLbHIQFiPsCQZJFEKyfV5V/ncePmmw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@nx/nx-freebsd-x64": {
-      "version": "20.8.2",
-      "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-20.8.2.tgz",
-      "integrity": "sha512-joZxFbgJfkHkB9uMIJr73Gpnm9pnpvr0XKGbWC409/d2x7q1qK77tKdyhGm+A3+kaZFwstNVPmCUtUwJYyU6LA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@nx/nx-linux-arm-gnueabihf": {
-      "version": "20.8.2",
-      "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-20.8.2.tgz",
-      "integrity": "sha512-98O/qsxn4vIMPY/FyzvmVrl7C5yFhCUVk0/4PF+PA2SvtQ051L1eMRY6bq/lb69qfN6szJPZ41PG5mPx0NeLZw==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@nx/nx-linux-arm64-gnu": {
-      "version": "20.8.2",
-      "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-20.8.2.tgz",
-      "integrity": "sha512-h6a+HxwfSpxsi4KpxGgPh9GDBmD2E+XqGCdfYpobabxqEBvlnIlJyuDhlRR06cTWpuNXHpRdrVogmV6m/YbtDg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@nx/nx-linux-arm64-musl": {
-      "version": "20.8.2",
-      "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-20.8.2.tgz",
-      "integrity": "sha512-4Ev+jM0VAxDHV/dFgMXjQTCXS4I8W4oMe7FSkXpG8RUn6JK659DC8ExIDPoGIh+Cyqq6r6mw1CSia+ciQWICWQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
     "node_modules/@nx/nx-linux-x64-gnu": {
-      "version": "20.8.2",
-      "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-20.8.2.tgz",
-      "integrity": "sha512-nR0ev+wxu+nQYRd7bhqggOxK7UfkV6h+Ko1mumUFyrM5GvPpz/ELhjJFSnMcOkOMcvH0b6G5uTBJvN1XWCkbmg==",
+      "version": "20.7.0",
       "cpu": [
         "x64"
       ],
@@ -7070,9 +7197,7 @@
       }
     },
     "node_modules/@nx/nx-linux-x64-musl": {
-      "version": "20.8.2",
-      "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-20.8.2.tgz",
-      "integrity": "sha512-ost41l5yc2aq2Gc9bMMpaPi/jkXqbXEMEPHrxWKuKmaek3K2zbVDQzvBBNcQKxf/mlCsrqN4QO0mKYSRRqag5A==",
+      "version": "20.7.0",
       "cpu": [
         "x64"
       ],
@@ -7086,54 +7211,207 @@
         "node": ">= 10"
       }
     },
-    "node_modules/@nx/nx-win32-arm64-msvc": {
-      "version": "20.8.2",
-      "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-20.8.2.tgz",
-      "integrity": "sha512-0SEOqT/daBG5WtM9vOGilrYaAuf1tiALdrFavY62+/arXYxXemUKmRI5qoKDTnvoLMBGkJs6kxhMO5b7aUXIvQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@nx/nx-win32-x64-msvc": {
-      "version": "20.8.2",
-      "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-20.8.2.tgz",
-      "integrity": "sha512-iIsY+tVqes/NOqTbJmggL9Juie/iaDYlWgXA9IUv88FE9thqWKhVj4/tCcPjsOwzD+1SVna3YISEEFsx5UV4ew==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
     "node_modules/@octokit/auth-token": {
+      "version": "3.0.4",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@octokit/core": {
+      "version": "4.2.4",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@octokit/auth-token": "^3.0.0",
+        "@octokit/graphql": "^5.0.0",
+        "@octokit/request": "^6.0.0",
+        "@octokit/request-error": "^3.0.0",
+        "@octokit/types": "^9.0.0",
+        "before-after-hook": "^2.2.0",
+        "universal-user-agent": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@octokit/endpoint": {
+      "version": "7.0.6",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@octokit/types": "^9.0.0",
+        "is-plain-object": "^5.0.0",
+        "universal-user-agent": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@octokit/endpoint/node_modules/is-plain-object": {
+      "version": "5.0.0",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@octokit/graphql": {
+      "version": "5.0.6",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@octokit/request": "^6.0.0",
+        "@octokit/types": "^9.0.0",
+        "universal-user-agent": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@octokit/openapi-types": {
+      "version": "18.1.1",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/@octokit/plugin-enterprise-rest": {
+      "version": "6.0.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@octokit/plugin-paginate-rest": {
+      "version": "6.1.2",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@octokit/tsconfig": "^1.0.2",
+        "@octokit/types": "^9.2.3"
+      },
+      "engines": {
+        "node": ">= 14"
+      },
+      "peerDependencies": {
+        "@octokit/core": ">=4"
+      }
+    },
+    "node_modules/@octokit/plugin-request-log": {
+      "version": "1.0.4",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "peerDependencies": {
+        "@octokit/core": ">=3"
+      }
+    },
+    "node_modules/@octokit/plugin-rest-endpoint-methods": {
+      "version": "7.2.3",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@octokit/types": "^10.0.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      },
+      "peerDependencies": {
+        "@octokit/core": ">=3"
+      }
+    },
+    "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types": {
+      "version": "10.0.0",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@octokit/openapi-types": "^18.0.0"
+      }
+    },
+    "node_modules/@octokit/request": {
+      "version": "6.2.8",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@octokit/endpoint": "^7.0.0",
+        "@octokit/request-error": "^3.0.0",
+        "@octokit/types": "^9.0.0",
+        "is-plain-object": "^5.0.0",
+        "node-fetch": "^2.6.7",
+        "universal-user-agent": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@octokit/request-error": {
+      "version": "3.0.3",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@octokit/types": "^9.0.0",
+        "deprecation": "^2.0.0",
+        "once": "^1.4.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@octokit/request/node_modules/is-plain-object": {
+      "version": "5.0.0",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@octokit/rest": {
+      "version": "20.1.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/core": "^5.0.2",
+        "@octokit/plugin-paginate-rest": "11.4.4-cjs.2",
+        "@octokit/plugin-request-log": "^4.0.0",
+        "@octokit/plugin-rest-endpoint-methods": "13.3.2-cjs.1"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/rest/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,
       "license": "MIT",
       "engines": {
         "node": ">= 18"
       }
     },
-    "node_modules/@octokit/core": {
+    "node_modules/@octokit/rest/node_modules/@octokit/core": {
       "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-5.2.1.tgz",
-      "integrity": "sha512-dKYCMuPO1bmrpuogcjQ8z7ICCH3FP6WmxpwC03yjzGfZhj9fTJg6+bS1+UAplekbN2C+M61UNllGOOoAfGCrdQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7149,10 +7427,8 @@
         "node": ">= 18"
       }
     },
-    "node_modules/@octokit/endpoint": {
+    "node_modules/@octokit/rest/node_modules/@octokit/endpoint": {
       "version": "9.0.6",
-      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-9.0.6.tgz",
-      "integrity": "sha512-H1fNTMA57HbkFESSt3Y9+FBICv+0jFceJFPWDePYlR/iMGrwM5ph+Dd4XRQs+8X+PUFURLQgX9ChPfhJ/1uNQw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7163,10 +7439,8 @@
         "node": ">= 18"
       }
     },
-    "node_modules/@octokit/graphql": {
+    "node_modules/@octokit/rest/node_modules/@octokit/graphql": {
       "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-7.1.1.tgz",
-      "integrity": "sha512-3mkDltSfcDUoa176nlGoA32RGjeWjl3K7F/BwHwRMJUW/IteSa4bnSV8p2ThNkcIcZU2umkZWxwETSSCJf2Q7g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7178,23 +7452,13 @@
         "node": ">= 18"
       }
     },
-    "node_modules/@octokit/openapi-types": {
+    "node_modules/@octokit/rest/node_modules/@octokit/openapi-types": {
       "version": "24.2.0",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-24.2.0.tgz",
-      "integrity": "sha512-9sIH3nSUttelJSXUrmGzl7QUBFul0/mB8HRYl3fOlgHbIWG+WnYDXU3v/2zMtAvuzZ/ed00Ei6on975FhBfzrg==",
-      "license": "MIT"
-    },
-    "node_modules/@octokit/plugin-enterprise-rest": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-6.0.1.tgz",
-      "integrity": "sha512-93uGjlhUD+iNg1iWhUENAtJata6w5nE+V4urXOAlIXdco6xNZtUSfYY8dzp3Udy74aqO/B5UZL80x/YMa5PKRw==",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@octokit/plugin-paginate-rest": {
+    "node_modules/@octokit/rest/node_modules/@octokit/plugin-paginate-rest": {
       "version": "11.4.4-cjs.2",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-11.4.4-cjs.2.tgz",
-      "integrity": "sha512-2dK6z8fhs8lla5PaOTgqfCGBxgAv/le+EhPs27KklPhm1bKObpu6lXzwfUEQ16ajXzqNrKMujsFyo9K2eaoISw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7207,10 +7471,8 @@
         "@octokit/core": "5"
       }
     },
-    "node_modules/@octokit/plugin-request-log": {
+    "node_modules/@octokit/rest/node_modules/@octokit/plugin-request-log": {
       "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-4.0.1.tgz",
-      "integrity": "sha512-GihNqNpGHorUrO7Qa9JbAl0dbLnqJVrV8OXe2Zm5/Y4wFkZQDfTreBzVmiRfJVfE4mClXdihHnbpyyO9FSX4HA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -7220,10 +7482,8 @@
         "@octokit/core": "5"
       }
     },
-    "node_modules/@octokit/plugin-rest-endpoint-methods": {
+    "node_modules/@octokit/rest/node_modules/@octokit/plugin-rest-endpoint-methods": {
       "version": "13.3.2-cjs.1",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-13.3.2-cjs.1.tgz",
-      "integrity": "sha512-VUjIjOOvF2oELQmiFpWA1aOPdawpyaCUqcEBc/UOUnj3Xp6DJGrJ1+bjUIIDzdHjnFNO6q57ODMfdEZnoBkCwQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7236,10 +7496,8 @@
         "@octokit/core": "^5"
       }
     },
-    "node_modules/@octokit/request": {
+    "node_modules/@octokit/rest/node_modules/@octokit/request": {
       "version": "8.4.1",
-      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-8.4.1.tgz",
-      "integrity": "sha512-qnB2+SY3hkCmBxZsR/MPCybNmbJe4KAlfWErXq+rBKkQJlbjdJeS85VI9r8UqeLYLvnAenU8Q1okM/0MBsAGXw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7252,10 +7510,8 @@
         "node": ">= 18"
       }
     },
-    "node_modules/@octokit/request-error": {
+    "node_modules/@octokit/rest/node_modules/@octokit/request-error": {
       "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-5.1.1.tgz",
-      "integrity": "sha512-v9iyEQJH6ZntoENr9/yXxjuezh4My67CBSu9r6Ve/05Iu5gNgnisNWOsoJHTP6k0Rr0+HQIpnH+kyammu90q/g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7267,41 +7523,37 @@
         "node": ">= 18"
       }
     },
-    "node_modules/@octokit/rest": {
-      "version": "20.1.2",
-      "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-20.1.2.tgz",
-      "integrity": "sha512-GmYiltypkHHtihFwPRxlaorG5R9VAHuk/vbszVoRTGXnAsY60wYLkh/E2XiFmdZmqrisw+9FaazS1i5SbdWYgA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/core": "^5.0.2",
-        "@octokit/plugin-paginate-rest": "11.4.4-cjs.2",
-        "@octokit/plugin-request-log": "^4.0.0",
-        "@octokit/plugin-rest-endpoint-methods": "13.3.2-cjs.1"
-      },
-      "engines": {
-        "node": ">= 18"
-      }
-    },
-    "node_modules/@octokit/types": {
+    "node_modules/@octokit/rest/node_modules/@octokit/types": {
       "version": "13.10.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.10.0.tgz",
-      "integrity": "sha512-ifLaO34EbbPj0Xgro4G5lP5asESjwHracYJvVaPIyXMuiuXLlhic3S47cBdTb+jfODkTE5YtGCLt3Ay3+J97sA==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@octokit/openapi-types": "^24.2.0"
       }
     },
+    "node_modules/@octokit/tsconfig": {
+      "version": "1.0.2",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/@octokit/types": {
+      "version": "9.3.2",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@octokit/openapi-types": "^18.0.0"
+      }
+    },
     "node_modules/@petamoriken/float16": {
-      "version": "3.9.2",
-      "resolved": "https://registry.npmjs.org/@petamoriken/float16/-/float16-3.9.2.tgz",
-      "integrity": "sha512-VgffxawQde93xKxT3qap3OH+meZf7VaSB5Sqd4Rqc+FP5alWbpOyan/7tRbOAvynjpG3GpdtAuGU/NdhQpmrog==",
+      "version": "3.9.1",
       "license": "MIT"
     },
     "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==",
       "license": "MIT",
       "optional": true,
       "engines": {
@@ -7309,22 +7561,18 @@
       }
     },
     "node_modules/@pkgr/core": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.2.7.tgz",
-      "integrity": "sha512-YLT9Zo3oNPJoBjBc4q8G2mjU4tqIbf5CEOORbUUr48dCD9q3umJ3IPlVqOqDakPfd2HuwccBaqlGhN4Gmr5OWg==",
+      "version": "0.1.1",
       "dev": true,
       "license": "MIT",
       "engines": {
         "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
       },
       "funding": {
-        "url": "https://opencollective.com/pkgr"
+        "url": "https://opencollective.com/unts"
       }
     },
     "node_modules/@pnpm/config.env-replace": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@pnpm/config.env-replace/-/config.env-replace-1.1.0.tgz",
-      "integrity": "sha512-htyl8TWnKL7K/ESFa1oW2UB5lVDxuF5DpM7tBi6Hu2LNL3mWkIzNLG6N4zoCUP1lCKNxWy/3iu8mS8MvToGd6w==",
       "license": "MIT",
       "engines": {
         "node": ">=12.22.0"
@@ -7332,8 +7580,6 @@
     },
     "node_modules/@pnpm/network.ca-file": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@pnpm/network.ca-file/-/network.ca-file-1.0.2.tgz",
-      "integrity": "sha512-YcPQ8a0jwYU9bTdJDpXjMi7Brhkr1mXsXrUJvjqM2mQDgkRiz8jFaQGOdaLxgjtUfQgZhKy/O3cG/YwmgKaxLA==",
       "license": "MIT",
       "dependencies": {
         "graceful-fs": "4.2.10"
@@ -7344,14 +7590,10 @@
     },
     "node_modules/@pnpm/network.ca-file/node_modules/graceful-fs": {
       "version": "4.2.10",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
       "license": "ISC"
     },
     "node_modules/@pnpm/npm-conf": {
       "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/@pnpm/npm-conf/-/npm-conf-2.3.1.tgz",
-      "integrity": "sha512-c83qWb22rNRuB0UaVCI0uRPNRr8Z0FWnEIvT47jiHAmOIUHbBOg5XvV7pM5x+rKn9HRpjxquDbXYSXr3fAKFcw==",
       "license": "MIT",
       "dependencies": {
         "@pnpm/config.env-replace": "^1.1.0",
@@ -7363,22 +7605,16 @@
       }
     },
     "node_modules/@polka/url": {
-      "version": "1.0.0-next.29",
-      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.29.tgz",
-      "integrity": "sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww==",
+      "version": "1.0.0-next.28",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@probe.gl/env": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/@probe.gl/env/-/env-4.1.0.tgz",
-      "integrity": "sha512-5ac2Jm2K72VCs4eSMsM7ykVRrV47w32xOGMvcgqn8vQdEMF9PRXyBGYEV9YbqRKWNKpNKmQJVi4AHM/fkCxs9w==",
       "license": "MIT"
     },
     "node_modules/@probe.gl/log": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/@probe.gl/log/-/log-4.1.0.tgz",
-      "integrity": "sha512-r4gRReNY6f+OZEMgfWEXrAE2qJEt8rX0HsDJQXUBMoc+5H47bdB7f/5HBHAmapK8UydwPKL9wCDoS22rJ0yq7Q==",
       "license": "MIT",
       "dependencies": {
         "@probe.gl/env": "4.1.0"
@@ -7386,14 +7622,10 @@
     },
     "node_modules/@probe.gl/stats": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/@probe.gl/stats/-/stats-4.1.0.tgz",
-      "integrity": "sha512-EI413MkWKBDVNIfLdqbeNSJTs7ToBz/KVGkwi3D+dQrSIkRI2IYbWGAU3xX+D6+CI4ls8ehxMhNpUVMaZggDvQ==",
       "license": "MIT"
     },
     "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,
       "license": "Apache-2.0",
       "dependencies": {
@@ -7415,8 +7647,6 @@
     },
     "node_modules/@puppeteer/browsers/node_modules/debug": {
       "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
-      "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7433,15 +7663,11 @@
     },
     "node_modules/@puppeteer/browsers/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/@puppeteer/browsers/node_modules/semver": {
       "version": "7.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
-      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -7911,9 +8137,9 @@
       }
     },
     "node_modules/@rc-component/trigger": {
-      "version": "2.2.6",
-      "resolved": "https://registry.npmjs.org/@rc-component/trigger/-/trigger-2.2.6.tgz",
-      "integrity": "sha512-/9zuTnWwhQ3S3WT1T8BubuFTT46kvnXgaERR9f4BTKyn61/wpf/BvbImzYBubzJibU707FxwbKszLlHjcLiv1Q==",
+      "version": "2.2.7",
+      "resolved": "https://registry.npmjs.org/@rc-component/trigger/-/trigger-2.2.7.tgz",
+      "integrity": "sha512-Qggj4Z0AA2i5dJhzlfFSmg1Qrziu8dsdHOihROL5Kl18seO2Eh/ZaTYt2c8a/CyGaTChnFry7BEYew1+/fhSbA==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.23.2",
@@ -7933,26 +8159,18 @@
     },
     "node_modules/@react-dnd/asap": {
       "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@react-dnd/asap/-/asap-4.0.1.tgz",
-      "integrity": "sha512-kLy0PJDDwvwwTXxqTFNAAllPHD73AycE9ypWeln/IguoGBEbvFcPDbCV03G52bEcC5E+YgupBE0VzHGdC8SIXg==",
       "license": "MIT"
     },
     "node_modules/@react-dnd/invariant": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@react-dnd/invariant/-/invariant-2.0.0.tgz",
-      "integrity": "sha512-xL4RCQBCBDJ+GRwKTFhGUW8GXa4yoDfJrPbLblc3U09ciS+9ZJXJ3Qrcs/x2IODOdIE5kQxvMmE2UKyqUictUw==",
       "license": "MIT"
     },
     "node_modules/@react-dnd/shallowequal": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@react-dnd/shallowequal/-/shallowequal-2.0.0.tgz",
-      "integrity": "sha512-Pc/AFTdwZwEKJxFJvlxrSmGe/di+aAOBn60sremrpLo6VI/6cmiUYNNwlI5KNYttg7uypzA3ILPMPgxB2GYZEg==",
       "license": "MIT"
     },
     "node_modules/@react-icons/all-files": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/@react-icons/all-files/-/all-files-4.1.0.tgz",
-      "integrity": "sha512-hxBI2UOuVaI3O/BhQfhtb4kcGn9ft12RWAFVMUeNjqqhLsHvFtzIkFaptBJpFDANTKoDfdVoHTKZDlwKCACbMQ==",
       "license": "MIT",
       "peerDependencies": {
         "react": "*"
@@ -7960,8 +8178,6 @@
     },
     "node_modules/@react-spring/animated": {
       "version": "9.7.5",
-      "resolved": "https://registry.npmjs.org/@react-spring/animated/-/animated-9.7.5.tgz",
-      "integrity": "sha512-Tqrwz7pIlsSDITzxoLS3n/v/YCUHQdOIKtOJf4yL6kYVSDTSmVK1LI1Q3M/uu2Sx4X3pIWF3xLUhlsA6SPNTNg==",
       "license": "MIT",
       "peer": true,
       "dependencies": {
@@ -7974,8 +8190,6 @@
     },
     "node_modules/@react-spring/core": {
       "version": "9.7.5",
-      "resolved": "https://registry.npmjs.org/@react-spring/core/-/core-9.7.5.tgz",
-      "integrity": "sha512-rmEqcxRcu7dWh7MnCcMXLvrf6/SDlSokLaLTxiPlAYi11nN3B5oiCUAblO72o+9z/87j2uzxa2Inm8UbLjXA+w==",
       "license": "MIT",
       "peer": true,
       "dependencies": {
@@ -7993,15 +8207,11 @@
     },
     "node_modules/@react-spring/rafz": {
       "version": "9.7.5",
-      "resolved": "https://registry.npmjs.org/@react-spring/rafz/-/rafz-9.7.5.tgz",
-      "integrity": "sha512-5ZenDQMC48wjUzPAm1EtwQ5Ot3bLIAwwqP2w2owG5KoNdNHpEJV263nGhCeKKmuA3vG2zLLOdu3or6kuDjA6Aw==",
       "license": "MIT",
       "peer": true
     },
     "node_modules/@react-spring/shared": {
       "version": "9.7.5",
-      "resolved": "https://registry.npmjs.org/@react-spring/shared/-/shared-9.7.5.tgz",
-      "integrity": "sha512-wdtoJrhUeeyD/PP/zo+np2s1Z820Ohr/BbuVYv+3dVLW7WctoiN7std8rISoYoHpUXtbkpesSKuPIw/6U1w1Pw==",
       "license": "MIT",
       "peer": true,
       "dependencies": {
@@ -8014,15 +8224,11 @@
     },
     "node_modules/@react-spring/types": {
       "version": "9.7.5",
-      "resolved": "https://registry.npmjs.org/@react-spring/types/-/types-9.7.5.tgz",
-      "integrity": "sha512-HVj7LrZ4ReHWBimBvu2SKND3cDVUPWKLqRTmWe/fNY6o1owGOX0cAHbdPDTMelgBlVbrTKrre6lFkhqGZErK/g==",
       "license": "MIT",
       "peer": true
     },
     "node_modules/@react-spring/web": {
       "version": "9.7.5",
-      "resolved": "https://registry.npmjs.org/@react-spring/web/-/web-9.7.5.tgz",
-      "integrity": "sha512-lmvqGwpe+CSttsWNZVr+Dg62adtKhauGwLyGE/RRyZ8AAMLgb9x3NDMA5RMElXo+IMyTkPp7nxTB8ZQlmhb6JQ==",
       "license": "MIT",
       "peer": true,
       "dependencies": {
@@ -8038,8 +8244,6 @@
     },
     "node_modules/@reduxjs/toolkit": {
       "version": "1.9.7",
-      "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-1.9.7.tgz",
-      "integrity": "sha512-t7v8ZPxhhKgOKtU+uyJT13lu4vL7az5aFi4IdoDs/eS548edn2M8Ik9h8fxgvMjGoAUVFSt6ZC1P5cWmQ014QQ==",
       "license": "MIT",
       "dependencies": {
         "immer": "^9.0.21",
@@ -8062,8 +8266,6 @@
     },
     "node_modules/@reduxjs/toolkit/node_modules/immer": {
       "version": "9.0.21",
-      "resolved": "https://registry.npmjs.org/immer/-/immer-9.0.21.tgz",
-      "integrity": "sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA==",
       "license": "MIT",
       "funding": {
         "type": "opencollective",
@@ -8071,9 +8273,7 @@
       }
     },
     "node_modules/@rjsf/core": {
-      "version": "5.24.11",
-      "resolved": "https://registry.npmjs.org/@rjsf/core/-/core-5.24.11.tgz",
-      "integrity": "sha512-iSO8IIrsBREQZPPVb6AdtnQBclDcU0YK8cnF9oqS/mV+Qk/r8kU6On0X8j/lj8setGBdFJKDFA0hdJkNquQI1Q==",
+      "version": "5.24.1",
       "license": "Apache-2.0",
       "dependencies": {
         "lodash": "^4.17.21",
@@ -8091,9 +8291,7 @@
       }
     },
     "node_modules/@rjsf/core/node_modules/nanoid": {
-      "version": "3.3.11",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
-      "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
+      "version": "3.3.8",
       "funding": [
         {
           "type": "github",
@@ -8109,9 +8307,7 @@
       }
     },
     "node_modules/@rjsf/utils": {
-      "version": "5.24.11",
-      "resolved": "https://registry.npmjs.org/@rjsf/utils/-/utils-5.24.11.tgz",
-      "integrity": "sha512-2OyQM4Eum67jr4GJly6eflZhD8qoWkl7brCvCZ10z+pW6dgsGEusqRvTioK0L7thWJ5LwbJ2i4SFqJjiChZGxA==",
+      "version": "5.24.3",
       "license": "Apache-2.0",
       "dependencies": {
         "json-schema-merge-allof": "^0.8.1",
@@ -8128,9 +8324,7 @@
       }
     },
     "node_modules/@rjsf/validator-ajv8": {
-      "version": "5.24.11",
-      "resolved": "https://registry.npmjs.org/@rjsf/validator-ajv8/-/validator-ajv8-5.24.11.tgz",
-      "integrity": "sha512-x6pZojVPVFB1bVk3e8GvStyDXJN8ufa3Aoz4wx+UJRSdh7J4Iud+jaATPxyrjhLIuxsQhUy7ed39/4iP+YYZ/Q==",
+      "version": "5.24.9",
       "license": "Apache-2.0",
       "dependencies": {
         "ajv": "^8.12.0",
@@ -8147,22 +8341,834 @@
     },
     "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,
       "license": "MIT"
     },
     "node_modules/@scarf/scarf": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@scarf/scarf/-/scarf-1.4.0.tgz",
-      "integrity": "sha512-xxeapPiUXdZAE3che6f3xogoJPeZgig6omHEy1rIY5WVsB3H2BHNnZH+gHG6x91SCWyQCzWGsuL2Hh3ClO5/qQ==",
       "hasInstallScript": true,
       "license": "Apache-2.0"
     },
+    "node_modules/@sec-ant/readable-stream": {
+      "version": "0.4.1",
+      "license": "MIT"
+    },
+    "node_modules/@semantic-release/changelog": {
+      "version": "6.0.3",
+      "license": "MIT",
+      "dependencies": {
+        "@semantic-release/error": "^3.0.0",
+        "aggregate-error": "^3.0.0",
+        "fs-extra": "^11.0.0",
+        "lodash": "^4.17.4"
+      },
+      "engines": {
+        "node": ">=14.17"
+      },
+      "peerDependencies": {
+        "semantic-release": ">=18.0.0"
+      }
+    },
+    "node_modules/@semantic-release/commit-analyzer": {
+      "version": "13.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "conventional-changelog-angular": "^8.0.0",
+        "conventional-changelog-writer": "^8.0.0",
+        "conventional-commits-filter": "^5.0.0",
+        "conventional-commits-parser": "^6.0.0",
+        "debug": "^4.0.0",
+        "import-from-esm": "^2.0.0",
+        "lodash-es": "^4.17.21",
+        "micromatch": "^4.0.2"
+      },
+      "engines": {
+        "node": ">=20.8.1"
+      },
+      "peerDependencies": {
+        "semantic-release": ">=20.1.0"
+      }
+    },
+    "node_modules/@semantic-release/commit-analyzer/node_modules/conventional-changelog-angular": {
+      "version": "8.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "compare-func": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@semantic-release/commit-analyzer/node_modules/conventional-changelog-writer": {
+      "version": "8.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "conventional-commits-filter": "^5.0.0",
+        "handlebars": "^4.7.7",
+        "meow": "^13.0.0",
+        "semver": "^7.5.2"
+      },
+      "bin": {
+        "conventional-changelog-writer": "dist/cli/index.js"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@semantic-release/commit-analyzer/node_modules/conventional-commits-filter": {
+      "version": "5.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@semantic-release/commit-analyzer/node_modules/conventional-commits-parser": {
+      "version": "6.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "meow": "^13.0.0"
+      },
+      "bin": {
+        "conventional-commits-parser": "dist/cli/index.js"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@semantic-release/commit-analyzer/node_modules/meow": {
+      "version": "13.2.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@semantic-release/error": {
+      "version": "3.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.17"
+      }
+    },
+    "node_modules/@semantic-release/git": {
+      "version": "10.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "@semantic-release/error": "^3.0.0",
+        "aggregate-error": "^3.0.0",
+        "debug": "^4.0.0",
+        "dir-glob": "^3.0.0",
+        "execa": "^5.0.0",
+        "lodash": "^4.17.4",
+        "micromatch": "^4.0.0",
+        "p-reduce": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=14.17"
+      },
+      "peerDependencies": {
+        "semantic-release": ">=18.0.0"
+      }
+    },
+    "node_modules/@semantic-release/github": {
+      "version": "11.0.3",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/core": "^7.0.0",
+        "@octokit/plugin-paginate-rest": "^13.0.0",
+        "@octokit/plugin-retry": "^8.0.0",
+        "@octokit/plugin-throttling": "^11.0.0",
+        "@semantic-release/error": "^4.0.0",
+        "aggregate-error": "^5.0.0",
+        "debug": "^4.3.4",
+        "dir-glob": "^3.0.1",
+        "globby": "^14.0.0",
+        "http-proxy-agent": "^7.0.0",
+        "https-proxy-agent": "^7.0.0",
+        "issue-parser": "^7.0.0",
+        "lodash-es": "^4.17.21",
+        "mime": "^4.0.0",
+        "p-filter": "^4.0.0",
+        "url-join": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=20.8.1"
+      },
+      "peerDependencies": {
+        "semantic-release": ">=24.1.0"
+      }
+    },
+    "node_modules/@semantic-release/github/node_modules/@octokit/auth-token": {
+      "version": "6.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 20"
+      }
+    },
+    "node_modules/@semantic-release/github/node_modules/@octokit/core": {
+      "version": "7.0.2",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/auth-token": "^6.0.0",
+        "@octokit/graphql": "^9.0.1",
+        "@octokit/request": "^10.0.2",
+        "@octokit/request-error": "^7.0.0",
+        "@octokit/types": "^14.0.0",
+        "before-after-hook": "^4.0.0",
+        "universal-user-agent": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 20"
+      }
+    },
+    "node_modules/@semantic-release/github/node_modules/@octokit/endpoint": {
+      "version": "11.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^14.0.0",
+        "universal-user-agent": "^7.0.2"
+      },
+      "engines": {
+        "node": ">= 20"
+      }
+    },
+    "node_modules/@semantic-release/github/node_modules/@octokit/graphql": {
+      "version": "9.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/request": "^10.0.2",
+        "@octokit/types": "^14.0.0",
+        "universal-user-agent": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 20"
+      }
+    },
+    "node_modules/@semantic-release/github/node_modules/@octokit/openapi-types": {
+      "version": "25.1.0",
+      "license": "MIT"
+    },
+    "node_modules/@semantic-release/github/node_modules/@octokit/plugin-paginate-rest": {
+      "version": "13.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^14.1.0"
+      },
+      "engines": {
+        "node": ">= 20"
+      },
+      "peerDependencies": {
+        "@octokit/core": ">=6"
+      }
+    },
+    "node_modules/@semantic-release/github/node_modules/@octokit/plugin-retry": {
+      "version": "8.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/request-error": "^7.0.0",
+        "@octokit/types": "^14.0.0",
+        "bottleneck": "^2.15.3"
+      },
+      "engines": {
+        "node": ">= 20"
+      },
+      "peerDependencies": {
+        "@octokit/core": ">=7"
+      }
+    },
+    "node_modules/@semantic-release/github/node_modules/@octokit/plugin-throttling": {
+      "version": "11.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^14.0.0",
+        "bottleneck": "^2.15.3"
+      },
+      "engines": {
+        "node": ">= 20"
+      },
+      "peerDependencies": {
+        "@octokit/core": "^7.0.0"
+      }
+    },
+    "node_modules/@semantic-release/github/node_modules/@octokit/request": {
+      "version": "10.0.2",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/endpoint": "^11.0.0",
+        "@octokit/request-error": "^7.0.0",
+        "@octokit/types": "^14.0.0",
+        "fast-content-type-parse": "^3.0.0",
+        "universal-user-agent": "^7.0.2"
+      },
+      "engines": {
+        "node": ">= 20"
+      }
+    },
+    "node_modules/@semantic-release/github/node_modules/@octokit/request-error": {
+      "version": "7.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^14.0.0"
+      },
+      "engines": {
+        "node": ">= 20"
+      }
+    },
+    "node_modules/@semantic-release/github/node_modules/@octokit/types": {
+      "version": "14.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/openapi-types": "^25.1.0"
+      }
+    },
+    "node_modules/@semantic-release/github/node_modules/@semantic-release/error": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@semantic-release/github/node_modules/agent-base": {
+      "version": "7.1.3",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@semantic-release/github/node_modules/aggregate-error": {
+      "version": "5.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "clean-stack": "^5.2.0",
+        "indent-string": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@semantic-release/github/node_modules/before-after-hook": {
+      "version": "4.0.0",
+      "license": "Apache-2.0"
+    },
+    "node_modules/@semantic-release/github/node_modules/clean-stack": {
+      "version": "5.2.0",
+      "license": "MIT",
+      "dependencies": {
+        "escape-string-regexp": "5.0.0"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@semantic-release/github/node_modules/escape-string-regexp": {
+      "version": "5.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@semantic-release/github/node_modules/fast-content-type-parse": {
+      "version": "3.0.0",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fastify"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fastify"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/@semantic-release/github/node_modules/globby": {
+      "version": "14.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "@sindresorhus/merge-streams": "^2.1.0",
+        "fast-glob": "^3.3.3",
+        "ignore": "^7.0.3",
+        "path-type": "^6.0.0",
+        "slash": "^5.1.0",
+        "unicorn-magic": "^0.3.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@semantic-release/github/node_modules/http-proxy-agent": {
+      "version": "7.0.2",
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^7.1.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@semantic-release/github/node_modules/https-proxy-agent": {
+      "version": "7.0.6",
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^7.1.2",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@semantic-release/github/node_modules/ignore": {
+      "version": "7.0.5",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/@semantic-release/github/node_modules/indent-string": {
+      "version": "5.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@semantic-release/github/node_modules/mime": {
+      "version": "4.0.7",
+      "funding": [
+        "https://github.com/sponsors/broofa"
+      ],
+      "license": "MIT",
+      "bin": {
+        "mime": "bin/cli.js"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@semantic-release/github/node_modules/path-type": {
+      "version": "6.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@semantic-release/github/node_modules/slash": {
+      "version": "5.1.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@semantic-release/github/node_modules/unicorn-magic": {
+      "version": "0.3.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@semantic-release/github/node_modules/universal-user-agent": {
+      "version": "7.0.3",
+      "license": "ISC"
+    },
+    "node_modules/@semantic-release/npm": {
+      "version": "12.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "@semantic-release/error": "^4.0.0",
+        "aggregate-error": "^5.0.0",
+        "execa": "^9.0.0",
+        "fs-extra": "^11.0.0",
+        "lodash-es": "^4.17.21",
+        "nerf-dart": "^1.0.0",
+        "normalize-url": "^8.0.0",
+        "npm": "^10.5.0",
+        "rc": "^1.2.8",
+        "read-pkg": "^9.0.0",
+        "registry-auth-token": "^5.0.0",
+        "semver": "^7.1.2",
+        "tempy": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=20.8.1"
+      },
+      "peerDependencies": {
+        "semantic-release": ">=20.1.0"
+      }
+    },
+    "node_modules/@semantic-release/npm/node_modules/@semantic-release/error": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@semantic-release/npm/node_modules/@sindresorhus/merge-streams": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@semantic-release/npm/node_modules/aggregate-error": {
+      "version": "5.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "clean-stack": "^5.2.0",
+        "indent-string": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@semantic-release/npm/node_modules/clean-stack": {
+      "version": "5.2.0",
+      "license": "MIT",
+      "dependencies": {
+        "escape-string-regexp": "5.0.0"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@semantic-release/npm/node_modules/escape-string-regexp": {
+      "version": "5.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@semantic-release/npm/node_modules/execa": {
+      "version": "9.6.0",
+      "license": "MIT",
+      "dependencies": {
+        "@sindresorhus/merge-streams": "^4.0.0",
+        "cross-spawn": "^7.0.6",
+        "figures": "^6.1.0",
+        "get-stream": "^9.0.0",
+        "human-signals": "^8.0.1",
+        "is-plain-obj": "^4.1.0",
+        "is-stream": "^4.0.1",
+        "npm-run-path": "^6.0.0",
+        "pretty-ms": "^9.2.0",
+        "signal-exit": "^4.1.0",
+        "strip-final-newline": "^4.0.0",
+        "yoctocolors": "^2.1.1"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.5.0"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "node_modules/@semantic-release/npm/node_modules/figures": {
+      "version": "6.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "is-unicode-supported": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@semantic-release/npm/node_modules/get-stream": {
+      "version": "9.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "@sec-ant/readable-stream": "^0.4.1",
+        "is-stream": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@semantic-release/npm/node_modules/human-signals": {
+      "version": "8.0.1",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=18.18.0"
+      }
+    },
+    "node_modules/@semantic-release/npm/node_modules/indent-string": {
+      "version": "5.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@semantic-release/npm/node_modules/index-to-position": {
+      "version": "1.1.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@semantic-release/npm/node_modules/is-plain-obj": {
+      "version": "4.1.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@semantic-release/npm/node_modules/is-stream": {
+      "version": "4.0.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@semantic-release/npm/node_modules/normalize-url": {
+      "version": "8.0.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@semantic-release/npm/node_modules/npm-run-path": {
+      "version": "6.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "path-key": "^4.0.0",
+        "unicorn-magic": "^0.3.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@semantic-release/npm/node_modules/npm-run-path/node_modules/unicorn-magic": {
+      "version": "0.3.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@semantic-release/npm/node_modules/parse-json": {
+      "version": "8.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.26.2",
+        "index-to-position": "^1.1.0",
+        "type-fest": "^4.39.1"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@semantic-release/npm/node_modules/path-key": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@semantic-release/npm/node_modules/read-pkg": {
+      "version": "9.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "@types/normalize-package-data": "^2.4.3",
+        "normalize-package-data": "^6.0.0",
+        "parse-json": "^8.0.0",
+        "type-fest": "^4.6.0",
+        "unicorn-magic": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@semantic-release/npm/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "license": "ISC",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@semantic-release/npm/node_modules/strip-final-newline": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@semantic-release/npm/node_modules/type-fest": {
+      "version": "4.41.0",
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@semantic-release/release-notes-generator": {
+      "version": "14.0.3",
+      "license": "MIT",
+      "dependencies": {
+        "conventional-changelog-angular": "^8.0.0",
+        "conventional-changelog-writer": "^8.0.0",
+        "conventional-commits-filter": "^5.0.0",
+        "conventional-commits-parser": "^6.0.0",
+        "debug": "^4.0.0",
+        "get-stream": "^7.0.0",
+        "import-from-esm": "^2.0.0",
+        "into-stream": "^7.0.0",
+        "lodash-es": "^4.17.21",
+        "read-package-up": "^11.0.0"
+      },
+      "engines": {
+        "node": ">=20.8.1"
+      },
+      "peerDependencies": {
+        "semantic-release": ">=20.1.0"
+      }
+    },
+    "node_modules/@semantic-release/release-notes-generator/node_modules/conventional-changelog-angular": {
+      "version": "8.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "compare-func": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@semantic-release/release-notes-generator/node_modules/conventional-changelog-writer": {
+      "version": "8.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "conventional-commits-filter": "^5.0.0",
+        "handlebars": "^4.7.7",
+        "meow": "^13.0.0",
+        "semver": "^7.5.2"
+      },
+      "bin": {
+        "conventional-changelog-writer": "dist/cli/index.js"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@semantic-release/release-notes-generator/node_modules/conventional-commits-filter": {
+      "version": "5.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@semantic-release/release-notes-generator/node_modules/conventional-commits-parser": {
+      "version": "6.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "meow": "^13.0.0"
+      },
+      "bin": {
+        "conventional-commits-parser": "dist/cli/index.js"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@semantic-release/release-notes-generator/node_modules/get-stream": {
+      "version": "7.0.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@semantic-release/release-notes-generator/node_modules/meow": {
+      "version": "13.2.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/@sigstore/bundle": {
       "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-2.3.2.tgz",
-      "integrity": "sha512-wueKWDk70QixNLB363yHc2D2ItTgYiMTdPwK8D9dKQMR3ZQ0c35IxP5xnwQ8cNLoCgCRcHf14kE+CLIvNX1zmA==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -8174,8 +9180,6 @@
     },
     "node_modules/@sigstore/core": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@sigstore/core/-/core-1.1.0.tgz",
-      "integrity": "sha512-JzBqdVIyqm2FRQCulY6nbQzMpJJpSiJ8XXWMhtOX9eKgaXXpfNOF53lzQEjIydlStnd/eFtuC1dW4VYdD93oRg==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -8184,8 +9188,6 @@
     },
     "node_modules/@sigstore/protobuf-specs": {
       "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.3.3.tgz",
-      "integrity": "sha512-RpacQhBlwpBWd7KEJsRKcBQalbV28fvkxwTOJIqhIuDysMMaJW47V4OqW30iJB9uRpqOSxxEAQFdr8tTattReQ==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -8194,8 +9196,6 @@
     },
     "node_modules/@sigstore/sign": {
       "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-2.3.2.tgz",
-      "integrity": "sha512-5Vz5dPVuunIIvC5vBb0APwo7qKA4G9yM48kPWJT+OEERs40md5GoUR1yedwpekWZ4m0Hhw44m6zU+ObsON+iDA==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -8212,8 +9212,6 @@
     },
     "node_modules/@sigstore/tuf": {
       "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-2.3.4.tgz",
-      "integrity": "sha512-44vtsveTPUpqhm9NCrbU8CWLe3Vck2HO1PNLw7RIajbB7xhtn5RBPm1VNSCMwqGYHhDsBJG8gDF0q4lgydsJvw==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -8226,8 +9224,6 @@
     },
     "node_modules/@sigstore/verify": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@sigstore/verify/-/verify-1.2.1.tgz",
-      "integrity": "sha512-8iKx79/F73DKbGfRf7+t4dqrc0bRr0thdPrxAtCKWRm/F0tG71i6O1rvlnScncJLLBZHn3h8M3c1BSUAb9yu8g==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -8241,16 +9237,11 @@
     },
     "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,
       "license": "MIT"
     },
     "node_modules/@sindresorhus/is": {
       "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz",
-      "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=10"
@@ -8261,8 +9252,6 @@
     },
     "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==",
       "license": "MIT",
       "engines": {
         "node": ">=18"
@@ -8273,8 +9262,6 @@
     },
     "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": "BSD-3-Clause",
       "dependencies": {
@@ -8283,8 +9270,6 @@
     },
     "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": "BSD-3-Clause",
       "dependencies": {
@@ -8293,8 +9278,6 @@
     },
     "node_modules/@sinonjs/samsam": {
       "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-8.0.2.tgz",
-      "integrity": "sha512-v46t/fwnhejRSFTGqbpn9u+LQ9xJDse10gNnPgAcxgdoCDMXj/G2asWAC/8Qs+BAZDicX+MNZouXT1A7c83kVw==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
@@ -8305,8 +9288,6 @@
     },
     "node_modules/@sinonjs/samsam/node_modules/type-detect": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.1.0.tgz",
-      "integrity": "sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -8315,15 +9296,12 @@
     },
     "node_modules/@sinonjs/text-encoding": {
       "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.3.tgz",
-      "integrity": "sha512-DE427ROAphMQzU4ENbliGYrBSYPXF+TtLg9S8vzeA+OF4ZKzoDdzfL8sxuMUGS/lgRhM6j1URSk9ghf7Xo1tyA==",
       "dev": true,
       "license": "(Unlicense OR Apache-2.0)"
     },
     "node_modules/@storybook/addon-actions": {
       "version": "8.1.11",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-actions/-/addon-actions-8.1.11.tgz",
-      "integrity": "sha512-jqYXgBgOVInStOCk//AA+dGkrfN8R7rDXA4lyu82zM59kvICtG9iqgmkSRDn0Z3zUkM+lIHZGoz0aLVQ8pxsgw==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@storybook/core-events": "8.1.11",
@@ -8340,8 +9318,6 @@
     },
     "node_modules/@storybook/addon-backgrounds": {
       "version": "8.1.11",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-backgrounds/-/addon-backgrounds-8.1.11.tgz",
-      "integrity": "sha512-naGf1ovmsU2pSWb270yRO1IidnO+0YCZ5Tcb8I4rPhZ0vsdXNURYKS1LPSk1OZkvaUXdeB4Im9HhHfUBJOW9oQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8356,8 +9332,6 @@
     },
     "node_modules/@storybook/addon-controls": {
       "version": "8.1.11",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-controls/-/addon-controls-8.1.11.tgz",
-      "integrity": "sha512-q/Vt4meNVlFlBWIMCJhx6r+bqiiYocCta2RoUK5nyIZUiLzHncKHX6JnCU36EmJzRyah9zkwjfCb2G1r9cjnoQ==",
       "license": "MIT",
       "dependencies": {
         "@storybook/blocks": "8.1.11",
@@ -8372,8 +9346,6 @@
     },
     "node_modules/@storybook/addon-docs": {
       "version": "8.1.11",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-docs/-/addon-docs-8.1.11.tgz",
-      "integrity": "sha512-69dv+CE4R5wFU7xnJmhuyEbLN2PEVDV3N/BbgJqeucIYPmm6zDV83Q66teCHKYtRln3BFUqPH5mxsjiHobxfJQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8405,8 +9377,6 @@
     },
     "node_modules/@storybook/addon-essentials": {
       "version": "8.1.11",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-essentials/-/addon-essentials-8.1.11.tgz",
-      "integrity": "sha512-uRTpcIZQnflML8H+2onicUNIIssKfuviW8Lyrs/KFwSZ1rMcYzhwzCNbGlIbAv04tgHe5NqEyNhb+DVQcZQBzg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8432,8 +9402,6 @@
     },
     "node_modules/@storybook/addon-highlight": {
       "version": "8.1.11",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-highlight/-/addon-highlight-8.1.11.tgz",
-      "integrity": "sha512-Iu8FCAd4ETsB6QF4xDE/OLLZY3HOFopuLM5KE0f58jnccF5zAVGr1Rj/54p6TeK0PEou0tLRPFuZs+LPlEzrSw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8446,8 +9414,6 @@
     },
     "node_modules/@storybook/addon-links": {
       "version": "8.1.11",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-links/-/addon-links-8.1.11.tgz",
-      "integrity": "sha512-HlV2RQSrZyi+55W1B1a9eWNuJdNpWx0g3j7s2arNlNmbd6/kfWAp84axBstI1tL0nW4svut7bWlCsMSOIden+A==",
       "license": "MIT",
       "dependencies": {
         "@storybook/csf": "^0.1.7",
@@ -8469,8 +9435,6 @@
     },
     "node_modules/@storybook/addon-mdx-gfm": {
       "version": "8.1.11",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-mdx-gfm/-/addon-mdx-gfm-8.1.11.tgz",
-      "integrity": "sha512-0/4Xaisvmoi26iK1ezTOB9dN2b0JbgWKzO2PO6att2Jh7lplLCf1QeoE8Y4SgCh0brage+mA8mKI8NrT7d18pg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8485,8 +9449,6 @@
     },
     "node_modules/@storybook/addon-measure": {
       "version": "8.1.11",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-measure/-/addon-measure-8.1.11.tgz",
-      "integrity": "sha512-LkQD3SiLWaWt53aLB3EnmhD9Im8EOO+HKSUE+XGnIJRUcHHRqHfvDkN9KX7T1DCWbfRE5WzMHF5o23b3UiAANw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8500,8 +9462,6 @@
     },
     "node_modules/@storybook/addon-outline": {
       "version": "8.1.11",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-outline/-/addon-outline-8.1.11.tgz",
-      "integrity": "sha512-vco3RLVjkcS25dNtj1lxmjq4fC0Nq08KNLMS5cbNPVJWNTuSUi/2EthSTQQCdpfMV/p6u+D5uF20A9Pl0xJFXw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8515,8 +9475,6 @@
     },
     "node_modules/@storybook/addon-toolbars": {
       "version": "8.1.11",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-toolbars/-/addon-toolbars-8.1.11.tgz",
-      "integrity": "sha512-reIKB0+JTiP+GNzynlDcRf4xmv9+j/DQ94qiXl2ZG5+ufKilH8DiRZpVA/i0x+4+TxdGdOJr1/pOf8tAmhNEoQ==",
       "dev": true,
       "license": "MIT",
       "funding": {
@@ -8526,8 +9484,6 @@
     },
     "node_modules/@storybook/addon-viewport": {
       "version": "8.1.11",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-viewport/-/addon-viewport-8.1.11.tgz",
-      "integrity": "sha512-qk4IcGnAgiAUQxt8l5PIQ293Za+w6wxlJQIpxr7+QM8OVkADPzXY0MmQfYWU9EQplrxAC2MSx3/C1gZeq+MDOQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8600,8 +9556,6 @@
     },
     "node_modules/@storybook/builder-manager": {
       "version": "8.1.11",
-      "resolved": "https://registry.npmjs.org/@storybook/builder-manager/-/builder-manager-8.1.11.tgz",
-      "integrity": "sha512-U7bmed4Ayg+OlJ8HPmLeGxLTHzDY7rxmxM4aAs4YL01fufYfBcjkIP9kFhJm+GJOvGm+YJEUAPe5mbM1P/bn0Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8627,8 +9581,6 @@
     },
     "node_modules/@storybook/builder-webpack5": {
       "version": "8.1.11",
-      "resolved": "https://registry.npmjs.org/@storybook/builder-webpack5/-/builder-webpack5-8.1.11.tgz",
-      "integrity": "sha512-3/aKmnZu+mHj5LB4VyvzrlHzn2iVjH5y8EUPtFYOkjc2KBkPpF39jBHecfDVCWeO/6kgvAI41t7LLnYB6DZqhw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8677,10 +9629,16 @@
         }
       }
     },
+    "node_modules/@storybook/builder-webpack5/node_modules/@types/node": {
+      "version": "18.19.74",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
     "node_modules/@storybook/builder-webpack5/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": {
@@ -8696,8 +9654,6 @@
     },
     "node_modules/@storybook/builder-webpack5/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,
       "license": "MIT",
       "peerDependencies": {
@@ -8706,8 +9662,6 @@
     },
     "node_modules/@storybook/builder-webpack5/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": {
@@ -8723,8 +9677,6 @@
     },
     "node_modules/@storybook/builder-webpack5/node_modules/cosmiconfig": {
       "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
-      "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8740,8 +9692,6 @@
     },
     "node_modules/@storybook/builder-webpack5/node_modules/css-loader": {
       "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.11.0.tgz",
-      "integrity": "sha512-CTJ+AEQJjq5NzLga5pE39qdiSV56F8ywCIsqNIRF0r7BDgWsN25aazToqAFg7ZrtA/U016xudB3ffgweORxX7g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8776,8 +9726,6 @@
     },
     "node_modules/@storybook/builder-webpack5/node_modules/fork-ts-checker-webpack-plugin": {
       "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-8.0.0.tgz",
-      "integrity": "sha512-mX3qW3idpueT2klaQXBzrIM/pHw+T0B/V9KHEvNrqijTq9NFnMZU6oreVxDYcf33P8a5cW+67PjodNHthGnNVg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8805,8 +9753,6 @@
     },
     "node_modules/@storybook/builder-webpack5/node_modules/fork-ts-checker-webpack-plugin/node_modules/fs-extra": {
       "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8820,15 +9766,11 @@
     },
     "node_modules/@storybook/builder-webpack5/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,
       "license": "MIT"
     },
     "node_modules/@storybook/builder-webpack5/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,
       "license": "MIT",
       "dependencies": {
@@ -8846,8 +9788,6 @@
     },
     "node_modules/@storybook/builder-webpack5/node_modules/style-loader": {
       "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.4.tgz",
-      "integrity": "sha512-0WqXzrsMTyb8yjZJHDqwmnwRJvhALK9LfRtRc6B4UTWe8AijYLZYZ9thuJTZc2VfQWINADW/j+LiJnfy2RoC1w==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -8861,10 +9801,13 @@
         "webpack": "^5.0.0"
       }
     },
+    "node_modules/@storybook/builder-webpack5/node_modules/undici-types": {
+      "version": "5.26.5",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@storybook/builder-webpack5/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,
       "license": "ISC",
       "engines": {
@@ -8873,8 +9816,6 @@
     },
     "node_modules/@storybook/channels": {
       "version": "8.1.11",
-      "resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-8.1.11.tgz",
-      "integrity": "sha512-fu5FTqo6duOqtJFa6gFzKbiSLJoia+8Tibn3xFfB6BeifWrH81hc+AZq0lTmHo5qax2G5t8ZN8JooHjMw6k2RA==",
       "license": "MIT",
       "dependencies": {
         "@storybook/client-logger": "8.1.11",
@@ -8890,8 +9831,6 @@
     },
     "node_modules/@storybook/cli": {
       "version": "8.1.11",
-      "resolved": "https://registry.npmjs.org/@storybook/cli/-/cli-8.1.11.tgz",
-      "integrity": "sha512-4U48w9C7mVEKrykcPcfHwJkRyCqJ28XipbElACbjIIkQEqaHaOVtP3GeKIrgkoOXe/HK3O4zKWRP2SqlVS0r4A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8943,8 +9882,6 @@
     },
     "node_modules/@storybook/cli/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": {
@@ -8960,8 +9897,6 @@
     },
     "node_modules/@storybook/cli/node_modules/detect-indent": {
       "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz",
-      "integrity": "sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -8969,18 +9904,16 @@
       }
     },
     "node_modules/@storybook/cli/node_modules/globby": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-14.1.0.tgz",
-      "integrity": "sha512-0Ia46fDOaT7k4og1PDW4YbodWWr3scS2vAr2lTbsplOt2WkKp0vQbkI9wKis/T5LV/dqPjO3bpS/z6GTJB82LA==",
+      "version": "14.0.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@sindresorhus/merge-streams": "^2.1.0",
-        "fast-glob": "^3.3.3",
-        "ignore": "^7.0.3",
-        "path-type": "^6.0.0",
+        "fast-glob": "^3.3.2",
+        "ignore": "^5.2.4",
+        "path-type": "^5.0.0",
         "slash": "^5.1.0",
-        "unicorn-magic": "^0.3.0"
+        "unicorn-magic": "^0.1.0"
       },
       "engines": {
         "node": ">=18"
@@ -8991,25 +9924,22 @@
     },
     "node_modules/@storybook/cli/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/@storybook/cli/node_modules/ignore": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
-      "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
+    "node_modules/@storybook/cli/node_modules/is-unicode-supported": {
+      "version": "0.1.0",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">= 4"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/@storybook/cli/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,
       "license": "MIT",
       "dependencies": {
@@ -9019,10 +9949,23 @@
         "node": ">=8"
       }
     },
+    "node_modules/@storybook/cli/node_modules/log-symbols": {
+      "version": "4.1.0",
+      "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/@storybook/cli/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": {
@@ -9034,8 +9977,6 @@
     },
     "node_modules/@storybook/cli/node_modules/normalize-package-data/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": {
@@ -9044,8 +9985,6 @@
     },
     "node_modules/@storybook/cli/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==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9068,8 +10007,6 @@
     },
     "node_modules/@storybook/cli/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,
       "license": "MIT",
       "dependencies": {
@@ -9084,8 +10021,6 @@
     },
     "node_modules/@storybook/cli/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,
       "license": "MIT",
       "dependencies": {
@@ -9096,13 +10031,11 @@
       }
     },
     "node_modules/@storybook/cli/node_modules/path-type": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-6.0.0.tgz",
-      "integrity": "sha512-Vj7sf++t5pBD637NSfkxpHSMfWaeig5+DKWLhcqIYx6mWQz5hdJTGDVMQiJcw1ZYkhs7AazKDGpRVji1LJCZUQ==",
+      "version": "5.0.0",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=18"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -9110,8 +10043,6 @@
     },
     "node_modules/@storybook/cli/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,
       "license": "MIT",
       "dependencies": {
@@ -9126,8 +10057,6 @@
     },
     "node_modules/@storybook/cli/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,
       "license": "MIT",
       "dependencies": {
@@ -9144,8 +10073,6 @@
     },
     "node_modules/@storybook/cli/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,
       "license": "MIT",
       "dependencies": {
@@ -9158,8 +10085,6 @@
     },
     "node_modules/@storybook/cli/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,
       "license": "(MIT OR CC0-1.0)",
       "engines": {
@@ -9168,8 +10093,6 @@
     },
     "node_modules/@storybook/cli/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": {
@@ -9181,8 +10104,6 @@
     },
     "node_modules/@storybook/cli/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,
       "license": "(MIT OR CC0-1.0)",
       "engines": {
@@ -9191,8 +10112,6 @@
     },
     "node_modules/@storybook/client-logger": {
       "version": "8.1.11",
-      "resolved": "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-8.1.11.tgz",
-      "integrity": "sha512-DVMh2usz3yYmlqCLCiCKy5fT8/UR9aTh+gSqwyNFkGZrIM4otC5A8eMXajXifzotQLT5SaOEnM3WzHwmpvMIEA==",
       "license": "MIT",
       "dependencies": {
         "@storybook/global": "^5.0.0"
@@ -9204,8 +10123,6 @@
     },
     "node_modules/@storybook/codemod": {
       "version": "8.1.11",
-      "resolved": "https://registry.npmjs.org/@storybook/codemod/-/codemod-8.1.11.tgz",
-      "integrity": "sha512-/LCozjH1IQ1TOs9UQV59BE0X6UZ9q+C0NEUz7qmJZPrwAii3FkW4l7D/fwxblpMExaoxv0oE8NQfUz49U/5Ymg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9231,18 +10148,16 @@
       }
     },
     "node_modules/@storybook/codemod/node_modules/globby": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-14.1.0.tgz",
-      "integrity": "sha512-0Ia46fDOaT7k4og1PDW4YbodWWr3scS2vAr2lTbsplOt2WkKp0vQbkI9wKis/T5LV/dqPjO3bpS/z6GTJB82LA==",
+      "version": "14.0.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@sindresorhus/merge-streams": "^2.1.0",
-        "fast-glob": "^3.3.3",
-        "ignore": "^7.0.3",
-        "path-type": "^6.0.0",
+        "fast-glob": "^3.3.2",
+        "ignore": "^5.2.4",
+        "path-type": "^5.0.0",
         "slash": "^5.1.0",
-        "unicorn-magic": "^0.3.0"
+        "unicorn-magic": "^0.1.0"
       },
       "engines": {
         "node": ">=18"
@@ -9251,24 +10166,12 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@storybook/codemod/node_modules/ignore": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
-      "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 4"
-      }
-    },
     "node_modules/@storybook/codemod/node_modules/path-type": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-6.0.0.tgz",
-      "integrity": "sha512-Vj7sf++t5pBD637NSfkxpHSMfWaeig5+DKWLhcqIYx6mWQz5hdJTGDVMQiJcw1ZYkhs7AazKDGpRVji1LJCZUQ==",
+      "version": "5.0.0",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=18"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -9276,8 +10179,6 @@
     },
     "node_modules/@storybook/codemod/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": {
@@ -9313,10 +10214,38 @@
         "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta"
       }
     },
+    "node_modules/@storybook/core": {
+      "version": "8.5.1",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@storybook/csf": "0.1.12",
+        "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": {
+        "prettier": "^2 || ^3"
+      },
+      "peerDependenciesMeta": {
+        "prettier": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@storybook/core-common": {
       "version": "8.1.11",
-      "resolved": "https://registry.npmjs.org/@storybook/core-common/-/core-common-8.1.11.tgz",
-      "integrity": "sha512-Ix0nplD4I4DrV2t9B+62jaw1baKES9UbR/Jz9LVKFF9nsua3ON0aVe73dOjMxFWBngpzBYWe+zYBTZ7aQtDH4Q==",
       "license": "MIT",
       "dependencies": {
         "@storybook/core-events": "8.1.11",
@@ -9364,8 +10293,6 @@
     },
     "node_modules/@storybook/core-common/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==",
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
@@ -9373,8 +10300,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -9389,8 +10314,6 @@
     },
     "node_modules/@storybook/core-common/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==",
       "license": "MIT",
       "dependencies": {
         "commondir": "^1.0.1",
@@ -9406,8 +10329,6 @@
     },
     "node_modules/@storybook/core-common/node_modules/find-cache-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==",
       "license": "MIT",
       "dependencies": {
         "locate-path": "^5.0.0",
@@ -9419,8 +10340,6 @@
     },
     "node_modules/@storybook/core-common/node_modules/find-cache-dir/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==",
       "license": "MIT",
       "dependencies": {
         "find-up": "^4.0.0"
@@ -9431,8 +10350,6 @@
     },
     "node_modules/@storybook/core-common/node_modules/glob": {
       "version": "10.4.5",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
-      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
       "license": "ISC",
       "dependencies": {
         "foreground-child": "^3.1.0",
@@ -9451,8 +10368,6 @@
     },
     "node_modules/@storybook/core-common/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==",
       "license": "MIT",
       "dependencies": {
         "p-locate": "^4.1.0"
@@ -9463,8 +10378,6 @@
     },
     "node_modules/@storybook/core-common/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==",
       "license": "MIT",
       "dependencies": {
         "semver": "^6.0.0"
@@ -9478,8 +10391,6 @@
     },
     "node_modules/@storybook/core-common/node_modules/make-dir/node_modules/semver": {
       "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -9487,8 +10398,6 @@
     },
     "node_modules/@storybook/core-common/node_modules/minimatch": {
       "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "license": "ISC",
       "dependencies": {
         "brace-expansion": "^2.0.1"
@@ -9502,8 +10411,6 @@
     },
     "node_modules/@storybook/core-common/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==",
       "license": "MIT",
       "dependencies": {
         "p-try": "^2.0.0"
@@ -9517,8 +10424,6 @@
     },
     "node_modules/@storybook/core-common/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==",
       "license": "MIT",
       "dependencies": {
         "p-limit": "^2.2.0"
@@ -9529,8 +10434,6 @@
     },
     "node_modules/@storybook/core-events": {
       "version": "8.1.11",
-      "resolved": "https://registry.npmjs.org/@storybook/core-events/-/core-events-8.1.11.tgz",
-      "integrity": "sha512-vXaNe2KEW9BGlLrg0lzmf5cJ0xt+suPjWmEODH5JqBbrdZ67X6ApA2nb6WcxDQhykesWCuFN5gp1l+JuDOBi7A==",
       "license": "MIT",
       "dependencies": {
         "@storybook/csf": "^0.1.7",
@@ -9543,8 +10446,6 @@
     },
     "node_modules/@storybook/core-server": {
       "version": "8.1.11",
-      "resolved": "https://registry.npmjs.org/@storybook/core-server/-/core-server-8.1.11.tgz",
-      "integrity": "sha512-L6dzQTmR0np/kagNONvvlm6lSvF1FNc9js3vxsEEPnEypLbhx8bDZaHmuhmBpYUzKyUMpRVQTE/WgjHLuBBuxA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9599,10 +10500,16 @@
         "url": "https://opencollective.com/storybook"
       }
     },
+    "node_modules/@storybook/core-server/node_modules/@types/node": {
+      "version": "18.19.74",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
     "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==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9618,8 +10525,6 @@
     },
     "node_modules/@storybook/core-server/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,
       "license": "MIT",
       "dependencies": {
@@ -9631,18 +10536,16 @@
       }
     },
     "node_modules/@storybook/core-server/node_modules/globby": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-14.1.0.tgz",
-      "integrity": "sha512-0Ia46fDOaT7k4og1PDW4YbodWWr3scS2vAr2lTbsplOt2WkKp0vQbkI9wKis/T5LV/dqPjO3bpS/z6GTJB82LA==",
+      "version": "14.0.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@sindresorhus/merge-streams": "^2.1.0",
-        "fast-glob": "^3.3.3",
-        "ignore": "^7.0.3",
-        "path-type": "^6.0.0",
+        "fast-glob": "^3.3.2",
+        "ignore": "^5.2.4",
+        "path-type": "^5.0.0",
         "slash": "^5.1.0",
-        "unicorn-magic": "^0.3.0"
+        "unicorn-magic": "^0.1.0"
       },
       "engines": {
         "node": ">=18"
@@ -9653,25 +10556,11 @@
     },
     "node_modules/@storybook/core-server/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/@storybook/core-server/node_modules/ignore": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
-      "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 4"
-      }
-    },
     "node_modules/@storybook/core-server/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,
       "license": "MIT",
       "dependencies": {
@@ -9683,8 +10572,6 @@
     },
     "node_modules/@storybook/core-server/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": {
@@ -9696,8 +10583,6 @@
     },
     "node_modules/@storybook/core-server/node_modules/normalize-package-data/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": {
@@ -9706,8 +10591,6 @@
     },
     "node_modules/@storybook/core-server/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,
       "license": "MIT",
       "dependencies": {
@@ -9722,8 +10605,6 @@
     },
     "node_modules/@storybook/core-server/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,
       "license": "MIT",
       "dependencies": {
@@ -9734,13 +10615,11 @@
       }
     },
     "node_modules/@storybook/core-server/node_modules/path-type": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-6.0.0.tgz",
-      "integrity": "sha512-Vj7sf++t5pBD637NSfkxpHSMfWaeig5+DKWLhcqIYx6mWQz5hdJTGDVMQiJcw1ZYkhs7AazKDGpRVji1LJCZUQ==",
+      "version": "5.0.0",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=18"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -9748,8 +10627,6 @@
     },
     "node_modules/@storybook/core-server/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,
       "license": "MIT",
       "dependencies": {
@@ -9764,8 +10641,6 @@
     },
     "node_modules/@storybook/core-server/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,
       "license": "MIT",
       "dependencies": {
@@ -9782,8 +10657,6 @@
     },
     "node_modules/@storybook/core-server/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,
       "license": "(MIT OR CC0-1.0)",
       "engines": {
@@ -9792,8 +10665,6 @@
     },
     "node_modules/@storybook/core-server/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": {
@@ -9805,18 +10676,19 @@
     },
     "node_modules/@storybook/core-server/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,
       "license": "(MIT OR CC0-1.0)",
       "engines": {
         "node": ">=8"
       }
     },
+    "node_modules/@storybook/core-server/node_modules/undici-types": {
+      "version": "5.26.5",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@storybook/core-webpack": {
       "version": "8.1.11",
-      "resolved": "https://registry.npmjs.org/@storybook/core-webpack/-/core-webpack-8.1.11.tgz",
-      "integrity": "sha512-UQY+t0BDb408OuxW6jQN1ghXcejZlFNgprgvuKlhY3MSv1XwmjrxBDwnLDat4QfBJHFbjdn4eR7pSBzrfE6tKA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9831,10 +10703,29 @@
         "url": "https://opencollective.com/storybook"
       }
     },
+    "node_modules/@storybook/core-webpack/node_modules/@types/node": {
+      "version": "18.19.74",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/@storybook/core-webpack/node_modules/undici-types": {
+      "version": "5.26.5",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@storybook/core/node_modules/@storybook/csf": {
+      "version": "0.1.12",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "type-fest": "^2.19.0"
+      }
+    },
     "node_modules/@storybook/csf": {
       "version": "0.1.13",
-      "resolved": "https://registry.npmjs.org/@storybook/csf/-/csf-0.1.13.tgz",
-      "integrity": "sha512-7xOOwCLGB3ebM87eemep89MYRFTko+D8qE7EdAAq74lgdqRR5cOUtYWJLjO2dLtP94nqoOdHJo6MdLLKzg412Q==",
       "license": "MIT",
       "dependencies": {
         "type-fest": "^2.19.0"
@@ -9842,8 +10733,6 @@
     },
     "node_modules/@storybook/csf-plugin": {
       "version": "8.1.11",
-      "resolved": "https://registry.npmjs.org/@storybook/csf-plugin/-/csf-plugin-8.1.11.tgz",
-      "integrity": "sha512-hkA8gjFtSN/tabG0cuvmEqanMXtxPr3qTkp4UNSt1R6jBEgFHRG2y/KYLl367kDwOSFTT987ZgRfJJruU66Fvw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9857,8 +10746,6 @@
     },
     "node_modules/@storybook/csf-tools": {
       "version": "8.1.11",
-      "resolved": "https://registry.npmjs.org/@storybook/csf-tools/-/csf-tools-8.1.11.tgz",
-      "integrity": "sha512-6qMWAg/dBwCVIHzANM9lSHoirwqSS+wWmv+NwAs0t9S94M75IttHYxD3IyzwaSYCC5llp0EQFvtXXAuSfFbibg==",
       "license": "MIT",
       "dependencies": {
         "@babel/generator": "^7.24.4",
@@ -9878,15 +10765,11 @@
     },
     "node_modules/@storybook/docs-mdx": {
       "version": "3.1.0-next.0",
-      "resolved": "https://registry.npmjs.org/@storybook/docs-mdx/-/docs-mdx-3.1.0-next.0.tgz",
-      "integrity": "sha512-t4syFIeSyufieNovZbLruPt2DmRKpbwL4fERCZ1MifWDRIORCKLc4NCEHy+IqvIqd71/SJV2k4B51nF7vlJfmQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@storybook/docs-tools": {
       "version": "8.1.11",
-      "resolved": "https://registry.npmjs.org/@storybook/docs-tools/-/docs-tools-8.1.11.tgz",
-      "integrity": "sha512-mEXtR9rS7Y+OdKtT/QG6JBGYR1L41mcDhIqhnk7RmYl9qJstVAegrCKWR53sPKFdTVOHU7dmu6k+BD+TqHpyyw==",
       "license": "MIT",
       "dependencies": {
         "@storybook/core-common": "8.1.11",
@@ -9905,8 +10788,6 @@
     },
     "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==",
       "license": "MIT"
     },
     "node_modules/@storybook/icons": {
@@ -9924,8 +10805,6 @@
     },
     "node_modules/@storybook/manager": {
       "version": "8.1.11",
-      "resolved": "https://registry.npmjs.org/@storybook/manager/-/manager-8.1.11.tgz",
-      "integrity": "sha512-e02y9dmxowo7cTKYm9am7UO6NOHoHy6Xi7xZf/UA932qLwFZUtk5pnwIEFaZWI3OQsRUCGhP+FL5zizU7uVZeg==",
       "dev": true,
       "license": "MIT",
       "funding": {
@@ -9935,8 +10814,6 @@
     },
     "node_modules/@storybook/manager-api": {
       "version": "8.1.11",
-      "resolved": "https://registry.npmjs.org/@storybook/manager-api/-/manager-api-8.1.11.tgz",
-      "integrity": "sha512-QSgwKfAw01K9YvvZj30iGBMgQ4YaCT3vojmttuqdH5ukyXkiO7pENLJj4Y+alwUeSi0g+SJeadCI3PXySBHOGg==",
       "license": "MIT",
       "dependencies": {
         "@storybook/channels": "8.1.11",
@@ -9962,8 +10839,6 @@
     },
     "node_modules/@storybook/node-logger": {
       "version": "8.1.11",
-      "resolved": "https://registry.npmjs.org/@storybook/node-logger/-/node-logger-8.1.11.tgz",
-      "integrity": "sha512-wdzFo7B2naGhS52L3n1qBkt5BfvQjs8uax6B741yKRpiGgeAN8nz8+qelkD25MbSukxvbPgDot7WJvsMU/iCzg==",
       "license": "MIT",
       "funding": {
         "type": "opencollective",
@@ -10010,10 +10885,25 @@
         }
       }
     },
+    "node_modules/@storybook/preset-react-webpack/node_modules/@types/node": {
+      "version": "18.19.115",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.115.tgz",
+      "integrity": "sha512-kNrFiTgG4a9JAn1LMQeLOv3MvXIPokzXziohMrMsvpYgLpdEt/mMiVYc4sGKtDfyxM5gIDF4VgrPRyCw4fHOYg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/@storybook/preset-react-webpack/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,
+      "license": "MIT"
+    },
     "node_modules/@storybook/preview": {
       "version": "8.1.11",
-      "resolved": "https://registry.npmjs.org/@storybook/preview/-/preview-8.1.11.tgz",
-      "integrity": "sha512-K/9NZmjnL0D1BROkTNWNoPqgL2UaocALRSqCARmkBLgU2Rn/FuZgEclHkWlYo6pUrmLNK+bZ+XzpNMu12iTbpg==",
       "dev": true,
       "license": "MIT",
       "funding": {
@@ -10023,8 +10913,6 @@
     },
     "node_modules/@storybook/preview-api": {
       "version": "8.1.11",
-      "resolved": "https://registry.npmjs.org/@storybook/preview-api/-/preview-api-8.1.11.tgz",
-      "integrity": "sha512-8ZChmFV56GKppCJ0hnBd/kNTfGn2gWVq1242kuet13pbJtBpvOhyq4W01e/Yo14tAPXvgz8dSnMvWLbJx4QfhQ==",
       "license": "MIT",
       "dependencies": {
         "@storybook/channels": "8.1.11",
@@ -10095,8 +10983,6 @@
     },
     "node_modules/@storybook/react-docgen-typescript-plugin": {
       "version": "1.0.6--canary.9.0c3f3b7.0",
-      "resolved": "https://registry.npmjs.org/@storybook/react-docgen-typescript-plugin/-/react-docgen-typescript-plugin-1.0.6--canary.9.0c3f3b7.0.tgz",
-      "integrity": "sha512-KUqXC3oa9JuQ0kZJLBhVdS4lOneKTOopnNBK4tUAgoxWQ3u/IjzdueZjFr7gyBrXMoU6duutk3RQR9u8ZpYJ4Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -10115,8 +11001,6 @@
     },
     "node_modules/@storybook/react-docgen-typescript-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,
       "license": "MIT",
       "dependencies": {
@@ -10133,8 +11017,6 @@
     },
     "node_modules/@storybook/react-docgen-typescript-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,
       "license": "MIT",
       "dependencies": {
@@ -10147,8 +11029,6 @@
     },
     "node_modules/@storybook/react-docgen-typescript-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,
       "license": "MIT",
       "dependencies": {
@@ -10160,8 +11040,6 @@
     },
     "node_modules/@storybook/react-docgen-typescript-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,
       "license": "MIT",
       "dependencies": {
@@ -10176,8 +11054,6 @@
     },
     "node_modules/@storybook/react-docgen-typescript-plugin/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,
       "license": "MIT",
       "dependencies": {
@@ -10192,8 +11068,6 @@
     },
     "node_modules/@storybook/react-docgen-typescript-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,
       "license": "MIT",
       "dependencies": {
@@ -10205,8 +11079,6 @@
     },
     "node_modules/@storybook/react-docgen-typescript-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,
       "license": "MIT",
       "dependencies": {
@@ -10218,8 +11090,6 @@
     },
     "node_modules/@storybook/react-docgen-typescript-plugin/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": "ISC",
       "bin": {
@@ -10242,8 +11112,6 @@
     },
     "node_modules/@storybook/react-webpack5": {
       "version": "8.1.11",
-      "resolved": "https://registry.npmjs.org/@storybook/react-webpack5/-/react-webpack5-8.1.11.tgz",
-      "integrity": "sha512-VzugGZv9xsZo/mMBj7LsAbQChXIzqKGPRTIO+CQEkDe9HaWBYTJ5Ak46bKw318WYB6QdJcIe8v5sGv68TCStVA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -10271,10 +11139,36 @@
         }
       }
     },
+    "node_modules/@storybook/react-webpack5/node_modules/@types/node": {
+      "version": "18.19.74",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/@storybook/react-webpack5/node_modules/undici-types": {
+      "version": "5.26.5",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@storybook/react/node_modules/@types/node": {
+      "version": "18.19.115",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.115.tgz",
+      "integrity": "sha512-kNrFiTgG4a9JAn1LMQeLOv3MvXIPokzXziohMrMsvpYgLpdEt/mMiVYc4sGKtDfyxM5gIDF4VgrPRyCw4fHOYg==",
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/@storybook/react/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==",
+      "license": "MIT"
+    },
     "node_modules/@storybook/router": {
       "version": "8.1.11",
-      "resolved": "https://registry.npmjs.org/@storybook/router/-/router-8.1.11.tgz",
-      "integrity": "sha512-nU5lsBvy0L8wBYOkjagh29ztZicDATpZNYrHuavlhQ2jznmmHdJvXKYk+VrMAbthjQ6ZBqfeeMNPR1UlnqR5Rw==",
       "license": "MIT",
       "dependencies": {
         "@storybook/client-logger": "8.1.11",
@@ -10288,8 +11182,6 @@
     },
     "node_modules/@storybook/telemetry": {
       "version": "8.1.11",
-      "resolved": "https://registry.npmjs.org/@storybook/telemetry/-/telemetry-8.1.11.tgz",
-      "integrity": "sha512-Jqvm7HcZismKzPuebhyLECO6KjGiSk4ycbca1WUM/TUvifxCXqgoUPlHHQEEfaRdHS63/MSqtMNjLsQRLC/vNQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -10309,8 +11201,6 @@
     },
     "node_modules/@storybook/telemetry/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": {
@@ -10326,15 +11216,11 @@
     },
     "node_modules/@storybook/telemetry/node_modules/fetch-retry": {
       "version": "5.0.6",
-      "resolved": "https://registry.npmjs.org/fetch-retry/-/fetch-retry-5.0.6.tgz",
-      "integrity": "sha512-3yurQZ2hD9VISAhJJP9bpYFNQrHHBXE2JxxjY5aLEcDi46RmAzJE2OC9FAde0yis5ElW0jTTzs0zfg/Cca4XqQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@storybook/telemetry/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,
       "license": "MIT",
       "dependencies": {
@@ -10347,15 +11233,11 @@
     },
     "node_modules/@storybook/telemetry/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/@storybook/telemetry/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,
       "license": "MIT",
       "dependencies": {
@@ -10367,8 +11249,6 @@
     },
     "node_modules/@storybook/telemetry/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": {
@@ -10380,8 +11260,6 @@
     },
     "node_modules/@storybook/telemetry/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,
       "license": "MIT",
       "dependencies": {
@@ -10396,8 +11274,6 @@
     },
     "node_modules/@storybook/telemetry/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,
       "license": "MIT",
       "dependencies": {
@@ -10409,8 +11285,6 @@
     },
     "node_modules/@storybook/telemetry/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,
       "license": "MIT",
       "dependencies": {
@@ -10425,8 +11299,6 @@
     },
     "node_modules/@storybook/telemetry/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,
       "license": "MIT",
       "dependencies": {
@@ -10443,8 +11315,6 @@
     },
     "node_modules/@storybook/telemetry/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,
       "license": "(MIT OR CC0-1.0)",
       "engines": {
@@ -10453,8 +11323,6 @@
     },
     "node_modules/@storybook/telemetry/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": {
@@ -10463,8 +11331,6 @@
     },
     "node_modules/@storybook/telemetry/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,
       "license": "(MIT OR CC0-1.0)",
       "engines": {
@@ -10501,8 +11367,6 @@
     },
     "node_modules/@storybook/types": {
       "version": "8.1.11",
-      "resolved": "https://registry.npmjs.org/@storybook/types/-/types-8.1.11.tgz",
-      "integrity": "sha512-k9N5iRuY2+t7lVRL6xeu6diNsxO3YI3lS4Juv3RZ2K4QsE/b3yG5ElfJB8DjHDSHwRH4ORyrU71KkOCUVfvtnw==",
       "license": "MIT",
       "dependencies": {
         "@storybook/channels": "8.1.11",
@@ -10608,8 +11472,6 @@
     },
     "node_modules/@svgr/babel-plugin-add-jsx-attribute": {
       "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-8.0.0.tgz",
-      "integrity": "sha512-b9MIk7yhdS1pMCZM8VeNfUlSKVRhsHZNMl5O9SfaX0l0t5wjdgu4IDzGB8bpnGBBOjGST3rRFVsaaEtI4W6f7g==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -10625,8 +11487,6 @@
     },
     "node_modules/@svgr/babel-plugin-remove-jsx-attribute": {
       "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-8.0.0.tgz",
-      "integrity": "sha512-BcCkm/STipKvbCl6b7QFrMh/vx00vIP63k2eM66MfHJzPr6O2U0jYEViXkHJWqXqQYjdeA9cuCl5KWmlwjDvbA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -10642,8 +11502,6 @@
     },
     "node_modules/@svgr/babel-plugin-remove-jsx-empty-expression": {
       "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-8.0.0.tgz",
-      "integrity": "sha512-5BcGCBfBxB5+XSDSWnhTThfI9jcO5f0Ai2V24gZpG+wXF14BzwxxdDb4g6trdOux0rhibGs385BeFMSmxtS3uA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -10659,8 +11517,6 @@
     },
     "node_modules/@svgr/babel-plugin-replace-jsx-attribute-value": {
       "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-8.0.0.tgz",
-      "integrity": "sha512-KVQ+PtIjb1BuYT3ht8M5KbzWBhdAjjUPdlMtpuw/VjT8coTrItWX6Qafl9+ji831JaJcu6PJNKCV0bp01lBNzQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -10676,8 +11532,6 @@
     },
     "node_modules/@svgr/babel-plugin-svg-dynamic-title": {
       "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-8.0.0.tgz",
-      "integrity": "sha512-omNiKqwjNmOQJ2v6ge4SErBbkooV2aAWwaPFs2vUY7p7GhVkzRkJ00kILXQvRhA6miHnNpXv7MRnnSjdRjK8og==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -10693,8 +11547,6 @@
     },
     "node_modules/@svgr/babel-plugin-svg-em-dimensions": {
       "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-8.0.0.tgz",
-      "integrity": "sha512-mURHYnu6Iw3UBTbhGwE/vsngtCIbHE43xCRK7kCw4t01xyGqb2Pd+WXekRRoFOBIY29ZoOhUCTEweDMdrjfi9g==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -10710,8 +11562,6 @@
     },
     "node_modules/@svgr/babel-plugin-transform-react-native-svg": {
       "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-8.1.0.tgz",
-      "integrity": "sha512-Tx8T58CHo+7nwJ+EhUwx3LfdNSG9R2OKfaIXXs5soiy5HtgoAEkDay9LIimLOcG8dJQH1wPZp/cnAv6S9CrR1Q==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -10727,8 +11577,6 @@
     },
     "node_modules/@svgr/babel-plugin-transform-svg-component": {
       "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-8.0.0.tgz",
-      "integrity": "sha512-DFx8xa3cZXTdb/k3kfPeaixecQLgKh5NVBMwD0AQxOzcZawK4oo1Jh9LbrcACUivsCA7TLG8eeWgrDXjTMhRmw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -10744,8 +11592,6 @@
     },
     "node_modules/@svgr/babel-preset": {
       "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-8.1.0.tgz",
-      "integrity": "sha512-7EYDbHE7MxHpv4sxvnVPngw5fuR6pw79SkcrILHJ/iMpuKySNCl5W1qcwPEpU+LgyRXOaAFgH0KhwD18wwg6ug==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -10771,8 +11617,6 @@
     },
     "node_modules/@svgr/core": {
       "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@svgr/core/-/core-8.1.0.tgz",
-      "integrity": "sha512-8QqtOQT5ACVlmsvKOJNEaWmRPmcojMOzCz4Hs2BGG/toAp/K38LcsMRyLp349glq5AzJbCEeimEoxaX6v/fLrA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -10792,8 +11636,6 @@
     },
     "node_modules/@svgr/hast-util-to-babel-ast": {
       "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-8.0.0.tgz",
-      "integrity": "sha512-EbDKwO9GpfWP4jN9sGdYwPBU0kdomaPIL2Eu4YwmgP+sJeXT+L7bMwJUBnhzfH8Q2qMBqZ4fJwpCyYsAN3mt2Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -10810,8 +11652,6 @@
     },
     "node_modules/@svgr/plugin-jsx": {
       "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-8.1.0.tgz",
-      "integrity": "sha512-0xiIyBsLlr8quN+WyuxooNW9RJ0Dpr8uOnH/xrCVO8GLUcwHISwj1AG0k+LFzteTkAA0GbX0kj9q6Dk70PTiPA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -10833,8 +11673,6 @@
     },
     "node_modules/@svgr/plugin-svgo": {
       "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@svgr/plugin-svgo/-/plugin-svgo-8.1.0.tgz",
-      "integrity": "sha512-Ywtl837OGO9pTLIN/onoWLmDQ4zFUycI1g76vuKGEz6evR/ZTJlJuz3G/fIkb6OVBJ2g0o6CGJzaEjfmEo3AHA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -10855,8 +11693,6 @@
     },
     "node_modules/@svgr/webpack": {
       "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@svgr/webpack/-/webpack-8.1.0.tgz",
-      "integrity": "sha512-LnhVjMWyMQV9ZmeEy26maJk+8HTIbd59cH4F2MJ439k9DqejRisfFNGAPvRYlKETuh9LrImlS8aKsBgKjMA8WA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -10879,8 +11715,6 @@
     },
     "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==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -10892,8 +11726,6 @@
     },
     "node_modules/@testing-library/dom": {
       "version": "8.20.1",
-      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-8.20.1.tgz",
-      "integrity": "sha512-/DiOQ5xBxgdYRC8LNk7U+RWat0S3qRLeIw3ZIkMQ9kkVlRmwD/Eg8k8CqIpD6GW7u20JIUOfMKbxtiLutpjQ4g==",
       "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.10.4",
@@ -10911,8 +11743,6 @@
     },
     "node_modules/@testing-library/dom/node_modules/chalk": {
       "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -10927,8 +11757,6 @@
     },
     "node_modules/@testing-library/jest-dom": {
       "version": "6.6.3",
-      "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-6.6.3.tgz",
-      "integrity": "sha512-IteBhl4XqYNkM54f4ejhLRJiZNqcSCoXUOG2CPK7qbD322KjQozM4kHQOfkG2oln9b9HTYqs+Sae8vBATubxxA==",
       "license": "MIT",
       "dependencies": {
         "@adobe/css-tools": "^4.4.0",
@@ -10947,8 +11775,6 @@
     },
     "node_modules/@testing-library/jest-dom/node_modules/dom-accessibility-api": {
       "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.6.3.tgz",
-      "integrity": "sha512-7ZgogeTnjuHbo+ct10G9Ffp0mif17idi0IyWNVA/wcwcm7NPOD/WEHVP3n7n3MhXqxoIYm8d6MuZohYWIZ4T3w==",
       "license": "MIT"
     },
     "node_modules/@testing-library/react": {
@@ -10971,8 +11797,6 @@
     },
     "node_modules/@testing-library/user-event": {
       "version": "12.8.3",
-      "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-12.8.3.tgz",
-      "integrity": "sha512-IR0iWbFkgd56Bu5ZI/ej8yQwrkCv8Qydx6RzwbKz9faXazR/+5tvYKsZQgyXJiwgpcva127YO6JcWy7YlCfofQ==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.12.5"
@@ -10987,15 +11811,11 @@
     },
     "node_modules/@tokenizer/token": {
       "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@tokenizer/token/-/token-0.3.0.tgz",
-      "integrity": "sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@tootallnate/once": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
-      "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -11004,15 +11824,11 @@
     },
     "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,
       "license": "MIT"
     },
     "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": "ISC",
       "engines": {
@@ -11021,32 +11837,22 @@
     },
     "node_modules/@tsconfig/node10": {
       "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz",
-      "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==",
       "license": "MIT"
     },
     "node_modules/@tsconfig/node12": {
       "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
-      "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
       "license": "MIT"
     },
     "node_modules/@tsconfig/node14": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
-      "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
       "license": "MIT"
     },
     "node_modules/@tsconfig/node16": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz",
-      "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==",
       "license": "MIT"
     },
     "node_modules/@tufjs/canonical-json": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-2.0.0.tgz",
-      "integrity": "sha512-yVtV8zsdo8qFHe+/3kw81dSLyF7D576A5cCFCi4X7B39tWT7SekaEFUnvnWJHz+9qO7qJTah1JbrDjWKqFtdWA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -11055,8 +11861,6 @@
     },
     "node_modules/@tufjs/models": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-2.0.1.tgz",
-      "integrity": "sha512-92F7/SFyufn4DXsha9+QfKnN03JGqtMFMXgSHbZOo8JG59WkTni7UzAouNQDf7AuP9OAMxVOPQcqG3sB7w+kkg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -11069,8 +11873,6 @@
     },
     "node_modules/@tufjs/models/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": {
@@ -11079,8 +11881,6 @@
     },
     "node_modules/@tufjs/models/node_modules/minimatch": {
       "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": {
@@ -11095,8 +11895,6 @@
     },
     "node_modules/@tybys/wasm-util": {
       "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.9.0.tgz",
-      "integrity": "sha512-6+7nlbMVX/PVDCwaIQ8nTOPveOcFLSt8GcXdx8hD0bt39uWxYT88uXzqTd4fTvqta7oeUJqudepapKNt2DYJFw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -11105,14 +11903,10 @@
     },
     "node_modules/@types/aria-query": {
       "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz",
-      "integrity": "sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==",
       "license": "MIT"
     },
     "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": {
@@ -11124,9 +11918,7 @@
       }
     },
     "node_modules/@types/babel__generator": {
-      "version": "7.27.0",
-      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.27.0.tgz",
-      "integrity": "sha512-ufFd2Xi92OAVPYsy+P4n7/U7e68fex0+Ee8gSG9KX7eo084CWiQ4sdxktvdl0bOPupXtVJPY19zk6EwWqUQ8lg==",
+      "version": "7.6.8",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -11135,8 +11927,6 @@
     },
     "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": {
@@ -11145,9 +11935,7 @@
       }
     },
     "node_modules/@types/babel__traverse": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.7.tgz",
-      "integrity": "sha512-dkO5fhS7+/oos4ciWxyEyjWe48zmG6wbCheo/G2ZnHx4fs3EU6YC6UM8rk56gAjNJ9P3MTH2jo5jb92/K6wbng==",
+      "version": "7.20.6",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -11156,14 +11944,10 @@
     },
     "node_modules/@types/base16": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@types/base16/-/base16-1.0.5.tgz",
-      "integrity": "sha512-OzOWrTluG9cwqidEzC/Q6FAmIPcnZfm8BFRlIx0+UIUqnuAmi5OS88O0RpT3Yz6qdmqObvUhasrbNsCofE4W9A==",
       "license": "MIT"
     },
     "node_modules/@types/body-parser": {
-      "version": "1.19.6",
-      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.6.tgz",
-      "integrity": "sha512-HLFeCYgz89uk22N5Qg3dvGvsv46B8GLvKKo1zKG4NybA8U2DiEO3w9lqGg29t/tfLRJpJ6iQxnVw4OnB7MoM9g==",
+      "version": "1.19.5",
       "license": "MIT",
       "dependencies": {
         "@types/connect": "*",
@@ -11172,8 +11956,6 @@
     },
     "node_modules/@types/bonjour": {
       "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.13.tgz",
-      "integrity": "sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -11182,8 +11964,6 @@
     },
     "node_modules/@types/cacheable-request": {
       "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz",
-      "integrity": "sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -11193,16 +11973,22 @@
         "@types/responselike": "^1.0.0"
       }
     },
+    "node_modules/@types/cheerio": {
+      "version": "0.22.35",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "node_modules/@types/chroma-js": {
       "version": "2.4.5",
-      "resolved": "https://registry.npmjs.org/@types/chroma-js/-/chroma-js-2.4.5.tgz",
-      "integrity": "sha512-6ISjhzJViaPCy2q2e6PgK+8HcHQDQ0V2LDiKmYAh+jJlLqDa6HbwDh0wOevHY0kHHUx0iZwjSRbVD47WOUx5EQ==",
       "license": "MIT"
     },
     "node_modules/@types/classnames": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@types/classnames/-/classnames-2.3.0.tgz",
-      "integrity": "sha512-3GsbOoDYteFShlrBTKzI2Eii4vPg/jAf7LXRIn0WQePKlmhpkV0KoTMuawA7gZJkrbPrZGwv9IEAfIWaOaQK8w==",
       "license": "MIT",
       "dependencies": {
         "classnames": "*"
@@ -11210,8 +11996,6 @@
     },
     "node_modules/@types/color": {
       "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/@types/color/-/color-3.0.6.tgz",
-      "integrity": "sha512-NMiNcZFRUAiUUCCf7zkAelY8eV3aKqfbzyFQlXpPIEeoNDbsEHGpb854V3gzTsGKYj830I5zPuOwU/TP5/cW6A==",
       "license": "MIT",
       "dependencies": {
         "@types/color-convert": "*"
@@ -11219,8 +12003,6 @@
     },
     "node_modules/@types/color-convert": {
       "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@types/color-convert/-/color-convert-2.0.4.tgz",
-      "integrity": "sha512-Ub1MmDdyZ7mX//g25uBAoH/mWGd9swVbt8BseymnaE18SU4po/PjmCrHxqIIRjBo3hV/vh1KGr0eMxUhp+t+dQ==",
       "license": "MIT",
       "dependencies": {
         "@types/color-name": "^1.1.0"
@@ -11228,14 +12010,10 @@
     },
     "node_modules/@types/color-name": {
       "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.5.tgz",
-      "integrity": "sha512-j2K5UJqGTxeesj6oQuGpMgifpT5k9HprgQd8D1Y0lOFqKHl3PJu5GMeS4Y5EgjS55AE6OQxf8mPED9uaGbf4Cg==",
       "license": "MIT"
     },
     "node_modules/@types/connect": {
       "version": "3.4.38",
-      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz",
-      "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==",
       "license": "MIT",
       "dependencies": {
         "@types/node": "*"
@@ -11243,8 +12021,6 @@
     },
     "node_modules/@types/connect-history-api-fallback": {
       "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz",
-      "integrity": "sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -11252,10 +12028,15 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/conventional-commits-parser": {
+      "version": "5.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "node_modules/@types/cross-spawn": {
       "version": "6.0.6",
-      "resolved": "https://registry.npmjs.org/@types/cross-spawn/-/cross-spawn-6.0.6.tgz",
-      "integrity": "sha512-fXRhhUkG4H3TQk5dBhQ7m/JDdSNHKwR2BBia62lhwEIq9xGiQKLxd6LymNhn47SjXhsUEPmxi+PKw2OkW4LLjA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -11263,21 +12044,16 @@
       }
     },
     "node_modules/@types/d3": {
-      "version": "3.5.38",
-      "resolved": "https://registry.npmjs.org/@types/d3/-/d3-3.5.38.tgz",
-      "integrity": "sha512-O/gRkjWULp3xVX8K85V0H3tsSGole0WYt77KVpGZO2xTGLuVFuvE6JIsIli3fvFHCYBhGFn/8OHEEyMYF+QehA==",
+      "version": "3.5.53",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/d3-array": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.0.3.tgz",
-      "integrity": "sha512-Reoy+pKnvsksN0lQUlcH6dOGjRZ/3WRwXR//m+/8lt1BXeI4xyaUZoqULNjyXXRuh0Mj4LNpkCvhUpQlY3X5xQ==",
+      "version": "2.12.7",
       "license": "MIT"
     },
     "node_modules/@types/d3-cloud": {
       "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/@types/d3-cloud/-/d3-cloud-1.2.9.tgz",
-      "integrity": "sha512-5EWJvnlCrqTThGp8lYHx+DL00sOjx2HTlXH1WRe93k5pfOIhPQaL63NttaKYIbT7bTXp/USiunjNS/N4ipttIQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -11286,27 +12062,19 @@
     },
     "node_modules/@types/d3-color": {
       "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-3.1.3.tgz",
-      "integrity": "sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/d3-delaunay": {
       "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/@types/d3-delaunay/-/d3-delaunay-6.0.1.tgz",
-      "integrity": "sha512-tLxQ2sfT0p6sxdG75c6f/ekqxjyYR0+LwPrsO1mbC9YDBzPJhs2HbJJRrn8Ez1DBoHRo2yx7YEATI+8V1nGMnQ==",
       "license": "MIT"
     },
     "node_modules/@types/d3-format": {
       "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@types/d3-format/-/d3-format-3.0.4.tgz",
-      "integrity": "sha512-fALi2aI6shfg7vM5KiR1wNJnZ7r6UuggVqtDA+xiEdPZQwy/trcQaHnwShLuLdta2rTymCNpxYTiMZX/e09F4g==",
       "license": "MIT"
     },
     "node_modules/@types/d3-geo": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@types/d3-geo/-/d3-geo-3.1.0.tgz",
-      "integrity": "sha512-856sckF0oP/diXtS4jNsiQw/UuK5fQG8l/a9VVLeSouf1/PPbBE1i1W852zVwKwYCBkFJJB7nCFTbk6UMEXBOQ==",
       "license": "MIT",
       "dependencies": {
         "@types/geojson": "*"
@@ -11314,8 +12082,6 @@
     },
     "node_modules/@types/d3-interpolate": {
       "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-3.0.4.tgz",
-      "integrity": "sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -11324,14 +12090,10 @@
     },
     "node_modules/@types/d3-path": {
       "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-1.0.11.tgz",
-      "integrity": "sha512-4pQMp8ldf7UaB/gR8Fvvy69psNHkTpD/pVw3vmEi8iZAB9EPMBruB1JvHO4BIq9QkUUd2lV1F5YXpMNj7JPBpw==",
       "license": "MIT"
     },
     "node_modules/@types/d3-scale": {
       "version": "2.2.10",
-      "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-2.2.10.tgz",
-      "integrity": "sha512-j4V7qQ+CQzK2KpvI5NDejdPAcds+fTzNGqWXrCXv1zNR33HRir0bMdhzN1OHDQLNXYffW/zOr3FOS2qlHDEgrw==",
       "license": "MIT",
       "dependencies": {
         "@types/d3-time": "^1"
@@ -11339,20 +12101,14 @@
     },
     "node_modules/@types/d3-scale-chromatic": {
       "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/@types/d3-scale-chromatic/-/d3-scale-chromatic-1.5.4.tgz",
-      "integrity": "sha512-HwLVEm8laYTNOR9Kc9745XDKgRa69VIIChNkSKJgrJOsDLI9QSiFSH2Bi4wMbGrvFs+X64azev7NfBPq+VOFVg==",
       "license": "MIT"
     },
     "node_modules/@types/d3-scale/node_modules/@types/d3-time": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-1.1.4.tgz",
-      "integrity": "sha512-JIvy2HjRInE+TXOmIGN5LCmeO0hkFZx5f9FZ7kiN+D+YTcc8pptsiLiuHsvwxwC7VVKmJ2ExHUgNlAiV7vQM9g==",
       "license": "MIT"
     },
     "node_modules/@types/d3-shape": {
       "version": "1.3.12",
-      "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-1.3.12.tgz",
-      "integrity": "sha512-8oMzcd4+poSLGgV0R1Q1rOlx/xdmozS4Xab7np0eamFFUYq71AU9pOCJEFnkXW2aI/oXdVYJzw6pssbSut7Z9Q==",
       "license": "MIT",
       "dependencies": {
         "@types/d3-path": "^1"
@@ -11360,26 +12116,18 @@
     },
     "node_modules/@types/d3-time": {
       "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.4.tgz",
-      "integrity": "sha512-yuzZug1nkAAaBlBBikKZTgzCeA+k1uy4ZFwWANOfKw5z5LRhV0gNA7gNkKm7HoK+HRN0wX3EkxGk0fpbWhmB7g==",
       "license": "MIT"
     },
     "node_modules/@types/d3-time-format": {
       "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@types/d3-time-format/-/d3-time-format-4.0.3.tgz",
-      "integrity": "sha512-5xg9rC+wWL8kdDj153qZcsJ0FWiFt0J5RB6LYUNZjwSnesfblqrI/bJ1wBdJ8OQfncgbJG5+2F+qfqnqyzYxyg==",
       "license": "MIT"
     },
     "node_modules/@types/d3-voronoi": {
       "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/@types/d3-voronoi/-/d3-voronoi-1.1.12.tgz",
-      "integrity": "sha512-DauBl25PKZZ0WVJr42a6CNvI6efsdzofl9sajqZr2Gf5Gu733WkDdUGiPkUHXiUvYGzNNlFQde2wdZdfQPG+yw==",
       "license": "MIT"
     },
     "node_modules/@types/debug": {
       "version": "4.1.12",
-      "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz",
-      "integrity": "sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==",
       "license": "MIT",
       "dependencies": {
         "@types/ms": "*"
@@ -11387,53 +12135,37 @@
     },
     "node_modules/@types/detect-port": {
       "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/@types/detect-port/-/detect-port-1.3.5.tgz",
-      "integrity": "sha512-Rf3/lB9WkDfIL9eEKaSYKc+1L/rNVYBjThk22JTqQw0YozXarX8YljFAz+HCoC6h4B4KwCMsBPZHaFezwT4BNA==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/diff": {
       "version": "5.2.3",
-      "resolved": "https://registry.npmjs.org/@types/diff/-/diff-5.2.3.tgz",
-      "integrity": "sha512-K0Oqlrq3kQMaO2RhfrNQX5trmt+XLyom88zS0u84nnIcLvFnRUMRRHmrGny5GSM+kNO9IZLARsdQHDzkhAgmrQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/doctrine": {
       "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/@types/doctrine/-/doctrine-0.0.3.tgz",
-      "integrity": "sha512-w5jZ0ee+HaPOaX25X2/2oGR/7rgAQSYII7X7pp0m9KgBfMP7uKfMfTvcpl5Dj+eDBbpxKGiqE+flqDr6XTd2RA==",
       "license": "MIT"
     },
     "node_modules/@types/dom-to-image": {
       "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/@types/dom-to-image/-/dom-to-image-2.6.7.tgz",
-      "integrity": "sha512-me5VbCv+fcXozblWwG13krNBvuEOm6kA5xoa4RrjDJCNFOZSWR3/QLtOXimBHk1Fisq69Gx3JtOoXtg1N1tijg==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/ejs": {
       "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/@types/ejs/-/ejs-3.1.5.tgz",
-      "integrity": "sha512-nv+GSx77ZtXiJzwKdsASqi+YQ5Z7vwHsTP0JY2SiQgjGckkBRKZnk8nIM+7oUZ1VCtuTz0+By4qVR7fqzp/Dfg==",
       "license": "MIT"
     },
     "node_modules/@types/emscripten": {
-      "version": "1.40.1",
-      "resolved": "https://registry.npmjs.org/@types/emscripten/-/emscripten-1.40.1.tgz",
-      "integrity": "sha512-sr53lnYkQNhjHNN0oJDdUm5564biioI5DuOpycufDVK7D3y+GR3oUswe2rlwY1nPNyusHbrJ9WoTyIHl4/Bpwg==",
+      "version": "1.39.13",
       "license": "MIT"
     },
     "node_modules/@types/escodegen": {
       "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/@types/escodegen/-/escodegen-0.0.6.tgz",
-      "integrity": "sha512-AjwI4MvWx3HAOaZqYsjKWyEObT9lcVV0Y0V8nXo6cXzN8ZiMxVhf6F3d/UNvXVGKrEzL/Dluc5p+y9GkzlTWig==",
       "license": "MIT"
     },
     "node_modules/@types/eslint": {
       "version": "9.6.1",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
-      "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -11443,8 +12175,6 @@
     },
     "node_modules/@types/eslint-scope": {
       "version": "3.7.7",
-      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
-      "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -11454,20 +12184,15 @@
     },
     "node_modules/@types/estree": {
       "version": "0.0.51",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
-      "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==",
       "license": "MIT"
     },
     "node_modules/@types/expect": {
       "version": "1.20.4",
-      "resolved": "https://registry.npmjs.org/@types/expect/-/expect-1.20.4.tgz",
-      "integrity": "sha512-Q5Vn3yjTDyCMV50TB6VRIbQNxSE4OmZR86VSbGaNpfUolm0iePBB4KdEEHmxoY5sT2+2DIvXW0rvMDP2nHZ4Mg==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/@types/express": {
-      "version": "4.17.23",
-      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.23.tgz",
-      "integrity": "sha512-Crp6WY9aTYP3qPi2wGDo9iUe/rceX01UMhnF1jmwDcKCFM6cx7YhGP/Mpr3y9AASpfHixIG0E6azCcL5OcDHsQ==",
+      "version": "4.17.21",
       "license": "MIT",
       "dependencies": {
         "@types/body-parser": "*",
@@ -11478,8 +12203,6 @@
     },
     "node_modules/@types/express-serve-static-core": {
       "version": "4.19.6",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz",
-      "integrity": "sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A==",
       "license": "MIT",
       "dependencies": {
         "@types/node": "*",
@@ -11488,29 +12211,23 @@
         "@types/send": "*"
       }
     },
-    "node_modules/@types/fetch-mock": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/@types/fetch-mock/-/fetch-mock-7.3.8.tgz",
-      "integrity": "sha512-ztsIGiyUvD0GaqPc9/hb8k20gnr6lupqA6SFtqt+8v2mtHhNO/Ebb6/b7N6af/7x0A7s1C8nxrEGzajMBqz8qA==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@types/file-saver": {
       "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/@types/file-saver/-/file-saver-2.0.7.tgz",
-      "integrity": "sha512-dNKVfHd/jk0SkR/exKGj2ggkB45MAkzvWCaqLUUgkyjITkGNzH8H+yUwr+BLJUBjZOe9w8X3wgmXhZDRg1ED6A==",
       "license": "MIT"
     },
     "node_modules/@types/geojson": {
       "version": "7946.0.16",
-      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.16.tgz",
-      "integrity": "sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==",
       "license": "MIT"
     },
+    "node_modules/@types/geojson-vt": {
+      "version": "3.2.5",
+      "license": "MIT",
+      "dependencies": {
+        "@types/geojson": "*"
+      }
+    },
     "node_modules/@types/glob": {
       "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-8.1.0.tgz",
-      "integrity": "sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -11518,33 +12235,22 @@
         "@types/node": "*"
       }
     },
-    "node_modules/@types/glob/node_modules/@types/minimatch": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz",
-      "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==",
+    "node_modules/@types/glob-to-regexp": {
+      "version": "0.4.4",
       "dev": true,
       "license": "MIT"
     },
-    "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==",
+    "node_modules/@types/glob/node_modules/@types/minimatch": {
+      "version": "5.1.2",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/node": "*"
-      }
+      "license": "MIT"
     },
     "node_modules/@types/hammerjs": {
       "version": "2.0.46",
-      "resolved": "https://registry.npmjs.org/@types/hammerjs/-/hammerjs-2.0.46.tgz",
-      "integrity": "sha512-ynRvcq6wvqexJ9brDMS4BnBLzmr0e14d6ZJTEShTBWKymQiHwlAyGu0ZPEFI2Fh1U53F7tN9ufClWM5KvqkKOw==",
       "license": "MIT"
     },
     "node_modules/@types/hast": {
       "version": "2.3.10",
-      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-2.3.10.tgz",
-      "integrity": "sha512-McWspRw8xx8J9HurkVBfYj0xKoE25tOFlHGdx4MJ5xORQrMGZNqJhVQWaIbm6Oyla5kYOXtDiopzKRJzEOkwJw==",
       "license": "MIT",
       "dependencies": {
         "@types/unist": "^2"
@@ -11552,15 +12258,11 @@
     },
     "node_modules/@types/history": {
       "version": "4.7.11",
-      "resolved": "https://registry.npmjs.org/@types/history/-/history-4.7.11.tgz",
-      "integrity": "sha512-qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/hoist-non-react-statics": {
       "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.6.tgz",
-      "integrity": "sha512-lPByRJUer/iN/xa4qpyL0qmL11DqNW81iU/IG1S3uvRUq4oKagz8VCxZjiWkumgt66YT3vOdDgZ0o32sGKtCEw==",
       "license": "MIT",
       "dependencies": {
         "@types/react": "*",
@@ -11569,28 +12271,20 @@
     },
     "node_modules/@types/html-minifier-terser": {
       "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
-      "integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/http-cache-semantics": {
       "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz",
-      "integrity": "sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/http-errors": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.5.tgz",
-      "integrity": "sha512-r8Tayk8HJnX0FztbZN7oVqGccWgw98T/0neJphO91KkmOzug1KkofZURD4UaD5uH8AqcFLfdPErnBod0u71/qg==",
+      "version": "2.0.4",
       "license": "MIT"
     },
     "node_modules/@types/http-proxy": {
-      "version": "1.17.16",
-      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.16.tgz",
-      "integrity": "sha512-sdWoUajOB1cd0A8cRRQ1cfyWNbmFKLAqBB89Y8x5iYyG/mkJHc0YUH8pdWBy2omi9qtCpiIgGjuwO0dQST2l5w==",
+      "version": "1.17.15",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -11598,11 +12292,9 @@
       }
     },
     "node_modules/@types/inquirer": {
-      "version": "9.0.8",
-      "resolved": "https://registry.npmjs.org/@types/inquirer/-/inquirer-9.0.8.tgz",
-      "integrity": "sha512-CgPD5kFGWsb8HJ5K7rfWlifao87m4ph8uioU7OTncJevmE/VLIqAAjfQtko578JZg7/f69K4FgqYym3gNr7DeA==",
-      "devOptional": true,
+      "version": "9.0.7",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/through": "*",
         "rxjs": "^7.2.0"
@@ -11610,14 +12302,10 @@
     },
     "node_modules/@types/istanbul-lib-coverage": {
       "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
-      "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==",
       "license": "MIT"
     },
     "node_modules/@types/istanbul-lib-report": {
       "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz",
-      "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==",
       "license": "MIT",
       "dependencies": {
         "@types/istanbul-lib-coverage": "*"
@@ -11625,8 +12313,6 @@
     },
     "node_modules/@types/istanbul-reports": {
       "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz",
-      "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -11635,8 +12321,6 @@
     },
     "node_modules/@types/jest": {
       "version": "29.5.14",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.14.tgz",
-      "integrity": "sha512-ZN+4sdnLUbo8EVvVc2ao0GFW6oVrQRPn4K2lglySj7APvSrgzxHiNNK99us4WDMi57xxA2yggblIAMNhXOotLQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -11646,8 +12330,6 @@
     },
     "node_modules/@types/jest/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==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -11659,8 +12341,6 @@
     },
     "node_modules/@types/jest/node_modules/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,
       "license": "MIT",
       "dependencies": {
@@ -11674,8 +12354,6 @@
     },
     "node_modules/@types/jquery": {
       "version": "3.5.32",
-      "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.32.tgz",
-      "integrity": "sha512-b9Xbf4CkMqS02YH8zACqN1xzdxc3cO735Qe5AbSUFmyOiaWAbcpqh9Wna+Uk0vgACvoQHpWDg2rGdHkYPLmCiQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -11684,15 +12362,11 @@
     },
     "node_modules/@types/js-levenshtein": {
       "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@types/js-levenshtein/-/js-levenshtein-1.1.3.tgz",
-      "integrity": "sha512-jd+Q+sD20Qfu9e2aEXogiO3vpOC1PYJOUdyN9gvs4Qrvkg4wF43L5OhqrPeokdv8TL0/mXoYfpkcoGZMNN2pkQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/jsdom": {
       "version": "20.0.1",
-      "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-20.0.1.tgz",
-      "integrity": "sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -11701,55 +12375,21 @@
         "parse5": "^7.0.0"
       }
     },
-    "node_modules/@types/jsdom/node_modules/entities": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.0.tgz",
-      "integrity": "sha512-aKstq2TDOndCn4diEyp9Uq/Flu2i1GlLkc6XIDQSDMuaFE3OPW5OphLCyQ5SpSJZTb4reN+kTcYru5yIfXoRPw==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": ">=0.12"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
-    "node_modules/@types/jsdom/node_modules/parse5": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.3.0.tgz",
-      "integrity": "sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "entities": "^6.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/inikulin/parse5?sponsor=1"
-      }
-    },
     "node_modules/@types/json-bigint": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@types/json-bigint/-/json-bigint-1.0.4.tgz",
-      "integrity": "sha512-ydHooXLbOmxBbubnA7Eh+RpBzuaIiQjh8WGJYQB50JFGFrdxW7JzVlyEV7fAXw0T2sqJ1ysTneJbiyNLqZRAag==",
       "license": "MIT"
     },
     "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==",
       "license": "MIT"
     },
     "node_modules/@types/json5": {
       "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/keyv": {
       "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz",
-      "integrity": "sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -11757,15 +12397,11 @@
       }
     },
     "node_modules/@types/lodash": {
-      "version": "4.17.17",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.17.tgz",
-      "integrity": "sha512-RRVJ+J3J+WmyOTqnz3PiBLA501eKwXl2noseKOrNo/6+XEHjTAxO4xHvxQB6QuNm+s4WRbn6rSiap8+EA+ykFQ==",
+      "version": "4.17.16",
       "license": "MIT"
     },
     "node_modules/@types/lodash-es": {
       "version": "4.17.12",
-      "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.12.tgz",
-      "integrity": "sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==",
       "license": "MIT",
       "dependencies": {
         "@types/lodash": "*"
@@ -11773,8 +12409,6 @@
     },
     "node_modules/@types/lodash.get": {
       "version": "4.4.9",
-      "resolved": "https://registry.npmjs.org/@types/lodash.get/-/lodash.get-4.4.9.tgz",
-      "integrity": "sha512-J5dvW98sxmGnamqf+/aLP87PYXyrha9xIgc2ZlHl6OHMFR2Ejdxep50QfU0abO1+CH6+ugx+8wEUN1toImAinA==",
       "license": "MIT",
       "dependencies": {
         "@types/lodash": "*"
@@ -11782,18 +12416,27 @@
     },
     "node_modules/@types/mapbox__geojson-extent": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@types/mapbox__geojson-extent/-/mapbox__geojson-extent-1.0.3.tgz",
-      "integrity": "sha512-i7r+3Iencd5PMleZmIRciaN8ntaGvwPA2sHts50YFrZeH9FIJFAjK64HgDaqzrtecmPbMvIltQuwuEbEQfoUJA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/geojson": "*"
       }
     },
+    "node_modules/@types/mapbox__point-geometry": {
+      "version": "0.1.4",
+      "license": "MIT"
+    },
+    "node_modules/@types/mapbox__vector-tile": {
+      "version": "1.3.4",
+      "license": "MIT",
+      "dependencies": {
+        "@types/geojson": "*",
+        "@types/mapbox__point-geometry": "*",
+        "@types/pbf": "*"
+      }
+    },
     "node_modules/@types/mapbox-gl": {
       "version": "2.7.21",
-      "resolved": "https://registry.npmjs.org/@types/mapbox-gl/-/mapbox-gl-2.7.21.tgz",
-      "integrity": "sha512-Dx9MuF2kKgT/N22LsMUB4b3acFZh9clVqz9zv1fomoiPoBrJolwYxpWA/9LPO/2N0xWbKi4V+pkjTaFkkx/4wA==",
       "license": "MIT",
       "dependencies": {
         "@types/geojson": "*"
@@ -11801,15 +12444,11 @@
     },
     "node_modules/@types/math-expression-evaluator": {
       "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/@types/math-expression-evaluator/-/math-expression-evaluator-1.3.3.tgz",
-      "integrity": "sha512-j18VQRLs5GXflqJFLEcSOfdo7vN7WVG8CimAIyhPpDTsd7LJrnvackbGqdXkLVV5W514iyAlLCMaCCXQX0YZWA==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/mdast": {
       "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-4.0.4.tgz",
-      "integrity": "sha512-kGaNbPh1k7AFzgpud/gMdvIm5xuECykRR+JnWKQno9TAXVa6WIVCGTPvYGekIDL4uwCZQSYbUxNBSb1aUo79oA==",
       "license": "MIT",
       "dependencies": {
         "@types/unist": "*"
@@ -11817,57 +12456,41 @@
     },
     "node_modules/@types/mdx": {
       "version": "2.0.13",
-      "resolved": "https://registry.npmjs.org/@types/mdx/-/mdx-2.0.13.tgz",
-      "integrity": "sha512-+OWZQfAYyio6YkJb3HLxDrvnx6SWWDbC0zVPfBRzUk0/nqoDyf6dNxQi3eArPe8rJ473nobTMQ/8Zk+LxJ+Yuw==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/mime": {
       "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz",
-      "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==",
       "license": "MIT"
     },
     "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,
       "license": "MIT"
     },
     "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,
       "license": "MIT"
     },
     "node_modules/@types/mousetrap": {
       "version": "1.6.15",
-      "resolved": "https://registry.npmjs.org/@types/mousetrap/-/mousetrap-1.6.15.tgz",
-      "integrity": "sha512-qL0hyIMNPow317QWW/63RvL1x5MVMV+Ru3NaY9f/CuEpCqrmb7WeuK2071ZY5hczOnm38qExWM2i2WtkXLSqFw==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/ms": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@types/ms/-/ms-2.1.0.tgz",
-      "integrity": "sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==",
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "18.19.111",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.111.tgz",
-      "integrity": "sha512-90sGdgA+QLJr1F9X79tQuEut0gEYIfkX9pydI4XGRgvFo9g2JWswefI+WUSUHPYVBHYSEfTEqBxA5hQvAZB3Mw==",
+      "version": "22.15.30",
       "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~6.21.0"
       }
     },
     "node_modules/@types/node-forge": {
       "version": "1.3.11",
-      "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.11.tgz",
-      "integrity": "sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -11876,52 +12499,40 @@
     },
     "node_modules/@types/normalize-package-data": {
       "version": "2.4.4",
-      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz",
-      "integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==",
       "license": "MIT"
     },
     "node_modules/@types/offscreencanvas": {
       "version": "2019.7.3",
-      "resolved": "https://registry.npmjs.org/@types/offscreencanvas/-/offscreencanvas-2019.7.3.tgz",
-      "integrity": "sha512-ieXiYmgSRXUDeOntE1InxjWyvEelZGP63M+cGuquuRLuIKKT1osnkXjxev9B7d1nXSug5vpunx+gNlbVxMlC9A==",
       "license": "MIT"
     },
     "node_modules/@types/parse-json": {
       "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz",
-      "integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==",
+      "license": "MIT"
+    },
+    "node_modules/@types/pbf": {
+      "version": "3.0.5",
       "license": "MIT"
     },
     "node_modules/@types/pretty-hrtime": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@types/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
-      "integrity": "sha512-nj39q0wAIdhwn7DGUyT9irmsKK1tV0bd5WFEhgpqNTMFZ8cE+jieuTphCW0tfdm47S2zVT5mr09B28b1chmQMA==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/prop-types": {
       "version": "15.7.14",
-      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.14.tgz",
-      "integrity": "sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ==",
       "license": "MIT"
     },
     "node_modules/@types/qs": {
-      "version": "6.14.0",
-      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.14.0.tgz",
-      "integrity": "sha512-eOunJqu0K1923aExK6y8p6fsihYEn/BYuQ4g0CxAAgFc4b/ZLN4CrsRZ55srTdqoiLzU2B2evC+apEIxprEzkQ==",
+      "version": "6.9.18",
       "license": "MIT"
     },
     "node_modules/@types/raf": {
       "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/@types/raf/-/raf-3.4.3.tgz",
-      "integrity": "sha512-c4YAvMedbPZ5tEyxzQdMoOhhJ4RD3rngZIdwC2/qDN3d7JpEhB6fiBRKVY1lg5B7Wk+uPBjn5f39j1/2MY1oOw==",
       "license": "MIT",
       "optional": true
     },
     "node_modules/@types/range-parser": {
       "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz",
-      "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==",
       "license": "MIT"
     },
     "node_modules/@types/react": {
@@ -11934,18 +12545,6 @@
         "csstype": "^3.0.2"
       }
     },
-    "node_modules/@types/react-color": {
-      "version": "3.0.13",
-      "resolved": "https://registry.npmjs.org/@types/react-color/-/react-color-3.0.13.tgz",
-      "integrity": "sha512-2c/9FZ4ixC5T3JzN0LP5Cke2Mf0MKOP2Eh0NPDPWmuVH3NjPyhEjqNMQpN1Phr5m74egAy+p2lYNAFrX1z9Yrg==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/reactcss": "*"
-      },
-      "peerDependencies": {
-        "@types/react": "*"
-      }
-    },
     "node_modules/@types/react-dom": {
       "version": "18.3.7",
       "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.7.tgz",
@@ -11955,6 +12554,13 @@
         "@types/react": "^18.0.0"
       }
     },
+    "node_modules/@types/react-google-recaptcha": {
+      "version": "2.1.9",
+      "license": "MIT",
+      "dependencies": {
+        "@types/react": "*"
+      }
+    },
     "node_modules/@types/react-gravatar": {
       "version": "2.6.14",
       "resolved": "https://registry.npmjs.org/@types/react-gravatar/-/react-gravatar-2.6.14.tgz",
@@ -11967,8 +12573,6 @@
     },
     "node_modules/@types/react-json-tree": {
       "version": "0.6.11",
-      "resolved": "https://registry.npmjs.org/@types/react-json-tree/-/react-json-tree-0.6.11.tgz",
-      "integrity": "sha512-HP0Sf0ZHjCi1FHLJxh/pLaxaevEW6ILlV2C5Dn3EZFTkLjWkv+EVf/l/zvtmoU9ZwuO/3TKVeWK/700UDxunTw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -11977,8 +12581,6 @@
     },
     "node_modules/@types/react-loadable": {
       "version": "5.5.11",
-      "resolved": "https://registry.npmjs.org/@types/react-loadable/-/react-loadable-5.5.11.tgz",
-      "integrity": "sha512-/tq2IJ853MoIFRBmqVOxnGsRRjER5TmEKzsZtaAkiXAWoDeKgR/QNOT1vd9k0p9h/F616X21cpNh3hu4RutzRQ==",
       "license": "MIT",
       "dependencies": {
         "@types/react": "*",
@@ -11987,8 +12589,6 @@
     },
     "node_modules/@types/react-redux": {
       "version": "7.1.34",
-      "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.34.tgz",
-      "integrity": "sha512-GdFaVjEbYv4Fthm2ZLvj1VSCedV7TqE5y1kNwnjSdBOTXuRSgowux6J8TAct15T3CKBr63UMk+2CO7ilRhyrAQ==",
       "license": "MIT",
       "dependencies": {
         "@types/hoist-non-react-statics": "^3.3.0",
@@ -11999,8 +12599,6 @@
     },
     "node_modules/@types/react-resizable": {
       "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@types/react-resizable/-/react-resizable-3.0.8.tgz",
-      "integrity": "sha512-Pcvt2eGA7KNXldt1hkhVhAgZ8hK41m0mp89mFgQi7LAAEZiaLgm4fHJ5zbJZ/4m2LVaAyYrrRRv1LHDcrGQanA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -12009,8 +12607,6 @@
     },
     "node_modules/@types/react-router": {
       "version": "5.1.20",
-      "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.20.tgz",
-      "integrity": "sha512-jGjmu/ZqS7FjSH6owMcD5qpq19+1RS9DeVRqfl1FeBMxTDQAGwlMWOcs52NDoXaNKyG3d1cYQFMs9rCrb88o9Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -12020,8 +12616,6 @@
     },
     "node_modules/@types/react-router-dom": {
       "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-5.3.3.tgz",
-      "integrity": "sha512-kpqnYK4wcdm5UaWI3fLcELopqLrHgLqNsdpHauzlQktfkHL3npOSwtj1Uz9oKBAzs7lFtVkV8j83voAz2D8fhw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -12032,8 +12626,6 @@
     },
     "node_modules/@types/react-syntax-highlighter": {
       "version": "15.5.13",
-      "resolved": "https://registry.npmjs.org/@types/react-syntax-highlighter/-/react-syntax-highlighter-15.5.13.tgz",
-      "integrity": "sha512-uLGJ87j6Sz8UaBAooU0T6lWJ0dBmjZgN1PZTrj05TNql2/XpC6+4HhMT5syIdFUUt+FASfCeLLv4kBygNU+8qA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -12042,8 +12634,6 @@
     },
     "node_modules/@types/react-table": {
       "version": "7.7.20",
-      "resolved": "https://registry.npmjs.org/@types/react-table/-/react-table-7.7.20.tgz",
-      "integrity": "sha512-ahMp4pmjVlnExxNwxyaDrFgmKxSbPwU23sGQw2gJK4EhCvnvmib2s/O/+y1dfV57dXOwpr2plfyBol+vEHbi2w==",
       "license": "MIT",
       "dependencies": {
         "@types/react": "*"
@@ -12051,8 +12641,6 @@
     },
     "node_modules/@types/react-transition-group": {
       "version": "4.4.12",
-      "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.12.tgz",
-      "integrity": "sha512-8TV6R3h2j7a91c+1DXdJi3Syo69zzIZbz7Lg5tORM5LEJG7X/E6a1V3drRyBRZq7/utz7A+c4OgYLiLcYGHG6w==",
       "dev": true,
       "license": "MIT",
       "peerDependencies": {
@@ -12061,8 +12649,6 @@
     },
     "node_modules/@types/react-ultimate-pagination": {
       "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@types/react-ultimate-pagination/-/react-ultimate-pagination-1.2.4.tgz",
-      "integrity": "sha512-1y9jLt3KEFGzFD+99qVpJUI/Eu4cEx48sClB957eGoepWRLVVi+r1UBj0157Mg7HYZcIF4I1/qGZYaBBQWhaqg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -12071,8 +12657,6 @@
     },
     "node_modules/@types/react-virtualized-auto-sizer": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@types/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.4.tgz",
-      "integrity": "sha512-nhYwlFiYa8M3S+O2T9QO/e1FQUYMr/wJENUdf/O0dhRi1RS/93rjrYQFYdbUqtdFySuhrtnEDX29P6eKOttY+A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -12081,27 +12665,13 @@
     },
     "node_modules/@types/react-window": {
       "version": "1.8.8",
-      "resolved": "https://registry.npmjs.org/@types/react-window/-/react-window-1.8.8.tgz",
-      "integrity": "sha512-8Ls660bHR1AUA2kuRvVG9D/4XpRC6wjAaPT9dil7Ckc76eP9TKWZwwmgfq8Q1LANX3QNDnoU4Zp48A3w+zK69Q==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/react": "*"
       }
     },
-    "node_modules/@types/reactcss": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmjs.org/@types/reactcss/-/reactcss-1.2.13.tgz",
-      "integrity": "sha512-gi3S+aUi6kpkF5vdhUsnkwbiSEIU/BEJyD7kBy2SudWBUuKmJk8AQKE0OVcQQeEy40Azh0lV6uynxlikYIJuwg==",
-      "license": "MIT",
-      "peerDependencies": {
-        "@types/react": "*"
-      }
-    },
     "node_modules/@types/redux-localstorage": {
       "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/@types/redux-localstorage/-/redux-localstorage-1.0.12.tgz",
-      "integrity": "sha512-+N1PsS/4o0KZM9UXPXiLgXRtO4WqasOSQxFyW6ahqzgzG6sy5i2zluwssT+gFnXm7DrTF6qqVvauDf0lWM468g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -12110,8 +12680,6 @@
     },
     "node_modules/@types/redux-localstorage/node_modules/redux": {
       "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/redux/-/redux-3.7.2.tgz",
-      "integrity": "sha512-pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -12123,8 +12691,6 @@
     },
     "node_modules/@types/redux-mock-store": {
       "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@types/redux-mock-store/-/redux-mock-store-1.5.0.tgz",
-      "integrity": "sha512-jcscBazm6j05Hs6xYCca6psTUBbFT2wqMxT7wZEHAYFxHB/I8jYk7d5msrHUlDiSL02HdTqTmkK2oIV8i3C8DA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -12133,15 +12699,11 @@
     },
     "node_modules/@types/resolve": {
       "version": "1.20.6",
-      "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.6.tgz",
-      "integrity": "sha512-A4STmOXPhMUtHH+S6ymgE2GiBSMqf4oTvcQZMcHzokuTLVYzXTB8ttjcgxOVaAp2lGwEdzZ0J+cRbbeevQj1UQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/responselike": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.3.tgz",
-      "integrity": "sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -12150,36 +12712,26 @@
     },
     "node_modules/@types/retry": {
       "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz",
-      "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/rison": {
       "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/@types/rison/-/rison-0.1.0.tgz",
-      "integrity": "sha512-Xj7FO2KBR555nDy58tzrSPpNrShppZpPMZi5WjcNglyFEKQZwRnJLrU2U4wHs61Fl/A8gr+siO/Py04hTWLjzg==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/seedrandom": {
       "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@types/seedrandom/-/seedrandom-3.0.8.tgz",
-      "integrity": "sha512-TY1eezMU2zH2ozQoAFAQFOPpvP15g+ZgSfTZt31AUUH/Rxtnz3H+A/Sv1Snw2/amp//omibc+AEkTaA8KUeOLQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/semver": {
-      "version": "7.7.0",
-      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.7.0.tgz",
-      "integrity": "sha512-k107IF4+Xr7UHjwDc7Cfd6PRQfbdkiRabXGRjo07b4WyPahFBZCZ1sE+BNxYIJPPg73UkfOsVOLwqVc/6ETrIA==",
+      "version": "7.5.8",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/send": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.5.tgz",
-      "integrity": "sha512-z6F2D3cOStZvuk2SaP6YrwkNO65iTZcwA2ZkSABegdkAh/lf+Aa/YQndZVfmEXT5vgAp6zv06VQ3ejSVjAny4w==",
+      "version": "0.17.4",
       "license": "MIT",
       "dependencies": {
         "@types/mime": "^1",
@@ -12188,8 +12740,6 @@
     },
     "node_modules/@types/serve-index": {
       "version": "1.9.4",
-      "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.4.tgz",
-      "integrity": "sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -12197,9 +12747,7 @@
       }
     },
     "node_modules/@types/serve-static": {
-      "version": "1.15.8",
-      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.8.tgz",
-      "integrity": "sha512-roei0UY3LhpOJvjbIP6ZZFngyLKl5dskOtDhxY5THRSpO+ZI+nzJ+m5yUMzGrp89YRa7lvknKkMYjqQFGwA7Sg==",
+      "version": "1.15.7",
       "license": "MIT",
       "dependencies": {
         "@types/http-errors": "*",
@@ -12208,9 +12756,7 @@
       }
     },
     "node_modules/@types/sinon": {
-      "version": "17.0.4",
-      "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-17.0.4.tgz",
-      "integrity": "sha512-RHnIrhfPO3+tJT0s7cFaXGZvsL4bbR3/k7z3P312qMS4JaS2Tk+KiwiLx1S0rQ56ERj00u1/BtdyVd0FY+Pdew==",
+      "version": "17.0.3",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -12219,21 +12765,15 @@
     },
     "node_modules/@types/sinonjs__fake-timers": {
       "version": "8.1.5",
-      "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.5.tgz",
-      "integrity": "sha512-mQkU2jY8jJEF7YHjHvsQO8+3ughTL1mcnn96igfhONmR+fUPSKIkefQYpSe8bsly2Ep7oQbn/6VG5/9/0qcArQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/sizzle": {
       "version": "2.3.9",
-      "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.9.tgz",
-      "integrity": "sha512-xzLEyKB50yqCUPUJkIsrVvoWNfFUbIZI+RspLWt8u+tIW/BetMBZtgV2LY/2o+tYH8dRvQ+eoPf3NdhQCcLE2w==",
       "license": "MIT"
     },
     "node_modules/@types/sockjs": {
       "version": "0.3.36",
-      "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.36.tgz",
-      "integrity": "sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -12242,57 +12782,56 @@
     },
     "node_modules/@types/source-list-map": {
       "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.6.tgz",
-      "integrity": "sha512-5JcVt1u5HDmlXkwOD2nslZVllBBc7HDuOICfiZah2Z0is8M8g+ddAEawbmd3VjedfDHBzxCaXLs07QEmb7y54g==",
       "license": "MIT"
     },
     "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,
       "license": "MIT"
     },
+    "node_modules/@types/supercluster": {
+      "version": "7.1.3",
+      "license": "MIT",
+      "dependencies": {
+        "@types/geojson": "*"
+      }
+    },
     "node_modules/@types/tapable": {
       "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.12.tgz",
-      "integrity": "sha512-bTHG8fcxEqv1M9+TD14P8ok8hjxoOCkfKc8XXLaaD05kI7ohpeI956jtDOD3XHKBQrlyPughUtzm1jtVhHpA5Q==",
       "license": "MIT"
     },
+    "node_modules/@types/testing-library__jest-dom": {
+      "version": "5.14.9",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/jest": "*"
+      }
+    },
     "node_modules/@types/through": {
       "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/@types/through/-/through-0.0.33.tgz",
-      "integrity": "sha512-HsJ+z3QuETzP3cswwtzt2vEIiHBk/dCcHGhbmG5X3ecnwFD/lPrMpliGXxSCg03L9AhrdwA4Oz/qfspkDW+xGQ==",
-      "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/tinycolor2": {
       "version": "1.4.6",
-      "resolved": "https://registry.npmjs.org/@types/tinycolor2/-/tinycolor2-1.4.6.tgz",
-      "integrity": "sha512-iEN8J0BoMnsWBqjVbWH/c0G0Hh7O21lpR2/+PrvAVgWdzL7eexIFm4JN/Wn10PTcmNdtS6U67r499mlWMXOxNw==",
       "license": "MIT"
     },
     "node_modules/@types/tough-cookie": {
       "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.5.tgz",
-      "integrity": "sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/trusted-types": {
       "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz",
-      "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==",
       "license": "MIT",
       "optional": true
     },
     "node_modules/@types/uglify-js": {
       "version": "3.17.5",
-      "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.17.5.tgz",
-      "integrity": "sha512-TU+fZFBTBcXj/GpDpDaBmgWk/gn96kMZ+uocaFUlV2f8a6WdMzzI44QBCmGcCiYR0Y6ZlNRiyUyKKt5nl/lbzQ==",
       "license": "MIT",
       "dependencies": {
         "source-map": "^0.6.1"
@@ -12300,8 +12839,6 @@
     },
     "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==",
       "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
@@ -12309,35 +12846,27 @@
     },
     "node_modules/@types/underscore": {
       "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/@types/underscore/-/underscore-1.13.0.tgz",
-      "integrity": "sha512-L6LBgy1f0EFQZ+7uSA57+n2g/s4Qs5r06Vwrwn0/nuK1de+adz00NWaztRQ30aEqw5qOaWbPI8u2cGQ52lj6VA==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/unist": {
       "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.11.tgz",
-      "integrity": "sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA==",
       "license": "MIT"
     },
     "node_modules/@types/urijs": {
       "version": "1.19.25",
-      "resolved": "https://registry.npmjs.org/@types/urijs/-/urijs-1.19.25.tgz",
-      "integrity": "sha512-XOfUup9r3Y06nFAZh3WvO0rBU4OtlfPB/vgxpjg+NRdGU6CN6djdc6OEiH+PcqHCY6eFLo9Ista73uarf4gnBg==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/uuid": {
       "version": "9.0.8",
-      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.8.tgz",
-      "integrity": "sha512-jg+97EGIcY9AGHJJRaaPVgetKDsrTgbRjQ5Msgjh/DQKEFl0DtyRr/VCOyD1T2R1MNeWPK/u7JoGhlDZnKBAfA==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/vinyl": {
       "version": "2.0.12",
-      "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.12.tgz",
-      "integrity": "sha512-Sr2fYMBUVGYq8kj3UthXFAu5UN6ZW+rYr4NACjZQJvHvj+c8lYv0CahmZ2P/r7iUkN44gGUBwqxZkrKXYPb7cw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/expect": "^1.20.4",
         "@types/node": "*"
@@ -12345,8 +12874,6 @@
     },
     "node_modules/@types/webpack": {
       "version": "4.41.40",
-      "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.40.tgz",
-      "integrity": "sha512-u6kMFSBM9HcoTpUXnL6mt2HSzftqb3JgYV6oxIgL2dl6sX6aCa5k6SOkzv5DuZjBTPUE/dJltKtwwuqrkZHpfw==",
       "license": "MIT",
       "dependencies": {
         "@types/node": "*",
@@ -12359,8 +12886,6 @@
     },
     "node_modules/@types/webpack-sources": {
       "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-3.2.3.tgz",
-      "integrity": "sha512-4nZOdMwSPHZ4pTEZzSp0AsTM4K7Qmu40UKW4tJDiOVs20UzYF9l+qUe4s0ftfN0pin06n+5cWWDJXH+sbhAiDw==",
       "license": "MIT",
       "dependencies": {
         "@types/node": "*",
@@ -12370,8 +12895,6 @@
     },
     "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==",
       "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
@@ -12379,18 +12902,21 @@
     },
     "node_modules/@types/ws": {
       "version": "8.5.5",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.5.tgz",
-      "integrity": "sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
     },
+    "node_modules/@types/xml2js": {
+      "version": "0.4.14",
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "node_modules/@types/yargs": {
       "version": "17.0.33",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz",
-      "integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -12399,14 +12925,10 @@
     },
     "node_modules/@types/yargs-parser": {
       "version": "21.0.3",
-      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
-      "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==",
       "license": "MIT"
     },
     "node_modules/@types/yauzl": {
       "version": "2.10.3",
-      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz",
-      "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==",
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -12414,33 +12936,30 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz",
-      "integrity": "sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==",
+      "version": "7.18.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@eslint-community/regexpp": "^4.4.0",
-        "@typescript-eslint/scope-manager": "5.62.0",
-        "@typescript-eslint/type-utils": "5.62.0",
-        "@typescript-eslint/utils": "5.62.0",
-        "debug": "^4.3.4",
+        "@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.2.0",
-        "natural-compare-lite": "^1.4.0",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
+        "ignore": "^5.3.1",
+        "natural-compare": "^1.4.0",
+        "ts-api-utils": "^1.3.0"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^5.0.0",
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+        "@typescript-eslint/parser": "^7.0.0",
+        "eslint": "^8.56.0"
       },
       "peerDependenciesMeta": {
         "typescript": {
@@ -12448,27 +12967,151 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/parser": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz",
-      "integrity": "sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==",
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
+      "version": "7.18.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "7.18.0",
+        "@typescript-eslint/visitor-keys": "7.18.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
+      "version": "7.18.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "7.18.0",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "5.62.0",
-        "@typescript-eslint/types": "5.62.0",
-        "@typescript-eslint/typescript-estree": "5.62.0",
-        "debug": "^4.3.4"
+        "@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": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": {
+      "version": "7.18.0",
+      "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": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+        "eslint": "^8.56.0"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "7.18.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "7.18.0",
+        "eslint-visitor-keys": "^3.4.3"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/eslint-visitor-keys": {
+      "version": "3.4.3",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/minimatch": {
+      "version": "9.0.5",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@typescript-eslint/parser": {
+      "version": "7.18.0",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "@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": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.56.0"
       },
       "peerDependenciesMeta": {
         "typescript": {
@@ -12476,10 +13119,112 @@
         }
       }
     },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
+      "version": "7.18.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "7.18.0",
+        "@typescript-eslint/visitor-keys": "7.18.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
+      "version": "7.18.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "7.18.0",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "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": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "7.18.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "7.18.0",
+        "eslint-visitor-keys": "^3.4.3"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/eslint-visitor-keys": {
+      "version": "3.4.3",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/minimatch": {
+      "version": "9.0.5",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/@typescript-eslint/scope-manager": {
       "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz",
-      "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -12495,26 +13240,24 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz",
-      "integrity": "sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==",
+      "version": "7.18.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "5.62.0",
-        "@typescript-eslint/utils": "5.62.0",
+        "@typescript-eslint/typescript-estree": "7.18.0",
+        "@typescript-eslint/utils": "7.18.0",
         "debug": "^4.3.4",
-        "tsutils": "^3.21.0"
+        "ts-api-utils": "^1.3.0"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "*"
+        "eslint": "^8.56.0"
       },
       "peerDependenciesMeta": {
         "typescript": {
@@ -12522,10 +13265,133 @@
         }
       }
     },
+    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/scope-manager": {
+      "version": "7.18.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "7.18.0",
+        "@typescript-eslint/visitor-keys": "7.18.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": {
+      "version": "7.18.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "7.18.0",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "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": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/utils": {
+      "version": "7.18.0",
+      "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": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.56.0"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "7.18.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "7.18.0",
+        "eslint-visitor-keys": "^3.4.3"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils/node_modules/eslint-visitor-keys": {
+      "version": "3.4.3",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils/node_modules/minimatch": {
+      "version": "9.0.5",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/@typescript-eslint/types": {
       "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz",
-      "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -12538,8 +13404,6 @@
     },
     "node_modules/@typescript-eslint/typescript-estree": {
       "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz",
-      "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
@@ -12566,8 +13430,6 @@
     },
     "node_modules/@typescript-eslint/utils": {
       "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz",
-      "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -12593,8 +13455,6 @@
     },
     "node_modules/@typescript-eslint/visitor-keys": {
       "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz",
-      "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -12611,8 +13471,6 @@
     },
     "node_modules/@typescript-eslint/visitor-keys/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": "Apache-2.0",
       "engines": {
@@ -12624,174 +13482,14 @@
     },
     "node_modules/@ungap/structured-clone": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz",
-      "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==",
       "license": "ISC"
     },
     "node_modules/@ungap/url-search-params": {
       "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/@ungap/url-search-params/-/url-search-params-0.2.2.tgz",
-      "integrity": "sha512-qQsguKXZVKdCixOHX9jqnX/K/1HekPDpGKyEcXHT+zR6EjGA7S4boSuelL4uuPv6YfhN0n8c4UxW+v/Z3gM2iw==",
       "license": "ISC"
     },
-    "node_modules/@unrs/resolver-binding-darwin-arm64": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-arm64/-/resolver-binding-darwin-arm64-1.7.11.tgz",
-      "integrity": "sha512-i3/wlWjQJXMh1uiGtiv7k1EYvrrS3L1hdwmWJJiz1D8jWy726YFYPIxQWbEIVPVAgrfRR0XNlLrTQwq17cuCGw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@unrs/resolver-binding-darwin-x64": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-x64/-/resolver-binding-darwin-x64-1.7.11.tgz",
-      "integrity": "sha512-8XXyFvc6w6kmMmi6VYchZhjd5CDcp+Lv6Cn1YmUme0ypsZ/0Kzd+9ESrWtDrWibKPTgSteDTxp75cvBOY64FQQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@unrs/resolver-binding-freebsd-x64": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-freebsd-x64/-/resolver-binding-freebsd-x64-1.7.11.tgz",
-      "integrity": "sha512-0qJBYzP8Qk24CZ05RSWDQUjdiQUeIJGfqMMzbtXgCKl/a5xa6thfC0MQkGIr55LCLd6YmMyO640ifYUa53lybQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ]
-    },
-    "node_modules/@unrs/resolver-binding-linux-arm-gnueabihf": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-gnueabihf/-/resolver-binding-linux-arm-gnueabihf-1.7.11.tgz",
-      "integrity": "sha512-1sGwpgvx+WZf0GFT6vkkOm6UJ+mlsVnjw+Yv9esK71idWeRAG3bbpkf3AoY8KIqKqmnzJExi0uKxXpakQ5Pcbg==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@unrs/resolver-binding-linux-arm-musleabihf": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-musleabihf/-/resolver-binding-linux-arm-musleabihf-1.7.11.tgz",
-      "integrity": "sha512-D/1F/2lTe+XAl3ohkYj51NjniVly8sIqkA/n1aOND3ZMO418nl2JNU95iVa1/RtpzaKcWEsNTtHRogykrUflJg==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@unrs/resolver-binding-linux-arm64-gnu": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-gnu/-/resolver-binding-linux-arm64-gnu-1.7.11.tgz",
-      "integrity": "sha512-7vFWHLCCNFLEQlmwKQfVy066ohLLArZl+AV/AdmrD1/pD1FlmqM+FKbtnONnIwbHtgetFUCV/SRi1q4D49aTlw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@unrs/resolver-binding-linux-arm64-musl": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-musl/-/resolver-binding-linux-arm64-musl-1.7.11.tgz",
-      "integrity": "sha512-tYkGIx8hjWPh4zcn17jLEHU8YMmdP2obRTGkdaB3BguGHh31VCS3ywqC4QjTODjmhhNyZYkj/1Dz/+0kKvg9YA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@unrs/resolver-binding-linux-ppc64-gnu": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-ppc64-gnu/-/resolver-binding-linux-ppc64-gnu-1.7.11.tgz",
-      "integrity": "sha512-6F328QIUev29vcZeRX6v6oqKxfUoGwIIAhWGD8wSysnBYFY0nivp25jdWmAb1GildbCCaQvOKEhCok7YfWkj4Q==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@unrs/resolver-binding-linux-riscv64-gnu": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-gnu/-/resolver-binding-linux-riscv64-gnu-1.7.11.tgz",
-      "integrity": "sha512-NqhWmiGJGdzbZbeucPZIG9Iav4lyYLCarEnxAceguMx9qlpeEF7ENqYKOwB8Zqk7/CeuYMEcLYMaW2li6HyDzQ==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@unrs/resolver-binding-linux-riscv64-musl": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-musl/-/resolver-binding-linux-riscv64-musl-1.7.11.tgz",
-      "integrity": "sha512-J2RPIFKMdTrLtBdfR1cUMKl8Gcy05nlQ+bEs/6al7EdWLk9cs3tnDREHZ7mV9uGbeghpjo4i8neNZNx3PYUY9w==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@unrs/resolver-binding-linux-s390x-gnu": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-s390x-gnu/-/resolver-binding-linux-s390x-gnu-1.7.11.tgz",
-      "integrity": "sha512-bDpGRerHvvHdhun7MmFUNDpMiYcJSqWckwAVVRTJf8F+RyqYJOp/mx04PDc7DhpNPeWdnTMu91oZRMV+gGaVcQ==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
     "node_modules/@unrs/resolver-binding-linux-x64-gnu": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-gnu/-/resolver-binding-linux-x64-gnu-1.7.11.tgz",
-      "integrity": "sha512-G9U7bVmylzRLma3cK39RBm3guoD1HOvY4o0NS4JNm37AD0lS7/xyMt7kn0JejYyc0Im8J+rH69/dXGM9DAJcSQ==",
+      "version": "1.9.2",
       "cpu": [
         "x64"
       ],
@@ -12803,9 +13501,7 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-linux-x64-musl": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-musl/-/resolver-binding-linux-x64-musl-1.7.11.tgz",
-      "integrity": "sha512-7qL20SBKomekSunm7M9Fe5L93bFbn+FbHiGJbfTlp0RKhPVoJDP73vOxf1QrmJHyDPECsGWPFnKa/f8fO2FsHw==",
+      "version": "1.9.2",
       "cpu": [
         "x64"
       ],
@@ -12816,82 +13512,8 @@
         "linux"
       ]
     },
-    "node_modules/@unrs/resolver-binding-wasm32-wasi": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-wasm32-wasi/-/resolver-binding-wasm32-wasi-1.7.11.tgz",
-      "integrity": "sha512-jisvIva8MidjI+B1lFRZZMfCPaCISePgTyR60wNT1MeQvIh5Ksa0G3gvI+Iqyj3jqYbvOHByenpa5eDGcSdoSg==",
-      "cpu": [
-        "wasm32"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "@napi-rs/wasm-runtime": "^0.2.10"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/@unrs/resolver-binding-wasm32-wasi/node_modules/@napi-rs/wasm-runtime": {
-      "version": "0.2.10",
-      "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.10.tgz",
-      "integrity": "sha512-bCsCyeZEwVErsGmyPNSzwfwFn4OdxBj0mmv6hOFucB/k81Ojdu68RbZdxYsRQUPc9l6SU5F/cG+bXgWs3oUgsQ==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "@emnapi/core": "^1.4.3",
-        "@emnapi/runtime": "^1.4.3",
-        "@tybys/wasm-util": "^0.9.0"
-      }
-    },
-    "node_modules/@unrs/resolver-binding-win32-arm64-msvc": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-arm64-msvc/-/resolver-binding-win32-arm64-msvc-1.7.11.tgz",
-      "integrity": "sha512-G+H5nQZ8sRZ8ebMY6mRGBBvTEzMYEcgVauLsNHpvTUavZoCCRVP1zWkCZgOju2dW3O22+8seTHniTdl1/uLz3g==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@unrs/resolver-binding-win32-ia32-msvc": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-ia32-msvc/-/resolver-binding-win32-ia32-msvc-1.7.11.tgz",
-      "integrity": "sha512-Hfy46DBfFzyv0wgR0MMOwFFib2W2+Btc8oE5h4XlPhpelnSyA6nFxkVIyTgIXYGTdFaLoZFNn62fmqx3rjEg3A==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@unrs/resolver-binding-win32-x64-msvc": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-x64-msvc/-/resolver-binding-win32-x64-msvc-1.7.11.tgz",
-      "integrity": "sha512-7L8NdsQlCJ8T106Gbz/AjzM4QKWVsoQbKpB9bMBGcIZswUuAnJMHpvbqGW3RBqLHCIwX4XZ5fxSBHEFcK2h9wA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
     "node_modules/@visx/annotation": {
       "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/@visx/annotation/-/annotation-3.12.0.tgz",
-      "integrity": "sha512-ZH6Y4jfrb47iEUV9O2itU9TATE5IPzhs5qvP6J7vmv26qkqwDcuE7xN3S3l9R70WjyEKGbpO8js4EijA3FJWkA==",
       "license": "MIT",
       "dependencies": {
         "@types/react": "*",
@@ -12908,8 +13530,6 @@
     },
     "node_modules/@visx/axis": {
       "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/@visx/axis/-/axis-3.12.0.tgz",
-      "integrity": "sha512-8MoWpfuaJkhm2Yg+HwyytK8nk+zDugCqTT/tRmQX7gW4LYrHYLXFUXOzbDyyBakCVaUbUaAhVFxpMASJiQKf7A==",
       "license": "MIT",
       "dependencies": {
         "@types/react": "*",
@@ -12942,8 +13562,6 @@
     },
     "node_modules/@visx/curve": {
       "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/@visx/curve/-/curve-3.12.0.tgz",
-      "integrity": "sha512-Ng1mefXIzoIoAivw7dJ+ZZYYUbfuwXgZCgQynShr6ZIVw7P4q4HeQfJP3W24ON+1uCSrzoycHSXRelhR9SBPcw==",
       "license": "MIT",
       "dependencies": {
         "@types/d3-shape": "^1.3.1",
@@ -12952,8 +13570,6 @@
     },
     "node_modules/@visx/drag": {
       "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/@visx/drag/-/drag-3.12.0.tgz",
-      "integrity": "sha512-LXOoPVw//YPjpYhDJYBsCYDuv1QimsXjDV98duH0aCy4V94ediXMQpe2wHq4pnlDobLEB71FjOZMFrbFmqtERg==",
       "license": "MIT",
       "dependencies": {
         "@types/react": "*",
@@ -12967,8 +13583,6 @@
     },
     "node_modules/@visx/event": {
       "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/@visx/event/-/event-3.12.0.tgz",
-      "integrity": "sha512-9Lvw6qJ0Fi+y1vsC1WspfdIKCxHTb7oy59Uql1uBdPGT8zChP0vuxW0jQNQRDbKgoefj4pCXAFi8+MF1mEtVTw==",
       "license": "MIT",
       "dependencies": {
         "@types/react": "*",
@@ -12977,8 +13591,6 @@
     },
     "node_modules/@visx/glyph": {
       "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/@visx/glyph/-/glyph-3.12.0.tgz",
-      "integrity": "sha512-E9ST9MoPNyXQzjZxYYAGXT4CbBpnB90Qhx8UvUUM2/n/SZUNeH+m6UiB/CzT0jGK2b0lPHF91mlOiQ8JXBRhYg==",
       "license": "MIT",
       "dependencies": {
         "@types/d3-shape": "^1.3.1",
@@ -12994,8 +13606,6 @@
     },
     "node_modules/@visx/grid": {
       "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/@visx/grid/-/grid-3.12.0.tgz",
-      "integrity": "sha512-L4ex2ooSYhwNIxJ3XFIKRhoSvEGjPc2Y3YCrtNB4TV5Ofdj4q0UMOsxfrH23Pr8HSHuQhb6VGMgYoK0LuWqDmQ==",
       "license": "MIT",
       "dependencies": {
         "@types/react": "*",
@@ -13013,8 +13623,6 @@
     },
     "node_modules/@visx/group": {
       "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/@visx/group/-/group-3.12.0.tgz",
-      "integrity": "sha512-Dye8iS1alVXPv7nj/7M37gJe6sSKqJLH7x6sEWAsRQ9clI0kFvjbKcKgF+U3aAVQr0NCohheFV+DtR8trfK/Ag==",
       "license": "MIT",
       "dependencies": {
         "@types/react": "*",
@@ -13027,8 +13635,6 @@
     },
     "node_modules/@visx/point": {
       "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/@visx/point/-/point-3.12.0.tgz",
-      "integrity": "sha512-I6UrHoJAEVbx3RORQNupgTiX5EzjuZpiwLPxn8L2mI5nfERotPKi1Yus12Cq2WtXqEBR/WgqTnoImlqOXBykcA==",
       "license": "MIT"
     },
     "node_modules/@visx/react-spring": {
@@ -13052,8 +13658,6 @@
     },
     "node_modules/@visx/responsive": {
       "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/@visx/responsive/-/responsive-3.12.0.tgz",
-      "integrity": "sha512-GV1BTYwAGlk/K5c9vH8lS2syPnTuIqEacI7L6LRPbsuaLscXMNi+i9fZyzo0BWvAdtRV8v6Urzglo++lvAXT1Q==",
       "license": "MIT",
       "dependencies": {
         "@types/lodash": "^4.14.172",
@@ -13067,8 +13671,6 @@
     },
     "node_modules/@visx/scale": {
       "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/@visx/scale/-/scale-3.12.0.tgz",
-      "integrity": "sha512-+ubijrZ2AwWCsNey0HGLJ0YKNeC/XImEFsr9rM+Uef1CM3PNM43NDdNTrdBejSlzRq0lcfQPWYMYQFSlkLcPOg==",
       "license": "MIT",
       "dependencies": {
         "@visx/vendor": "3.12.0"
@@ -13076,8 +13678,6 @@
     },
     "node_modules/@visx/shape": {
       "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/@visx/shape/-/shape-3.12.0.tgz",
-      "integrity": "sha512-/1l0lrpX9tPic6SJEalryBKWjP/ilDRnQA+BGJTI1tj7i23mJ/J0t4nJHyA1GrL4QA/bM/qTJ35eyz5dEhJc4g==",
       "license": "MIT",
       "dependencies": {
         "@types/d3-path": "^1.0.8",
@@ -13099,8 +13699,6 @@
     },
     "node_modules/@visx/text": {
       "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/@visx/text/-/text-3.12.0.tgz",
-      "integrity": "sha512-0rbDYQlbuKPhBqXkkGYKFec1gQo05YxV45DORzr6hCyaizdJk1G+n9VkuKSHKBy1vVQhBA0W3u/WXd7tiODQPA==",
       "license": "MIT",
       "dependencies": {
         "@types/lodash": "^4.14.172",
@@ -13133,8 +13731,6 @@
     },
     "node_modules/@visx/vendor": {
       "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/@visx/vendor/-/vendor-3.12.0.tgz",
-      "integrity": "sha512-SVO+G0xtnL9dsNpGDcjCgoiCnlB3iLSM9KLz1sLbSrV7RaVXwY3/BTm2X9OWN1jH2a9M+eHt6DJ6sE6CXm4cUg==",
       "license": "MIT and ISC",
       "dependencies": {
         "@types/d3-array": "3.0.3",
@@ -13158,22 +13754,20 @@
         "internmap": "2.0.3"
       }
     },
+    "node_modules/@visx/vendor/node_modules/@types/d3-array": {
+      "version": "3.0.3",
+      "license": "MIT"
+    },
     "node_modules/@visx/vendor/node_modules/@types/d3-color": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-3.1.0.tgz",
-      "integrity": "sha512-HKuicPHJuvPgCD+np6Se9MQvS6OCbJmOjGvylzMJRlDwUXjKTTXs6Pwgk79O09Vj/ho3u1ofXnhFOaEWWPrlwA==",
       "license": "MIT"
     },
     "node_modules/@visx/vendor/node_modules/@types/d3-format": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@types/d3-format/-/d3-format-3.0.1.tgz",
-      "integrity": "sha512-5KY70ifCCzorkLuIkDe0Z9YTf9RR2CjBX1iaJG+rgM/cPP+sO+q9YdQ9WdhQcgPj1EQiJ2/0+yUkkziTG6Lubg==",
       "license": "MIT"
     },
     "node_modules/@visx/vendor/node_modules/@types/d3-interpolate": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
-      "integrity": "sha512-jx5leotSeac3jr0RePOH1KdR9rISG91QIE4Q2PYTu4OymLTZfA3SrnURSLzKH48HmXVUru50b8nje4E79oQSQw==",
       "license": "MIT",
       "dependencies": {
         "@types/d3-color": "*"
@@ -13181,8 +13775,6 @@
     },
     "node_modules/@visx/vendor/node_modules/@types/d3-scale": {
       "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.2.tgz",
-      "integrity": "sha512-Yk4htunhPAwN0XGlIwArRomOjdoBFXC3+kCxK2Ubg7I9shQlVSJy/pG/Ht5ASN+gdMIalpk8TJ5xV74jFsetLA==",
       "license": "MIT",
       "dependencies": {
         "@types/d3-time": "*"
@@ -13190,20 +13782,24 @@
     },
     "node_modules/@visx/vendor/node_modules/@types/d3-time": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.0.tgz",
-      "integrity": "sha512-sZLCdHvBUcNby1cB6Fd3ZBrABbjz3v1Vm90nysCQ6Vt7vd6e/h9Lt7SiJUoEX0l4Dzc7P5llKyhqSi1ycSf1Hg==",
       "license": "MIT"
     },
     "node_modules/@visx/vendor/node_modules/@types/d3-time-format": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@types/d3-time-format/-/d3-time-format-2.1.0.tgz",
-      "integrity": "sha512-/myT3I7EwlukNOX2xVdMzb8FRgNzRMpsZddwst9Ld/VFe6LyJyRp0s32l/V9XoUzk+Gqu56F/oGk6507+8BxrA==",
       "license": "MIT"
     },
+    "node_modules/@visx/vendor/node_modules/d3-array": {
+      "version": "3.2.1",
+      "license": "ISC",
+      "dependencies": {
+        "internmap": "1 - 2"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/@visx/vendor/node_modules/d3-format": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.0.tgz",
-      "integrity": "sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==",
       "license": "ISC",
       "engines": {
         "node": ">=12"
@@ -13211,8 +13807,6 @@
     },
     "node_modules/@visx/vendor/node_modules/d3-scale": {
       "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz",
-      "integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==",
       "license": "ISC",
       "dependencies": {
         "d3-array": "2.10.0 - 3",
@@ -13227,8 +13821,6 @@
     },
     "node_modules/@visx/voronoi": {
       "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/@visx/voronoi/-/voronoi-3.12.0.tgz",
-      "integrity": "sha512-U3HWu6g5UjQchFDq8k/A4U9WrlN+80rAFPdGOUvIGOueQw9RmlZlNaeg8IJcQr2yk1s4O/VSpt3nR82zdINWMw==",
       "license": "MIT",
       "dependencies": {
         "@types/d3-voronoi": "^1.1.9",
@@ -13243,8 +13835,6 @@
     },
     "node_modules/@visx/xychart": {
       "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/@visx/xychart/-/xychart-3.12.0.tgz",
-      "integrity": "sha512-itJ7qvj/STpVmHesVyo2vPOataBM1mgSaf9R6/s4Bpe340wZldfCJ+IqRcNgdtbBagz1Hlr/sRnla4tWE2yw9A==",
       "license": "MIT",
       "dependencies": {
         "@types/lodash": "^4.14.172",
@@ -13276,8 +13866,6 @@
     },
     "node_modules/@visx/xychart/node_modules/d3-shape": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-2.1.0.tgz",
-      "integrity": "sha512-PnjUqfM2PpskbSLTJvAzp2Wv4CZsnAgTfcVRTwW03QR3MkXF8Uo7B1y/lWkAsmbKwuecto++4NlsYcvYpXpTHA==",
       "license": "BSD-3-Clause",
       "dependencies": {
         "d3-path": "1 - 2"
@@ -13285,8 +13873,6 @@
     },
     "node_modules/@wdio/config": {
       "version": "7.31.1",
-      "resolved": "https://registry.npmjs.org/@wdio/config/-/config-7.31.1.tgz",
-      "integrity": "sha512-WAfswbCatwiaDVqy6kfF/5T8/WS/US/SRhBGUFrfBuGMIe+RRoHgy7jURFWSvUIE7CNHj8yvs46fLUcxhXjzcQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -13301,10 +13887,16 @@
         "node": ">=12.0.0"
       }
     },
+    "node_modules/@wdio/config/node_modules/@types/node": {
+      "version": "18.19.115",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
     "node_modules/@wdio/config/node_modules/@wdio/types": {
       "version": "7.30.2",
-      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.30.2.tgz",
-      "integrity": "sha512-uZ8o7FX8RyBsaXiOWa59UKTCHTtADNvOArYTcHNEIzt+rh4JdB/uwqfc8y4TCNA2kYm7PWaQpUFwpStLeg0H1Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -13324,9 +13916,7 @@
       }
     },
     "node_modules/@wdio/config/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==",
+      "version": "2.0.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -13335,9 +13925,6 @@
     },
     "node_modules/@wdio/config/node_modules/glob": {
       "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": {
@@ -13356,8 +13943,6 @@
     },
     "node_modules/@wdio/config/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": "ISC",
       "dependencies": {
@@ -13369,8 +13954,6 @@
     },
     "node_modules/@wdio/config/node_modules/typescript": {
       "version": "4.9.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
-      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
       "dev": true,
       "license": "Apache-2.0",
       "optional": true,
@@ -13383,10 +13966,13 @@
         "node": ">=4.2.0"
       }
     },
+    "node_modules/@wdio/config/node_modules/undici-types": {
+      "version": "5.26.5",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@wdio/logger": {
       "version": "7.26.0",
-      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.26.0.tgz",
-      "integrity": "sha512-kQj9s5JudAG9qB+zAAcYGPHVfATl2oqKgqj47yjehOQ1zzG33xmtL1ArFbQKWhDG32y1A8sN6b0pIqBEIwgg8Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -13401,8 +13987,6 @@
     },
     "node_modules/@wdio/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,
       "license": "MIT",
       "dependencies": {
@@ -13418,8 +14002,6 @@
     },
     "node_modules/@wdio/protocols": {
       "version": "7.27.0",
-      "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-7.27.0.tgz",
-      "integrity": "sha512-hT/U22R5i3HhwPjkaKAG0yd59eaOaZB0eibRj2+esCImkb5Y6rg8FirrlYRxIGFVBl0+xZV0jKHzR5+o097nvg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -13428,8 +14010,6 @@
     },
     "node_modules/@wdio/utils": {
       "version": "7.30.2",
-      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-7.30.2.tgz",
-      "integrity": "sha512-np7I+smszFUennbQKdzbMN/zUL3s3EZq9pCCUcTRjjs9TE4tnn0wfmGdoz2o7REYu6kn9NfFFJyVIM2VtBbKEA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -13441,10 +14021,16 @@
         "node": ">=12.0.0"
       }
     },
+    "node_modules/@wdio/utils/node_modules/@types/node": {
+      "version": "18.19.115",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
     "node_modules/@wdio/utils/node_modules/@wdio/types": {
       "version": "7.30.2",
-      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.30.2.tgz",
-      "integrity": "sha512-uZ8o7FX8RyBsaXiOWa59UKTCHTtADNvOArYTcHNEIzt+rh4JdB/uwqfc8y4TCNA2kYm7PWaQpUFwpStLeg0H1Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -13465,8 +14051,6 @@
     },
     "node_modules/@wdio/utils/node_modules/typescript": {
       "version": "4.9.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
-      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
       "dev": true,
       "license": "Apache-2.0",
       "optional": true,
@@ -13479,10 +14063,13 @@
         "node": ">=4.2.0"
       }
     },
+    "node_modules/@wdio/utils/node_modules/undici-types": {
+      "version": "5.26.5",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@webassemblyjs/ast": {
       "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz",
-      "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -13492,29 +14079,21 @@
     },
     "node_modules/@webassemblyjs/floating-point-hex-parser": {
       "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",
-      "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@webassemblyjs/helper-api-error": {
       "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz",
-      "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@webassemblyjs/helper-buffer": {
       "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz",
-      "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@webassemblyjs/helper-numbers": {
       "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz",
-      "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -13525,15 +14104,11 @@
     },
     "node_modules/@webassemblyjs/helper-wasm-bytecode": {
       "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz",
-      "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@webassemblyjs/helper-wasm-section": {
       "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz",
-      "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -13545,8 +14120,6 @@
     },
     "node_modules/@webassemblyjs/ieee754": {
       "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz",
-      "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -13555,8 +14128,6 @@
     },
     "node_modules/@webassemblyjs/leb128": {
       "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz",
-      "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -13565,15 +14136,11 @@
     },
     "node_modules/@webassemblyjs/utf8": {
       "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz",
-      "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@webassemblyjs/wasm-edit": {
       "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz",
-      "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -13589,8 +14156,6 @@
     },
     "node_modules/@webassemblyjs/wasm-gen": {
       "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz",
-      "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -13603,8 +14168,6 @@
     },
     "node_modules/@webassemblyjs/wasm-opt": {
       "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz",
-      "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -13616,8 +14179,6 @@
     },
     "node_modules/@webassemblyjs/wasm-parser": {
       "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz",
-      "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -13631,8 +14192,6 @@
     },
     "node_modules/@webassemblyjs/wast-printer": {
       "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz",
-      "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -13642,8 +14201,6 @@
     },
     "node_modules/@webpack-cli/configtest": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.2.0.tgz",
-      "integrity": "sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg==",
       "dev": true,
       "license": "MIT",
       "peerDependencies": {
@@ -13653,8 +14210,6 @@
     },
     "node_modules/@webpack-cli/info": {
       "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.5.0.tgz",
-      "integrity": "sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -13666,8 +14221,6 @@
     },
     "node_modules/@webpack-cli/serve": {
       "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.7.0.tgz",
-      "integrity": "sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==",
       "dev": true,
       "license": "MIT",
       "peerDependencies": {
@@ -13681,9 +14234,6 @@
     },
     "node_modules/@xmldom/xmldom": {
       "version": "0.8.10",
-      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz",
-      "integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=10.0.0"
@@ -13691,22 +14241,16 @@
     },
     "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,
       "license": "BSD-3-Clause"
     },
     "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,
       "license": "Apache-2.0"
     },
     "node_modules/@yarnpkg/esbuild-plugin-pnp": {
       "version": "3.0.0-rc.15",
-      "resolved": "https://registry.npmjs.org/@yarnpkg/esbuild-plugin-pnp/-/esbuild-plugin-pnp-3.0.0-rc.15.tgz",
-      "integrity": "sha512-kYzDJO5CA9sy+on/s2aIW0411AklfCi8Ck/4QDivOqsMKpStZA2SsR+X27VTggGwpStWaLrjJcDcdDMowtG8MA==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
@@ -13721,8 +14265,6 @@
     },
     "node_modules/@yarnpkg/fslib": {
       "version": "2.10.3",
-      "resolved": "https://registry.npmjs.org/@yarnpkg/fslib/-/fslib-2.10.3.tgz",
-      "integrity": "sha512-41H+Ga78xT9sHvWLlFOZLIhtU6mTGZ20pZ29EiZa97vnxdohJD2AF42rCoAoWfqUz486xY6fhjMH+DYEM9r14A==",
       "license": "BSD-2-Clause",
       "dependencies": {
         "@yarnpkg/libzip": "^2.3.0",
@@ -13734,14 +14276,10 @@
     },
     "node_modules/@yarnpkg/fslib/node_modules/tslib": {
       "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
       "license": "0BSD"
     },
     "node_modules/@yarnpkg/libzip": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@yarnpkg/libzip/-/libzip-2.3.0.tgz",
-      "integrity": "sha512-6xm38yGVIa6mKm/DUCF2zFFJhERh/QWp1ufm4cNUvxsONBmfPg8uZ9pZBdOmF6qFGr/HlT6ABBkCSx/dlEtvWg==",
       "license": "BSD-2-Clause",
       "dependencies": {
         "@types/emscripten": "^1.39.6",
@@ -13753,21 +14291,15 @@
     },
     "node_modules/@yarnpkg/libzip/node_modules/tslib": {
       "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
       "license": "0BSD"
     },
     "node_modules/@yarnpkg/lockfile": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz",
-      "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==",
       "dev": true,
       "license": "BSD-2-Clause"
     },
     "node_modules/@yarnpkg/parsers": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-3.0.2.tgz",
-      "integrity": "sha512-/HcYgtUSiJiot/XWGLOlGxPYUG65+/31V8oqk17vZLW1xlCoR4PampyePljOxY2n8/3jz9+tIFzICsyGujJZoA==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
@@ -13780,10 +14312,8 @@
     },
     "node_modules/@yeoman/adapter": {
       "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/@yeoman/adapter/-/adapter-1.6.0.tgz",
-      "integrity": "sha512-oJw/i6zUDdfsT5VOPuANDDEWs5NhlMq5+rmyZIVdgBTXalbCw6nUfJQOblO2Fnq+Ov6CxlyzDBTWQvL5cEjA+g==",
-      "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/inquirer": "^9.0.3",
         "chalk": "^5.2.0",
@@ -13797,12 +14327,21 @@
         "node": ">=18.12.0"
       }
     },
+    "node_modules/@yeoman/adapter/node_modules/ansi-regex": {
+      "version": "6.1.0",
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
     "node_modules/@yeoman/adapter/node_modules/chalk": {
       "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.4.1.tgz",
-      "integrity": "sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w==",
-      "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": "^12.17.0 || ^14.13 || >=16.0.0"
       },
@@ -13810,12 +14349,24 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
+    "node_modules/@yeoman/adapter/node_modules/cli-cursor": {
+      "version": "5.0.0",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "restore-cursor": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/@yeoman/adapter/node_modules/cli-spinners": {
       "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz",
-      "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==",
-      "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=6"
       },
@@ -13823,158 +14374,26 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@yeoman/adapter/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==",
-      "devOptional": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">= 12"
-      }
-    },
     "node_modules/@yeoman/adapter/node_modules/emoji-regex": {
       "version": "10.4.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz",
-      "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==",
-      "devOptional": true,
-      "license": "MIT"
-    },
-    "node_modules/@yeoman/adapter/node_modules/eventemitter3": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
-      "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==",
-      "devOptional": true,
-      "license": "MIT"
-    },
-    "node_modules/@yeoman/adapter/node_modules/inquirer": {
-      "version": "9.3.7",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-9.3.7.tgz",
-      "integrity": "sha512-LJKFHCSeIRq9hanN14IlOtPSTe3lNES7TYDTE2xxdAy1LS5rYphajK1qtwvj3YmQXvvk0U2Vbmcni8P9EIQW9w==",
-      "devOptional": true,
       "license": "MIT",
-      "dependencies": {
-        "@inquirer/figures": "^1.0.3",
-        "ansi-escapes": "^4.3.2",
-        "cli-width": "^4.1.0",
-        "external-editor": "^3.1.0",
-        "mute-stream": "1.0.0",
-        "ora": "^5.4.1",
-        "run-async": "^3.0.0",
-        "rxjs": "^7.8.1",
-        "string-width": "^4.2.3",
-        "strip-ansi": "^6.0.1",
-        "wrap-ansi": "^6.2.0",
-        "yoctocolors-cjs": "^2.1.2"
-      },
-      "engines": {
-        "node": ">=18"
-      }
+      "peer": true
     },
-    "node_modules/@yeoman/adapter/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==",
-      "devOptional": true,
+    "node_modules/@yeoman/adapter/node_modules/is-interactive": {
+      "version": "2.0.0",
       "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
+      "peer": true,
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@yeoman/adapter/node_modules/inquirer/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==",
-      "devOptional": true,
-      "license": "MIT",
-      "dependencies": {
-        "chalk": "^4.1.0",
-        "is-unicode-supported": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@yeoman/adapter/node_modules/inquirer/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==",
-      "devOptional": true,
-      "license": "MIT",
-      "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_modules/@yeoman/adapter/node_modules/log-symbols": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-7.0.1.tgz",
-      "integrity": "sha512-ja1E3yCr9i/0hmBVaM0bfwDjnGy8I/s6PP4DFp+yP+a+mrHO4Rm7DtmnqROTUkHIkqffC84YY7AeqX6oFk0WFg==",
-      "devOptional": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-unicode-supported": "^2.0.0",
-        "yoctocolors": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@yeoman/adapter/node_modules/log-symbols/node_modules/is-unicode-supported": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-2.1.0.tgz",
-      "integrity": "sha512-mE00Gnza5EEB3Ds0HfMyllZzbBrmLOX3vfWoj9A9PEnTfratQ/BcaJOuMhnkhjXvb2+FkY3VuHqtAGpTPmglFQ==",
-      "devOptional": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@yeoman/adapter/node_modules/mute-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-1.0.0.tgz",
-      "integrity": "sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==",
-      "devOptional": true,
-      "license": "ISC",
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
     "node_modules/@yeoman/adapter/node_modules/onetime": {
       "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-7.0.0.tgz",
-      "integrity": "sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==",
-      "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "mimic-function": "^5.0.0"
       },
@@ -13986,11 +14405,9 @@
       }
     },
     "node_modules/@yeoman/adapter/node_modules/ora": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-8.2.0.tgz",
-      "integrity": "sha512-weP+BZ8MVNnlCm8c0Qdc1WSWq4Qn7I+9CJGm7Qali6g44e/PUzbjNqJX5NJ9ljlNMosfJvg1fKEGILklK9cwnw==",
-      "devOptional": true,
+      "version": "8.1.1",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "chalk": "^5.3.0",
         "cli-cursor": "^5.0.0",
@@ -14009,67 +14426,10 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@yeoman/adapter/node_modules/ora/node_modules/ansi-regex": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
-      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
-      "devOptional": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
-      }
-    },
-    "node_modules/@yeoman/adapter/node_modules/ora/node_modules/cli-cursor": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-5.0.0.tgz",
-      "integrity": "sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==",
-      "devOptional": true,
-      "license": "MIT",
-      "dependencies": {
-        "restore-cursor": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@yeoman/adapter/node_modules/ora/node_modules/is-interactive": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-2.0.0.tgz",
-      "integrity": "sha512-qP1vozQRI+BMOPcjFzrjXuQvdak2pHNUMZoeG2eRbiSqyvbEf/wQtEOTOX1guk6E3t36RkaqiSt8A/6YElNxLQ==",
-      "devOptional": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@yeoman/adapter/node_modules/ora/node_modules/is-unicode-supported": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-2.1.0.tgz",
-      "integrity": "sha512-mE00Gnza5EEB3Ds0HfMyllZzbBrmLOX3vfWoj9A9PEnTfratQ/BcaJOuMhnkhjXvb2+FkY3VuHqtAGpTPmglFQ==",
-      "devOptional": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/@yeoman/adapter/node_modules/ora/node_modules/log-symbols": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-6.0.0.tgz",
-      "integrity": "sha512-i24m8rpwhmPIS4zscNzK6MSEhk0DUWa/8iYQWxhffV8jkI4Phvs3F+quL5xvS0gdQR0FyTCMMH33Y78dDTzzIw==",
-      "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "chalk": "^5.3.0",
         "is-unicode-supported": "^1.3.0"
@@ -14083,10 +14443,8 @@
     },
     "node_modules/@yeoman/adapter/node_modules/ora/node_modules/log-symbols/node_modules/is-unicode-supported": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-1.3.0.tgz",
-      "integrity": "sha512-43r2mRvz+8JRIKnWJ+3j8JtjRKZ6GmjzfaE/qiBJnikNnYv/6bagRJ1kUhNk8R5EX/GkobD+r+sfxCPJsiKBLQ==",
-      "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -14094,12 +14452,36 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@yeoman/adapter/node_modules/ora/node_modules/string-width": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
-      "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
-      "devOptional": true,
+    "node_modules/@yeoman/adapter/node_modules/restore-cursor": {
+      "version": "5.1.0",
       "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "onetime": "^7.0.0",
+        "signal-exit": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@yeoman/adapter/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "license": "ISC",
+      "peer": true,
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@yeoman/adapter/node_modules/string-width": {
+      "version": "7.2.0",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
         "emoji-regex": "^10.3.0",
         "get-east-asian-width": "^1.0.0",
@@ -14112,12 +14494,10 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@yeoman/adapter/node_modules/ora/node_modules/strip-ansi": {
+    "node_modules/@yeoman/adapter/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==",
-      "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "ansi-regex": "^6.0.1"
       },
@@ -14128,117 +14508,35 @@
         "url": "https://github.com/chalk/strip-ansi?sponsor=1"
       }
     },
-    "node_modules/@yeoman/adapter/node_modules/p-queue": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-8.1.0.tgz",
-      "integrity": "sha512-mxLDbbGIBEXTJL0zEx8JIylaj3xQ7Z/7eEVjcF9fJX4DBiH9oqe+oahYnlKKxm0Ci9TlWTyhSHgygxMxjIB2jw==",
-      "devOptional": true,
-      "license": "MIT",
-      "dependencies": {
-        "eventemitter3": "^5.0.1",
-        "p-timeout": "^6.1.2"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@yeoman/adapter/node_modules/p-timeout": {
-      "version": "6.1.4",
-      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-6.1.4.tgz",
-      "integrity": "sha512-MyIV3ZA/PmyBN/ud8vV9XzwTrNtR4jFrObymZYnZqMmW0zA8Z17vnT0rBgFE/TlohB+YCHqXMgZzb3Csp49vqg==",
-      "devOptional": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=14.16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@yeoman/adapter/node_modules/restore-cursor": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz",
-      "integrity": "sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==",
-      "devOptional": true,
-      "license": "MIT",
-      "dependencies": {
-        "onetime": "^7.0.0",
-        "signal-exit": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@yeoman/adapter/node_modules/run-async": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-3.0.0.tgz",
-      "integrity": "sha512-540WwVDOMxA6dN6We19EcT9sc3hkXPw5mzRNGM3FkdN/vtE9NFvj5lFAPNwUDmJjXidm3v7TC1cTE7t17Ulm1Q==",
-      "devOptional": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/@yeoman/adapter/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==",
-      "devOptional": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/@yeoman/adapter/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==",
-      "devOptional": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@yeoman/namespace": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@yeoman/namespace/-/namespace-1.0.1.tgz",
-      "integrity": "sha512-XGdYL0HCoPvrzW7T8bxD6RbCY/B8uvR2jpOzJc/yEwTueKHwoVhjSLjVXkokQAO0LNl8nQFLVZ1aKfr2eFWZeA==",
       "license": "MIT",
       "engines": {
         "node": "^16.13.0 || >=18.12.0"
       }
     },
     "node_modules/@yeoman/types": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/@yeoman/types/-/types-1.6.0.tgz",
-      "integrity": "sha512-7Deh9qpDCoOmQal7Sdicb1v/Qv0KFhLqDHnSKh9NBKvvU4EKAFXmd4MuXFvGTCLQfKhuZ6doiM9CMUd4jGp25w==",
+      "version": "1.5.0",
       "license": "MIT",
       "peer": true,
+      "dependencies": {
+        "@yeoman/adapter": "^1.6.0"
+      },
+      "acceptDependencies": {
+        "@yeoman/adapter": "^2.0.0-beta.0",
+        "mem-fs": "^4.0.0-beta.1",
+        "mem-fs-editor": ">=10.0.2"
+      },
       "engines": {
         "node": "^16.13.0 || >=18.12.0"
       },
       "peerDependencies": {
         "@types/node": ">=16.18.26",
-        "@yeoman/adapter": "^1.6.0 || ^2.0.0-beta.0",
-        "mem-fs": "^3.0.0 || ^4.0.0-beta.1",
-        "mem-fs-editor": "^10.0.2 || >=10.0.2"
+        "@yeoman/adapter": "^1.6.0",
+        "mem-fs": "^3.0.0",
+        "mem-fs-editor": "^10.0.2"
       },
       "peerDependenciesMeta": {
-        "@yeoman/adapter": {
-          "optional": true
-        },
         "mem-fs": {
           "optional": true
         },
@@ -14249,8 +14547,6 @@
     },
     "node_modules/@zkochan/js-yaml": {
       "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/@zkochan/js-yaml/-/js-yaml-0.0.7.tgz",
-      "integrity": "sha512-nrUSn7hzt7J6JWgWGz78ZYI8wj+gdIJdk0Ynjpp8l+trkn58Uqsf6RYrYkEK+3X18EX+TNdtJI0WxAtc+L84SQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -14262,23 +14558,16 @@
     },
     "node_modules/@zkochan/js-yaml/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/abab": {
       "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
-      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
-      "deprecated": "Use your platform's native atob() and btoa() methods instead",
       "dev": true,
       "license": "BSD-3-Clause"
     },
     "node_modules/abbrev": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz",
-      "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==",
       "dev": true,
       "license": "ISC",
       "engines": {
@@ -14287,8 +14576,6 @@
     },
     "node_modules/abort-controller": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
-      "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -14298,23 +14585,13 @@
         "node": ">=6.5"
       }
     },
-    "node_modules/abortcontroller-polyfill": {
-      "version": "1.7.8",
-      "resolved": "https://registry.npmjs.org/abortcontroller-polyfill/-/abortcontroller-polyfill-1.7.8.tgz",
-      "integrity": "sha512-9f1iZ2uWh92VcrU9Y8x+LdM4DLj75VE0MJB8zuF1iUnroEptStw+DQ8EQPMUdfe5k+PkB1uUfDQfWbhstH8LrQ==",
-      "license": "MIT"
-    },
     "node_modules/abstract-logging": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/abstract-logging/-/abstract-logging-2.0.1.tgz",
-      "integrity": "sha512-2BjRTZxTPvheOvGbBslFSYOUkr+SjPtOnrLP33f+VIWLzezQpZcqVg7ja3L4dBXmzzgwT+a029jRx5PCi3JuiA==",
       "dev": true,
       "license": "MIT"
     },
     "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": {
@@ -14326,15 +14603,11 @@
       }
     },
     "node_modules/ace-builds": {
-      "version": "1.42.0",
-      "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.42.0.tgz",
-      "integrity": "sha512-nRDbpHguujCh9Lb00jtJAblR6d5JEi6RVrHtj+TAlUqRYwWl5Es7iHnyXUOmTcMfkzQ2/TPn45G/yvdQGa0ZXw==",
+      "version": "1.43.1",
       "license": "BSD-3-Clause"
     },
     "node_modules/acorn": {
       "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
       "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
@@ -14343,47 +14616,8 @@
         "node": ">=0.4.0"
       }
     },
-    "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/acorn-globals/node_modules/acorn": {
-      "version": "8.14.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
-      "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-globals/node_modules/acorn-walk": {
-      "version": "8.3.4",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz",
-      "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "acorn": "^8.11.0"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "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==",
       "license": "MIT",
       "peerDependencies": {
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
@@ -14391,8 +14625,6 @@
     },
     "node_modules/acorn-walk": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
-      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
       "license": "MIT",
       "engines": {
         "node": ">=0.4.0"
@@ -14400,15 +14632,11 @@
     },
     "node_modules/add-stream": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz",
-      "integrity": "sha512-qQLMr+8o0WC4FZGQTcJiKBVC59JylcPSrTtk6usvmIDFUOCKegapy1VHQwRbFMOFyb/inzUVqHs+eMYKDM1YeQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/address": {
       "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/address/-/address-1.2.2.tgz",
-      "integrity": "sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -14417,14 +14645,10 @@
     },
     "node_modules/ag-charts-types": {
       "version": "11.1.1",
-      "resolved": "https://registry.npmjs.org/ag-charts-types/-/ag-charts-types-11.1.1.tgz",
-      "integrity": "sha512-bRmUcf5VVhEEekhX8Vk0NSwa8Te8YM/zchjyYKR2CX4vDYiwoohM1Jg9RFvbIhVbLC1S6QrPEbx5v2C6RDfpSA==",
       "license": "MIT"
     },
     "node_modules/ag-grid-community": {
       "version": "33.1.1",
-      "resolved": "https://registry.npmjs.org/ag-grid-community/-/ag-grid-community-33.1.1.tgz",
-      "integrity": "sha512-CNubIro0ipj4nfQ5WJPG9Isp7UI6MMDvNzrPdHNf3W+IoM8Uv3RUhjEn7xQqpQHuu6o/tMjrqpacipMUkhzqnw==",
       "license": "MIT",
       "dependencies": {
         "ag-charts-types": "11.1.1"
@@ -14432,8 +14656,6 @@
     },
     "node_modules/ag-grid-react": {
       "version": "33.1.1",
-      "resolved": "https://registry.npmjs.org/ag-grid-react/-/ag-grid-react-33.1.1.tgz",
-      "integrity": "sha512-xJ+t2gpqUUwpFqAeDvKz/GLVR4unkOghfQBr8iIY9RAdGFarYFClJavsOa8XPVVUqEB9OIuPVFnOdtocbX0jeA==",
       "license": "MIT",
       "dependencies": {
         "ag-grid-community": "33.1.1",
@@ -14446,8 +14668,6 @@
     },
     "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",
       "dependencies": {
@@ -14459,8 +14679,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "clean-stack": "^2.0.0",
@@ -14472,8 +14690,6 @@
     },
     "node_modules/ajv": {
       "version": "8.17.1",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
-      "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
       "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
@@ -14488,8 +14704,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "ajv": "^8.0.0"
@@ -14505,8 +14719,6 @@
     },
     "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,
       "license": "MIT",
       "dependencies": {
@@ -14518,8 +14730,6 @@
     },
     "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,
       "license": "ISC",
       "dependencies": {
@@ -14528,8 +14738,6 @@
     },
     "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==",
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -14537,8 +14745,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "type-fest": "^0.21.3"
@@ -14552,8 +14758,6 @@
     },
     "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==",
       "license": "(MIT OR CC0-1.0)",
       "engines": {
         "node": ">=10"
@@ -14564,8 +14768,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"
@@ -14577,8 +14779,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==",
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -14586,8 +14786,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
@@ -14600,67 +14798,9 @@
       }
     },
     "node_modules/antd": {
-      "version": "4.10.3",
-      "resolved": "https://registry.npmjs.org/antd/-/antd-4.10.3.tgz",
-      "integrity": "sha512-J/IZvW15MwTmUxK/AWFkSU51T1Hyn4e0GchJWlIe7+FrPpLoTgLf9/Cx3mgxiooHfE9OfvnYvvRli1VxHH6H0Q==",
-      "license": "MIT",
-      "dependencies": {
-        "@ant-design/colors": "^5.0.0",
-        "@ant-design/icons": "^4.3.0",
-        "@ant-design/react-slick": "~0.28.1",
-        "@babel/runtime": "^7.11.2",
-        "array-tree-filter": "^2.1.0",
-        "classnames": "^2.2.6",
-        "copy-to-clipboard": "^3.2.0",
-        "lodash": "^4.17.20",
-        "moment": "^2.25.3",
-        "rc-cascader": "~1.4.0",
-        "rc-checkbox": "~2.3.0",
-        "rc-collapse": "~3.1.0",
-        "rc-dialog": "~8.5.1",
-        "rc-drawer": "~4.2.0",
-        "rc-dropdown": "~3.2.0",
-        "rc-field-form": "~1.17.3",
-        "rc-image": "~5.0.2",
-        "rc-input-number": "~6.1.0",
-        "rc-mentions": "~1.5.0",
-        "rc-menu": "~8.10.0",
-        "rc-motion": "^2.4.0",
-        "rc-notification": "~4.5.2",
-        "rc-pagination": "~3.1.2",
-        "rc-picker": "~2.5.1",
-        "rc-progress": "~3.1.0",
-        "rc-rate": "~2.9.0",
-        "rc-resize-observer": "^1.0.0",
-        "rc-select": "~12.1.0",
-        "rc-slider": "~9.7.1",
-        "rc-steps": "~4.1.0",
-        "rc-switch": "~3.2.0",
-        "rc-table": "~7.12.0",
-        "rc-tabs": "~11.7.0",
-        "rc-textarea": "~0.3.0",
-        "rc-tooltip": "~5.0.0",
-        "rc-tree": "~4.1.0",
-        "rc-tree-select": "~4.3.0",
-        "rc-upload": "~3.3.4",
-        "rc-util": "^5.7.0",
-        "scroll-into-view-if-needed": "^2.2.25",
-        "warning": "^4.0.3"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/ant-design"
-      },
-      "peerDependencies": {
-        "react": ">=16.9.0",
-        "react-dom": ">=16.9.0"
-      }
-    },
-    "node_modules/antd-v5": {
-      "name": "antd",
-      "version": "5.25.4",
-      "resolved": "https://registry.npmjs.org/antd/-/antd-5.25.4.tgz",
-      "integrity": "sha512-yXdWqq1NJSZnD1HoPZWnWuQJGVYYnB3h0Ufsz4sbt3T0N9SdJ4G9GPpLMk8Gn9zWtwBekfR4THPVZ9uzAyhBHQ==",
+      "version": "5.26.3",
+      "resolved": "https://registry.npmjs.org/antd/-/antd-5.26.3.tgz",
+      "integrity": "sha512-M/s9Q39h/+G7AWnS6fbNxmAI9waTH4ti022GVEXBLq2j810V1wJ3UOQps13nEilzDNcyxnFN/EIbqIgS7wSYaA==",
       "license": "MIT",
       "dependencies": {
         "@ant-design/colors": "^7.2.1",
@@ -14674,7 +14814,7 @@
         "@rc-component/mutate-observer": "^1.1.0",
         "@rc-component/qrcode": "~1.0.0",
         "@rc-component/tour": "~1.15.1",
-        "@rc-component/trigger": "^2.2.6",
+        "@rc-component/trigger": "^2.2.7",
         "classnames": "^2.5.1",
         "copy-to-clipboard": "^3.3.3",
         "dayjs": "^1.11.11",
@@ -14702,7 +14842,7 @@
         "rc-slider": "~11.1.8",
         "rc-steps": "~6.0.1",
         "rc-switch": "~4.1.0",
-        "rc-table": "~7.50.5",
+        "rc-table": "~7.51.1",
         "rc-tabs": "~15.6.1",
         "rc-textarea": "~1.10.0",
         "rc-tooltip": "~6.4.0",
@@ -14722,575 +14862,12 @@
         "react-dom": ">=16.9.0"
       }
     },
-    "node_modules/antd-v5/node_modules/@ant-design/react-slick": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@ant-design/react-slick/-/react-slick-1.1.2.tgz",
-      "integrity": "sha512-EzlvzE6xQUBrZuuhSAFTdsr4P2bBBHGZwKFemEfq8gIGyIQCxalYfZW/T2ORbtQx5rU69o+WycP3exY/7T1hGA==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.10.4",
-        "classnames": "^2.2.5",
-        "json2mq": "^0.2.0",
-        "resize-observer-polyfill": "^1.5.1",
-        "throttle-debounce": "^5.0.0"
-      },
-      "peerDependencies": {
-        "react": ">=16.9.0"
-      }
-    },
-    "node_modules/antd-v5/node_modules/rc-cascader": {
-      "version": "3.34.0",
-      "resolved": "https://registry.npmjs.org/rc-cascader/-/rc-cascader-3.34.0.tgz",
-      "integrity": "sha512-KpXypcvju9ptjW9FaN2NFcA2QH9E9LHKq169Y0eWtH4e/wHQ5Wh5qZakAgvb8EKZ736WZ3B0zLLOBsrsja5Dag==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.25.7",
-        "classnames": "^2.3.1",
-        "rc-select": "~14.16.2",
-        "rc-tree": "~5.13.0",
-        "rc-util": "^5.43.0"
-      },
-      "peerDependencies": {
-        "react": ">=16.9.0",
-        "react-dom": ">=16.9.0"
-      }
-    },
-    "node_modules/antd-v5/node_modules/rc-checkbox": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/rc-checkbox/-/rc-checkbox-3.5.0.tgz",
-      "integrity": "sha512-aOAQc3E98HteIIsSqm6Xk2FPKIER6+5vyEFMZfo73TqM+VVAIqOkHoPjgKLqSNtVLWScoaM7vY2ZrGEheI79yg==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.10.1",
-        "classnames": "^2.3.2",
-        "rc-util": "^5.25.2"
-      },
-      "peerDependencies": {
-        "react": ">=16.9.0",
-        "react-dom": ">=16.9.0"
-      }
-    },
-    "node_modules/antd-v5/node_modules/rc-collapse": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/rc-collapse/-/rc-collapse-3.9.0.tgz",
-      "integrity": "sha512-swDdz4QZ4dFTo4RAUMLL50qP0EY62N2kvmk2We5xYdRwcRn8WcYtuetCJpwpaCbUfUt5+huLpVxhvmnK+PHrkA==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.10.1",
-        "classnames": "2.x",
-        "rc-motion": "^2.3.4",
-        "rc-util": "^5.27.0"
-      },
-      "peerDependencies": {
-        "react": ">=16.9.0",
-        "react-dom": ">=16.9.0"
-      }
-    },
-    "node_modules/antd-v5/node_modules/rc-dialog": {
-      "version": "9.6.0",
-      "resolved": "https://registry.npmjs.org/rc-dialog/-/rc-dialog-9.6.0.tgz",
-      "integrity": "sha512-ApoVi9Z8PaCQg6FsUzS8yvBEQy0ZL2PkuvAgrmohPkN3okps5WZ5WQWPc1RNuiOKaAYv8B97ACdsFU5LizzCqg==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.10.1",
-        "@rc-component/portal": "^1.0.0-8",
-        "classnames": "^2.2.6",
-        "rc-motion": "^2.3.0",
-        "rc-util": "^5.21.0"
-      },
-      "peerDependencies": {
-        "react": ">=16.9.0",
-        "react-dom": ">=16.9.0"
-      }
-    },
-    "node_modules/antd-v5/node_modules/rc-drawer": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/rc-drawer/-/rc-drawer-7.3.0.tgz",
-      "integrity": "sha512-DX6CIgiBWNpJIMGFO8BAISFkxiuKitoizooj4BDyee8/SnBn0zwO2FHrNDpqqepj0E/TFTDpmEBCyFuTgC7MOg==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.23.9",
-        "@rc-component/portal": "^1.1.1",
-        "classnames": "^2.2.6",
-        "rc-motion": "^2.6.1",
-        "rc-util": "^5.38.1"
-      },
-      "peerDependencies": {
-        "react": ">=16.9.0",
-        "react-dom": ">=16.9.0"
-      }
-    },
-    "node_modules/antd-v5/node_modules/rc-dropdown": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/rc-dropdown/-/rc-dropdown-4.2.1.tgz",
-      "integrity": "sha512-YDAlXsPv3I1n42dv1JpdM7wJ+gSUBfeyPK59ZpBD9jQhK9jVuxpjj3NmWQHOBceA1zEPVX84T2wbdb2SD0UjmA==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.18.3",
-        "@rc-component/trigger": "^2.0.0",
-        "classnames": "^2.2.6",
-        "rc-util": "^5.44.1"
-      },
-      "peerDependencies": {
-        "react": ">=16.11.0",
-        "react-dom": ">=16.11.0"
-      }
-    },
-    "node_modules/antd-v5/node_modules/rc-field-form": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/rc-field-form/-/rc-field-form-2.7.0.tgz",
-      "integrity": "sha512-hgKsCay2taxzVnBPZl+1n4ZondsV78G++XVsMIJCAoioMjlMQR9YwAp7JZDIECzIu2Z66R+f4SFIRrO2DjDNAA==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.18.0",
-        "@rc-component/async-validator": "^5.0.3",
-        "rc-util": "^5.32.2"
-      },
-      "engines": {
-        "node": ">=8.x"
-      },
-      "peerDependencies": {
-        "react": ">=16.9.0",
-        "react-dom": ">=16.9.0"
-      }
-    },
-    "node_modules/antd-v5/node_modules/rc-image": {
-      "version": "7.12.0",
-      "resolved": "https://registry.npmjs.org/rc-image/-/rc-image-7.12.0.tgz",
-      "integrity": "sha512-cZ3HTyyckPnNnUb9/DRqduqzLfrQRyi+CdHjdqgsyDpI3Ln5UX1kXnAhPBSJj9pVRzwRFgqkN7p9b6HBDjmu/Q==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.11.2",
-        "@rc-component/portal": "^1.0.2",
-        "classnames": "^2.2.6",
-        "rc-dialog": "~9.6.0",
-        "rc-motion": "^2.6.2",
-        "rc-util": "^5.34.1"
-      },
-      "peerDependencies": {
-        "react": ">=16.9.0",
-        "react-dom": ">=16.9.0"
-      }
-    },
-    "node_modules/antd-v5/node_modules/rc-input-number": {
-      "version": "9.5.0",
-      "resolved": "https://registry.npmjs.org/rc-input-number/-/rc-input-number-9.5.0.tgz",
-      "integrity": "sha512-bKaEvB5tHebUURAEXw35LDcnRZLq3x1k7GxfAqBMzmpHkDGzjAtnUL8y4y5N15rIFIg5IJgwr211jInl3cipag==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.10.1",
-        "@rc-component/mini-decimal": "^1.0.1",
-        "classnames": "^2.2.5",
-        "rc-input": "~1.8.0",
-        "rc-util": "^5.40.1"
-      },
-      "peerDependencies": {
-        "react": ">=16.9.0",
-        "react-dom": ">=16.9.0"
-      }
-    },
-    "node_modules/antd-v5/node_modules/rc-mentions": {
-      "version": "2.20.0",
-      "resolved": "https://registry.npmjs.org/rc-mentions/-/rc-mentions-2.20.0.tgz",
-      "integrity": "sha512-w8HCMZEh3f0nR8ZEd466ATqmXFCMGMN5UFCzEUL0bM/nGw/wOS2GgRzKBcm19K++jDyuWCOJOdgcKGXU3fXfbQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.22.5",
-        "@rc-component/trigger": "^2.0.0",
-        "classnames": "^2.2.6",
-        "rc-input": "~1.8.0",
-        "rc-menu": "~9.16.0",
-        "rc-textarea": "~1.10.0",
-        "rc-util": "^5.34.1"
-      },
-      "peerDependencies": {
-        "react": ">=16.9.0",
-        "react-dom": ">=16.9.0"
-      }
-    },
-    "node_modules/antd-v5/node_modules/rc-menu": {
-      "version": "9.16.1",
-      "resolved": "https://registry.npmjs.org/rc-menu/-/rc-menu-9.16.1.tgz",
-      "integrity": "sha512-ghHx6/6Dvp+fw8CJhDUHFHDJ84hJE3BXNCzSgLdmNiFErWSOaZNsihDAsKq9ByTALo/xkNIwtDFGIl6r+RPXBg==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.10.1",
-        "@rc-component/trigger": "^2.0.0",
-        "classnames": "2.x",
-        "rc-motion": "^2.4.3",
-        "rc-overflow": "^1.3.1",
-        "rc-util": "^5.27.0"
-      },
-      "peerDependencies": {
-        "react": ">=16.9.0",
-        "react-dom": ">=16.9.0"
-      }
-    },
-    "node_modules/antd-v5/node_modules/rc-notification": {
-      "version": "5.6.4",
-      "resolved": "https://registry.npmjs.org/rc-notification/-/rc-notification-5.6.4.tgz",
-      "integrity": "sha512-KcS4O6B4qzM3KH7lkwOB7ooLPZ4b6J+VMmQgT51VZCeEcmghdeR4IrMcFq0LG+RPdnbe/ArT086tGM8Snimgiw==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.10.1",
-        "classnames": "2.x",
-        "rc-motion": "^2.9.0",
-        "rc-util": "^5.20.1"
-      },
-      "engines": {
-        "node": ">=8.x"
-      },
-      "peerDependencies": {
-        "react": ">=16.9.0",
-        "react-dom": ">=16.9.0"
-      }
-    },
-    "node_modules/antd-v5/node_modules/rc-pagination": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/rc-pagination/-/rc-pagination-5.1.0.tgz",
-      "integrity": "sha512-8416Yip/+eclTFdHXLKTxZvn70duYVGTvUUWbckCCZoIl3jagqke3GLsFrMs0bsQBikiYpZLD9206Ej4SOdOXQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.10.1",
-        "classnames": "^2.3.2",
-        "rc-util": "^5.38.0"
-      },
-      "peerDependencies": {
-        "react": ">=16.9.0",
-        "react-dom": ">=16.9.0"
-      }
-    },
-    "node_modules/antd-v5/node_modules/rc-picker": {
-      "version": "4.11.3",
-      "resolved": "https://registry.npmjs.org/rc-picker/-/rc-picker-4.11.3.tgz",
-      "integrity": "sha512-MJ5teb7FlNE0NFHTncxXQ62Y5lytq6sh5nUw0iH8OkHL/TjARSEvSHpr940pWgjGANpjCwyMdvsEV55l5tYNSg==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.24.7",
-        "@rc-component/trigger": "^2.0.0",
-        "classnames": "^2.2.1",
-        "rc-overflow": "^1.3.2",
-        "rc-resize-observer": "^1.4.0",
-        "rc-util": "^5.43.0"
-      },
-      "engines": {
-        "node": ">=8.x"
-      },
-      "peerDependencies": {
-        "date-fns": ">= 2.x",
-        "dayjs": ">= 1.x",
-        "luxon": ">= 3.x",
-        "moment": ">= 2.x",
-        "react": ">=16.9.0",
-        "react-dom": ">=16.9.0"
-      },
-      "peerDependenciesMeta": {
-        "date-fns": {
-          "optional": true
-        },
-        "dayjs": {
-          "optional": true
-        },
-        "luxon": {
-          "optional": true
-        },
-        "moment": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/antd-v5/node_modules/rc-progress": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/rc-progress/-/rc-progress-4.0.0.tgz",
-      "integrity": "sha512-oofVMMafOCokIUIBnZLNcOZFsABaUw8PPrf1/y0ZBvKZNpOiu5h4AO9vv11Sw0p4Hb3D0yGWuEattcQGtNJ/aw==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.10.1",
-        "classnames": "^2.2.6",
-        "rc-util": "^5.16.1"
-      },
-      "peerDependencies": {
-        "react": ">=16.9.0",
-        "react-dom": ">=16.9.0"
-      }
-    },
-    "node_modules/antd-v5/node_modules/rc-rate": {
-      "version": "2.13.1",
-      "resolved": "https://registry.npmjs.org/rc-rate/-/rc-rate-2.13.1.tgz",
-      "integrity": "sha512-QUhQ9ivQ8Gy7mtMZPAjLbxBt5y9GRp65VcUyGUMF3N3fhiftivPHdpuDIaWIMOTEprAjZPC08bls1dQB+I1F2Q==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.10.1",
-        "classnames": "^2.2.5",
-        "rc-util": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8.x"
-      },
-      "peerDependencies": {
-        "react": ">=16.9.0",
-        "react-dom": ">=16.9.0"
-      }
-    },
-    "node_modules/antd-v5/node_modules/rc-select": {
-      "version": "14.16.8",
-      "resolved": "https://registry.npmjs.org/rc-select/-/rc-select-14.16.8.tgz",
-      "integrity": "sha512-NOV5BZa1wZrsdkKaiK7LHRuo5ZjZYMDxPP6/1+09+FB4KoNi8jcG1ZqLE3AVCxEsYMBe65OBx71wFoHRTP3LRg==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.10.1",
-        "@rc-component/trigger": "^2.1.1",
-        "classnames": "2.x",
-        "rc-motion": "^2.0.1",
-        "rc-overflow": "^1.3.1",
-        "rc-util": "^5.16.1",
-        "rc-virtual-list": "^3.5.2"
-      },
-      "engines": {
-        "node": ">=8.x"
-      },
-      "peerDependencies": {
-        "react": "*",
-        "react-dom": "*"
-      }
-    },
-    "node_modules/antd-v5/node_modules/rc-slider": {
-      "version": "11.1.8",
-      "resolved": "https://registry.npmjs.org/rc-slider/-/rc-slider-11.1.8.tgz",
-      "integrity": "sha512-2gg/72YFSpKP+Ja5AjC5DPL1YnV8DEITDQrcc1eASrUYjl0esptaBVJBh5nLTXCCp15eD8EuGjwezVGSHhs9tQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.10.1",
-        "classnames": "^2.2.5",
-        "rc-util": "^5.36.0"
-      },
-      "engines": {
-        "node": ">=8.x"
-      },
-      "peerDependencies": {
-        "react": ">=16.9.0",
-        "react-dom": ">=16.9.0"
-      }
-    },
-    "node_modules/antd-v5/node_modules/rc-steps": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/rc-steps/-/rc-steps-6.0.1.tgz",
-      "integrity": "sha512-lKHL+Sny0SeHkQKKDJlAjV5oZ8DwCdS2hFhAkIjuQt1/pB81M0cA0ErVFdHq9+jmPmFw1vJB2F5NBzFXLJxV+g==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.16.7",
-        "classnames": "^2.2.3",
-        "rc-util": "^5.16.1"
-      },
-      "engines": {
-        "node": ">=8.x"
-      },
-      "peerDependencies": {
-        "react": ">=16.9.0",
-        "react-dom": ">=16.9.0"
-      }
-    },
-    "node_modules/antd-v5/node_modules/rc-switch": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/rc-switch/-/rc-switch-4.1.0.tgz",
-      "integrity": "sha512-TI8ufP2Az9oEbvyCeVE4+90PDSljGyuwix3fV58p7HV2o4wBnVToEyomJRVyTaZeqNPAp+vqeo4Wnj5u0ZZQBg==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.21.0",
-        "classnames": "^2.2.1",
-        "rc-util": "^5.30.0"
-      },
-      "peerDependencies": {
-        "react": ">=16.9.0",
-        "react-dom": ">=16.9.0"
-      }
-    },
-    "node_modules/antd-v5/node_modules/rc-table": {
-      "version": "7.50.5",
-      "resolved": "https://registry.npmjs.org/rc-table/-/rc-table-7.50.5.tgz",
-      "integrity": "sha512-FDZu8aolhSYd3v9KOc3lZOVAU77wmRRu44R0Wfb8Oj1dXRUsloFaXMSl6f7yuWZUxArJTli7k8TEOX2mvhDl4A==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.10.1",
-        "@rc-component/context": "^1.4.0",
-        "classnames": "^2.2.5",
-        "rc-resize-observer": "^1.1.0",
-        "rc-util": "^5.44.3",
-        "rc-virtual-list": "^3.14.2"
-      },
-      "engines": {
-        "node": ">=8.x"
-      },
-      "peerDependencies": {
-        "react": ">=16.9.0",
-        "react-dom": ">=16.9.0"
-      }
-    },
-    "node_modules/antd-v5/node_modules/rc-tabs": {
-      "version": "15.6.1",
-      "resolved": "https://registry.npmjs.org/rc-tabs/-/rc-tabs-15.6.1.tgz",
-      "integrity": "sha512-/HzDV1VqOsUWyuC0c6AkxVYFjvx9+rFPKZ32ejxX0Uc7QCzcEjTA9/xMgv4HemPKwzBNX8KhGVbbumDjnj92aA==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.11.2",
-        "classnames": "2.x",
-        "rc-dropdown": "~4.2.0",
-        "rc-menu": "~9.16.0",
-        "rc-motion": "^2.6.2",
-        "rc-resize-observer": "^1.0.0",
-        "rc-util": "^5.34.1"
-      },
-      "engines": {
-        "node": ">=8.x"
-      },
-      "peerDependencies": {
-        "react": ">=16.9.0",
-        "react-dom": ">=16.9.0"
-      }
-    },
-    "node_modules/antd-v5/node_modules/rc-textarea": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/rc-textarea/-/rc-textarea-1.10.0.tgz",
-      "integrity": "sha512-ai9IkanNuyBS4x6sOL8qu/Ld40e6cEs6pgk93R+XLYg0mDSjNBGey6/ZpDs5+gNLD7urQ14po3V6Ck2dJLt9SA==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.10.1",
-        "classnames": "^2.2.1",
-        "rc-input": "~1.8.0",
-        "rc-resize-observer": "^1.0.0",
-        "rc-util": "^5.27.0"
-      },
-      "peerDependencies": {
-        "react": ">=16.9.0",
-        "react-dom": ">=16.9.0"
-      }
-    },
-    "node_modules/antd-v5/node_modules/rc-tooltip": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/rc-tooltip/-/rc-tooltip-6.4.0.tgz",
-      "integrity": "sha512-kqyivim5cp8I5RkHmpsp1Nn/Wk+1oeloMv9c7LXNgDxUpGm+RbXJGL+OPvDlcRnx9DBeOe4wyOIl4OKUERyH1g==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.11.2",
-        "@rc-component/trigger": "^2.0.0",
-        "classnames": "^2.3.1",
-        "rc-util": "^5.44.3"
-      },
-      "peerDependencies": {
-        "react": ">=16.9.0",
-        "react-dom": ">=16.9.0"
-      }
-    },
-    "node_modules/antd-v5/node_modules/rc-tree": {
-      "version": "5.13.1",
-      "resolved": "https://registry.npmjs.org/rc-tree/-/rc-tree-5.13.1.tgz",
-      "integrity": "sha512-FNhIefhftobCdUJshO7M8uZTA9F4OPGVXqGfZkkD/5soDeOhwO06T/aKTrg0WD8gRg/pyfq+ql3aMymLHCTC4A==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.10.1",
-        "classnames": "2.x",
-        "rc-motion": "^2.0.1",
-        "rc-util": "^5.16.1",
-        "rc-virtual-list": "^3.5.1"
-      },
-      "engines": {
-        "node": ">=10.x"
-      },
-      "peerDependencies": {
-        "react": "*",
-        "react-dom": "*"
-      }
-    },
-    "node_modules/antd-v5/node_modules/rc-tree-select": {
-      "version": "5.27.0",
-      "resolved": "https://registry.npmjs.org/rc-tree-select/-/rc-tree-select-5.27.0.tgz",
-      "integrity": "sha512-2qTBTzwIT7LRI1o7zLyrCzmo5tQanmyGbSaGTIf7sYimCklAToVVfpMC6OAldSKolcnjorBYPNSKQqJmN3TCww==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.25.7",
-        "classnames": "2.x",
-        "rc-select": "~14.16.2",
-        "rc-tree": "~5.13.0",
-        "rc-util": "^5.43.0"
-      },
-      "peerDependencies": {
-        "react": "*",
-        "react-dom": "*"
-      }
-    },
-    "node_modules/antd-v5/node_modules/rc-upload": {
-      "version": "4.9.2",
-      "resolved": "https://registry.npmjs.org/rc-upload/-/rc-upload-4.9.2.tgz",
-      "integrity": "sha512-nHx+9rbd1FKMiMRYsqQ3NkXUv7COHPBo3X1Obwq9SWS6/diF/A0aJ5OHubvwUAIDs+4RMleljV0pcrNUc823GQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.18.3",
-        "classnames": "^2.2.5",
-        "rc-util": "^5.2.0"
-      },
-      "peerDependencies": {
-        "react": ">=16.9.0",
-        "react-dom": ">=16.9.0"
-      }
-    },
-    "node_modules/antd/node_modules/@ant-design/colors": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/@ant-design/colors/-/colors-5.1.1.tgz",
-      "integrity": "sha512-Txy4KpHrp3q4XZdfgOBqLl+lkQIc3tEvHXOimRN1giX1AEC7mGtyrO9p8iRGJ3FLuVMGa2gNEzQyghVymLttKQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@ctrl/tinycolor": "^3.3.1"
-      }
-    },
-    "node_modules/antd/node_modules/@ant-design/icons": {
-      "version": "4.8.3",
-      "resolved": "https://registry.npmjs.org/@ant-design/icons/-/icons-4.8.3.tgz",
-      "integrity": "sha512-HGlIQZzrEbAhpJR6+IGdzfbPym94Owr6JZkJ2QCCnOkPVIWMO2xgIVcOKnl8YcpijIo39V7l2qQL5fmtw56cMw==",
-      "license": "MIT",
-      "dependencies": {
-        "@ant-design/colors": "^6.0.0",
-        "@ant-design/icons-svg": "^4.3.0",
-        "@babel/runtime": "^7.11.2",
-        "classnames": "^2.2.6",
-        "lodash": "^4.17.15",
-        "rc-util": "^5.9.4"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "peerDependencies": {
-        "react": ">=16.0.0",
-        "react-dom": ">=16.0.0"
-      }
-    },
-    "node_modules/antd/node_modules/@ant-design/icons/node_modules/@ant-design/colors": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/@ant-design/colors/-/colors-6.0.0.tgz",
-      "integrity": "sha512-qAZRvPzfdWHtfameEGP2Qvuf838NhergR35o+EuVyB5XvSA98xod5r4utvi4TJ3ywmevm290g9nsCG5MryrdWQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@ctrl/tinycolor": "^3.4.0"
-      }
-    },
-    "node_modules/antd/node_modules/compute-scroll-into-view": {
-      "version": "1.0.20",
-      "resolved": "https://registry.npmjs.org/compute-scroll-into-view/-/compute-scroll-into-view-1.0.20.tgz",
-      "integrity": "sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==",
+    "node_modules/any-promise": {
+      "version": "1.3.0",
       "license": "MIT"
     },
-    "node_modules/antd/node_modules/scroll-into-view-if-needed": {
-      "version": "2.2.31",
-      "resolved": "https://registry.npmjs.org/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.31.tgz",
-      "integrity": "sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==",
-      "license": "MIT",
-      "dependencies": {
-        "compute-scroll-into-view": "^1.0.20"
-      }
-    },
     "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==",
       "license": "ISC",
       "dependencies": {
         "normalize-path": "^3.0.0",
@@ -15302,14 +14879,10 @@
     },
     "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": "sha512-jlpIfsOoNoafl92Sz//64uQHGSyMrD2vYG5d8o2a4qGvyNCvXur7bzIsWtAC/6flI2RYAp3kv8rsfBtaLm7w0g==",
       "license": "MIT"
     },
     "node_modules/append-transform": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-2.0.0.tgz",
-      "integrity": "sha512-7yeyCEurROLQJFv5Xj4lEGTy0borxepjFv1g22oAdqFu//SrAlDl1O1Nxx15SH1RoliUml6p8dwJW9jvZughhg==",
       "dev": true,
       "license": "MIT",
       "peer": true,
@@ -15322,15 +14895,11 @@
     },
     "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,
       "license": "ISC"
     },
     "node_modules/arch": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz",
-      "integrity": "sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==",
       "funding": [
         {
           "type": "github",
@@ -15349,27 +14918,25 @@
     },
     "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",
       "peer": true
     },
     "node_modules/arg": {
       "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
-      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
       "license": "MIT"
     },
     "node_modules/argparse": {
       "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
       "license": "MIT",
       "dependencies": {
         "sprintf-js": "~1.0.2"
       }
     },
+    "node_modules/argv-formatter": {
+      "version": "1.0.0",
+      "license": "MIT"
+    },
     "node_modules/aria-hidden": {
       "version": "1.2.6",
       "resolved": "https://registry.npmjs.org/aria-hidden/-/aria-hidden-1.2.6.tgz",
@@ -15384,8 +14951,6 @@
     },
     "node_modules/aria-query": {
       "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz",
-      "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "deep-equal": "^2.0.5"
@@ -15393,8 +14958,6 @@
     },
     "node_modules/array-buffer-byte-length": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz",
-      "integrity": "sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==",
       "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.3",
@@ -15409,8 +14972,6 @@
     },
     "node_modules/array-differ": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz",
-      "integrity": "sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -15419,33 +14980,24 @@
     },
     "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,
       "license": "MIT"
     },
     "node_modules/array-ify": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz",
-      "integrity": "sha512-c5AMf34bKdvPhQ7tBGhqkgKNUzMr4WUs+WDtC2ZUGOUncbxKMTvqxYctiseW3+L4bA8ec+GcZ6/A/FW4m8ukng==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/array-includes": {
-      "version": "3.1.9",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.9.tgz",
-      "integrity": "sha512-FmeCCAenzH0KH381SPT5FZmiA/TmpndpcaShhfgEN9eCVjnFBqq3l1xrI42y8+PPLI6hypzou4GXw00WHmPBLQ==",
+      "version": "3.1.8",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.4",
+        "call-bind": "^1.0.7",
         "define-properties": "^1.2.1",
-        "es-abstract": "^1.24.0",
-        "es-object-atoms": "^1.1.1",
-        "get-intrinsic": "^1.3.0",
-        "is-string": "^1.1.1",
-        "math-intrinsics": "^1.1.0"
+        "es-abstract": "^1.23.2",
+        "es-object-atoms": "^1.0.0",
+        "get-intrinsic": "^1.2.4",
+        "is-string": "^1.0.7"
       },
       "engines": {
         "node": ">= 0.4"
@@ -15454,25 +15006,36 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array-tree-filter": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-tree-filter/-/array-tree-filter-2.1.0.tgz",
-      "integrity": "sha512-4ROwICNlNw/Hqa9v+rk5h22KjmzB1JGTMVKP2AKJBOCgb0yL0ASf0+YvCcLNNwquOHNX48jkeZIJ3a+oOQqKcw==",
-      "license": "MIT"
-    },
     "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==",
       "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
+    "node_modules/array.prototype.filter": {
+      "version": "1.0.4",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-array-method-boxes-properly": "^1.0.0",
+        "es-object-atoms": "^1.0.0",
+        "is-string": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "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": {
@@ -15491,19 +15054,16 @@
       }
     },
     "node_modules/array.prototype.findlastindex": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.6.tgz",
-      "integrity": "sha512-F/TKATkzseUExPlfvmwQKGITM3DGTK+vkAsCZoDc5daVygbJBnjEUCbgkAvVFsgfXfX4YIqZ/27G3k3tdXrTxQ==",
+      "version": "1.2.5",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.4",
+        "call-bind": "^1.0.7",
         "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.9",
+        "es-abstract": "^1.23.2",
         "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.1.1",
-        "es-shim-unscopables": "^1.1.0"
+        "es-object-atoms": "^1.0.0",
+        "es-shim-unscopables": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -15514,8 +15074,6 @@
     },
     "node_modules/array.prototype.flat": {
       "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.3.tgz",
-      "integrity": "sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -15533,8 +15091,6 @@
     },
     "node_modules/array.prototype.flatmap": {
       "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.3.tgz",
-      "integrity": "sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -15551,20 +15107,17 @@
       }
     },
     "node_modules/array.prototype.reduce": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.8.tgz",
-      "integrity": "sha512-DwuEqgXFBwbmZSRqt3BpQigWNUoqw9Ml2dTWdF3B2zQlQX4OeUE0zyuzX0fX0IbTvjdkZbcBTU3idgpO78qkTw==",
+      "version": "1.0.7",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.4",
+        "call-bind": "^1.0.7",
         "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.9",
+        "es-abstract": "^1.23.2",
         "es-array-method-boxes-properly": "^1.0.0",
         "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.1.1",
-        "is-string": "^1.1.1"
+        "es-object-atoms": "^1.0.0",
+        "is-string": "^1.0.7"
       },
       "engines": {
         "node": ">= 0.4"
@@ -15575,8 +15128,6 @@
     },
     "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",
       "dependencies": {
@@ -15592,8 +15143,6 @@
     },
     "node_modules/arraybuffer.prototype.slice": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz",
-      "integrity": "sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==",
       "license": "MIT",
       "dependencies": {
         "array-buffer-byte-length": "^1.0.1",
@@ -15613,8 +15162,6 @@
     },
     "node_modules/arrify": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-      "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -15632,8 +15179,6 @@
     },
     "node_modules/assert": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-2.1.0.tgz",
-      "integrity": "sha512-eLHpSK/Y4nhMJ07gDaAzoX/XAKS8PSaojml3M0DM4JpV1LAi5JOJ/p6H/XWrl8L+DzVEvVCW1z3vWAaB9oTsQw==",
       "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
@@ -15654,8 +15199,6 @@
     },
     "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": {
@@ -15667,15 +15210,11 @@
     },
     "node_modules/ast-types-flow": {
       "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.8.tgz",
-      "integrity": "sha512-OH/2E5Fg20h2aPrbe+QL8JZQFko0YZaF+j4mnQ7BGhfavO7OpSLa8a0y9sBwomHdSbkhTS8TQNayBfnW5DwbvQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/astral-regex": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -15683,35 +15222,21 @@
     },
     "node_modules/async": {
       "version": "3.2.6",
-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
-      "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
       "license": "MIT"
     },
     "node_modules/async-function": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/async-function/-/async-function-1.0.0.tgz",
-      "integrity": "sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==",
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       }
     },
-    "node_modules/async-validator": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-3.5.2.tgz",
-      "integrity": "sha512-8eLCg00W9pIRZSB781UUX/H6Oskmm8xloZfr09lz5bikRpBVDlJ3hRVuxxP1SxcwsEYfJ4IU8Q19Y8/893r3rQ==",
-      "license": "MIT"
-    },
     "node_modules/asynckit": {
       "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
       "license": "MIT"
     },
     "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==",
       "license": "ISC",
       "engines": {
         "node": ">= 4.0.0"
@@ -15719,8 +15244,6 @@
     },
     "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==",
       "license": "(MIT OR Apache-2.0)",
       "bin": {
         "atob": "bin/atob.js"
@@ -15731,8 +15254,6 @@
     },
     "node_modules/atomic-sleep": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/atomic-sleep/-/atomic-sleep-1.0.0.tgz",
-      "integrity": "sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -15741,8 +15262,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "possible-typed-array-names": "^1.0.0"
@@ -15756,8 +15275,6 @@
     },
     "node_modules/avvio": {
       "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/avvio/-/avvio-8.4.0.tgz",
-      "integrity": "sha512-CDSwaxINFy59iNwhYnkvALBwZiTydGkOecZyPkqBpABYR1KqGEsET0VOOYDwtleZSUIdeY36DC2bSZ24CO1igA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -15781,9 +15298,7 @@
       "license": "MIT"
     },
     "node_modules/axe-core": {
-      "version": "4.10.3",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.10.3.tgz",
-      "integrity": "sha512-Xm7bpRXnDSX2YE2YFfBk2FnF0ep6tmG7xPh8iHee8MIcrgq762Nkce856dYtJYLkuIoYZvGfTs/PbZhideTcEg==",
+      "version": "4.10.2",
       "dev": true,
       "license": "MPL-2.0",
       "engines": {
@@ -15791,9 +15306,7 @@
       }
     },
     "node_modules/axios": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.9.0.tgz",
-      "integrity": "sha512-re4CqKTJaURpzbLHtIi6XpDv20/CnpXOtjRY5/CU32L8gU8ek9UIivcfvSWvmKEngmVbrUtPpdDwWDWL7DNHvg==",
+      "version": "1.8.4",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -15804,15 +15317,11 @@
     },
     "node_modules/axios/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,
       "license": "MIT"
     },
     "node_modules/axobject-query": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.1.0.tgz",
-      "integrity": "sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -15821,14 +15330,10 @@
     },
     "node_modules/b4a": {
       "version": "1.6.7",
-      "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.7.tgz",
-      "integrity": "sha512-OnAYlL5b7LEkALw87fUVafQw5rVR9RjwGd4KUwNQ6DrrNmaVaUCgLipfVlzrPQ4tWOR9P0IXGNOx50jYCCdSJg==",
       "license": "Apache-2.0"
     },
     "node_modules/babel-core": {
       "version": "7.0.0-bridge.0",
-      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-7.0.0-bridge.0.tgz",
-      "integrity": "sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg==",
       "dev": true,
       "license": "MIT",
       "peerDependencies": {
@@ -15836,31 +15341,27 @@
       }
     },
     "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==",
+      "version": "30.0.2",
       "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",
+        "@jest/transform": "30.0.2",
+        "@types/babel__core": "^7.20.5",
+        "babel-plugin-istanbul": "^7.0.0",
+        "babel-preset-jest": "30.0.1",
+        "chalk": "^4.1.2",
+        "graceful-fs": "^4.2.11",
         "slash": "^3.0.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.8.0"
+        "@babel/core": "^7.11.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": {
@@ -15876,8 +15377,6 @@
     },
     "node_modules/babel-jest/node_modules/slash": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -15886,8 +15385,6 @@
     },
     "node_modules/babel-loader": {
       "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-10.0.0.tgz",
-      "integrity": "sha512-z8jt+EdS61AMw22nSfoNJAZ0vrtmhPRVi6ghL3rCeRZI8cdNYFiV5xeV3HbE7rlZZNmGH8BVccwWt8/ED0QOHA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -15903,8 +15400,6 @@
     },
     "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,
       "license": "MIT",
       "dependencies": {
@@ -15912,42 +15407,35 @@
       }
     },
     "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==",
+      "version": "7.0.0",
       "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": "^5.0.4",
+        "@istanbuljs/schema": "^0.1.3",
+        "istanbul-lib-instrument": "^6.0.2",
         "test-exclude": "^6.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
       }
     },
     "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==",
+      "version": "30.0.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.3.3",
-        "@babel/types": "^7.3.3",
-        "@types/babel__core": "^7.1.14",
-        "@types/babel__traverse": "^7.0.6"
+        "@babel/template": "^7.27.2",
+        "@babel/types": "^7.27.3",
+        "@types/babel__core": "^7.20.5"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/babel-plugin-jsx-remove-data-test-id": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jsx-remove-data-test-id/-/babel-plugin-jsx-remove-data-test-id-3.0.0.tgz",
-      "integrity": "sha512-E4uM/LIUizjy2Z5tVAfa8pSXsYgoKWJ97kzuEMfsIxSLSNDWsAhgFVPkgNuakViX5dkNjw1DKIi0VpWP6djqbw==",
       "dev": true,
       "license": "MIT",
       "peerDependencies": {
@@ -15956,8 +15444,6 @@
     },
     "node_modules/babel-plugin-lodash": {
       "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/babel-plugin-lodash/-/babel-plugin-lodash-3.3.4.tgz",
-      "integrity": "sha512-yDZLjK7TCkWl1gpBeBGmuaDIFhZKmkoL+Cu2MUUjv5VxUZx/z7tBGBCBcQs5RI1Bkz5LLmNdjx7paOyQtMovyg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -15970,8 +15456,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.12.5",
@@ -15985,8 +15469,6 @@
     },
     "node_modules/babel-plugin-macros/node_modules/cosmiconfig": {
       "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
-      "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
       "license": "MIT",
       "dependencies": {
         "@types/parse-json": "^4.0.0",
@@ -16001,22 +15483,18 @@
     },
     "node_modules/babel-plugin-macros/node_modules/yaml": {
       "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
       "license": "ISC",
       "engines": {
         "node": ">= 6"
       }
     },
     "node_modules/babel-plugin-polyfill-corejs2": {
-      "version": "0.4.13",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.13.tgz",
-      "integrity": "sha512-3sX/eOms8kd3q2KZ6DAhKPc0dgm525Gqq5NtWKZ7QYYZEv57OQ54KtblzJzH1lQF/eQxO8KjWGIK9IPUJNus5g==",
+      "version": "0.4.12",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/compat-data": "^7.22.6",
-        "@babel/helper-define-polyfill-provider": "^0.6.4",
+        "@babel/helper-define-polyfill-provider": "^0.6.3",
         "semver": "^6.3.1"
       },
       "peerDependencies": {
@@ -16025,8 +15503,6 @@
     },
     "node_modules/babel-plugin-polyfill-corejs2/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": "ISC",
       "bin": {
@@ -16035,8 +15511,6 @@
     },
     "node_modules/babel-plugin-polyfill-corejs3": {
       "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.11.1.tgz",
-      "integrity": "sha512-yGCqvBT4rwMczo28xkH/noxJ6MZ4nJfkVYdoDaC/utLtWrXxv27HVrzAeSbqR8SxDsp46n0YF47EbHoixy6rXQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -16048,13 +15522,11 @@
       }
     },
     "node_modules/babel-plugin-polyfill-regenerator": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.4.tgz",
-      "integrity": "sha512-7gD3pRadPrbjhjLyxebmx/WrFYcuSjZ0XbdUujQMZ/fcE9oeewk2U/7PCvez84UeuK3oSjmPZ0Ch0dlupQvGzw==",
+      "version": "0.6.3",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.6.4"
+        "@babel/helper-define-polyfill-provider": "^0.6.3"
       },
       "peerDependencies": {
         "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
@@ -16062,8 +15534,6 @@
     },
     "node_modules/babel-plugin-typescript-to-proptypes": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-typescript-to-proptypes/-/babel-plugin-typescript-to-proptypes-2.1.0.tgz",
-      "integrity": "sha512-jTV65uJPnSmW/SddPxv+OFBf05sv6JUq64iQCnuzU68/rK/O8dE8dVPIIy7URc4dG2MfmptKotmZGS0myO6loQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -16082,8 +15552,6 @@
     },
     "node_modules/babel-preset-current-node-syntax": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.1.0.tgz",
-      "integrity": "sha512-ldYss8SbBlWva1bs28q78Ju5Zq1F+8BrqBZZ0VFhLBvhh6lCpC2o3gDJi/5DRLs9FgYZCnmPYIVFU4lRXCkyUw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -16108,26 +15576,22 @@
       }
     },
     "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==",
+      "version": "30.0.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "babel-plugin-jest-hoist": "^29.6.3",
-        "babel-preset-current-node-syntax": "^1.0.0"
+        "babel-plugin-jest-hoist": "30.0.1",
+        "babel-preset-current-node-syntax": "^1.1.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0"
+        "@babel/core": "^7.11.0"
       }
     },
     "node_modules/bail": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/bail/-/bail-2.0.2.tgz",
-      "integrity": "sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw==",
       "license": "MIT",
       "funding": {
         "type": "github",
@@ -16136,21 +15600,15 @@
     },
     "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==",
       "license": "MIT"
     },
     "node_modules/bare-events": {
       "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.5.4.tgz",
-      "integrity": "sha512-+gFfDkR8pj4/TrWCGUGWmJIkBwuxPS5F+a5yWjOHQt2hHvNZd5YLzadjmDUtFmMM4y429bnKLa8bYBMHcYdnQA==",
       "license": "Apache-2.0",
       "optional": true
     },
     "node_modules/bare-fs": {
       "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-4.1.5.tgz",
-      "integrity": "sha512-1zccWBMypln0jEE05LzZt+V/8y8AQsQQqxtklqaIyg5nu6OAYFhZxPXinJTSG+kU5qyNmeLgcn9AW7eHiCHVLA==",
       "dev": true,
       "license": "Apache-2.0",
       "optional": true,
@@ -16173,8 +15631,6 @@
     },
     "node_modules/bare-os": {
       "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-3.6.1.tgz",
-      "integrity": "sha512-uaIjxokhFidJP+bmmvKSgiMzj2sV5GPHaZVAIktcxcpCyBFFWO+YlikVAdhmUo2vYFvFhOXIAlldqV29L8126g==",
       "dev": true,
       "license": "Apache-2.0",
       "optional": true,
@@ -16184,8 +15640,6 @@
     },
     "node_modules/bare-path": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-3.0.0.tgz",
-      "integrity": "sha512-tyfW2cQcB5NN8Saijrhqn0Zh7AnFNsnczRcuWODH0eYAXBsJ5gVxAUuNr7tsHSC6IZ77cA0SitzT+s47kot8Mw==",
       "dev": true,
       "license": "Apache-2.0",
       "optional": true,
@@ -16195,8 +15649,6 @@
     },
     "node_modules/bare-stream": {
       "version": "2.6.5",
-      "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.6.5.tgz",
-      "integrity": "sha512-jSmxKJNJmHySi6hC42zlZnq00rga4jjxcgNZjY9N5WlOe/iOoGRtdwGsHzQv2RlH2KOYMwGUXhf2zXd32BA9RA==",
       "dev": true,
       "license": "Apache-2.0",
       "optional": true,
@@ -16218,14 +15670,10 @@
     },
     "node_modules/base16": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/base16/-/base16-1.0.0.tgz",
-      "integrity": "sha512-pNdYkNPiJUnEhnfXV56+sQy8+AaPcG3POZAUnwr4EeqCUZFz4u2PePbo3e5Gj4ziYPCWGUZT9RHisvJKnwFuBQ==",
       "license": "MIT"
     },
     "node_modules/base64-arraybuffer": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
-      "integrity": "sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ==",
       "license": "MIT",
       "optional": true,
       "engines": {
@@ -16234,8 +15682,6 @@
     },
     "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==",
       "funding": [
         {
           "type": "github",
@@ -16254,8 +15700,6 @@
     },
     "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,
       "license": "MIT",
       "engines": {
@@ -16264,8 +15708,6 @@
     },
     "node_modules/batch": {
       "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
-      "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
       "dev": true,
       "license": "MIT"
     },
@@ -16280,16 +15722,11 @@
     },
     "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,
       "license": "Apache-2.0"
     },
     "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",
       "dependencies": {
         "open": "^8.0.4"
@@ -16300,8 +15737,6 @@
     },
     "node_modules/big-integer": {
       "version": "1.6.52",
-      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.52.tgz",
-      "integrity": "sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg==",
       "dev": true,
       "license": "Unlicense",
       "engines": {
@@ -16310,17 +15745,13 @@
     },
     "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==",
       "license": "MIT",
       "engines": {
         "node": "*"
       }
     },
     "node_modules/bignumber.js": {
-      "version": "9.3.0",
-      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.3.0.tgz",
-      "integrity": "sha512-EM7aMFTXbptt/wZdMlBv2t8IViwQL+h6SLHosp8Yf0dqJMTnY6iL32opnAB6kAdL0SZPuvcAzFr31o0c/R3/RA==",
+      "version": "9.1.2",
       "license": "MIT",
       "engines": {
         "node": "*"
@@ -16328,8 +15759,6 @@
     },
     "node_modules/bin-links": {
       "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/bin-links/-/bin-links-4.0.4.tgz",
-      "integrity": "sha512-cMtq4W5ZsEwcutJrVId+a/tjt8GSbS+h0oNkdl6+6rBuEv8Ot33Bevj5KPm40t309zuhVic8NjpuL42QCiJWWA==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -16342,51 +15771,17 @@
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
-    "node_modules/bin-links/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,
-      "license": "ISC",
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/bin-links/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": "ISC",
-      "dependencies": {
-        "imurmurhash": "^0.1.4",
-        "signal-exit": "^4.0.1"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
     "node_modules/binary": {
       "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
-      "integrity": "sha512-D4H1y5KYwpJgK8wk1Cue5LLPgmwHKYSChkbspQg5JtVuR5ulGckxfR62H3AE9UDkdMC8yyXlqYihuz3Aqg2XZg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "buffers": "~0.1.1",
         "chainsaw": "~0.1.0"
-      },
-      "engines": {
-        "node": "*"
       }
     },
     "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": {
@@ -16398,8 +15793,6 @@
     },
     "node_modules/binaryextensions": {
       "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/binaryextensions/-/binaryextensions-6.11.0.tgz",
-      "integrity": "sha512-sXnYK/Ij80TO3lcqZVV2YgfKN5QjUWIRk/XSm2J/4bd/lPko3lvk0O4ZppH6m+6hB2/GTu+ptNwVFe1xh+QLQw==",
       "license": "Artistic-2.0",
       "dependencies": {
         "editions": "^6.21.0"
@@ -16413,9 +15806,6 @@
     },
     "node_modules/bl": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "buffer": "^5.5.0",
@@ -16425,8 +15815,6 @@
     },
     "node_modules/blob": {
       "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/blob/-/blob-0.1.0.tgz",
-      "integrity": "sha512-k+GwK+4Rj+MPNT4qu+y6+kHp+mPmmNd+28zdrIo69QM9UvypK5Vhcw7jnRiY4KaOMAiOdn0NtPQGTb+Ox1Dtng==",
       "license": "MIT",
       "dependencies": {
         "esm": "^3.2.25"
@@ -16434,27 +15822,19 @@
     },
     "node_modules/blob-util": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/blob-util/-/blob-util-2.0.2.tgz",
-      "integrity": "sha512-T7JQa+zsXXEa6/8ZhHcQEW1UFfVM49Ts65uBkFL6fz2QmrElqmbajIDJvuA0tEhRe5eIjpV9ZF+0RfZR9voJFQ==",
       "license": "Apache-2.0"
     },
     "node_modules/bluebird": {
       "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
       "license": "MIT"
     },
     "node_modules/bmpimagejs": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/bmpimagejs/-/bmpimagejs-1.0.4.tgz",
-      "integrity": "sha512-21oKU7kbRt2OgOOj7rdiNr/yznDNUQ585plxR00rsmECcZr+6O1oCwB8OIoSHk/bDhbG8mFXIdeQuCPHgZ6QBw==",
       "dev": true,
       "license": "MIT"
     },
     "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": {
@@ -16478,8 +15858,6 @@
     },
     "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,
       "license": "MIT",
       "dependencies": {
@@ -16488,8 +15866,6 @@
     },
     "node_modules/body-parser/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": "MIT",
       "dependencies": {
@@ -16501,15 +15877,11 @@
     },
     "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,
       "license": "MIT"
     },
     "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": "BSD-3-Clause",
       "dependencies": {
@@ -16524,8 +15896,6 @@
     },
     "node_modules/bonjour-service": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.3.0.tgz",
-      "integrity": "sha512-3YuAUiSkWykd+2Azjgyxei8OWf8thdn8AITIog2M4UICzoqfjlqr64WIjEXZllf/W6vK1goqleSR6brGomxQqA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -16535,30 +15905,19 @@
     },
     "node_modules/boolbase": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
       "dev": true,
       "license": "ISC"
     },
-    "node_modules/bootstrap": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.4.1.tgz",
-      "integrity": "sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/bootstrap-slider": {
       "version": "11.0.2",
-      "resolved": "https://registry.npmjs.org/bootstrap-slider/-/bootstrap-slider-11.0.2.tgz",
-      "integrity": "sha512-CdwS+Z6X79OkLes9RfDgPB9UIY/+81wTkm6ktdSB6hdyiRbjJLFQIjZdnEr55tDyXZfgC7U6yeSXkNN9ZdGqjA==",
+      "license": "MIT"
+    },
+    "node_modules/bottleneck": {
+      "version": "2.19.5",
       "license": "MIT"
     },
     "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,
       "license": "MIT",
       "dependencies": {
@@ -16580,8 +15939,6 @@
     },
     "node_modules/boxen/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,
       "license": "MIT",
       "engines": {
@@ -16590,8 +15947,6 @@
     },
     "node_modules/boxen/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,
       "license": "(MIT OR CC0-1.0)",
       "engines": {
@@ -16600,8 +15955,6 @@
     },
     "node_modules/bplist-parser": {
       "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.2.0.tgz",
-      "integrity": "sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -16613,14 +15966,10 @@
     },
     "node_modules/brace": {
       "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/brace/-/brace-0.11.1.tgz",
-      "integrity": "sha512-Fc8Ne62jJlKHiG/ajlonC4Sd66Pq68fFwK4ihJGNZpGqboc324SQk+lRvMzpPRuJOmfrJefdG8/7JdWX4bzJ2Q==",
       "license": "MIT"
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
@@ -16629,8 +15978,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "fill-range": "^7.1.1"
@@ -16641,8 +15988,6 @@
     },
     "node_modules/brfs": {
       "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/brfs/-/brfs-1.6.1.tgz",
-      "integrity": "sha512-OfZpABRQQf+Xsmju8XE9bDjs+uU4vLREGolP7bDgcpsI17QREyZ4Bl+2KLxxx1kCgA0fAIhKQBaBYh+PEcCqYQ==",
       "license": "MIT",
       "dependencies": {
         "quote-stream": "^1.0.1",
@@ -16655,15 +16000,10 @@
       }
     },
     "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
+      "version": "1.2.1"
     },
     "node_modules/browserify-zlib": {
       "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
-      "integrity": "sha512-19OEpq7vWgsH6WkvkBJQDFvJS1uPcbFOQ4v9CU839dO+ZZXUZO6XpE6hNCqvlIIj+4fZvRiJ6DsAQ382GwiyTQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -16672,15 +16012,11 @@
     },
     "node_modules/browserify-zlib/node_modules/pako": {
       "version": "0.2.9",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
-      "integrity": "sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/browserslist": {
-      "version": "4.25.0",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.0.tgz",
-      "integrity": "sha512-PJ8gYKeS5e/whHBh8xrwYK+dAvEj7JXtz6uTucnMRB8OiGTsKccFekoRrjajPBHV8oOY+2tI4uxeceSimKwMFA==",
+      "version": "4.24.4",
       "dev": true,
       "funding": [
         {
@@ -16698,10 +16034,10 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001718",
-        "electron-to-chromium": "^1.5.160",
+        "caniuse-lite": "^1.0.30001688",
+        "electron-to-chromium": "^1.5.73",
         "node-releases": "^2.0.19",
-        "update-browserslist-db": "^1.1.3"
+        "update-browserslist-db": "^1.1.1"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -16712,8 +16048,6 @@
     },
     "node_modules/bs-logger": {
       "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
-      "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -16725,8 +16059,6 @@
     },
     "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": "Apache-2.0",
       "dependencies": {
@@ -16735,8 +16067,6 @@
     },
     "node_modules/btoa": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/btoa/-/btoa-1.2.1.tgz",
-      "integrity": "sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g==",
       "license": "(MIT OR Apache-2.0)",
       "bin": {
         "btoa": "bin/btoa.js"
@@ -16747,8 +16077,6 @@
     },
     "node_modules/buffer": {
       "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
       "funding": [
         {
           "type": "github",
@@ -16771,8 +16099,6 @@
     },
     "node_modules/buffer-crc32": {
       "version": "0.2.13",
-      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-      "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
       "license": "MIT",
       "engines": {
         "node": "*"
@@ -16780,8 +16106,6 @@
     },
     "node_modules/buffer-equal": {
       "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.1.tgz",
-      "integrity": "sha512-RgSV6InVQ9ODPdLWJ5UAqBqJBOg370Nz6ZQtRzpt6nUjc8v0St97uJ4PYC6NztqIScrAXafKM3mZPMygSe1ggA==",
       "license": "MIT",
       "engines": {
         "node": ">=0.4.0"
@@ -16789,20 +16113,14 @@
     },
     "node_modules/buffer-equal-constant-time": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
-      "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==",
       "license": "BSD-3-Clause"
     },
     "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==",
       "license": "MIT"
     },
     "node_modules/buffers": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
-      "integrity": "sha512-9q/rDEGSb/Qsvv2qvzIzdluL5k7AaJOTrw23z9reQthrbF7is4CtlT0DXyO1oei2DCp4uojjzQ7igaSHp1kAEQ==",
       "dev": true,
       "engines": {
         "node": ">=0.2.0"
@@ -16810,8 +16128,6 @@
     },
     "node_modules/bundle-name": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bundle-name/-/bundle-name-4.1.0.tgz",
-      "integrity": "sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -16826,8 +16142,6 @@
     },
     "node_modules/byte-size": {
       "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/byte-size/-/byte-size-8.1.1.tgz",
-      "integrity": "sha512-tUkzZWK0M/qdoLEqikxBWe4kumyuwjl3HO6zHTr4yEI23EojPtLYXdG1+AQY7MN0cGyNDvEaJ8wiYQm6P2bPxg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -16836,8 +16150,6 @@
     },
     "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": {
@@ -16846,8 +16158,6 @@
     },
     "node_modules/cacache": {
       "version": "18.0.4",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.4.tgz",
-      "integrity": "sha512-B+L5iIa9mgcjLbliir2th36yEwPftrzteHYujzsx3dFP/31GCHcIeS8f5MGd80odLOjaOvSpU3EEAmRQptkxLQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -16870,8 +16180,6 @@
     },
     "node_modules/cacache/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": {
@@ -16880,8 +16188,6 @@
     },
     "node_modules/cacache/node_modules/glob": {
       "version": "10.4.5",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
-      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -16901,15 +16207,11 @@
     },
     "node_modules/cacache/node_modules/lru-cache": {
       "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
-      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
       "dev": true,
       "license": "ISC"
     },
     "node_modules/cacache/node_modules/minimatch": {
       "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": {
@@ -16924,8 +16226,6 @@
     },
     "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,
       "license": "MIT",
       "engines": {
@@ -16934,8 +16234,6 @@
     },
     "node_modules/cacheable-request": {
       "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.4.tgz",
-      "integrity": "sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -16953,8 +16251,6 @@
     },
     "node_modules/cacheable-request/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,
       "license": "MIT",
       "dependencies": {
@@ -16969,8 +16265,6 @@
     },
     "node_modules/cachedir": {
       "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/cachedir/-/cachedir-2.4.0.tgz",
-      "integrity": "sha512-9EtFOZR8g22CL7BWjJ9BUx1+A/djkofnyW3aOXZORNW2kxoUpx2h+uN2cOqwPmFhnpVmxg+KW2OjOSgChTEvsQ==",
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -16978,8 +16272,6 @@
     },
     "node_modules/caching-transform": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-4.0.0.tgz",
-      "integrity": "sha512-kpqOvwXnjjN44D89K5ccQC+RUrsy7jB/XLlRrx0D7/2HNcTPqzsb6XgYoErwko6QsV184CA2YgS1fxDiiDZMWA==",
       "dev": true,
       "license": "MIT",
       "peer": true,
@@ -16995,8 +16287,6 @@
     },
     "node_modules/caching-transform/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,
       "license": "MIT",
       "peer": true,
@@ -17012,8 +16302,6 @@
     },
     "node_modules/caching-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": "ISC",
       "peer": true,
@@ -17023,8 +16311,6 @@
     },
     "node_modules/caching-transform/node_modules/write-file-atomic": {
       "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
       "dev": true,
       "license": "ISC",
       "peer": true,
@@ -17037,8 +16323,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "call-bind-apply-helpers": "^1.0.0",
@@ -17054,9 +16338,7 @@
       }
     },
     "node_modules/call-bind-apply-helpers": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
-      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
+      "version": "1.0.1",
       "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0",
@@ -17067,13 +16349,11 @@
       }
     },
     "node_modules/call-bound": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz",
-      "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
+      "version": "1.0.3",
       "license": "MIT",
       "dependencies": {
-        "call-bind-apply-helpers": "^1.0.2",
-        "get-intrinsic": "^1.3.0"
+        "call-bind-apply-helpers": "^1.0.1",
+        "get-intrinsic": "^1.2.6"
       },
       "engines": {
         "node": ">= 0.4"
@@ -17084,8 +16364,6 @@
     },
     "node_modules/callsites": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -17093,8 +16371,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,
       "license": "MIT",
       "dependencies": {
@@ -17104,8 +16380,6 @@
     },
     "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": {
@@ -17117,8 +16391,6 @@
     },
     "node_modules/camelcase-keys": {
       "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
-      "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -17135,8 +16407,6 @@
     },
     "node_modules/camelcase-keys/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,
       "license": "MIT",
       "engines": {
@@ -17145,8 +16415,6 @@
     },
     "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,
       "license": "MIT",
       "dependencies": {
@@ -17157,9 +16425,7 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001721",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001721.tgz",
-      "integrity": "sha512-cOuvmUVtKrtEaoKiO0rSc29jcjwMwX5tOHDy4MgVFEWiUXj4uBMJkwI8MDySkgXidpMiHUcviogAvFi4pA2hDQ==",
+      "version": "1.0.30001726",
       "dev": true,
       "funding": [
         {
@@ -17179,8 +16445,6 @@
     },
     "node_modules/canvg": {
       "version": "3.0.11",
-      "resolved": "https://registry.npmjs.org/canvg/-/canvg-3.0.11.tgz",
-      "integrity": "sha512-5ON+q7jCTgMp9cjpu4Jo6XbvfYwSB2Ow3kzHKfIyJfaCAOHLbdKPQqGKgfED/R5B+3TFFfe8pegYA+b423SRyA==",
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -17199,15 +16463,11 @@
     },
     "node_modules/canvg/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==",
       "license": "MIT",
       "optional": true
     },
     "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,
       "license": "MIT",
       "engines": {
@@ -17222,8 +16482,6 @@
     },
     "node_modules/ccount": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/ccount/-/ccount-2.0.1.tgz",
-      "integrity": "sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==",
       "license": "MIT",
       "funding": {
         "type": "github",
@@ -17232,37 +16490,23 @@
     },
     "node_modules/cephes": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/cephes/-/cephes-2.0.0.tgz",
-      "integrity": "sha512-4GMUzkcXHZ0HMZ3gZdBrv8pQs1/zkJh2Q9rQOF8NJZHanM359y3XOSdeqmDBPfxQKYQpJt58R3dUpofrIXJ2mg==",
       "license": "BSD-3-Clause"
     },
     "node_modules/chainsaw": {
       "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
-      "integrity": "sha512-75kWfWt6MEKNC8xYXIdRpDehRYY/tNSgwKaJq+dbbDcxORuVrrQ+SEHoWsniVn9XPYfP4gmdWIeDk/4YNp1rNQ==",
       "dev": true,
       "license": "MIT/X11",
       "dependencies": {
         "traverse": ">=0.3.0 <0.4"
-      },
-      "engines": {
-        "node": "*"
       }
     },
     "node_modules/chainsaw/node_modules/traverse": {
       "version": "0.3.9",
-      "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
-      "integrity": "sha512-iawgk0hLP3SxGKDfnDJf8wTz4p2qImnyihM5Hh/sGvQ3K37dPi/w8sRhdNIxYA1TwFwc5mDhIJq+O0RsvXBKdQ==",
       "dev": true,
-      "license": "MIT/X11",
-      "engines": {
-        "node": "*"
-      }
+      "license": "MIT/X11"
     },
     "node_modules/chalk": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-      "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
       "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -17274,9 +16518,6 @@
     },
     "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": ">=10"
@@ -17284,8 +16525,6 @@
     },
     "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==",
       "license": "MIT",
       "funding": {
         "type": "github",
@@ -17294,8 +16533,6 @@
     },
     "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==",
       "license": "MIT",
       "funding": {
         "type": "github",
@@ -17304,8 +16541,6 @@
     },
     "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==",
       "license": "MIT",
       "funding": {
         "type": "github",
@@ -17314,63 +16549,102 @@
     },
     "node_modules/chardet": {
       "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
-      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
-      "devOptional": true,
       "license": "MIT"
     },
+    "node_modules/cheap-ruler": {
+      "version": "4.0.0",
+      "license": "ISC"
+    },
     "node_modules/check-more-types": {
       "version": "2.24.0",
-      "resolved": "https://registry.npmjs.org/check-more-types/-/check-more-types-2.24.0.tgz",
-      "integrity": "sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA==",
       "license": "MIT",
       "engines": {
         "node": ">= 0.8.0"
       }
     },
     "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==",
+      "version": "1.1.0",
       "dev": true,
       "license": "MIT",
       "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"
+        "cheerio-select": "^2.1.0",
+        "dom-serializer": "^2.0.0",
+        "domhandler": "^5.0.3",
+        "domutils": "^3.2.2",
+        "encoding-sniffer": "^0.2.0",
+        "htmlparser2": "^10.0.0",
+        "parse5": "^7.3.0",
+        "parse5-htmlparser2-tree-adapter": "^7.1.0",
+        "parse5-parser-stream": "^7.1.2",
+        "undici": "^7.10.0",
+        "whatwg-mimetype": "^4.0.0"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">=18.17"
       },
       "funding": {
         "url": "https://github.com/cheeriojs/cheerio?sponsor=1"
       }
     },
     "node_modules/cheerio-select": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-1.6.0.tgz",
-      "integrity": "sha512-eq0GdBvxVFbqWgmCm7M3XGs1I8oLy/nExUnh6oLqmBditPO9AqQJrkslDpMun/hZ0yyTs8L0m85OHp4ho6Qm9g==",
+      "version": "2.1.0",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
-        "css-select": "^4.3.0",
-        "css-what": "^6.0.1",
-        "domelementtype": "^2.2.0",
-        "domhandler": "^4.3.1",
-        "domutils": "^2.8.0"
+        "boolbase": "^1.0.0",
+        "css-select": "^5.1.0",
+        "css-what": "^6.1.0",
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.3",
+        "domutils": "^3.0.1"
       },
       "funding": {
         "url": "https://github.com/sponsors/fb55"
       }
     },
+    "node_modules/cheerio/node_modules/entities": {
+      "version": "6.0.1",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/cheerio/node_modules/htmlparser2": {
+      "version": "10.0.0",
+      "dev": true,
+      "funding": [
+        "https://github.com/fb55/htmlparser2?sponsor=1",
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.3",
+        "domutils": "^3.2.1",
+        "entities": "^6.0.0"
+      }
+    },
+    "node_modules/cheerio/node_modules/parse5-htmlparser2-tree-adapter": {
+      "version": "7.1.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "domhandler": "^5.0.3",
+        "parse5": "^7.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/inikulin/parse5?sponsor=1"
+      }
+    },
     "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,
       "license": "MIT",
       "dependencies": {
@@ -17394,8 +16668,6 @@
     },
     "node_modules/chownr": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
-      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
       "dev": true,
       "license": "ISC",
       "engines": {
@@ -17404,14 +16676,10 @@
     },
     "node_modules/chroma-js": {
       "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/chroma-js/-/chroma-js-2.6.0.tgz",
-      "integrity": "sha512-BLHvCB9s8Z1EV4ethr6xnkl/P2YRFOGqfgvuMG/MyCbZPrTA+NeiByY6XvgF0zP4/2deU2CXnWyMa3zu1LqQ3A==",
       "license": "(BSD-3-Clause AND Apache-2.0)"
     },
     "node_modules/chrome-trace-event": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
-      "integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -17420,8 +16688,6 @@
     },
     "node_modules/chromium-bidi": {
       "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.6.3.tgz",
-      "integrity": "sha512-qXlsCmpCZJAnoTYI83Iu6EdYQpMYdVkCfq08KDh2pmlVqK5t5IA9mGs4/LwCwp4fqisSOMXZxP3HIh8w8aRn0A==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -17435,15 +16701,11 @@
     },
     "node_modules/chromium-bidi/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,
       "license": "MIT"
     },
     "node_modules/chrono-node": {
-      "version": "2.8.2",
-      "resolved": "https://registry.npmjs.org/chrono-node/-/chrono-node-2.8.2.tgz",
-      "integrity": "sha512-7BJ6TRHs4sFtOSsTISWXGKjg7C70wD+NU+44uA6euGnbvZnECvgzUv+5TS9sICta2sBQWej4UYy8XAg4W9E7rQ==",
+      "version": "2.7.8",
       "license": "MIT",
       "dependencies": {
         "dayjs": "^1.10.0"
@@ -17454,8 +16716,6 @@
     },
     "node_modules/ci-info": {
       "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.2.0.tgz",
-      "integrity": "sha512-cYY9mypksY8NRqgDB1XD1RiJL338v/551niynFTGkZOO2LHuB2OmOYxDIe/ttN9AHwrqdum1360G3ald0W9kCg==",
       "funding": [
         {
           "type": "github",
@@ -17469,8 +16729,6 @@
     },
     "node_modules/citty": {
       "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/citty/-/citty-0.1.6.tgz",
-      "integrity": "sha512-tskPPKEs8D2KPafUypv2gxwJP8h/OaJmC82QQGGDQcHvXX43xF2VDACcJVmZ0EuSxkpO9Kc4MlrA3q0+FG58AQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -17478,22 +16736,16 @@
       }
     },
     "node_modules/cjs-module-lexer": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.3.tgz",
-      "integrity": "sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q==",
+      "version": "1.4.1",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/classnames": {
       "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz",
-      "integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==",
       "license": "MIT"
     },
     "node_modules/clean-css": {
       "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.3.tgz",
-      "integrity": "sha512-D5J+kHaVb/wKSFcyyV75uCn8fiY4sV38XJoe4CUyGQ+mOU/fMVYUdH1hJC+CJQ5uY3EnW27SbJYS4X8BiLrAFg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -17505,8 +16757,6 @@
     },
     "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,
       "license": "BSD-3-Clause",
       "engines": {
@@ -17515,8 +16765,6 @@
     },
     "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==",
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -17524,8 +16772,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,
       "license": "MIT",
       "engines": {
@@ -17537,8 +16783,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "restore-cursor": "^3.1.0"
@@ -17547,11 +16791,92 @@
         "node": ">=8"
       }
     },
+    "node_modules/cli-highlight": {
+      "version": "2.1.11",
+      "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"
+      },
+      "bin": {
+        "highlight": "bin/highlight"
+      },
+      "engines": {
+        "node": ">=8.0.0",
+        "npm": ">=5.0.0"
+      }
+    },
+    "node_modules/cli-highlight/node_modules/chalk": {
+      "version": "4.1.2",
+      "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/cli-highlight/node_modules/cliui": {
+      "version": "7.0.4",
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
+      }
+    },
+    "node_modules/cli-highlight/node_modules/parse5": {
+      "version": "5.1.1",
+      "license": "MIT"
+    },
+    "node_modules/cli-highlight/node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "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/cli-highlight/node_modules/yargs": {
+      "version": "16.2.0",
+      "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/cli-highlight/node_modules/yargs-parser": {
+      "version": "20.2.9",
+      "license": "ISC",
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "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==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -17561,9 +16886,7 @@
       }
     },
     "node_modules/cli-table3": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.1.tgz",
-      "integrity": "sha512-w0q/enDHhPLq44ovMGdQeeDLvwxwavsJX7oQGYt/LrBlYsyaxyDnp6z3QzFut/6kLLKnlcUVJLrpB7KBfgG/RA==",
+      "version": "0.6.5",
       "license": "MIT",
       "dependencies": {
         "string-width": "^4.2.0"
@@ -17572,13 +16895,11 @@
         "node": "10.* || >= 12.*"
       },
       "optionalDependencies": {
-        "colors": "1.4.0"
+        "@colors/colors": "1.5.0"
       }
     },
     "node_modules/cli-truncate": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
-      "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
       "license": "MIT",
       "dependencies": {
         "slice-ansi": "^3.0.0",
@@ -17592,19 +16913,15 @@
       }
     },
     "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==",
-      "dev": true,
+      "version": "4.1.0",
       "license": "ISC",
+      "peer": true,
       "engines": {
-        "node": ">= 10"
+        "node": ">= 12"
       }
     },
     "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==",
       "license": "ISC",
       "dependencies": {
         "string-width": "^4.2.0",
@@ -17617,8 +16934,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "ansi-regex": "^5.0.1"
@@ -17629,8 +16944,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
@@ -17645,10 +16958,7 @@
       }
     },
     "node_modules/clone": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-      "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
-      "devOptional": true,
+      "version": "2.1.2",
       "license": "MIT",
       "engines": {
         "node": ">=0.8"
@@ -17656,8 +16966,6 @@
     },
     "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,
       "license": "MIT",
       "dependencies": {
@@ -17671,8 +16979,6 @@
     },
     "node_modules/clone-response": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz",
-      "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -17682,10 +16988,14 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/clone-stats": {
+      "version": "1.0.0",
+      "license": "MIT"
+    },
     "node_modules/clsx": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz",
-      "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz",
+      "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==",
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -17693,8 +17003,6 @@
     },
     "node_modules/cmd-shim": {
       "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-6.0.3.tgz",
-      "integrity": "sha512-FMabTRlc5t5zjdenF6mS0MBeFZm0XqHqeOkcskKFb/LYCcRQ5fVgLOHVc4Lq9CqABd9zhjwPjMBCJvMCziSVtA==",
       "dev": true,
       "license": "ISC",
       "engines": {
@@ -17703,8 +17011,6 @@
     },
     "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,
       "license": "MIT",
       "engines": {
@@ -17714,15 +17020,11 @@
     },
     "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,
       "license": "MIT"
     },
     "node_modules/color": {
       "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz",
-      "integrity": "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==",
       "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1",
@@ -17734,8 +17036,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
@@ -17746,14 +17046,10 @@
     },
     "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==",
       "license": "MIT"
     },
     "node_modules/color-string": {
       "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz",
-      "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==",
       "license": "MIT",
       "dependencies": {
         "color-name": "^1.0.0",
@@ -17762,8 +17058,6 @@
     },
     "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": {
@@ -17772,15 +17066,11 @@
     },
     "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,
       "license": "MIT"
     },
     "node_modules/colorette": {
       "version": "2.0.20",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
-      "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
       "license": "MIT"
     },
     "node_modules/colors": {
@@ -17795,8 +17085,6 @@
     },
     "node_modules/columnify": {
       "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/columnify/-/columnify-1.6.0.tgz",
-      "integrity": "sha512-lomjuFZKfM6MSAnV9aCZC9sc0qGbmZdfygNv+nCpqVkSKdCxCklLtd16O0EILGkImHw9ZpHkAnHaB+8Zxq5W6Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -17809,8 +17097,6 @@
     },
     "node_modules/columnify/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": {
@@ -17822,8 +17108,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "delayed-stream": "~1.0.0"
@@ -17834,8 +17118,6 @@
     },
     "node_modules/comma-separated-tokens": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz",
-      "integrity": "sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==",
       "license": "MIT",
       "funding": {
         "type": "github",
@@ -17844,8 +17126,6 @@
     },
     "node_modules/commander": {
       "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
-      "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
       "license": "MIT",
       "engines": {
         "node": ">= 6"
@@ -17853,15 +17133,11 @@
     },
     "node_modules/common-ancestor-path": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/common-ancestor-path/-/common-ancestor-path-1.0.1.tgz",
-      "integrity": "sha512-L3sHRo1pXXEqX8VU28kfgUY+YGsk09hPqZiZmLacNib6XNTCM8ubYeT7ryXQw8asB1sKgcU5lkB7ONug08aB8w==",
       "dev": true,
       "license": "ISC"
     },
     "node_modules/common-tags": {
       "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz",
-      "integrity": "sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==",
       "license": "MIT",
       "engines": {
         "node": ">=4.0.0"
@@ -17869,15 +17145,10 @@
     },
     "node_modules/commondir": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
       "license": "MIT"
     },
     "node_modules/compare-func": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/compare-func/-/compare-func-2.0.0.tgz",
-      "integrity": "sha512-zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "array-ify": "^1.0.0",
@@ -17886,8 +17157,6 @@
     },
     "node_modules/compressible": {
       "version": "2.0.18",
-      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
-      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -17898,9 +17167,7 @@
       }
     },
     "node_modules/compression": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.8.0.tgz",
-      "integrity": "sha512-k6WLKfunuqCYD3t6AsuPGvQWaKwuLLh2/xHNcX4qE+vIfDNXpSqnrhwA7O53R7WVQUnt8dVAIW+YHr7xTgOgGA==",
+      "version": "1.7.5",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -17918,8 +17185,6 @@
     },
     "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,
       "license": "MIT",
       "dependencies": {
@@ -17928,15 +17193,11 @@
     },
     "node_modules/compression/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/compression/node_modules/negotiator": {
       "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz",
-      "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -17945,8 +17206,6 @@
     },
     "node_modules/compute-gcd": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/compute-gcd/-/compute-gcd-1.2.1.tgz",
-      "integrity": "sha512-TwMbxBNz0l71+8Sc4czv13h4kEqnchV9igQZBi6QUaz09dnz13juGnnaWWJTRsP3brxOoxeB4SA2WELLw1hCtg==",
       "dependencies": {
         "validate.io-array": "^1.0.3",
         "validate.io-function": "^1.0.2",
@@ -17955,8 +17214,6 @@
     },
     "node_modules/compute-lcm": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/compute-lcm/-/compute-lcm-1.1.2.tgz",
-      "integrity": "sha512-OFNPdQAXnQhDSKioX8/XYT6sdUlXwpeMjfd6ApxMJfyZ4GxmLR1xvMERctlYhlHwIiz6CSpBc2+qYKjHGZw4TQ==",
       "dependencies": {
         "compute-gcd": "^1.2.1",
         "validate.io-array": "^1.0.3",
@@ -17966,20 +17223,14 @@
     },
     "node_modules/compute-scroll-into-view": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/compute-scroll-into-view/-/compute-scroll-into-view-3.1.1.tgz",
-      "integrity": "sha512-VRhuHOLoKYOy4UbilLbUzbYg93XLjv2PncJC50EuTWPA3gaja1UjBsUP/D/9/juV3vQFr6XBEzn9KCAHdUvOHw==",
       "license": "MIT"
     },
     "node_modules/concat-map": {
       "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
       "license": "MIT"
     },
     "node_modules/concat-stream": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz",
-      "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==",
       "dev": true,
       "engines": [
         "node >= 6.0"
@@ -17994,15 +17245,11 @@
     },
     "node_modules/confbox": {
       "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.1.8.tgz",
-      "integrity": "sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/config-chain": {
       "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz",
-      "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==",
       "license": "MIT",
       "dependencies": {
         "ini": "^1.3.4",
@@ -18011,21 +17258,15 @@
     },
     "node_modules/config-chain/node_modules/ini": {
       "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
       "license": "ISC"
     },
     "node_modules/confusing-browser-globals": {
       "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
-      "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/connect-history-api-fallback": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
-      "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -18033,9 +17274,7 @@
       }
     },
     "node_modules/consola": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/consola/-/consola-3.4.2.tgz",
-      "integrity": "sha512-5IKcdX0nnYavi6G7TtOhwkYzyjfJlatbjMjuLSfE2kYT5pMDOilZ4OvMhi637CcDICTmz3wARPoyhqyX1Y+XvA==",
+      "version": "3.4.0",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -18044,22 +17283,16 @@
     },
     "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,
       "license": "ISC"
     },
     "node_modules/constants-browserify": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
-      "integrity": "sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==",
       "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,
       "license": "MIT",
       "dependencies": {
@@ -18071,8 +17304,6 @@
     },
     "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,
       "license": "MIT",
       "engines": {
@@ -18081,9 +17312,16 @@
     },
     "node_modules/conventional-changelog-angular": {
       "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-7.0.0.tgz",
-      "integrity": "sha512-ROjNchA9LgfNMTTFSIWPzebCwOGFdgkEq45EnvvrmSLvCtAw0HSmrCs7/ty+wAeYUZyNay0YMUNYFTRL72PkBQ==",
-      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "compare-func": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/conventional-changelog-conventionalcommits": {
+      "version": "7.0.2",
       "license": "ISC",
       "dependencies": {
         "compare-func": "^2.0.0"
@@ -18094,8 +17332,6 @@
     },
     "node_modules/conventional-changelog-core": {
       "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-5.0.1.tgz",
-      "integrity": "sha512-Rvi5pH+LvgsqGwZPZ3Cq/tz4ty7mjijhr3qR4m9IBXNbxGGYgTVVO+duXzz9aArmHxFtwZ+LRkrNIMDQzgoY4A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -18117,8 +17353,6 @@
     },
     "node_modules/conventional-changelog-core/node_modules/dateformat": {
       "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz",
-      "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -18127,8 +17361,6 @@
     },
     "node_modules/conventional-changelog-core/node_modules/hosted-git-info": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
-      "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -18140,8 +17372,6 @@
     },
     "node_modules/conventional-changelog-core/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,
       "license": "ISC",
       "dependencies": {
@@ -18153,8 +17383,6 @@
     },
     "node_modules/conventional-changelog-core/node_modules/normalize-package-data": {
       "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
-      "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
@@ -18169,15 +17397,11 @@
     },
     "node_modules/conventional-changelog-core/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,
       "license": "ISC"
     },
     "node_modules/conventional-changelog-preset-loader": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-3.0.0.tgz",
-      "integrity": "sha512-qy9XbdSLmVnwnvzEisjxdDiLA4OmV3o8db+Zdg4WiFw14fP3B6XNz98X0swPPpkTd/pc1K7+adKgEDM1JCUMiA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -18186,8 +17410,6 @@
     },
     "node_modules/conventional-changelog-writer": {
       "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-6.0.1.tgz",
-      "integrity": "sha512-359t9aHorPw+U+nHzUXHS5ZnPBOizRxfQsWT5ZDHBfvfxQOAik+yfuhKXG66CN5LEWPpMNnIMHUTCKeYNprvHQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -18208,8 +17430,6 @@
     },
     "node_modules/conventional-changelog-writer/node_modules/dateformat": {
       "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz",
-      "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -18218,8 +17438,6 @@
     },
     "node_modules/conventional-commits-filter": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-3.0.0.tgz",
-      "integrity": "sha512-1ymej8b5LouPx9Ox0Dw/qAO2dVdfpRFq28e5Y0jJEU8ZrLdy0vOSkkIInwmxErFGhg6SALro60ZrwYFVTUDo4Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -18232,8 +17450,6 @@
     },
     "node_modules/conventional-commits-parser": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-4.0.0.tgz",
-      "integrity": "sha512-WRv5j1FsVM5FISJkoYMR6tPk07fkKT0UodruX4je86V4owk451yjXAKzKAPOs9l7y59E2viHUS9eQ+dfUA9NSg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -18251,8 +17467,6 @@
     },
     "node_modules/conventional-recommended-bump": {
       "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-7.0.1.tgz",
-      "integrity": "sha512-Ft79FF4SlOFvX4PkwFDRnaNiIVX7YbmqGU0RwccUaiGvgp3S0a8ipR2/Qxk31vclDNM+GSdJOVs2KrsUCjblVA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -18271,17 +17485,23 @@
         "node": ">=14"
       }
     },
+    "node_modules/convert-hrtime": {
+      "version": "5.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "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,
       "license": "MIT"
     },
     "node_modules/cookie": {
       "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
-      "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -18290,24 +17510,9 @@
     },
     "node_modules/cookie-signature": {
       "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/copy-anything": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.6.tgz",
-      "integrity": "sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-what": "^3.14.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mesqueeb"
-      }
-    },
     "node_modules/copy-to-clipboard": {
       "version": "3.3.3",
       "resolved": "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.3.tgz",
@@ -18318,18 +17523,15 @@
       }
     },
     "node_modules/copy-webpack-plugin": {
-      "version": "12.0.2",
-      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-12.0.2.tgz",
-      "integrity": "sha512-SNwdBeHyII+rWvee/bTnAYyO8vfVdcSTud4EIb6jcZ8inLeWucJE0DnxXQBjlQ5zlteuuvooGQy3LIyGxhvlOA==",
+      "version": "13.0.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "fast-glob": "^3.3.2",
         "glob-parent": "^6.0.1",
-        "globby": "^14.0.0",
         "normalize-path": "^3.0.0",
         "schema-utils": "^4.2.0",
-        "serialize-javascript": "^6.0.2"
+        "serialize-javascript": "^6.0.2",
+        "tinyglobby": "^0.2.12"
       },
       "engines": {
         "node": ">= 18.12.0"
@@ -18344,8 +17546,6 @@
     },
     "node_modules/copy-webpack-plugin/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": "ISC",
       "dependencies": {
@@ -18355,67 +17555,8 @@
         "node": ">=10.13.0"
       }
     },
-    "node_modules/copy-webpack-plugin/node_modules/globby": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-14.1.0.tgz",
-      "integrity": "sha512-0Ia46fDOaT7k4og1PDW4YbodWWr3scS2vAr2lTbsplOt2WkKp0vQbkI9wKis/T5LV/dqPjO3bpS/z6GTJB82LA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@sindresorhus/merge-streams": "^2.1.0",
-        "fast-glob": "^3.3.3",
-        "ignore": "^7.0.3",
-        "path-type": "^6.0.0",
-        "slash": "^5.1.0",
-        "unicorn-magic": "^0.3.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/copy-webpack-plugin/node_modules/ignore": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
-      "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/copy-webpack-plugin/node_modules/path-type": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-6.0.0.tgz",
-      "integrity": "sha512-Vj7sf++t5pBD637NSfkxpHSMfWaeig5+DKWLhcqIYx6mWQz5hdJTGDVMQiJcw1ZYkhs7AazKDGpRVji1LJCZUQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/copy-webpack-plugin/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": ">=14.16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/core-js": {
-      "version": "3.42.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.42.0.tgz",
-      "integrity": "sha512-Sz4PP4ZA+Rq4II21qkNqOEDTDrCvcANId3xpIgB34NDkWc3UduWj2dqEtN9yZIq8Dk3HyPI33x9sqqU5C8sr0g==",
+      "version": "3.40.0",
       "hasInstallScript": true,
       "license": "MIT",
       "funding": {
@@ -18424,13 +17565,11 @@
       }
     },
     "node_modules/core-js-compat": {
-      "version": "3.42.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.42.0.tgz",
-      "integrity": "sha512-bQasjMfyDGyaeWKBIu33lHh9qlSR0MFE/Nmc6nMjf/iU9b3rSMdAYz1Baxrv4lPdGUsTqZudHA4jIGSJy0SWZQ==",
+      "version": "3.40.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "browserslist": "^4.24.4"
+        "browserslist": "^4.24.3"
       },
       "funding": {
         "type": "opencollective",
@@ -18438,9 +17577,7 @@
       }
     },
     "node_modules/core-js-pure": {
-      "version": "3.42.0",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.42.0.tgz",
-      "integrity": "sha512-007bM04u91fF4kMgwom2I5cQxAFIy8jVulgr9eozILl/SZE53QOqnW/+vviC+wQWLv+AunBG+8Q0TLoeSsSxRQ==",
+      "version": "3.40.0",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -18451,14 +17588,10 @@
     },
     "node_modules/core-util-is": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
       "license": "MIT"
     },
     "node_modules/cosmiconfig": {
       "version": "8.3.6",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz",
-      "integrity": "sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -18484,15 +17617,11 @@
     },
     "node_modules/cosmiconfig/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/cosmiconfig/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": {
@@ -18502,55 +17631,12 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/create-jest": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz",
-      "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@jest/types": "^29.6.3",
-        "chalk": "^4.0.0",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.9",
-        "jest-config": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "prompts": "^2.0.1"
-      },
-      "bin": {
-        "create-jest": "bin/create-jest.js"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/create-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/chalk/chalk?sponsor=1"
-      }
-    },
     "node_modules/create-require": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
-      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
       "license": "MIT"
     },
     "node_modules/cross-env": {
       "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz",
-      "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -18568,8 +17654,6 @@
     },
     "node_modules/cross-spawn": {
       "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
-      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "license": "MIT",
       "dependencies": {
         "path-key": "^3.1.0",
@@ -18582,8 +17666,6 @@
     },
     "node_modules/crypto-random-string": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-4.0.0.tgz",
-      "integrity": "sha512-x8dy3RnvYdlUcPOjkEHqozhiwzKNSq7GcPuXFbnyMOCHxX8V3OgIg/pYuabl2sbUPfIJaeAQB7PMOK8DFIdoRA==",
       "license": "MIT",
       "dependencies": {
         "type-fest": "^1.0.1"
@@ -18597,8 +17679,6 @@
     },
     "node_modules/crypto-random-string/node_modules/type-fest": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz",
-      "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==",
       "license": "(MIT OR CC0-1.0)",
       "engines": {
         "node": ">=10"
@@ -18609,8 +17689,6 @@
     },
     "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": "ISC",
       "engines": {
@@ -18622,14 +17700,10 @@
     },
     "node_modules/css-font-parser": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/css-font-parser/-/css-font-parser-2.0.1.tgz",
-      "integrity": "sha512-C4aQOpCmQL/Arl68chQatNh7/Nfyty15kbLNZezGudjcKSqHHVoHQEeb9IJcjgQ6CiurrHZoEt47yce891vjGw==",
       "license": "BSD-3-Clause"
     },
     "node_modules/css-line-break": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/css-line-break/-/css-line-break-2.1.0.tgz",
-      "integrity": "sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==",
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -18638,8 +17712,6 @@
     },
     "node_modules/css-loader": {
       "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-7.1.2.tgz",
-      "integrity": "sha512-6WvYYn7l/XEGN8Xu2vWFt9nVzrCn39vKyTEFf/ExEyoksJjjSZV/0/35XPlMbpnr6VGhZIUg5yJrL8tGfes/FA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -18674,8 +17746,6 @@
     },
     "node_modules/css-minimizer-webpack-plugin": {
       "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-7.0.2.tgz",
-      "integrity": "sha512-nBRWZtI77PBZQgcXMNqiIXVshiQOVLGSf2qX/WZfG8IQfMbeHUMXaBWQmiiSTmPJUflQxHjZjzAmuyO7tpL2Jg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -18718,16 +17788,14 @@
       }
     },
     "node_modules/css-select": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
-      "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
+      "version": "5.1.0",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
         "boolbase": "^1.0.0",
-        "css-what": "^6.0.1",
-        "domhandler": "^4.3.1",
-        "domutils": "^2.8.0",
+        "css-what": "^6.1.0",
+        "domhandler": "^5.0.2",
+        "domutils": "^3.0.1",
         "nth-check": "^2.0.1"
       },
       "funding": {
@@ -18736,8 +17804,6 @@
     },
     "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": {
@@ -18750,15 +17816,11 @@
     },
     "node_modules/css-tree/node_modules/mdn-data": {
       "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,
       "license": "CC0-1.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": "BSD-2-Clause",
       "engines": {
@@ -18770,20 +17832,14 @@
     },
     "node_modules/css.escape": {
       "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz",
-      "integrity": "sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg==",
       "license": "MIT"
     },
     "node_modules/csscolorparser": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/csscolorparser/-/csscolorparser-1.0.3.tgz",
-      "integrity": "sha512-umPSgYwZkdFoUrH5hIq5kf0wPSXiro51nPw0j2K/c83KflkPSTBGMz6NJvMB+07VlL0y7VPo6QJcDjcgKTTm3w==",
       "license": "MIT"
     },
     "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,
       "license": "MIT",
       "bin": {
@@ -18795,19 +17851,15 @@
     },
     "node_modules/cssfilter": {
       "version": "0.0.10",
-      "resolved": "https://registry.npmjs.org/cssfilter/-/cssfilter-0.0.10.tgz",
-      "integrity": "sha512-FAaLDaplstoRsDR8XGYH51znUN0UY7nMc6Z9/fvE8EXGwvJE9hu7W2vHwx1+bd6gCYnln9nLbzxFTrcO9YQDZw==",
       "license": "MIT"
     },
     "node_modules/cssnano": {
-      "version": "7.0.7",
-      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-7.0.7.tgz",
-      "integrity": "sha512-evKu7yiDIF7oS+EIpwFlMF730ijRyLFaM2o5cTxRGJR9OKHKkc+qP443ZEVR9kZG0syaAJJCPJyfv5pbrxlSng==",
+      "version": "7.0.6",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "cssnano-preset-default": "^7.0.7",
-        "lilconfig": "^3.1.3"
+        "cssnano-preset-default": "^7.0.6",
+        "lilconfig": "^3.1.2"
       },
       "engines": {
         "node": "^18.12.0 || ^20.9.0 || >=22.0"
@@ -18817,71 +17869,65 @@
         "url": "https://opencollective.com/cssnano"
       },
       "peerDependencies": {
-        "postcss": "^8.4.32"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/cssnano-preset-default": {
-      "version": "7.0.7",
-      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-7.0.7.tgz",
-      "integrity": "sha512-jW6CG/7PNB6MufOrlovs1TvBTEVmhY45yz+bd0h6nw3h6d+1e+/TX+0fflZ+LzvZombbT5f+KC063w9VoHeHow==",
+      "version": "7.0.6",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "browserslist": "^4.24.5",
+        "browserslist": "^4.23.3",
         "css-declaration-sorter": "^7.2.0",
-        "cssnano-utils": "^5.0.1",
-        "postcss-calc": "^10.1.1",
-        "postcss-colormin": "^7.0.3",
-        "postcss-convert-values": "^7.0.5",
-        "postcss-discard-comments": "^7.0.4",
-        "postcss-discard-duplicates": "^7.0.2",
-        "postcss-discard-empty": "^7.0.1",
-        "postcss-discard-overridden": "^7.0.1",
-        "postcss-merge-longhand": "^7.0.5",
-        "postcss-merge-rules": "^7.0.5",
-        "postcss-minify-font-values": "^7.0.1",
-        "postcss-minify-gradients": "^7.0.1",
-        "postcss-minify-params": "^7.0.3",
-        "postcss-minify-selectors": "^7.0.5",
-        "postcss-normalize-charset": "^7.0.1",
-        "postcss-normalize-display-values": "^7.0.1",
-        "postcss-normalize-positions": "^7.0.1",
-        "postcss-normalize-repeat-style": "^7.0.1",
-        "postcss-normalize-string": "^7.0.1",
-        "postcss-normalize-timing-functions": "^7.0.1",
-        "postcss-normalize-unicode": "^7.0.3",
-        "postcss-normalize-url": "^7.0.1",
-        "postcss-normalize-whitespace": "^7.0.1",
-        "postcss-ordered-values": "^7.0.2",
-        "postcss-reduce-initial": "^7.0.3",
-        "postcss-reduce-transforms": "^7.0.1",
-        "postcss-svgo": "^7.0.2",
-        "postcss-unique-selectors": "^7.0.4"
+        "cssnano-utils": "^5.0.0",
+        "postcss-calc": "^10.0.2",
+        "postcss-colormin": "^7.0.2",
+        "postcss-convert-values": "^7.0.4",
+        "postcss-discard-comments": "^7.0.3",
+        "postcss-discard-duplicates": "^7.0.1",
+        "postcss-discard-empty": "^7.0.0",
+        "postcss-discard-overridden": "^7.0.0",
+        "postcss-merge-longhand": "^7.0.4",
+        "postcss-merge-rules": "^7.0.4",
+        "postcss-minify-font-values": "^7.0.0",
+        "postcss-minify-gradients": "^7.0.0",
+        "postcss-minify-params": "^7.0.2",
+        "postcss-minify-selectors": "^7.0.4",
+        "postcss-normalize-charset": "^7.0.0",
+        "postcss-normalize-display-values": "^7.0.0",
+        "postcss-normalize-positions": "^7.0.0",
+        "postcss-normalize-repeat-style": "^7.0.0",
+        "postcss-normalize-string": "^7.0.0",
+        "postcss-normalize-timing-functions": "^7.0.0",
+        "postcss-normalize-unicode": "^7.0.2",
+        "postcss-normalize-url": "^7.0.0",
+        "postcss-normalize-whitespace": "^7.0.0",
+        "postcss-ordered-values": "^7.0.1",
+        "postcss-reduce-initial": "^7.0.2",
+        "postcss-reduce-transforms": "^7.0.0",
+        "postcss-svgo": "^7.0.1",
+        "postcss-unique-selectors": "^7.0.3"
       },
       "engines": {
         "node": "^18.12.0 || ^20.9.0 || >=22.0"
       },
       "peerDependencies": {
-        "postcss": "^8.4.32"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/cssnano-utils": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-5.0.1.tgz",
-      "integrity": "sha512-ZIP71eQgG9JwjVZsTPSqhc6GHgEr53uJ7tK5///VfyWj6Xp2DBmixWHqJgPno+PqATzn48pL42ww9x5SSGmhZg==",
+      "version": "5.0.0",
       "dev": true,
       "license": "MIT",
       "engines": {
         "node": "^18.12.0 || ^20.9.0 || >=22.0"
       },
       "peerDependencies": {
-        "postcss": "^8.4.32"
+        "postcss": "^8.4.31"
       }
     },
     "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": {
@@ -18894,8 +17940,6 @@
     },
     "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": {
@@ -18909,26 +17953,15 @@
     },
     "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,
       "license": "CC0-1.0"
     },
-    "node_modules/cssom": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz",
-      "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/cssstyle": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.3.1.tgz",
-      "integrity": "sha512-ZgW+Jgdd7i52AaLYCriF8Mxqft0gD/R9i9wi6RWBhs1pqdPEzPjym7rvRKi397WmQFf3SlyUsszhw+VVCbx79Q==",
+      "version": "4.2.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@asamuzakjp/css-color": "^3.1.2",
+        "@asamuzakjp/css-color": "^2.8.2",
         "rrweb-cssom": "^0.8.0"
       },
       "engines": {
@@ -18937,14 +17970,17 @@
     },
     "node_modules/csstype": {
       "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
-      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
       "license": "MIT"
     },
+    "node_modules/currencyformatter.js": {
+      "version": "1.0.5",
+      "license": "MIT",
+      "peer": true
+    },
     "node_modules/cypress": {
-      "version": "14.4.1",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-14.4.1.tgz",
-      "integrity": "sha512-YSGvVXtTqSGRTyHbaxHI5dHU/9xc5ymaTIM4BU85GKhj980y6XgA3fShSpj5DatS8knXMsAvYItQxVQFHGpUtw==",
+      "version": "14.5.1",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-14.5.1.tgz",
+      "integrity": "sha512-vYBeZKW3UAtxwv5mFuSlOBCYhyO0H86TeDKRJ7TgARyHiREIaiDjeHtqjzrXRFrdz9KnNavqlm+z+hklC7v8XQ==",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
@@ -18974,6 +18010,7 @@
         "figures": "^3.2.0",
         "fs-extra": "^9.1.0",
         "getos": "^3.2.1",
+        "hasha": "5.2.2",
         "is-installed-globally": "~0.4.0",
         "lazy-ass": "^1.6.0",
         "listr2": "^3.8.3",
@@ -19001,14 +18038,10 @@
     },
     "node_modules/cypress/node_modules/@types/sinonjs__fake-timers": {
       "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.1.tgz",
-      "integrity": "sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==",
       "license": "MIT"
     },
     "node_modules/cypress/node_modules/chalk": {
       "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -19023,8 +18056,6 @@
     },
     "node_modules/cypress/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==",
       "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
@@ -19033,10 +18064,23 @@
         "node": ">=8"
       }
     },
+    "node_modules/cypress/node_modules/cli-table3": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.1.tgz",
+      "integrity": "sha512-w0q/enDHhPLq44ovMGdQeeDLvwxwavsJX7oQGYt/LrBlYsyaxyDnp6z3QzFut/6kLLKnlcUVJLrpB7KBfgG/RA==",
+      "license": "MIT",
+      "dependencies": {
+        "string-width": "^4.2.0"
+      },
+      "engines": {
+        "node": "10.* || >= 12.*"
+      },
+      "optionalDependencies": {
+        "colors": "1.4.0"
+      }
+    },
     "node_modules/cypress/node_modules/execa": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
-      "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
       "license": "MIT",
       "dependencies": {
         "cross-spawn": "^7.0.0",
@@ -19058,8 +18102,6 @@
     },
     "node_modules/cypress/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==",
       "license": "MIT",
       "dependencies": {
         "at-least-node": "^1.0.0",
@@ -19073,8 +18115,6 @@
     },
     "node_modules/cypress/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==",
       "license": "MIT",
       "dependencies": {
         "pump": "^3.0.0"
@@ -19088,13 +18128,35 @@
     },
     "node_modules/cypress/node_modules/human-signals": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
-      "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
       "license": "Apache-2.0",
       "engines": {
         "node": ">=8.12.0"
       }
     },
+    "node_modules/cypress/node_modules/is-unicode-supported": {
+      "version": "0.1.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/cypress/node_modules/log-symbols": {
+      "version": "4.1.0",
+      "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/cypress/node_modules/semver": {
       "version": "7.7.2",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
@@ -19109,8 +18171,6 @@
     },
     "node_modules/cypress/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==",
       "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
@@ -19124,26 +18184,21 @@
     },
     "node_modules/d3": {
       "version": "3.5.17",
-      "resolved": "https://registry.npmjs.org/d3/-/d3-3.5.17.tgz",
-      "integrity": "sha512-yFk/2idb8OHPKkbAL8QaOaqENNoMhIaSHZerk3oQsECwkObkCpJyjYwCe+OHiq6UEdhe1m8ZGARRRO3ljFjlKg==",
       "license": "BSD-3-Clause"
     },
     "node_modules/d3-array": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.1.tgz",
-      "integrity": "sha512-gUY/qeHq/yNqqoCKNq4vtpFLdoCdvyNpWoC/KNjhGbhDuQpAM9sIQQKkXSNpXa9h5KySs/gzm7R88WkUutgwWQ==",
-      "license": "ISC",
+      "version": "2.12.1",
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "internmap": "1 - 2"
-      },
-      "engines": {
-        "node": ">=12"
+        "internmap": "^1.0.0"
       }
     },
+    "node_modules/d3-array/node_modules/internmap": {
+      "version": "1.0.1",
+      "license": "ISC"
+    },
     "node_modules/d3-cloud": {
       "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/d3-cloud/-/d3-cloud-1.2.7.tgz",
-      "integrity": "sha512-8TrgcgwRIpoZYQp7s3fGB7tATWfhckRb8KcVd1bOgqkNdkJRDGWfdSf4HkHHzZxSczwQJdSxvfPudwir5IAJ3w==",
       "license": "BSD-3-Clause",
       "dependencies": {
         "d3-dispatch": "^1.0.3"
@@ -19151,14 +18206,10 @@
     },
     "node_modules/d3-collection": {
       "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/d3-collection/-/d3-collection-1.0.7.tgz",
-      "integrity": "sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A==",
       "license": "BSD-3-Clause"
     },
     "node_modules/d3-color": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz",
-      "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==",
       "license": "ISC",
       "engines": {
         "node": ">=12"
@@ -19166,8 +18217,6 @@
     },
     "node_modules/d3-delaunay": {
       "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-6.0.2.tgz",
-      "integrity": "sha512-IMLNldruDQScrcfT+MWnazhHbDJhcRJyOEBAJfwQnHle1RPh6WDuLvxNArUju2VSMSUuKlY5BGHRJ2cYyoFLQQ==",
       "license": "ISC",
       "dependencies": {
         "delaunator": "5"
@@ -19178,20 +18227,14 @@
     },
     "node_modules/d3-dispatch": {
       "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-1.0.6.tgz",
-      "integrity": "sha512-fVjoElzjhCEy+Hbn8KygnmMS7Or0a9sI2UzGwoB7cCtvI1XpVN9GpoYlnb3xt2YV66oXYb1fLJ8GMvP4hdU1RA==",
       "license": "BSD-3-Clause"
     },
     "node_modules/d3-format": {
       "version": "1.4.5",
-      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-1.4.5.tgz",
-      "integrity": "sha512-J0piedu6Z8iB6TbIGfZgDzfXxUFN3qQRMofy2oPdXzQibYGqPB/9iMcxr/TGalU+2RsyDO+U4f33id8tbnSRMQ==",
       "license": "BSD-3-Clause"
     },
     "node_modules/d3-geo": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.1.0.tgz",
-      "integrity": "sha512-JEo5HxXDdDYXCaWdwLRt79y7giK8SbhZJbFWXqbRTolCHFI5jRqteLzCsq51NKbUoX0PjBVSohxrx+NoOUujYA==",
       "license": "ISC",
       "dependencies": {
         "d3-array": "2.5.0 - 3"
@@ -19202,22 +18245,16 @@
     },
     "node_modules/d3-geo-projection": {
       "version": "0.2.16",
-      "resolved": "https://registry.npmjs.org/d3-geo-projection/-/d3-geo-projection-0.2.16.tgz",
-      "integrity": "sha512-NB4/NRMnfJnpodvRbNY/nOzuoU17P229ASYf2l1GwjZyfD7l5aIuMylDMbIBF4y42BGZZvGdUwFW8iFM/5UBzg==",
       "dependencies": {
         "brfs": "^1.3.0"
       }
     },
     "node_modules/d3-hexbin": {
       "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/d3-hexbin/-/d3-hexbin-0.2.2.tgz",
-      "integrity": "sha512-KS3fUT2ReD4RlGCjvCEm1RgMtp2NFZumdMu4DBzQK8AZv3fXRM6Xm8I4fSU07UXvH4xxg03NwWKWdvxfS/yc4w==",
       "license": "BSD-3-Clause"
     },
     "node_modules/d3-hierarchy": {
       "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz",
-      "integrity": "sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==",
       "license": "ISC",
       "engines": {
         "node": ">=12"
@@ -19225,8 +18262,6 @@
     },
     "node_modules/d3-interpolate": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
-      "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==",
       "license": "ISC",
       "dependencies": {
         "d3-color": "1 - 3"
@@ -19237,26 +18272,18 @@
     },
     "node_modules/d3-interpolate-path": {
       "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/d3-interpolate-path/-/d3-interpolate-path-2.2.1.tgz",
-      "integrity": "sha512-6qLLh/KJVzls0XtMsMpcxhqMhgVEN7VIbR/6YGZe2qlS8KDgyyVB20XcmGnDyB051HcefQXM/Tppa9vcANEA4Q==",
       "license": "BSD-3-Clause"
     },
     "node_modules/d3-path": {
       "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-1.0.9.tgz",
-      "integrity": "sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg==",
       "license": "BSD-3-Clause"
     },
     "node_modules/d3-queue": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/d3-queue/-/d3-queue-2.0.3.tgz",
-      "integrity": "sha512-ejbdHqZYEmk9ns/ljSbEcD6VRiuNwAkZMdFf6rsUb3vHROK5iMFd8xewDQnUVr6m/ba2BG63KmR/LySfsluxbg==",
       "license": "BSD-3-Clause"
     },
     "node_modules/d3-scale": {
       "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-2.2.2.tgz",
-      "integrity": "sha512-LbeEvGgIb8UMcAa0EATLNX0lelKWGYDQiPdHj+gLblGVhGLyNbaCn3EvrJf0A3Y/uOOU5aD6MTh5ZFCdEwGiCw==",
       "license": "BSD-3-Clause",
       "dependencies": {
         "d3-array": "^1.2.0",
@@ -19269,8 +18296,6 @@
     },
     "node_modules/d3-scale-chromatic": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-2.0.0.tgz",
-      "integrity": "sha512-LLqy7dJSL8yDy7NRmf6xSlsFZ6zYvJ4BcWFE4zBrOPnQERv9zj24ohnXKRbyi9YHnYV+HN1oEO3iFK971/gkzA==",
       "license": "BSD-3-Clause",
       "dependencies": {
         "d3-color": "1 - 2",
@@ -19279,8 +18304,6 @@
     },
     "node_modules/d3-scale-chromatic/node_modules/d3-interpolate": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-2.0.1.tgz",
-      "integrity": "sha512-c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ==",
       "license": "BSD-3-Clause",
       "dependencies": {
         "d3-color": "1 - 2"
@@ -19288,14 +18311,10 @@
     },
     "node_modules/d3-scale/node_modules/d3-array": {
       "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-1.2.4.tgz",
-      "integrity": "sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw==",
       "license": "BSD-3-Clause"
     },
     "node_modules/d3-scale/node_modules/d3-interpolate": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz",
-      "integrity": "sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==",
       "license": "BSD-3-Clause",
       "dependencies": {
         "d3-color": "1"
@@ -19303,14 +18322,10 @@
     },
     "node_modules/d3-scale/node_modules/d3-time": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-1.1.0.tgz",
-      "integrity": "sha512-Xh0isrZ5rPYYdqhAVk8VLnMEidhz5aP7htAADH6MfzgmmicPkTo8LhkLxci61/lCB7n7UmE3bN0leRt+qvkLxA==",
       "license": "BSD-3-Clause"
     },
     "node_modules/d3-scale/node_modules/d3-time-format": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz",
-      "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==",
       "license": "BSD-3-Clause",
       "dependencies": {
         "d3-time": "1"
@@ -19318,14 +18333,10 @@
     },
     "node_modules/d3-selection": {
       "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-1.4.2.tgz",
-      "integrity": "sha512-SJ0BqYihzOjDnnlfyeHT0e30k0K1+5sR3d5fNueCNeuhZTnGw4M4o8mqJchSwgKMXCNFo+e2VTChiSJ0vYtXkg==",
       "license": "BSD-3-Clause"
     },
     "node_modules/d3-shape": {
       "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.3.7.tgz",
-      "integrity": "sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw==",
       "license": "BSD-3-Clause",
       "dependencies": {
         "d3-path": "1"
@@ -19333,8 +18344,6 @@
     },
     "node_modules/d3-time": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz",
-      "integrity": "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==",
       "license": "ISC",
       "dependencies": {
         "d3-array": "2 - 3"
@@ -19345,8 +18354,6 @@
     },
     "node_modules/d3-time-format": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz",
-      "integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==",
       "license": "ISC",
       "dependencies": {
         "d3-time": "1 - 3"
@@ -19357,8 +18364,6 @@
     },
     "node_modules/d3-tip": {
       "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/d3-tip/-/d3-tip-0.9.1.tgz",
-      "integrity": "sha512-EVBfG9d+HnjIoyVXfhpytWxlF59JaobwizqMX9EBXtsFmJytjwHeYiUs74ldHQjE7S9vzfKTx2LCtvUrIbuFYg==",
       "license": "MIT",
       "dependencies": {
         "d3-collection": "^1.0.4",
@@ -19370,21 +18375,20 @@
     },
     "node_modules/d3-voronoi": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/d3-voronoi/-/d3-voronoi-1.1.4.tgz",
-      "integrity": "sha512-dArJ32hchFsrQ8uMiTBLq256MpnZjeuBtdHpaDlYuQyjU0CVzCJl/BVW+SkszaAeH95D/8gxqAhgx0ouAWAfRg==",
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/d3v3": {
+      "name": "d3",
+      "version": "3.5.17",
       "license": "BSD-3-Clause"
     },
     "node_modules/damerau-levenshtein": {
       "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz",
-      "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==",
       "dev": true,
       "license": "BSD-2-Clause"
     },
     "node_modules/dargs": {
       "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/dargs/-/dargs-7.0.0.tgz",
-      "integrity": "sha512-2iy1EkLdlBzQGvbweYRFxmFath8+K7+AKB0TlhHWkNuH+TmovaMH/Wp7V7R4u7f4SnX3OgLsU9t1NI9ioDnUpg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -19405,8 +18409,6 @@
     },
     "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": {
@@ -19415,8 +18417,6 @@
     },
     "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": {
@@ -19429,8 +18429,6 @@
     },
     "node_modules/data-urls/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,
       "license": "MIT",
       "engines": {
@@ -19438,9 +18436,7 @@
       }
     },
     "node_modules/data-urls/node_modules/tr46": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.1.1.tgz",
-      "integrity": "sha512-hdF5ZgjTqgAntKkklYw0R03MG2x/bSzTtkxmIRw/sTNV8YXsCJ1tfLAX23lhxhHJlEf3CRCOCGGWw3vI3GaSPw==",
+      "version": "5.0.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -19451,13 +18447,11 @@
       }
     },
     "node_modules/data-urls/node_modules/whatwg-url": {
-      "version": "14.2.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.2.0.tgz",
-      "integrity": "sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw==",
+      "version": "14.1.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "tr46": "^5.1.0",
+        "tr46": "^5.0.0",
         "webidl-conversions": "^7.0.0"
       },
       "engines": {
@@ -19466,8 +18460,6 @@
     },
     "node_modules/data-view-buffer": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz",
-      "integrity": "sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==",
       "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.3",
@@ -19483,8 +18475,6 @@
     },
     "node_modules/data-view-byte-length": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz",
-      "integrity": "sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==",
       "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.3",
@@ -19500,8 +18490,6 @@
     },
     "node_modules/data-view-byte-offset": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz",
-      "integrity": "sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==",
       "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.2",
@@ -19517,8 +18505,6 @@
     },
     "node_modules/datamaps": {
       "version": "0.5.9",
-      "resolved": "https://registry.npmjs.org/datamaps/-/datamaps-0.5.9.tgz",
-      "integrity": "sha512-GUXpO713URNzaExVUgBtqA5fr2UuxUG/fVitI04zEFHVL2FHSjd672alHq8E16oQqRNzF0m1bmx8WlTnDrGSqQ==",
       "license": "MIT",
       "dependencies": {
         "@types/d3": "3.5.38",
@@ -19526,26 +18512,12 @@
         "topojson": "^1.6.19"
       }
     },
-    "node_modules/date-fns": {
-      "version": "2.30.0",
-      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz",
-      "integrity": "sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.21.0"
-      },
-      "engines": {
-        "node": ">=0.11"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/date-fns"
-      }
+    "node_modules/datamaps/node_modules/@types/d3": {
+      "version": "3.5.38",
+      "license": "MIT"
     },
     "node_modules/dateformat": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.2.tgz",
-      "integrity": "sha512-EelsCzH0gMC2YmXuMeaZ3c6md1sUJQxyb1XXc4xaisi/K6qKukqZhKPrEQyRkdNIncgYyLoDTReq0nNyuKerTg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -19554,21 +18526,15 @@
     },
     "node_modules/dayjs": {
       "version": "1.11.13",
-      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz",
-      "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==",
       "license": "MIT"
     },
     "node_modules/debounce": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/debounce/-/debounce-1.2.1.tgz",
-      "integrity": "sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/debug": {
       "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "license": "MIT",
       "dependencies": {
         "ms": "2.1.2"
@@ -19584,8 +18550,6 @@
     },
     "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": {
@@ -19594,8 +18558,6 @@
     },
     "node_modules/decamelize-keys": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.1.tgz",
-      "integrity": "sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -19611,8 +18573,6 @@
     },
     "node_modules/decamelize-keys/node_modules/map-obj": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-      "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -19620,16 +18580,12 @@
       }
     },
     "node_modules/decimal.js": {
-      "version": "10.5.0",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.5.0.tgz",
-      "integrity": "sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw==",
+      "version": "10.4.3",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/decode-named-character-reference": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/decode-named-character-reference/-/decode-named-character-reference-1.1.0.tgz",
-      "integrity": "sha512-Wy+JTSbFThEOXQIR2L6mxJvEs+veIzpmqD7ynWxMXGpnk3smkHQOp6forLdHsKpAMW9iJpaBBIxz285t1n1C3w==",
+      "version": "1.0.2",
       "license": "MIT",
       "dependencies": {
         "character-entities": "^2.0.0"
@@ -19641,8 +18597,6 @@
     },
     "node_modules/decode-named-character-reference/node_modules/character-entities": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-2.0.2.tgz",
-      "integrity": "sha512-shx7oQ0Awen/BRIdkjkvz54PnEEI/EjwXDSIZp86/KKdbafHh1Df/RYGBhn4hbe2+uKC9FnT5UCEdyPz3ai9hQ==",
       "license": "MIT",
       "funding": {
         "type": "github",
@@ -19651,17 +18605,14 @@
     },
     "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==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=0.10"
       }
     },
     "node_modules/decompress-response": {
       "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,
       "license": "MIT",
       "dependencies": {
@@ -19676,8 +18627,6 @@
     },
     "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==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -19689,15 +18638,11 @@
     },
     "node_modules/dedent": {
       "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
-      "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/deep-equal": {
       "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.3.tgz",
-      "integrity": "sha512-ZIwpnevOurS8bpT4192sqAowWM76JDKSHYzMLty3BZGSswgq6pBaH3DhCSW5xVAZICZyKdOBPjwww5wfgT/6PA==",
       "license": "MIT",
       "dependencies": {
         "array-buffer-byte-length": "^1.0.0",
@@ -19728,8 +18673,6 @@
     },
     "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==",
       "license": "MIT",
       "engines": {
         "node": ">=4.0.0"
@@ -19737,14 +18680,10 @@
     },
     "node_modules/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==",
       "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": "MIT",
       "engines": {
@@ -19753,8 +18692,6 @@
     },
     "node_modules/default-browser": {
       "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-5.2.1.tgz",
-      "integrity": "sha512-WY/3TUME0x3KPYdRRxEJJvXRHV4PyPoUsxtZa78lwItwRQRHhd2U9xOscaT/YTf8uCXIAjeJOFBVEh/7FtD8Xg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -19770,8 +18707,6 @@
     },
     "node_modules/default-browser-id": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/default-browser-id/-/default-browser-id-3.0.0.tgz",
-      "integrity": "sha512-OZ1y3y0SqSICtE8DE4S8YOE9UZOJ8wO16fKWVP5J1Qz42kV9jcnMVFrEE/noXb/ss3Q4pZIH79kxofzyNNtUNA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -19787,8 +18722,6 @@
     },
     "node_modules/default-browser/node_modules/default-browser-id": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/default-browser-id/-/default-browser-id-5.0.0.tgz",
-      "integrity": "sha512-A6p/pu/6fyBcA1TRz/GqWYPViplrftcW2gZC9q79ngNCKAeR/X3gcEdXQHl4KNXV+3wgIJ1CPkJQ3IHM6lcsyA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -19798,23 +18731,8 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/default-gateway": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
-      "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "execa": "^5.0.0"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
     "node_modules/default-require-extensions": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-3.0.1.tgz",
-      "integrity": "sha512-eXTJmRbm2TIt9MgWTsOH1wEuhew6XGZcMeGKCtLedIg/NCsg1iBePXkceTdK4Fii7pzmN9tGsZhKzZ4h7O/fxw==",
       "dev": true,
       "license": "MIT",
       "peer": true,
@@ -19830,9 +18748,6 @@
     },
     "node_modules/defaults": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
-      "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==",
-      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "clone": "^1.0.2"
@@ -19841,10 +18756,15 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/defaults/node_modules/clone": {
+      "version": "1.0.4",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "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,
       "license": "MIT",
       "engines": {
@@ -19853,8 +18773,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "es-define-property": "^1.0.0",
@@ -19870,9 +18788,6 @@
     },
     "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,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -19880,8 +18795,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "define-data-property": "^1.0.1",
@@ -19897,15 +18810,11 @@
     },
     "node_modules/defu": {
       "version": "6.1.4",
-      "resolved": "https://registry.npmjs.org/defu/-/defu-6.1.4.tgz",
-      "integrity": "sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==",
       "dev": true,
       "license": "MIT"
     },
     "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": {
@@ -19919,8 +18828,6 @@
     },
     "node_modules/delaunator": {
       "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/delaunator/-/delaunator-5.0.1.tgz",
-      "integrity": "sha512-8nvh+XBe96aCESrGOqMp/84b13H9cdKbG5P2ejQCh4d4sK9RL4371qou9drQjMhvnPmhWl5hnmqbEE0fXr9Xnw==",
       "license": "ISC",
       "dependencies": {
         "robust-predicates": "^3.0.2"
@@ -19928,8 +18835,6 @@
     },
     "node_modules/delayed-stream": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
       "license": "MIT",
       "engines": {
         "node": ">=0.4.0"
@@ -19937,8 +18842,6 @@
     },
     "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": {
@@ -19947,15 +18850,11 @@
     },
     "node_modules/deprecation": {
       "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz",
-      "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==",
       "dev": true,
       "license": "ISC"
     },
     "node_modules/dequal": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
-      "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==",
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -19963,8 +18862,6 @@
     },
     "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": "MIT",
       "engines": {
@@ -19974,8 +18871,6 @@
     },
     "node_modules/detect-indent": {
       "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-7.0.1.tgz",
-      "integrity": "sha512-Mc7QhQ8s+cLrnUfU/Ji94vG/r8M26m8f++vyres4ZoojaRDpZ1eSIh/EpzLNwlWuvzSZ3UbDFspjFvTDXe6e/g==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -19984,8 +18879,6 @@
     },
     "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",
       "engines": {
@@ -19994,8 +18887,6 @@
     },
     "node_modules/detect-node": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
-      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
       "dev": true,
       "license": "MIT"
     },
@@ -20007,8 +18898,6 @@
     },
     "node_modules/detect-package-manager": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/detect-package-manager/-/detect-package-manager-2.0.1.tgz",
-      "integrity": "sha512-j/lJHyoLlWi6G1LDdLgvUtz60Zo5GEj+sVYtTVXnYLDPuzgC3llMxonXym9zIwhhUII8vjdw0LXxavpLqTbl1A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -20020,8 +18909,6 @@
     },
     "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,
       "license": "MIT",
       "dependencies": {
@@ -20038,8 +18925,6 @@
     },
     "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,
       "license": "MIT",
       "dependencies": {
@@ -20048,15 +18933,11 @@
     },
     "node_modules/detect-port/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/devlop": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/devlop/-/devlop-1.1.0.tgz",
-      "integrity": "sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==",
       "license": "MIT",
       "dependencies": {
         "dequal": "^2.0.0"
@@ -20068,15 +18949,11 @@
     },
     "node_modules/devtools-protocol": {
       "version": "0.0.1312386",
-      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1312386.tgz",
-      "integrity": "sha512-DPnhUXvmvKT2dFA/j7B+riVLUt9Q6RKJlcppojL5CoRywJJKLDYnRlw0gTFKfgDPHP5E04UoB71SxoJlVZy8FA==",
       "dev": true,
       "license": "BSD-3-Clause"
     },
     "node_modules/diff": {
       "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz",
-      "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==",
       "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.3.1"
@@ -20084,14 +18961,10 @@
     },
     "node_modules/diff-match-patch": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.5.tgz",
-      "integrity": "sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw==",
       "license": "Apache-2.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",
       "engines": {
@@ -20100,8 +18973,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "path-type": "^4.0.0"
@@ -20110,10 +18981,15 @@
         "node": ">=8"
       }
     },
+    "node_modules/discontinuous-range": {
+      "version": "1.0.0",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true
+    },
     "node_modules/distributions": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/distributions/-/distributions-2.2.0.tgz",
-      "integrity": "sha512-n7ybud+CRAOZlpg+ETuA0PTiSBfyVNt8Okns5gSK4NvHwj7RamQoufptOucvVcTn9CV4DZ38p1k6TgwMexUNkQ==",
       "license": "MIT",
       "dependencies": {
         "cephes": "^2.0.0"
@@ -20121,8 +18997,6 @@
     },
     "node_modules/dnd-core": {
       "version": "11.1.3",
-      "resolved": "https://registry.npmjs.org/dnd-core/-/dnd-core-11.1.3.tgz",
-      "integrity": "sha512-QugF55dNW+h+vzxVJ/LSJeTeUw9MCJ2cllhmVThVPEtF16ooBkxj0WBE5RB+AceFxMFo1rO6bJKXtqKl+JNnyA==",
       "license": "MIT",
       "dependencies": {
         "@react-dnd/asap": "^4.0.0",
@@ -20132,8 +19006,6 @@
     },
     "node_modules/dns-packet": {
       "version": "5.6.1",
-      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.1.tgz",
-      "integrity": "sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -20145,8 +19017,6 @@
     },
     "node_modules/doctrine": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
       "license": "Apache-2.0",
       "dependencies": {
         "esutils": "^2.0.2"
@@ -20157,20 +19027,10 @@
     },
     "node_modules/dom-accessibility-api": {
       "version": "0.5.16",
-      "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz",
-      "integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==",
-      "license": "MIT"
-    },
-    "node_modules/dom-align": {
-      "version": "1.12.4",
-      "resolved": "https://registry.npmjs.org/dom-align/-/dom-align-1.12.4.tgz",
-      "integrity": "sha512-R8LUSEay/68zE5c8/3BDxiTEvgb4xZTF0RKmAHfiEVN3klfIpXfi2/QCoiWPccVQ0J/ZGdz9OjzL4uJEP/MRAw==",
       "license": "MIT"
     },
     "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,
       "license": "MIT",
       "dependencies": {
@@ -20179,8 +19039,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.8.7",
@@ -20188,55 +19046,37 @@
       }
     },
     "node_modules/dom-serializer": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
-      "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
+      "version": "2.0.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.2.0",
-        "entities": "^2.0.0"
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.2",
+        "entities": "^4.2.0"
       },
       "funding": {
         "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
       }
     },
-    "node_modules/dom-serializer/node_modules/entities": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
     "node_modules/dom-to-image": {
       "version": "2.6.0",
       "resolved": "git+ssh://git@github.com/dmapper/dom-to-image.git#a7c386a8ea813930f05449ac71ab4be0c262dff3",
       "license": "MIT"
     },
     "node_modules/dom-to-image-more": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/dom-to-image-more/-/dom-to-image-more-3.6.0.tgz",
-      "integrity": "sha512-0BB0M9gRRP7znKBNLRAvNyWnkDIzSgMSDcS7WdPDzPnWhW2YJqxUR/dCHiJ2HdCV3K2rVky5Vba8UF31mvrCuQ==",
+      "version": "3.5.0",
       "license": "MIT"
     },
     "node_modules/dom-to-pdf": {
       "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/dom-to-pdf/-/dom-to-pdf-0.3.2.tgz",
-      "integrity": "sha512-eHLQ/IK+2PQlRjybQ9UHYwpiTd/YZFKqGFyRCjVvi6CPlH58drWQnxf7HBCVRUyAjOtI3RG0kvLidPhC7dOhcQ==",
       "license": "MIT",
       "dependencies": {
-        "dom-to-image": "git+https://github.com/dmapper/dom-to-image.git",
+        "dom-to-image": "https://github.com/dmapper/dom-to-image",
         "jspdf": "^2.5.1"
       }
     },
     "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,
       "funding": [
         {
@@ -20246,28 +19086,12 @@
       ],
       "license": "BSD-2-Clause"
     },
-    "node_modules/domexception": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
-      "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
-      "deprecated": "Use your platform's native DOMException instead",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "webidl-conversions": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/domhandler": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
-      "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
+      "version": "5.0.3",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
-        "domelementtype": "^2.2.0"
+        "domelementtype": "^2.3.0"
       },
       "engines": {
         "node": ">= 4"
@@ -20277,24 +19101,20 @@
       }
     },
     "node_modules/dompurify": {
-      "version": "3.2.6",
-      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.6.tgz",
-      "integrity": "sha512-/2GogDQlohXPZe6D6NOgQvXLPSYBqIWMnZ8zzOhn09REE4eyAzb+Hed3jhoM9OkuaJ8P6ZGTTVWQKAi8ieIzfQ==",
+      "version": "3.2.4",
       "license": "(MPL-2.0 OR Apache-2.0)",
       "optionalDependencies": {
         "@types/trusted-types": "^2.0.7"
       }
     },
     "node_modules/domutils": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
+      "version": "3.2.2",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
-        "dom-serializer": "^1.0.1",
-        "domelementtype": "^2.2.0",
-        "domhandler": "^4.2.0"
+        "dom-serializer": "^2.0.0",
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.3"
       },
       "funding": {
         "url": "https://github.com/fb55/domutils?sponsor=1"
@@ -20302,8 +19122,6 @@
     },
     "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,
       "license": "MIT",
       "dependencies": {
@@ -20313,9 +19131,6 @@
     },
     "node_modules/dot-prop": {
       "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
-      "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "is-obj": "^2.0.0"
@@ -20325,9 +19140,7 @@
       }
     },
     "node_modules/dotenv": {
-      "version": "16.5.0",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.5.0.tgz",
-      "integrity": "sha512-m/C+AwOAr9/W1UOIZUo232ejMNnJAJtYQjUbHoNTBNTJSvqzzDh7vnrei3o3r3m9blf6ZoDkvcw0VmozNRFJxg==",
+      "version": "16.4.7",
       "license": "BSD-2-Clause",
       "engines": {
         "node": ">=12"
@@ -20338,8 +19151,6 @@
     },
     "node_modules/dotenv-expand": {
       "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-10.0.0.tgz",
-      "integrity": "sha512-GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A==",
       "license": "BSD-2-Clause",
       "engines": {
         "node": ">=12"
@@ -20347,8 +19158,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "call-bind-apply-helpers": "^1.0.1",
@@ -20361,21 +19170,15 @@
     },
     "node_modules/duplex-maker": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/duplex-maker/-/duplex-maker-1.0.0.tgz",
-      "integrity": "sha512-KoHuzggxg7f+vvjqOHfXxaQYI1POzBm+ah0eec7YDssZmbt6QFBI8d1nl5GQwAgR2f+VQCPvyvZtmWWqWuFtlA==",
       "license": "MIT"
     },
     "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,
       "license": "MIT"
     },
     "node_modules/duplexer2": {
       "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
-      "integrity": "sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==",
       "license": "BSD-3-Clause",
       "dependencies": {
         "readable-stream": "^2.0.2"
@@ -20383,14 +19186,10 @@
     },
     "node_modules/duplexer2/node_modules/isarray": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
       "license": "MIT"
     },
     "node_modules/duplexer2/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==",
       "license": "MIT",
       "dependencies": {
         "core-util-is": "~1.0.0",
@@ -20404,14 +19203,10 @@
     },
     "node_modules/duplexer2/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/duplexer2/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"
@@ -20419,8 +19214,6 @@
     },
     "node_modules/duplexify": {
       "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
-      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
       "license": "MIT",
       "dependencies": {
         "end-of-stream": "^1.0.0",
@@ -20431,14 +19224,10 @@
     },
     "node_modules/duplexify/node_modules/isarray": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
       "license": "MIT"
     },
     "node_modules/duplexify/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==",
       "license": "MIT",
       "dependencies": {
         "core-util-is": "~1.0.0",
@@ -20452,14 +19241,10 @@
     },
     "node_modules/duplexify/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/duplexify/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"
@@ -20467,14 +19252,10 @@
     },
     "node_modules/earcut": {
       "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/earcut/-/earcut-2.2.4.tgz",
-      "integrity": "sha512-/pjZsA1b4RPHbeWZQn66SWS8nZZWLQQ23oE3Eam7aroEFGEvwKAsJfZ9ytiEMycfzXWpca4FA9QIOehf7PocBQ==",
       "license": "ISC"
     },
     "node_modules/eastasianwidth": {
       "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
-      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
       "license": "MIT"
     },
     "node_modules/ecc-jsbn": {
@@ -20495,8 +19276,6 @@
     },
     "node_modules/ecdsa-sig-formatter": {
       "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
-      "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "safe-buffer": "^5.0.1"
@@ -20504,8 +19283,6 @@
     },
     "node_modules/echarts": {
       "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.6.0.tgz",
-      "integrity": "sha512-oTbVTsXfKuEhxftHqL5xprgLoc0k7uScAwtryCgWF6hPYFLRwOUHiFmHGCBKP5NPFNkDVopOieyUqYGH8Fa3kA==",
       "license": "Apache-2.0",
       "dependencies": {
         "tslib": "2.3.0",
@@ -20514,14 +19291,10 @@
     },
     "node_modules/echarts/node_modules/tslib": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
-      "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==",
       "license": "0BSD"
     },
     "node_modules/editions": {
       "version": "6.21.0",
-      "resolved": "https://registry.npmjs.org/editions/-/editions-6.21.0.tgz",
-      "integrity": "sha512-ofkXJtn7z0urokN62DI3SBo/5xAtF0rR7tn+S/bSYV79Ka8pTajIIl+fFQ1q88DQEImymmo97M4azY3WX/nUdg==",
       "license": "Artistic-2.0",
       "dependencies": {
         "version-range": "^4.13.0"
@@ -20535,15 +19308,11 @@
     },
     "node_modules/ee-first": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/ejs": {
       "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
-      "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
       "license": "Apache-2.0",
       "dependencies": {
         "jake": "^10.8.5"
@@ -20556,22 +19325,22 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.165",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.165.tgz",
-      "integrity": "sha512-naiMx1Z6Nb2TxPU6fiFrUrDTjyPMLdTtaOd2oLmG8zVSg2hCWGkhPyxwk+qRmZ1ytwVqUv0u7ZcDA5+ALhaUtw==",
+      "version": "1.5.86",
       "dev": true,
       "license": "ISC"
     },
     "node_modules/email-addresses": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/email-addresses/-/email-addresses-5.0.0.tgz",
-      "integrity": "sha512-4OIPYlA6JXqtVn8zpHpGiI7vE6EQOAg16aGnDMIAlZVinnoZ8208tW1hAbjWydgN/4PLTT9q+O1K6AH/vALJGw==",
       "license": "MIT"
     },
+    "node_modules/emitter-component": {
+      "version": "1.1.2",
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "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": {
@@ -20583,14 +19352,14 @@
     },
     "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==",
+      "license": "MIT"
+    },
+    "node_modules/emojilib": {
+      "version": "2.4.0",
       "license": "MIT"
     },
     "node_modules/emojis-list": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
       "license": "MIT",
       "engines": {
         "node": ">= 4"
@@ -20598,14 +19367,10 @@
     },
     "node_modules/emotion-rgba": {
       "version": "0.0.12",
-      "resolved": "https://registry.npmjs.org/emotion-rgba/-/emotion-rgba-0.0.12.tgz",
-      "integrity": "sha512-lvtZ52BWisYDtis+HctQMkxcHwmFbzTiZhgMJGFfWXLsBYEzthfKE7nlysOiUwmmAdTM/8YBAPfwQ4MEDwiaWw==",
       "license": "MIT"
     },
     "node_modules/encodable": {
       "version": "0.7.8",
-      "resolved": "https://registry.npmjs.org/encodable/-/encodable-0.7.8.tgz",
-      "integrity": "sha512-rh5isin1c3ZJuultMyJZGBRbGIh8IrVHQuwlEG3lPMGZQ5yQUb2STIbXGGEbSifxT4POnojKjTxhm3ITTSdriw==",
       "license": "Apache-2.0",
       "dependencies": {
         "@encodable/color": "^1.1.0",
@@ -20626,22 +19391,12 @@
         "global-box": "*"
       }
     },
-    "node_modules/encodable/node_modules/@types/d3-array": {
-      "version": "2.12.7",
-      "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-2.12.7.tgz",
-      "integrity": "sha512-SVvxzxRVnIgtJbNTj5ZVJ9CZkVOANCpW0nQbRi7EOU5Q9G+JQQjXD2SCpr1OYCX09b3Yr7o0+CBofZAgU42rbQ==",
-      "license": "MIT"
-    },
     "node_modules/encodable/node_modules/@types/d3-color": {
       "version": "1.4.5",
-      "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-1.4.5.tgz",
-      "integrity": "sha512-5sNP3DmtSnSozxcjqmzQKsDOuVJXZkceo1KJScDc1982kk/TS9mTPc6lpli1gTu1MIBF1YWutpHpjucNWcIj5g==",
       "license": "MIT"
     },
     "node_modules/encodable/node_modules/@types/d3-interpolate": {
       "version": "1.4.5",
-      "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-1.4.5.tgz",
-      "integrity": "sha512-k9L18hXXv7OvK4PqW1kSFYIzasGOvfhPUWmHFkoZ8/ci99EAmY4HoF6zMefrHl0SGV7XYc7Qq2MNh8dK3edg5A==",
       "license": "MIT",
       "dependencies": {
         "@types/d3-color": "^1"
@@ -20649,23 +19404,10 @@
     },
     "node_modules/encodable/node_modules/@types/d3-time": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-1.1.4.tgz",
-      "integrity": "sha512-JIvy2HjRInE+TXOmIGN5LCmeO0hkFZx5f9FZ7kiN+D+YTcc8pptsiLiuHsvwxwC7VVKmJ2ExHUgNlAiV7vQM9g==",
       "license": "MIT"
     },
-    "node_modules/encodable/node_modules/d3-array": {
-      "version": "2.12.1",
-      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz",
-      "integrity": "sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==",
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "internmap": "^1.0.0"
-      }
-    },
     "node_modules/encodable/node_modules/d3-interpolate": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-2.0.1.tgz",
-      "integrity": "sha512-c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ==",
       "license": "BSD-3-Clause",
       "dependencies": {
         "d3-color": "1 - 2"
@@ -20673,8 +19415,6 @@
     },
     "node_modules/encodable/node_modules/d3-scale": {
       "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.3.0.tgz",
-      "integrity": "sha512-1JGp44NQCt5d1g+Yy+GeOnZP7xHo0ii8zsQp6PGzd+C1/dl0KGsp9A7Mxwp+1D1o4unbTTxVdU/ZOIEBoeZPbQ==",
       "license": "BSD-3-Clause",
       "dependencies": {
         "d3-array": "^2.3.0",
@@ -20686,8 +19426,6 @@
     },
     "node_modules/encodable/node_modules/d3-time": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-2.1.1.tgz",
-      "integrity": "sha512-/eIQe/eR4kCQwq7yxi7z4c6qEXf2IYGcjoWB5OOQy4Tq9Uv39/947qlDcN2TLkiTzQWzvnsuYPB9TrWaNfipKQ==",
       "license": "BSD-3-Clause",
       "dependencies": {
         "d3-array": "2"
@@ -20695,23 +19433,13 @@
     },
     "node_modules/encodable/node_modules/d3-time-format": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-3.0.0.tgz",
-      "integrity": "sha512-UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag==",
       "license": "BSD-3-Clause",
       "dependencies": {
         "d3-time": "1 - 2"
       }
     },
-    "node_modules/encodable/node_modules/internmap": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/internmap/-/internmap-1.0.1.tgz",
-      "integrity": "sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw==",
-      "license": "ISC"
-    },
     "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",
       "engines": {
@@ -20720,18 +19448,26 @@
     },
     "node_modules/encoding": {
       "version": "0.1.13",
-      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
-      "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "iconv-lite": "^0.6.2"
       }
     },
+    "node_modules/encoding-sniffer": {
+      "version": "0.2.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "iconv-lite": "^0.6.3",
+        "whatwg-encoding": "^3.1.1"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/encoding-sniffer?sponsor=1"
+      }
+    },
     "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==",
       "license": "MIT",
       "dependencies": {
         "once": "^1.4.0"
@@ -20739,8 +19475,6 @@
     },
     "node_modules/endent": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/endent/-/endent-2.1.0.tgz",
-      "integrity": "sha512-r8VyPX7XL8U01Xgnb1CjZ3XV+z90cXIJ9JPE/R9SEC9vpw2P6CfsRPJmp20DppC5N7ZAMCmjYkJIa744Iyg96w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -20750,9 +19484,7 @@
       }
     },
     "node_modules/enhanced-resolve": {
-      "version": "5.18.1",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz",
-      "integrity": "sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==",
+      "version": "5.18.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -20765,8 +19497,6 @@
     },
     "node_modules/enquirer": {
       "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz",
-      "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==",
       "license": "MIT",
       "dependencies": {
         "ansi-colors": "^4.1.1",
@@ -20778,8 +19508,6 @@
     },
     "node_modules/enquirer/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==",
       "license": "MIT",
       "dependencies": {
         "ansi-regex": "^5.0.1"
@@ -20790,8 +19518,6 @@
     },
     "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,
       "license": "BSD-2-Clause",
       "engines": {
@@ -20801,11 +19527,133 @@
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
+    "node_modules/env-ci": {
+      "version": "11.1.1",
+      "license": "MIT",
+      "dependencies": {
+        "execa": "^8.0.0",
+        "java-properties": "^1.0.2"
+      },
+      "engines": {
+        "node": "^18.17 || >=20.6.1"
+      }
+    },
+    "node_modules/env-ci/node_modules/execa": {
+      "version": "8.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^8.0.1",
+        "human-signals": "^5.0.0",
+        "is-stream": "^3.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^5.1.0",
+        "onetime": "^6.0.0",
+        "signal-exit": "^4.1.0",
+        "strip-final-newline": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=16.17"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "node_modules/env-ci/node_modules/get-stream": {
+      "version": "8.0.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/env-ci/node_modules/human-signals": {
+      "version": "5.0.0",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=16.17.0"
+      }
+    },
+    "node_modules/env-ci/node_modules/is-stream": {
+      "version": "3.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/env-ci/node_modules/mimic-fn": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/env-ci/node_modules/npm-run-path": {
+      "version": "5.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "path-key": "^4.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/env-ci/node_modules/onetime": {
+      "version": "6.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "mimic-fn": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/env-ci/node_modules/path-key": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/env-ci/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "license": "ISC",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/env-ci/node_modules/strip-final-newline": {
+      "version": "3.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "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",
       "engines": {
         "node": ">=6"
@@ -20813,8 +19661,6 @@
     },
     "node_modules/envinfo": {
       "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.13.0.tgz",
-      "integrity": "sha512-cvcaMr7KqXVh4nyzGTVqTum+gAiL265x5jUWQIDLq//zOGbW+gSW/C+OWLleY/rs9Qole6AZLMXPbtIFQbqu+Q==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -20824,58 +19670,121 @@
         "node": ">=4"
       }
     },
-    "node_modules/err-code": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
-      "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==",
-      "dev": true,
-      "license": "MIT"
+    "node_modules/environment": {
+      "version": "1.1.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     },
-    "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==",
+    "node_modules/enzyme": {
+      "version": "3.11.0",
       "dev": true,
       "license": "MIT",
       "optional": true,
+      "peer": true,
       "dependencies": {
-        "prr": "~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"
       },
-      "bin": {
-        "errno": "cli.js"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/enzyme-shallow-equal": {
+      "version": "1.0.7",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "hasown": "^2.0.0",
+        "object-is": "^1.1.5"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/enzyme-to-json": {
+      "version": "3.6.2",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@types/cheerio": "^0.22.22",
+        "lodash": "^4.17.21",
+        "react-is": "^16.12.0"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      },
+      "peerDependencies": {
+        "enzyme": "^3.4.0"
+      }
+    },
+    "node_modules/enzyme-to-json/node_modules/react-is": {
+      "version": "16.13.1",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/err-code": {
+      "version": "2.0.3",
+      "dev": true,
+      "license": "MIT"
+    },
     "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==",
       "license": "MIT",
       "dependencies": {
         "is-arrayish": "^0.2.1"
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.24.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.24.0.tgz",
-      "integrity": "sha512-WSzPgsdLtTcQwm4CROfS5ju2Wa1QQcVeT37jFjYzdFz1r9ahadC8B8/a4qxJxM+09F18iumCdRmlr96ZYkQvEg==",
+      "version": "1.23.9",
       "license": "MIT",
       "dependencies": {
         "array-buffer-byte-length": "^1.0.2",
         "arraybuffer.prototype.slice": "^1.0.4",
         "available-typed-arrays": "^1.0.7",
         "call-bind": "^1.0.8",
-        "call-bound": "^1.0.4",
+        "call-bound": "^1.0.3",
         "data-view-buffer": "^1.0.2",
         "data-view-byte-length": "^1.0.2",
         "data-view-byte-offset": "^1.0.1",
         "es-define-property": "^1.0.1",
         "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.1.1",
+        "es-object-atoms": "^1.0.0",
         "es-set-tostringtag": "^2.1.0",
         "es-to-primitive": "^1.3.0",
         "function.prototype.name": "^1.1.8",
-        "get-intrinsic": "^1.3.0",
-        "get-proto": "^1.0.1",
+        "get-intrinsic": "^1.2.7",
+        "get-proto": "^1.0.0",
         "get-symbol-description": "^1.1.0",
         "globalthis": "^1.0.4",
         "gopd": "^1.2.0",
@@ -20887,24 +19796,21 @@
         "is-array-buffer": "^3.0.5",
         "is-callable": "^1.2.7",
         "is-data-view": "^1.0.2",
-        "is-negative-zero": "^2.0.3",
         "is-regex": "^1.2.1",
-        "is-set": "^2.0.3",
         "is-shared-array-buffer": "^1.0.4",
         "is-string": "^1.1.1",
         "is-typed-array": "^1.1.15",
-        "is-weakref": "^1.1.1",
+        "is-weakref": "^1.1.0",
         "math-intrinsics": "^1.1.0",
-        "object-inspect": "^1.13.4",
+        "object-inspect": "^1.13.3",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.7",
         "own-keys": "^1.0.1",
-        "regexp.prototype.flags": "^1.5.4",
+        "regexp.prototype.flags": "^1.5.3",
         "safe-array-concat": "^1.1.3",
         "safe-push-apply": "^1.0.0",
         "safe-regex-test": "^1.1.0",
         "set-proto": "^1.0.0",
-        "stop-iteration-iterator": "^1.1.0",
         "string.prototype.trim": "^1.2.10",
         "string.prototype.trimend": "^1.0.9",
         "string.prototype.trimstart": "^1.0.8",
@@ -20913,7 +19819,7 @@
         "typed-array-byte-offset": "^1.0.4",
         "typed-array-length": "^1.0.7",
         "unbox-primitive": "^1.1.0",
-        "which-typed-array": "^1.1.19"
+        "which-typed-array": "^1.1.18"
       },
       "engines": {
         "node": ">= 0.4"
@@ -20924,15 +19830,11 @@
     },
     "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,
       "license": "MIT"
     },
     "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==",
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"
@@ -20940,8 +19842,6 @@
     },
     "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==",
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"
@@ -20949,8 +19849,6 @@
     },
     "node_modules/es-get-iterator": {
       "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz",
-      "integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==",
       "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
@@ -20969,8 +19867,6 @@
     },
     "node_modules/es-iterator-helpers": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.2.1.tgz",
-      "integrity": "sha512-uDn+FE1yrDzyC0pCo961B2IHbdM8y/ACZsKD4dG6WqrjV53BADjwa7D+1aom2rsNVfLyDgU/eigvlJGJ08OQ4w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -20996,16 +19892,12 @@
       }
     },
     "node_modules/es-module-lexer": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.7.0.tgz",
-      "integrity": "sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==",
+      "version": "1.6.0",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/es-object-atoms": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
-      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
       "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0"
@@ -21016,8 +19908,6 @@
     },
     "node_modules/es-set-tostringtag": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
-      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
       "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0",
@@ -21030,22 +19920,15 @@
       }
     },
     "node_modules/es-shim-unscopables": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.1.0.tgz",
-      "integrity": "sha512-d9T8ucsEhh8Bi1woXCf+TIKDIROLG5WCkxg8geBCbvk22kzwC5G2OnXVMO6FUsvQlgUUXQ2itephWDLqDzbeCw==",
+      "version": "1.0.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "hasown": "^2.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "hasown": "^2.0.0"
       }
     },
     "node_modules/es-to-primitive": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz",
-      "integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==",
       "license": "MIT",
       "dependencies": {
         "is-callable": "^1.2.7",
@@ -21061,16 +19944,12 @@
     },
     "node_modules/es6-error": {
       "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
-      "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
       "dev": true,
       "license": "MIT",
       "peer": true
     },
     "node_modules/esbuild": {
       "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz",
-      "integrity": "sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==",
       "hasInstallScript": true,
       "license": "MIT",
       "bin": {
@@ -21107,15 +19986,11 @@
     },
     "node_modules/esbuild-plugin-alias": {
       "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/esbuild-plugin-alias/-/esbuild-plugin-alias-0.2.1.tgz",
-      "integrity": "sha512-jyfL/pwPqaFXyKnj8lP8iLk6Z0m099uXR45aSN8Av1XD4vhvQutxxPzgA2bTcAwQpa1zCXDcWOlhFgyP3GKqhQ==",
       "dev": true,
       "license": "MIT"
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "debug": "^4.3.4"
@@ -21126,8 +20001,6 @@
     },
     "node_modules/escalade": {
       "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
-      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -21135,14 +20008,10 @@
     },
     "node_modules/escape-html": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
       "license": "MIT"
     },
     "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==",
       "license": "MIT",
       "engines": {
         "node": ">=10"
@@ -21153,8 +20022,6 @@
     },
     "node_modules/escodegen": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
-      "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
       "license": "BSD-2-Clause",
       "dependencies": {
         "esprima": "^4.0.1",
@@ -21174,8 +20041,6 @@
     },
     "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==",
       "license": "BSD-3-Clause",
       "optional": true,
       "engines": {
@@ -21184,9 +20049,6 @@
     },
     "node_modules/eslint": {
       "version": "8.57.1",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz",
-      "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==",
-      "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
@@ -21240,8 +20102,6 @@
     },
     "node_modules/eslint-config-airbnb": {
       "version": "19.0.4",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb/-/eslint-config-airbnb-19.0.4.tgz",
-      "integrity": "sha512-T75QYQVQX57jiNgpF9r1KegMICE94VYwoFQyMGhrvc+lB8YF2E/M/PYDaQe1AJcWaEgqLE+ErXV1Og/+6Vyzew==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -21262,8 +20122,6 @@
     },
     "node_modules/eslint-config-airbnb-base": {
       "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz",
-      "integrity": "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -21282,8 +20140,6 @@
     },
     "node_modules/eslint-config-airbnb-base/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": "ISC",
       "bin": {
@@ -21292,8 +20148,6 @@
     },
     "node_modules/eslint-config-prettier": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-7.2.0.tgz",
-      "integrity": "sha512-rV4Qu0C3nfJKPOAhFujFxB7RMP+URFyQqqOZW9DMRD7ZDTFyjaIlETU3xzHELt++4ugC0+Jm084HQYkkJe+Ivg==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -21303,10 +20157,19 @@
         "eslint": ">=7.0.0"
       }
     },
+    "node_modules/eslint-import-resolver-alias": {
+      "version": "1.1.2",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4"
+      },
+      "peerDependencies": {
+        "eslint-plugin-import": ">=1.4.0"
+      }
+    },
     "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,
       "license": "MIT",
       "dependencies": {
@@ -21317,8 +20180,6 @@
     },
     "node_modules/eslint-import-resolver-node/node_modules/debug": {
       "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -21326,25 +20187,24 @@
       }
     },
     "node_modules/eslint-import-resolver-typescript": {
-      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.10.1.tgz",
-      "integrity": "sha512-A1rHYb06zjMGAxdLSkN2fXPBwuSaQ0iO5M/hdyS0Ajj1VBaRp0sPD3dn1FhME3c/JluGFbwSxyCfqdSbtQLAHQ==",
+      "version": "3.7.0",
       "dev": true,
       "license": "ISC",
       "dependencies": {
         "@nolyfill/is-core-module": "1.0.39",
-        "debug": "^4.4.0",
-        "get-tsconfig": "^4.10.0",
-        "is-bun-module": "^2.0.0",
-        "stable-hash": "^0.0.5",
-        "tinyglobby": "^0.2.13",
-        "unrs-resolver": "^1.6.2"
+        "debug": "^4.3.7",
+        "enhanced-resolve": "^5.15.0",
+        "fast-glob": "^3.3.2",
+        "get-tsconfig": "^4.7.5",
+        "is-bun-module": "^1.0.2",
+        "is-glob": "^4.0.3",
+        "stable-hash": "^0.0.4"
       },
       "engines": {
         "node": "^14.18.0 || >=16.0.0"
       },
       "funding": {
-        "url": "https://opencollective.com/eslint-import-resolver-typescript"
+        "url": "https://opencollective.com/unts/projects/eslint-import-resolver-ts"
       },
       "peerDependencies": {
         "eslint": "*",
@@ -21361,9 +20221,7 @@
       }
     },
     "node_modules/eslint-import-resolver-typescript/node_modules/debug": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
-      "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
+      "version": "4.4.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -21380,15 +20238,11 @@
     },
     "node_modules/eslint-import-resolver-typescript/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/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,
       "license": "MIT",
       "dependencies": {
@@ -21405,8 +20259,6 @@
     },
     "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": {
@@ -21415,8 +20267,6 @@
     },
     "node_modules/eslint-plugin-cypress": {
       "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-cypress/-/eslint-plugin-cypress-3.6.0.tgz",
-      "integrity": "sha512-7IAMcBbTVu5LpWeZRn5a9mQ30y4hKp3AfTz+6nSD/x/7YyLMoBI6X7XjDLYI6zFvuy4Q4QVGl563AGEXGW/aSA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -21428,8 +20278,6 @@
     },
     "node_modules/eslint-plugin-cypress/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": {
@@ -21444,8 +20292,6 @@
     },
     "node_modules/eslint-plugin-cypress/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": {
@@ -21457,8 +20303,6 @@
     },
     "node_modules/eslint-plugin-file-progress": {
       "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-file-progress/-/eslint-plugin-file-progress-1.5.0.tgz",
-      "integrity": "sha512-get8oNfacIagP+igSzrEZhepPgodtdwACVeKQsE1fVvTL15tZvgCv8K4B2lKT4FZOZOyhxSkQGnWyjEOx1uoIw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -21479,8 +20323,6 @@
     },
     "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": {
@@ -21513,8 +20355,6 @@
     },
     "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": {
@@ -21523,8 +20363,6 @@
     },
     "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": "Apache-2.0",
       "dependencies": {
@@ -21536,8 +20374,6 @@
     },
     "node_modules/eslint-plugin-import/node_modules/json5": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
-      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -21549,8 +20385,6 @@
     },
     "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": "ISC",
       "bin": {
@@ -21559,8 +20393,6 @@
     },
     "node_modules/eslint-plugin-import/node_modules/strip-bom": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -21569,8 +20401,6 @@
     },
     "node_modules/eslint-plugin-import/node_modules/tsconfig-paths": {
       "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": {
@@ -21582,8 +20412,6 @@
     },
     "node_modules/eslint-plugin-jest": {
       "version": "27.9.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-27.9.0.tgz",
-      "integrity": "sha512-QIT7FH7fNmd9n4se7FFKHbsLKGQiw885Ds6Y/sxKgCZ6natwCsXdgPOADnYVxN2QrRweF0FZWbJ6S7Rsn7llug==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -21608,8 +20436,6 @@
     },
     "node_modules/eslint-plugin-jest-dom": {
       "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jest-dom/-/eslint-plugin-jest-dom-5.5.0.tgz",
-      "integrity": "sha512-CRlXfchTr7EgC3tDI7MGHY6QjdJU5Vv2RPaeeGtkXUHnKZf04kgzMPIJUXt4qKCvYWVVIEo9ut9Oq1vgXAykEA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -21633,8 +20459,6 @@
     },
     "node_modules/eslint-plugin-jsx-a11y": {
       "version": "6.10.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.10.2.tgz",
-      "integrity": "sha512-scB3nz4WmG75pV8+3eRUQOHZlNSUhFNq37xnpgRkCCELU3XMvXAxLk1eqWWyE22Ki4Q01Fnsw9BA3cJHDPgn2Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -21663,8 +20487,6 @@
     },
     "node_modules/eslint-plugin-jsx-a11y/node_modules/aria-query": {
       "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.2.tgz",
-      "integrity": "sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -21673,8 +20495,6 @@
     },
     "node_modules/eslint-plugin-lodash": {
       "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-lodash/-/eslint-plugin-lodash-7.4.0.tgz",
-      "integrity": "sha512-Tl83UwVXqe1OVeBRKUeWcfg6/pCW1GTRObbdnbEJgYwjxp5Q92MEWQaH9+dmzbRt6kvYU1Mp893E79nJiCSM8A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -21689,8 +20509,6 @@
     },
     "node_modules/eslint-plugin-no-only-tests": {
       "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-no-only-tests/-/eslint-plugin-no-only-tests-3.3.0.tgz",
-      "integrity": "sha512-brcKcxGnISN2CcVhXJ/kEQlNa0MEfGRtwKtWA16SkqXHKitaKIMrfemJKLKX1YqDU5C/5JY3PvZXd5jEW04e0Q==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -21698,14 +20516,12 @@
       }
     },
     "node_modules/eslint-plugin-prettier": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.4.1.tgz",
-      "integrity": "sha512-9dF+KuU/Ilkq27A8idRP7N2DH8iUR6qXcjF3FR2wETY21PZdBrIjwCau8oboyGj9b7etWmTGEeM8e7oOed6ZWg==",
+      "version": "5.2.3",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "prettier-linter-helpers": "^1.0.0",
-        "synckit": "^0.11.7"
+        "synckit": "^0.9.1"
       },
       "engines": {
         "node": "^14.18.0 || >=16.0.0"
@@ -21716,7 +20532,7 @@
       "peerDependencies": {
         "@types/eslint": ">=8.0.0",
         "eslint": ">=8.0.0",
-        "eslint-config-prettier": ">= 7.0.0 <10.0.0 || >=10.1.0",
+        "eslint-config-prettier": "*",
         "prettier": ">=3.0.0"
       },
       "peerDependenciesMeta": {
@@ -21729,9 +20545,7 @@
       }
     },
     "node_modules/eslint-plugin-react": {
-      "version": "7.37.5",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.5.tgz",
-      "integrity": "sha512-Qteup0SqU15kdocexFNAJMvCJEfa2xUKNV4CC1xsVMrIIqEy3SQ/rqyxCWNzfrd3/ldy6HMlD2e0JDVpDg2qIA==",
+      "version": "7.37.4",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -21745,7 +20559,7 @@
         "hasown": "^2.0.2",
         "jsx-ast-utils": "^2.4.1 || ^3.0.0",
         "minimatch": "^3.1.2",
-        "object.entries": "^1.1.9",
+        "object.entries": "^1.1.8",
         "object.fromentries": "^2.0.8",
         "object.values": "^1.2.1",
         "prop-types": "^15.8.1",
@@ -21763,8 +20577,6 @@
     },
     "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,
       "license": "MIT",
       "engines": {
@@ -21776,15 +20588,11 @@
     },
     "node_modules/eslint-plugin-react-prefer-function-component": {
       "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-prefer-function-component/-/eslint-plugin-react-prefer-function-component-3.4.0.tgz",
-      "integrity": "sha512-M1Up5EANZWG2wxMs4jObTDaH1Onm9hz49ZaJQbQgT7F1mzIo0pnBreu1HELNdlkKF5bKPzZ/g5DaCUd4lYVAnA==",
       "dev": true,
       "license": "MIT"
     },
     "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,
       "license": "Apache-2.0",
       "dependencies": {
@@ -21796,8 +20604,6 @@
     },
     "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,
       "license": "MIT",
       "dependencies": {
@@ -21814,8 +20620,6 @@
     },
     "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,
       "license": "ISC",
       "bin": {
@@ -21824,8 +20628,6 @@
     },
     "node_modules/eslint-plugin-storybook": {
       "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-storybook/-/eslint-plugin-storybook-0.8.0.tgz",
-      "integrity": "sha512-CZeVO5EzmPY7qghO2t64oaFM+8FTaD4uzOEjHKp516exyTKo+skKAL9GI3QALS2BXhyALJjNtwbmr1XinGE8bA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -21843,8 +20645,6 @@
     },
     "node_modules/eslint-plugin-storybook/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==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -21853,8 +20653,6 @@
     },
     "node_modules/eslint-plugin-testing-library": {
       "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-6.5.0.tgz",
-      "integrity": "sha512-Ls5TUfLm5/snocMAOlofSOJxNN0aKqwTlco7CrNtMjkTdQlkpSMaeTCDHCuXfzrI97xcx2rSCNeKeJjtpkNC1w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -21874,8 +20672,6 @@
     },
     "node_modules/eslint-scope": {
       "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
@@ -21888,8 +20684,6 @@
     },
     "node_modules/eslint-scope/node_modules/estraverse": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
       "dev": true,
       "license": "BSD-2-Clause",
       "engines": {
@@ -21898,8 +20692,6 @@
     },
     "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": "Apache-2.0",
       "engines": {
@@ -21908,8 +20700,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
@@ -21924,14 +20714,10 @@
     },
     "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==",
       "license": "Python-2.0"
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -21946,8 +20732,6 @@
     },
     "node_modules/eslint/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==",
       "license": "BSD-2-Clause",
       "dependencies": {
         "esrecurse": "^4.3.0",
@@ -21962,8 +20746,6 @@
     },
     "node_modules/eslint/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==",
       "license": "Apache-2.0",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -21974,8 +20756,6 @@
     },
     "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==",
       "license": "ISC",
       "dependencies": {
         "is-glob": "^4.0.3"
@@ -21986,8 +20766,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -22001,8 +20779,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "argparse": "^2.0.1"
@@ -22013,14 +20789,10 @@
     },
     "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==",
       "license": "MIT"
     },
     "node_modules/eslint/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==",
       "license": "MIT",
       "dependencies": {
         "ansi-regex": "^5.0.1"
@@ -22031,8 +20803,6 @@
     },
     "node_modules/eslint/node_modules/type-fest": {
       "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
       "license": "(MIT OR CC0-1.0)",
       "engines": {
         "node": ">=10"
@@ -22043,8 +20813,6 @@
     },
     "node_modules/esm": {
       "version": "3.2.25",
-      "resolved": "https://registry.npmjs.org/esm/-/esm-3.2.25.tgz",
-      "integrity": "sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==",
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -22052,8 +20820,6 @@
     },
     "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==",
       "license": "BSD-2-Clause",
       "dependencies": {
         "acorn": "^8.9.0",
@@ -22068,9 +20834,7 @@
       }
     },
     "node_modules/espree/node_modules/acorn": {
-      "version": "8.14.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
-      "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
+      "version": "8.14.0",
       "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
@@ -22081,8 +20845,6 @@
     },
     "node_modules/espree/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==",
       "license": "Apache-2.0",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -22093,8 +20855,6 @@
     },
     "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==",
       "license": "BSD-2-Clause",
       "bin": {
         "esparse": "bin/esparse.js",
@@ -22106,8 +20866,6 @@
     },
     "node_modules/esquery": {
       "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
-      "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
       "license": "BSD-3-Clause",
       "dependencies": {
         "estraverse": "^5.1.0"
@@ -22118,8 +20876,6 @@
     },
     "node_modules/esrecurse": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
       "license": "BSD-2-Clause",
       "dependencies": {
         "estraverse": "^5.2.0"
@@ -22130,8 +20886,6 @@
     },
     "node_modules/estraverse": {
       "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
       "license": "BSD-2-Clause",
       "engines": {
         "node": ">=4.0"
@@ -22139,8 +20893,6 @@
     },
     "node_modules/esutils": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
       "license": "BSD-2-Clause",
       "engines": {
         "node": ">=0.10.0"
@@ -22148,8 +20900,6 @@
     },
     "node_modules/etag": {
       "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -22158,8 +20908,6 @@
     },
     "node_modules/event-target-shim": {
       "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
-      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -22168,21 +20916,15 @@
     },
     "node_modules/eventemitter2": {
       "version": "6.4.7",
-      "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.7.tgz",
-      "integrity": "sha512-tYUSVOGeQPKt/eC1ABfhHy5Xd96N3oIijJvN3O9+TsC28T5V9yX9oEfEK5faP0EFSNVOG97qtAS68GBrQB2hDg==",
       "license": "MIT"
     },
     "node_modules/eventemitter3": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
-      "dev": true,
-      "license": "MIT"
+      "version": "5.0.1",
+      "license": "MIT",
+      "peer": true
     },
     "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,
       "license": "MIT",
       "engines": {
@@ -22191,8 +20933,6 @@
     },
     "node_modules/execa": {
       "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
       "license": "MIT",
       "dependencies": {
         "cross-spawn": "^7.0.3",
@@ -22214,8 +20954,6 @@
     },
     "node_modules/executable": {
       "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz",
-      "integrity": "sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==",
       "license": "MIT",
       "dependencies": {
         "pify": "^2.2.0"
@@ -22224,19 +20962,16 @@
         "node": ">=4"
       }
     },
-    "node_modules/exit": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-      "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
+    "node_modules/exit-x": {
+      "version": "0.2.2",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8.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": "MIT",
       "dependencies": {
@@ -22252,15 +20987,11 @@
     },
     "node_modules/exponential-backoff": {
       "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.2.tgz",
-      "integrity": "sha512-8QxYTVXUkuy7fIIoitQkPwGonB8F3Zj8eEO8Sqg9Zv/bkI7RJAzowee4gr81Hak/dUTpA2Z7VfQgoijjPNlUZA==",
       "dev": true,
       "license": "Apache-2.0"
     },
     "node_modules/express": {
       "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
-      "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -22306,8 +21037,6 @@
     },
     "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": {
@@ -22316,15 +21045,11 @@
     },
     "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,
       "license": "MIT"
     },
     "node_modules/express/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": "BSD-3-Clause",
       "dependencies": {
@@ -22339,15 +21064,10 @@
     },
     "node_modules/extend": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
       "license": "MIT"
     },
     "node_modules/external-editor": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
-      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
-      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "chardet": "^0.7.0",
@@ -22360,9 +21080,6 @@
     },
     "node_modules/external-editor/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==",
-      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3"
@@ -22373,9 +21090,6 @@
     },
     "node_modules/external-editor/node_modules/tmp": {
       "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "os-tmpdir": "~1.0.2"
@@ -22386,8 +21100,6 @@
     },
     "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==",
       "license": "BSD-2-Clause",
       "dependencies": {
         "debug": "^4.1.1",
@@ -22406,8 +21118,6 @@
     },
     "node_modules/extract-zip/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==",
       "license": "MIT",
       "dependencies": {
         "pump": "^3.0.0"
@@ -22430,8 +21140,6 @@
     },
     "node_modules/falafel": {
       "version": "2.2.5",
-      "resolved": "https://registry.npmjs.org/falafel/-/falafel-2.2.5.tgz",
-      "integrity": "sha512-HuC1qF9iTnHDnML9YZAdCDQwT0yKl/U55K4XSUXqGAA2GLoafFgWRqdAbhWJxXaYD4pyoVxAJ8wH670jMpI9DQ==",
       "license": "MIT",
       "dependencies": {
         "acorn": "^7.1.1",
@@ -22443,41 +21151,29 @@
     },
     "node_modules/fast-content-type-parse": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/fast-content-type-parse/-/fast-content-type-parse-1.1.0.tgz",
-      "integrity": "sha512-fBHHqSTFLVnR61C+gltJuE5GkVQMV0S2nqUO8TJ+5Z3qAKG8vAx4FKai1s5jq/inV1+sREynIWSuQ6HgoSXpDQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/fast-decode-uri-component": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/fast-decode-uri-component/-/fast-decode-uri-component-1.0.1.tgz",
-      "integrity": "sha512-WKgKWg5eUxvRZGwW8FvfbaH7AXSh2cL+3j5fMGzUMCxWBJ3dV3a7Wz8y2f/uQ0e3B6WmodD3oS54jTQ9HVTIIg==",
       "dev": true,
       "license": "MIT"
     },
     "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==",
       "license": "MIT"
     },
     "node_modules/fast-diff": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.3.0.tgz",
-      "integrity": "sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==",
       "dev": true,
       "license": "Apache-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==",
       "license": "MIT"
     },
     "node_modules/fast-glob": {
       "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
-      "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
       "license": "MIT",
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
@@ -22492,21 +21188,15 @@
     },
     "node_modules/fast-json-parse": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/fast-json-parse/-/fast-json-parse-1.0.3.tgz",
-      "integrity": "sha512-FRWsaZRWEJ1ESVNbDWmsAlqDk96gPQezzLghafp5J4GUKjbCz3OkAHuZs5TuPEtkbVQERysLp9xv6c24fBm8Aw==",
       "dev": true,
       "license": "MIT"
     },
     "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==",
       "license": "MIT"
     },
     "node_modules/fast-json-stringify": {
       "version": "5.16.1",
-      "resolved": "https://registry.npmjs.org/fast-json-stringify/-/fast-json-stringify-5.16.1.tgz",
-      "integrity": "sha512-KAdnLvy1yu/XrRtP+LJnxbBGrhN+xXu+gt3EUvZhYGKCr3lFHq/7UFJHHFgmJKoqlh6B40bZLEv7w46B0mqn1g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -22521,8 +21211,6 @@
     },
     "node_modules/fast-json-stringify/node_modules/ajv-formats": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-3.0.1.tgz",
-      "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -22539,21 +21227,15 @@
     },
     "node_modules/fast-json-stringify/node_modules/fast-uri": {
       "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-2.4.0.tgz",
-      "integrity": "sha512-ypuAmmMKInk5q7XcepxlnUWDLWv4GFtaJqAzWKqn62IpQ3pejtr5dTVbt3vwqVaMKmkNR55sTT+CqUKIaT21BA==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/fast-levenshtein": {
       "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
       "license": "MIT"
     },
     "node_modules/fast-querystring": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/fast-querystring/-/fast-querystring-1.1.2.tgz",
-      "integrity": "sha512-g6KuKWmFXc0fID8WWH0jit4g0AGBoJhCkJMb1RmbsSEUNvQ+ZC8D6CUZ+GtF8nMzSPXnhiePyyqqipzNNEnHjg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -22562,8 +21244,6 @@
     },
     "node_modules/fast-redact": {
       "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/fast-redact/-/fast-redact-3.5.0.tgz",
-      "integrity": "sha512-dwsoQlS7h9hMeYUq1W++23NDcBLV4KqONnITDV9DjfS3q1SgDGVrBdvvTLUotWtPSD7asWDV9/CmsZPy8Hf70A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -22572,14 +21252,10 @@
     },
     "node_modules/fast-safe-stringify": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
-      "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==",
       "license": "MIT"
     },
     "node_modules/fast-uri": {
       "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz",
-      "integrity": "sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==",
       "funding": [
         {
           "type": "github",
@@ -22593,18 +21269,20 @@
       "license": "BSD-3-Clause"
     },
     "node_modules/fast-xml-parser": {
-      "version": "4.5.3",
-      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.5.3.tgz",
-      "integrity": "sha512-RKihhV+SHsIUGXObeVy9AXiBbFwkVk7Syp8XgwN5U3JV416+Gwp/GO9i0JYKmikykgz/UHRrrV4ROuZEo/T0ig==",
+      "version": "4.5.1",
       "funding": [
         {
           "type": "github",
           "url": "https://github.com/sponsors/NaturalIntelligence"
+        },
+        {
+          "type": "paypal",
+          "url": "https://paypal.me/naturalintelligence"
         }
       ],
       "license": "MIT",
       "dependencies": {
-        "strnum": "^1.1.1"
+        "strnum": "^1.0.5"
       },
       "bin": {
         "fxparser": "src/cli/cli.js"
@@ -22612,8 +21290,6 @@
     },
     "node_modules/fastest-levenshtein": {
       "version": "1.0.16",
-      "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz",
-      "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -22622,8 +21298,6 @@
     },
     "node_modules/fastify": {
       "version": "4.29.1",
-      "resolved": "https://registry.npmjs.org/fastify/-/fastify-4.29.1.tgz",
-      "integrity": "sha512-m2kMNHIG92tSNWv+Z3UeTR9AWLLuo7KctC7mlFPtMEVrfjIhmQhkQnT9v15qA/BfVq3vvj134Y0jl9SBje3jXQ==",
       "dev": true,
       "funding": [
         {
@@ -22657,15 +21331,11 @@
     },
     "node_modules/fastify-plugin": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/fastify-plugin/-/fastify-plugin-3.0.1.tgz",
-      "integrity": "sha512-qKcDXmuZadJqdTm6vlCqioEbyewF60b/0LOFCcYN1B6BIZGlYJumWWOYs70SFYLDAH4YqdE1cxH/RKMG7rFxgA==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/fastq": {
-      "version": "1.19.1",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz",
-      "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==",
+      "version": "1.18.0",
       "license": "ISC",
       "dependencies": {
         "reusify": "^1.0.4"
@@ -22673,8 +21343,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "format": "^0.2.0"
@@ -22686,8 +21354,6 @@
     },
     "node_modules/faye-websocket": {
       "version": "0.11.4",
-      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
-      "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -22699,8 +21365,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,
       "license": "Apache-2.0",
       "dependencies": {
@@ -22709,8 +21373,6 @@
     },
     "node_modules/fd-slicer": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
-      "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
       "license": "MIT",
       "dependencies": {
         "pend": "~1.2.0"
@@ -22718,8 +21380,6 @@
     },
     "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": [
         {
@@ -22741,32 +21401,18 @@
       }
     },
     "node_modules/fetch-mock": {
-      "version": "9.11.0",
-      "resolved": "https://registry.npmjs.org/fetch-mock/-/fetch-mock-9.11.0.tgz",
-      "integrity": "sha512-PG1XUv+x7iag5p/iNHD4/jdpxL9FtVSqRMUQhPab4hVDt80T1MH5ehzVrL2IdXO9Q2iBggArFvPqjUbHFuI58Q==",
+      "version": "11.1.5",
       "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",
+        "@types/glob-to-regexp": "^0.4.4",
+        "dequal": "^2.0.3",
+        "glob-to-regexp": "^0.4.1",
         "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"
+        "regexparam": "^3.0.0"
       },
       "engines": {
-        "node": ">=4.0.0"
-      },
-      "funding": {
-        "type": "charity",
-        "url": "https://www.justgiving.com/refugee-support-europe"
-      },
-      "peerDependencies": {
-        "node-fetch": "*"
+        "node": ">=8.0.0"
       },
       "peerDependenciesMeta": {
         "node-fetch": {
@@ -22774,29 +21420,16 @@
         }
       }
     },
-    "node_modules/fetch-mock/node_modules/path-to-regexp": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-2.4.0.tgz",
-      "integrity": "sha512-G6zHoVqC6GGTQkZwF4lkuEyMbVOjoBKAEybQUypI1WTkqinCOrq2x6U2+phkJ1XsEMTy4LjtwPI7HW+NVrRR2w==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/fetch-retry": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/fetch-retry/-/fetch-retry-6.0.0.tgz",
-      "integrity": "sha512-BUFj1aMubgib37I3v4q78fYo63Po7t4HUPTpQ6/QE6yK6cIQrP+W43FYToeTEyg5m2Y7eFUtijUuAv/PDlWuag==",
       "license": "MIT"
     },
     "node_modules/fflate": {
       "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/fflate/-/fflate-0.8.2.tgz",
-      "integrity": "sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A==",
       "license": "MIT"
     },
     "node_modules/figures": {
       "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
       "license": "MIT",
       "dependencies": {
         "escape-string-regexp": "^1.0.5"
@@ -22810,8 +21443,6 @@
     },
     "node_modules/figures/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==",
       "license": "MIT",
       "engines": {
         "node": ">=0.8.0"
@@ -22819,8 +21450,6 @@
     },
     "node_modules/file-entry-cache": {
       "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
       "license": "MIT",
       "dependencies": {
         "flat-cache": "^3.0.4"
@@ -22831,14 +21460,10 @@
     },
     "node_modules/file-saver": {
       "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz",
-      "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==",
       "license": "MIT"
     },
     "node_modules/file-system-cache": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/file-system-cache/-/file-system-cache-2.3.0.tgz",
-      "integrity": "sha512-l4DMNdsIPsVnKrgEXbJwDJsA5mB8rGwHYERMgqQx/xAUtChPJMre1bXBzDEqqVbWv9AIbFezXMxeEkZDSrXUOQ==",
       "license": "MIT",
       "dependencies": {
         "fs-extra": "11.1.1",
@@ -22847,8 +21472,6 @@
     },
     "node_modules/file-system-cache/node_modules/fs-extra": {
       "version": "11.1.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz",
-      "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==",
       "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.2.0",
@@ -22861,8 +21484,6 @@
     },
     "node_modules/file-type": {
       "version": "18.7.0",
-      "resolved": "https://registry.npmjs.org/file-type/-/file-type-18.7.0.tgz",
-      "integrity": "sha512-ihHtXRzXEziMrQ56VSgU7wkxh55iNchFkosu7Y9/S+tXHdKyrGjVK0ujbqNnsxzea+78MaLhN6PGmfYSAv1ACw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -22879,8 +21500,6 @@
     },
     "node_modules/filelist": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
-      "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
       "license": "Apache-2.0",
       "dependencies": {
         "minimatch": "^5.0.1"
@@ -22888,8 +21507,6 @@
     },
     "node_modules/filelist/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==",
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
@@ -22897,8 +21514,6 @@
     },
     "node_modules/filelist/node_modules/minimatch": {
       "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
-      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
       "license": "ISC",
       "dependencies": {
         "brace-expansion": "^2.0.1"
@@ -22909,8 +21524,6 @@
     },
     "node_modules/filename-reserved-regex": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz",
-      "integrity": "sha512-lc1bnsSr4L4Bdif8Xb/qrtokGbq5zlsms/CYH8PP+WtCkGNF65DPiQY8vG3SakEdRn8Dlnm+gW/qWKKjS5sZzQ==",
       "license": "MIT",
       "engines": {
         "node": ">=4"
@@ -22918,8 +21531,6 @@
     },
     "node_modules/filenamify": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-4.3.0.tgz",
-      "integrity": "sha512-hcFKyUG57yWGAzu1CMt/dPzYZuv+jAJUT85bL8mrXvNe6hWj6yEHEc4EdcgiA6Z3oi1/9wXJdZPXF2dZNgwgOg==",
       "license": "MIT",
       "dependencies": {
         "filename-reserved-regex": "^2.0.0",
@@ -22935,8 +21546,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "to-regex-range": "^5.0.1"
@@ -22947,17 +21556,14 @@
     },
     "node_modules/filter-obj": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz",
-      "integrity": "sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/finalhandler": {
       "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
-      "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -22975,8 +21581,6 @@
     },
     "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,
       "license": "MIT",
       "dependencies": {
@@ -22985,15 +21589,11 @@
     },
     "node_modules/finalhandler/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/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,
       "license": "MIT",
       "dependencies": {
@@ -23007,8 +21607,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,
       "license": "MIT",
       "dependencies": {
@@ -23020,8 +21618,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,
       "license": "MIT",
       "dependencies": {
@@ -23034,8 +21630,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,
       "license": "MIT",
       "dependencies": {
@@ -23050,8 +21644,6 @@
     },
     "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,
       "license": "MIT",
       "dependencies": {
@@ -23063,8 +21655,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": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -23073,8 +21663,6 @@
     },
     "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,
       "license": "MIT",
       "dependencies": {
@@ -23086,8 +21674,6 @@
     },
     "node_modules/find-my-way": {
       "version": "8.2.2",
-      "resolved": "https://registry.npmjs.org/find-my-way/-/find-my-way-8.2.2.tgz",
-      "integrity": "sha512-Dobi7gcTEq8yszimcfp/R7+owiT4WncAJ7VTTgFH1jYJ5GaG1FbhjwDG820hptN0QDFvzVY3RfCzdInvGPGzjA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -23101,8 +21687,6 @@
     },
     "node_modules/find-process": {
       "version": "1.4.10",
-      "resolved": "https://registry.npmjs.org/find-process/-/find-process-1.4.10.tgz",
-      "integrity": "sha512-ncYFnWEIwL7PzmrK1yZtaccN8GhethD37RzBHG6iOZoFYB4vSmLLXfeWJjeN5nMvCJMjOtBvBBF8OgxEcikiZg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -23116,8 +21700,6 @@
     },
     "node_modules/find-process/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": {
@@ -23133,8 +21715,6 @@
     },
     "node_modules/find-process/node_modules/commander": {
       "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": {
@@ -23143,14 +21723,10 @@
     },
     "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==",
       "license": "MIT"
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "locate-path": "^6.0.0",
@@ -23164,9 +21740,7 @@
       }
     },
     "node_modules/find-up-simple": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/find-up-simple/-/find-up-simple-1.0.1.tgz",
-      "integrity": "sha512-afd4O7zpqHeRyg4PfDQsXmlDe2PfdHtJt6Akt8jOWaApLOZk5JXs6VMR29lz03pRe9mpykrRCYIYxaJYcfpncQ==",
+      "version": "1.0.0",
       "license": "MIT",
       "engines": {
         "node": ">=18"
@@ -23175,11 +21749,24 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/find-versions": {
+      "version": "6.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "semver-regex": "^4.0.5",
+        "super-regex": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/first-chunk-stream": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-5.0.0.tgz",
-      "integrity": "sha512-WdHo4ejd2cG2Dl+sLkW79SctU7mUQDfr4s1i26ffOZRs5mgv+BRttIM9gwcq0rDbemo0KlpVPaa3LBVLqPXzcQ==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
@@ -23189,8 +21776,6 @@
     },
     "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": {
@@ -23199,8 +21784,6 @@
     },
     "node_modules/flat-cache": {
       "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
-      "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
       "license": "MIT",
       "dependencies": {
         "flatted": "^3.2.9",
@@ -23213,9 +21796,6 @@
     },
     "node_modules/flat-cache/node_modules/rimraf": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "deprecated": "Rimraf versions prior to v4 are no longer supported",
       "license": "ISC",
       "dependencies": {
         "glob": "^7.1.3"
@@ -23228,15 +21808,11 @@
       }
     },
     "node_modules/flatted": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
-      "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
+      "version": "3.3.2",
       "license": "ISC"
     },
     "node_modules/flow-parser": {
-      "version": "0.273.0",
-      "resolved": "https://registry.npmjs.org/flow-parser/-/flow-parser-0.273.0.tgz",
-      "integrity": "sha512-KHe9AJfT0Zn0TpQ2daDFBpwaE0zqjWWiWLOANxzo/U6Xar5fRpU3Lucnk8iMVNitxo9inz2OmSnger70qHmsLw==",
+      "version": "0.259.1",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -23245,8 +21821,6 @@
     },
     "node_modules/follow-redirects": {
       "version": "1.15.9",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
-      "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
       "dev": true,
       "funding": [
         {
@@ -23265,27 +21839,17 @@
       }
     },
     "node_modules/for-each": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz",
-      "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==",
+      "version": "0.3.3",
       "license": "MIT",
       "dependencies": {
-        "is-callable": "^1.2.7"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "is-callable": "^1.1.3"
       }
     },
     "node_modules/foreground-child": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
-      "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
+      "version": "3.3.0",
       "license": "ISC",
       "dependencies": {
-        "cross-spawn": "^7.0.6",
+        "cross-spawn": "^7.0.0",
         "signal-exit": "^4.0.1"
       },
       "engines": {
@@ -23297,8 +21861,6 @@
     },
     "node_modules/foreground-child/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==",
       "license": "ISC",
       "engines": {
         "node": ">=14"
@@ -23317,15 +21879,13 @@
       }
     },
     "node_modules/fork-ts-checker-webpack-plugin": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-9.1.0.tgz",
-      "integrity": "sha512-mpafl89VFPJmhnJ1ssH+8wmM2b50n+Rew5x42NeI2U78aRWgtkEtGmctp7iT16UjquJTjorEmIfESj3DxdW84Q==",
+      "version": "9.0.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.16.7",
         "chalk": "^4.1.2",
-        "chokidar": "^4.0.1",
+        "chokidar": "^3.5.3",
         "cosmiconfig": "^8.2.0",
         "deepmerge": "^4.2.2",
         "fs-extra": "^10.0.0",
@@ -23337,7 +21897,8 @@
         "tapable": "^2.2.1"
       },
       "engines": {
-        "node": ">=14.21.3"
+        "node": ">=12.13.0",
+        "yarn": ">=1.0.0"
       },
       "peerDependencies": {
         "typescript": ">3.6.0",
@@ -23346,8 +21907,6 @@
     },
     "node_modules/fork-ts-checker-webpack-plugin/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": {
@@ -23363,8 +21922,6 @@
     },
     "node_modules/fork-ts-checker-webpack-plugin/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,
       "license": "MIT",
       "peerDependencies": {
@@ -23373,8 +21930,6 @@
     },
     "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,
       "license": "MIT",
       "dependencies": {
@@ -23388,26 +21943,8 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/chokidar": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
-      "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "readdirp": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 14.16.0"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
     "node_modules/fork-ts-checker-webpack-plugin/node_modules/fs-extra": {
       "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -23421,29 +21958,11 @@
     },
     "node_modules/fork-ts-checker-webpack-plugin/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,
       "license": "MIT"
     },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/readdirp": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
-      "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 14.18.0"
-      },
-      "funding": {
-        "type": "individual",
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
     "node_modules/fork-ts-checker-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,
       "license": "MIT",
       "dependencies": {
@@ -23460,15 +21979,11 @@
       }
     },
     "node_modules/form-data": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.3.tgz",
-      "integrity": "sha512-qsITQPfmvMOSAdeyZ+12I1c+CKSstAFAwu+97zrnWAbIr5u8wfsExUzCesVLC8NgHuRUqNN4Zy6UPWUTRGslcA==",
+      "version": "4.0.1",
       "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
-        "es-set-tostringtag": "^2.1.0",
-        "hasown": "^2.0.2",
         "mime-types": "^2.1.12"
       },
       "engines": {
@@ -23477,16 +21992,12 @@
     },
     "node_modules/format": {
       "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/format/-/format-0.2.2.tgz",
-      "integrity": "sha512-wzsgA6WOq+09wrU1tsJ09udeR/YZRaeArL9e1wPbFg3GG2yDnC2ldKpxs4xunpFF9DgqCqOIra3bc1HWrJ37Ww==",
       "engines": {
         "node": ">=0.4.x"
       }
     },
     "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,
       "license": "MIT",
       "dependencies": {
@@ -23498,8 +22009,6 @@
     },
     "node_modules/forwarded": {
       "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
-      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -23508,18 +22017,50 @@
     },
     "node_modules/fresh": {
       "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
       "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
+    "node_modules/from2": {
+      "version": "2.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0"
+      }
+    },
+    "node_modules/from2/node_modules/isarray": {
+      "version": "1.0.0",
+      "license": "MIT"
+    },
+    "node_modules/from2/node_modules/readable-stream": {
+      "version": "2.3.8",
+      "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/from2/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "license": "MIT"
+    },
+    "node_modules/from2/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
     "node_modules/fromentries": {
       "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/fromentries/-/fromentries-1.3.2.tgz",
-      "integrity": "sha512-cHEpEQHUg0f8XdtZCc2ZAhrHzKzT0MrFUTcvx+hfxYu7rGMDc5SKoXFh+n4YigxsHXRzc6OrCshdR1bWH6HHyg==",
       "dev": true,
       "funding": [
         {
@@ -23540,8 +22081,6 @@
     },
     "node_modules/front-matter": {
       "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/front-matter/-/front-matter-4.0.2.tgz",
-      "integrity": "sha512-I8ZuJ/qG92NWX8i5x1Y8qyj3vizhXS31OxjKDu3LKP+7/qBgfIKValiZIEwoVoJKUHlhWtYrktkxV1XsX+pPlg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -23550,15 +22089,11 @@
     },
     "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,
       "license": "MIT"
     },
     "node_modules/fs-extra": {
       "version": "11.3.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.0.tgz",
-      "integrity": "sha512-Z4XaCL6dUDHfP/jT25jJKMmtxvuwbkrD1vNSMFlo9lNLY2c5FHYSQgHPRZUjAB26TpDEoW9HCOgplrdbaPV/ew==",
       "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.2.0",
@@ -23571,8 +22106,6 @@
     },
     "node_modules/fs-minipass": {
       "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz",
-      "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -23584,52 +22117,37 @@
     },
     "node_modules/fs-monkey": {
       "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.6.tgz",
-      "integrity": "sha512-b1FMfwetIKymC0eioW7mTywihSQE4oLzQn1dB6rZB5fx/3NpNEdAWeCSMB+60/AeT0TCXsxzAlcYVEFCTAksWg==",
       "dev": true,
       "license": "Unlicense"
     },
     "node_modules/fs-readdir-recursive": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz",
-      "integrity": "sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA==",
       "dev": true,
       "license": "MIT"
     },
     "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==",
       "license": "ISC"
     },
-    "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/function-bind": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
       "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/function-timeout": {
+      "version": "1.0.2",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/function.prototype.name": {
       "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.8.tgz",
-      "integrity": "sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==",
       "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.8",
@@ -23648,17 +22166,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==",
       "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/fuse.js": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-7.1.0.tgz",
-      "integrity": "sha512-trLf4SzuuUxfusZADLINj+dE8clK1frKdmqiJNb1Es75fmI5oY6X2mxLVUciLLjxqw/xr72Dhy+lER6dGd02FQ==",
+      "version": "7.0.0",
       "license": "Apache-2.0",
       "engines": {
         "node": ">=10"
@@ -23666,8 +22180,6 @@
     },
     "node_modules/gaxios": {
       "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-6.7.1.tgz",
-      "integrity": "sha512-LDODD4TMYx7XXdpwxAVRAIAuB0bzv0s+ywFonY46k126qzQHT9ygyoa9tncmOiQmmDrik65UYsEkv3lbfqQ3yQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "extend": "^3.0.2",
@@ -23682,8 +22194,6 @@
     },
     "node_modules/gaxios/node_modules/agent-base": {
       "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
-      "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
       "license": "MIT",
       "engines": {
         "node": ">= 14"
@@ -23691,8 +22201,6 @@
     },
     "node_modules/gaxios/node_modules/https-proxy-agent": {
       "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
-      "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
       "license": "MIT",
       "dependencies": {
         "agent-base": "^7.1.2",
@@ -23704,8 +22212,6 @@
     },
     "node_modules/gaxios/node_modules/node-fetch": {
       "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
-      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
       "license": "MIT",
       "dependencies": {
         "whatwg-url": "^5.0.0"
@@ -23724,20 +22230,14 @@
     },
     "node_modules/gaxios/node_modules/tr46": {
       "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
       "license": "MIT"
     },
     "node_modules/gaxios/node_modules/webidl-conversions": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
       "license": "BSD-2-Clause"
     },
     "node_modules/gaxios/node_modules/whatwg-url": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
       "license": "MIT",
       "dependencies": {
         "tr46": "~0.0.3",
@@ -23745,13 +22245,10 @@
       }
     },
     "node_modules/gcp-metadata": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-6.1.1.tgz",
-      "integrity": "sha512-a4tiq7E0/5fTjxPAaH4jpjkSv/uCaU2p5KC6HVGrvl0cDjA8iBZv4vv1gyzlmK0ZUKqwpOyQMKzZQe3lTit77A==",
+      "version": "6.1.0",
       "license": "Apache-2.0",
       "dependencies": {
-        "gaxios": "^6.1.1",
-        "google-logging-utils": "^0.0.2",
+        "gaxios": "^6.0.0",
         "json-bigint": "^1.0.0"
       },
       "engines": {
@@ -23760,18 +22257,18 @@
     },
     "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,
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
+    "node_modules/geographiclib-geodesic": {
+      "version": "2.1.1",
+      "license": "MIT"
+    },
     "node_modules/geojson": {
       "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/geojson/-/geojson-0.5.0.tgz",
-      "integrity": "sha512-/Bx5lEn+qRF4TfQ5aLu6NH+UKtvIv7Lhc487y/c8BdludrCTpiWf9wyI0RTyqg49MFefIAvFDuEi5Dfd/zgNxQ==",
       "license": "MIT",
       "engines": {
         "node": ">= 0.10"
@@ -23779,66 +22276,60 @@
     },
     "node_modules/geojson-flatten": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/geojson-flatten/-/geojson-flatten-1.1.1.tgz",
-      "integrity": "sha512-k/6BCd0qAt7vdqdM1LkLfAy72EsLDy0laNwX0x2h49vfYCiQkRc4PSra8DNEdJ10EKRpwEvDXMb0dBknTJuWpQ==",
       "license": "BSD-2-Clause"
     },
     "node_modules/geojson-vt": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/geojson-vt/-/geojson-vt-3.2.1.tgz",
-      "integrity": "sha512-EvGQQi/zPrDA6zr6BnJD/YhwAkBP8nnJ9emh3EnHQKVMfg/MRVtPbMYdgVy/IaEmn4UfagD2a6fafPDL5hbtwg==",
+      "version": "4.0.2",
       "license": "ISC"
     },
     "node_modules/geolib": {
-      "version": "2.0.24",
-      "resolved": "https://registry.npmjs.org/geolib/-/geolib-2.0.24.tgz",
-      "integrity": "sha512-NR0AyYyEnGrFS9JvSFmmotQDxVCORJgDHdvBwSatxl5aHarOLMh3KuGI83bCvCfObjfoEiDe8Ung8GGLGAtthw=="
+      "version": "2.0.24"
     },
     "node_modules/geostyler": {
-      "version": "12.0.2",
-      "resolved": "https://registry.npmjs.org/geostyler/-/geostyler-12.0.2.tgz",
-      "integrity": "sha512-H5Jgszl+UU6/mrMznRTh815ZQpv4zkPwv4Nomi3jS68I6Afmx01s+403UGPTufiT/j7g/ZOSyOH3avBhAYvbaw==",
+      "version": "14.2.0",
       "license": "BSD-2-Clause",
       "dependencies": {
+        "@ant-design/icons": "^5.3.7",
         "@babel/polyfill": "^7.12.1",
-        "@dnd-kit/core": "^6.0.6",
-        "@dnd-kit/sortable": "^7.0.1",
-        "@dnd-kit/utilities": "^3.2.1",
-        "@monaco-editor/react": "^4.4.6",
-        "@types/chroma-js": "^2.1.4",
-        "@types/color": "^3.0.3",
-        "@types/file-saver": "^2.0.5",
-        "@types/geojson": "^7946.0.10",
-        "@types/lodash": "^4.14.188",
-        "@types/react-color": "^3.0.6",
+        "@dnd-kit/core": "^6.1.0",
+        "@dnd-kit/sortable": "^8.0.0",
+        "@dnd-kit/utilities": "^3.2.2",
+        "@monaco-editor/react": "^4.6.0",
+        "@types/chroma-js": "^2.4.4",
+        "@types/color": "^3.0.6",
+        "@types/file-saver": "^2.0.7",
+        "@types/geojson": "^7946.0.14",
+        "@types/lodash": "^4.17.4",
         "@ungap/url-search-params": "^0.2.2",
+        "antd": "^5.17.3",
         "blob": "^0.1.0",
         "chroma-js": "^2.4.2",
         "color": "^4.2.3",
-        "csstype": "^3.1.1",
+        "csstype": "^3.1.3",
         "file-saver": "^2.0.5",
-        "geostyler-cql-parser": "^3.0.1",
+        "geostyler-cql-parser": "^3.0.2",
         "geostyler-data": "^1.0.0",
         "geostyler-geojson-parser": "^1.0.1",
-        "geostyler-openlayers-parser": "^4.1.0",
-        "geostyler-sld-parser": "^5.0.0",
-        "geostyler-style": "^7.2.0",
+        "geostyler-mapbox-parser": "^5.0.1",
+        "geostyler-openlayers-parser": "^4.3.0",
+        "geostyler-qgis-parser": "^2.0.0",
+        "geostyler-sld-parser": "^5.3.1",
+        "geostyler-style": "^8.1.0",
         "geostyler-wfs-parser": "^2.0.0",
         "lodash": "^4.17.21",
-        "moment": "^2.29.4",
-        "monaco-editor": "^0.34.1",
-        "react-color": "^2.19.3",
-        "react-rnd": "^10.3.7",
-        "typescript-json-schema": "^0.55.0"
+        "monaco-editor": "^0.49.0",
+        "proj4": "^2.11.0",
+        "typescript-json-schema": "^0.64.0"
       },
       "engines": {
-        "node": ">=10.0.0"
+        "node": ">=18.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/geostyler"
       },
       "peerDependencies": {
-        "@ant-design/icons": ">=4.x",
         "@types/react": ">=16.x",
         "@types/react-dom": ">=16.x",
-        "antd": "4.x",
         "ol": ">=6.x",
         "react": ">=16.x",
         "react-dom": ">=16.x"
@@ -23846,8 +22337,6 @@
     },
     "node_modules/geostyler-cql-parser": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/geostyler-cql-parser/-/geostyler-cql-parser-3.0.2.tgz",
-      "integrity": "sha512-nfQOnWwFSrWtgl7DRmhwoa3r0BnpsMvEv7rb5D8ihpCUQS/YP09C2C1j6zKQVSnYRMl0545VnhtYtqejMgPaBg==",
       "license": "BSD-2-Clause",
       "dependencies": {
         "geostyler-style": "^7.2.0",
@@ -23856,8 +22345,6 @@
     },
     "node_modules/geostyler-data": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/geostyler-data/-/geostyler-data-1.0.0.tgz",
-      "integrity": "sha512-ctmk6OsunL427Uaa1HME/blTyBbl0Ihu+vPV1Irqz3ip80qvNLwDEr46xI5HwMeyrsWH8o76kfA0sF6oecW1BA==",
       "license": "BSD-2-Clause",
       "dependencies": {
         "@types/geojson": "7946.0.7",
@@ -23866,20 +22353,14 @@
     },
     "node_modules/geostyler-data/node_modules/@types/geojson": {
       "version": "7946.0.7",
-      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.7.tgz",
-      "integrity": "sha512-wE2v81i4C4Ol09RtsWFAqg3BUitWbHSpSlIo+bNdsCJijO9sjme+zm+73ZMCa/qMC8UEERxzGbvmr1cffo2SiQ==",
       "license": "MIT"
     },
     "node_modules/geostyler-data/node_modules/@types/json-schema": {
       "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.3.tgz",
-      "integrity": "sha512-Il2DtDVRGDcqjDtE+rF8iqg1CArehSK84HZJCT7AMITlyXRBpuPhqGLDQMowraqqu1coEaimg4ZOqggt6L6L+A==",
       "license": "MIT"
     },
     "node_modules/geostyler-geojson-parser": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/geostyler-geojson-parser/-/geostyler-geojson-parser-1.0.1.tgz",
-      "integrity": "sha512-b7eJ2sCrYCC7fIDItxfbDH9r55dE58OXTQjPb/kIlXgH+7A2o2xp7pQlRXu5xCqM5lucQAAM9A7IfLLhbflznw==",
       "license": "BSD-2-Clause",
       "dependencies": {
         "@babel/polyfill": "^7.4.4",
@@ -23892,8 +22373,6 @@
     },
     "node_modules/geostyler-geojson-parser/node_modules/@jest/types": {
       "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
-      "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
       "license": "MIT",
       "dependencies": {
         "@types/istanbul-lib-coverage": "^2.0.0",
@@ -23906,8 +22385,6 @@
     },
     "node_modules/geostyler-geojson-parser/node_modules/@types/istanbul-reports": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz",
-      "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==",
       "license": "MIT",
       "dependencies": {
         "@types/istanbul-lib-coverage": "*",
@@ -23916,8 +22393,6 @@
     },
     "node_modules/geostyler-geojson-parser/node_modules/@types/jest": {
       "version": "24.9.1",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-24.9.1.tgz",
-      "integrity": "sha512-Fb38HkXSVA4L8fGKEZ6le5bB8r6MRWlOCZbVuWZcmOMSCd2wCYOwN1ibj8daIoV9naq7aaOZjrLCoCMptKU/4Q==",
       "license": "MIT",
       "dependencies": {
         "jest-diff": "^24.3.0"
@@ -23925,14 +22400,10 @@
     },
     "node_modules/geostyler-geojson-parser/node_modules/@types/node": {
       "version": "12.20.55",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.55.tgz",
-      "integrity": "sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==",
       "license": "MIT"
     },
     "node_modules/geostyler-geojson-parser/node_modules/@types/yargs": {
       "version": "13.0.12",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.12.tgz",
-      "integrity": "sha512-qCxJE1qgz2y0hA4pIxjBR+PelCH0U5CK1XJXFwCNqfmliatKp47UCXXE9Dyk1OXBDLvsCF57TqQEJaeLfDYEOQ==",
       "license": "MIT",
       "dependencies": {
         "@types/yargs-parser": "*"
@@ -23940,8 +22411,6 @@
     },
     "node_modules/geostyler-geojson-parser/node_modules/ansi-regex": {
       "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -23949,8 +22418,6 @@
     },
     "node_modules/geostyler-geojson-parser/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==",
       "license": "MIT",
       "dependencies": {
         "color-convert": "^1.9.0"
@@ -23961,8 +22428,6 @@
     },
     "node_modules/geostyler-geojson-parser/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==",
       "license": "MIT",
       "dependencies": {
         "ansi-styles": "^3.2.1",
@@ -23975,8 +22440,6 @@
     },
     "node_modules/geostyler-geojson-parser/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==",
       "license": "MIT",
       "dependencies": {
         "color-name": "1.1.3"
@@ -23984,14 +22447,10 @@
     },
     "node_modules/geostyler-geojson-parser/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==",
       "license": "MIT"
     },
     "node_modules/geostyler-geojson-parser/node_modules/diff-sequences": {
       "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.9.0.tgz",
-      "integrity": "sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==",
       "license": "MIT",
       "engines": {
         "node": ">= 6"
@@ -23999,8 +22458,6 @@
     },
     "node_modules/geostyler-geojson-parser/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==",
       "license": "MIT",
       "engines": {
         "node": ">=0.8.0"
@@ -24008,8 +22465,6 @@
     },
     "node_modules/geostyler-geojson-parser/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==",
       "license": "MIT",
       "engines": {
         "node": ">=4"
@@ -24017,8 +22472,6 @@
     },
     "node_modules/geostyler-geojson-parser/node_modules/jest-diff": {
       "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-24.9.0.tgz",
-      "integrity": "sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==",
       "license": "MIT",
       "dependencies": {
         "chalk": "^2.0.1",
@@ -24032,8 +22485,6 @@
     },
     "node_modules/geostyler-geojson-parser/node_modules/jest-get-type": {
       "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz",
-      "integrity": "sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==",
       "license": "MIT",
       "engines": {
         "node": ">= 6"
@@ -24041,8 +22492,6 @@
     },
     "node_modules/geostyler-geojson-parser/node_modules/pretty-format": {
       "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz",
-      "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==",
       "license": "MIT",
       "dependencies": {
         "@jest/types": "^24.9.0",
@@ -24056,14 +22505,10 @@
     },
     "node_modules/geostyler-geojson-parser/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==",
       "license": "MIT"
     },
     "node_modules/geostyler-geojson-parser/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==",
       "license": "MIT",
       "dependencies": {
         "has-flag": "^3.0.0"
@@ -24072,10 +22517,38 @@
         "node": ">=4"
       }
     },
+    "node_modules/geostyler-mapbox-parser": {
+      "version": "5.0.1",
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "@types/mapbox-gl": "^2.7.18",
+        "geostyler-style": "^8.0.0"
+      },
+      "engines": {
+        "node": ">=18",
+        "npm": ">=9"
+      },
+      "funding": {
+        "url": "https://opencollective.com/geostyler"
+      }
+    },
+    "node_modules/geostyler-mapbox-parser/node_modules/geostyler-style": {
+      "version": "8.1.0",
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "@types/lodash": "^4.14.201",
+        "lodash": "^4.17.21"
+      },
+      "engines": {
+        "node": ">=16.0.0",
+        "npm": ">=6.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/geostyler"
+      }
+    },
     "node_modules/geostyler-openlayers-parser": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/geostyler-openlayers-parser/-/geostyler-openlayers-parser-4.3.0.tgz",
-      "integrity": "sha512-9LoctzoxorZogOpp6nXT6SZGnISRpNR9M+MLyhYVTFlOtDi4Gb4fWbUnpqVzDxqMNl8anMmv7cpMsmw1bjWsLw==",
       "license": "BSD-2-Clause",
       "dependencies": {
         "css-font-parser": "^2.0.0",
@@ -24093,8 +22566,6 @@
     },
     "node_modules/geostyler-openlayers-parser/node_modules/geostyler-style": {
       "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/geostyler-style/-/geostyler-style-8.1.0.tgz",
-      "integrity": "sha512-8NgtzRc63bxC+1Vgqj/mMj77GX38CXXXWQ93PeZBdoMTkY9C/H0Anz38OrrlKdUgNVFZ/GJTNYwnX4wdaO5j6A==",
       "license": "BSD-2-Clause",
       "dependencies": {
         "@types/lodash": "^4.14.201",
@@ -24108,10 +22579,57 @@
         "url": "https://opencollective.com/geostyler"
       }
     },
+    "node_modules/geostyler-qgis-parser": {
+      "version": "2.0.1",
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "@commitlint/cli": "^19.3.0",
+        "@commitlint/config-conventional": "^19.2.2",
+        "@semantic-release/changelog": "^6.0.3",
+        "@semantic-release/git": "^10.0.1",
+        "@types/lodash": "^4.14.190",
+        "@types/xml2js": "^0.4.11",
+        "@xmldom/xmldom": "^0.8.6",
+        "buffer": "^6.0.3",
+        "color": "^4.2.3",
+        "core-js": "^3.26.1",
+        "geostyler-cql-parser": "^3.0.1",
+        "geostyler-style": "^7.2.0",
+        "lodash": "^4.17.21",
+        "semantic-release": "^24.0.0",
+        "stream": "^0.0.2",
+        "string_decoder": "^1.3.0",
+        "timers": "^0.1.1",
+        "xml2js": "^0.6.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/geostyler"
+      }
+    },
+    "node_modules/geostyler-qgis-parser/node_modules/buffer": {
+      "version": "6.0.3",
+      "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.2.1"
+      }
+    },
     "node_modules/geostyler-sld-parser": {
       "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/geostyler-sld-parser/-/geostyler-sld-parser-5.4.0.tgz",
-      "integrity": "sha512-TY/gwMoE/M8Xv8ykviC1NqygykrojvrFSCRIc/+CNww5VS0Qf9pu9JxiSQONGfR6QWDPtQrfFIoazyH67c0jTg==",
       "license": "BSD-2-Clause",
       "dependencies": {
         "fast-xml-parser": "^4.2.2",
@@ -24125,8 +22643,6 @@
     },
     "node_modules/geostyler-sld-parser/node_modules/geostyler-style": {
       "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/geostyler-style/-/geostyler-style-8.1.0.tgz",
-      "integrity": "sha512-8NgtzRc63bxC+1Vgqj/mMj77GX38CXXXWQ93PeZBdoMTkY9C/H0Anz38OrrlKdUgNVFZ/GJTNYwnX4wdaO5j6A==",
       "license": "BSD-2-Clause",
       "dependencies": {
         "@types/lodash": "^4.14.201",
@@ -24142,8 +22658,6 @@
     },
     "node_modules/geostyler-style": {
       "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/geostyler-style/-/geostyler-style-7.5.0.tgz",
-      "integrity": "sha512-0qlFOwDl9cdiiNUk6ijRSpBq+W3Kpry1aZS++BE8EPBxvbFgoTsKU6JIriKLmCqPqBmJIVnMFMUEk6Sf3n0ZIA==",
       "license": "BSD-2-Clause",
       "dependencies": {
         "@types/lodash": "^4.14.201",
@@ -24159,8 +22673,6 @@
     },
     "node_modules/geostyler-wfs-parser": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/geostyler-wfs-parser/-/geostyler-wfs-parser-2.0.3.tgz",
-      "integrity": "sha512-23gmufyveYB/jhVzxPj/eb/zkI+xWSzTKqGO7gcAh0NYUFPI+UG3WTJhzT4Dj9G+ZTpSUnXOSmkHr4M7jZsakA==",
       "license": "BSD-2-Clause",
       "dependencies": {
         "@types/geojson": "^7946.0.14",
@@ -24174,10 +22686,23 @@
         "url": "https://opencollective.com/geostyler"
       }
     },
+    "node_modules/geostyler/node_modules/geostyler-style": {
+      "version": "8.1.0",
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "@types/lodash": "^4.14.201",
+        "lodash": "^4.17.21"
+      },
+      "engines": {
+        "node": ">=16.0.0",
+        "npm": ">=6.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/geostyler"
+      }
+    },
     "node_modules/geotiff": {
       "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/geotiff/-/geotiff-2.1.3.tgz",
-      "integrity": "sha512-PT6uoF5a1+kbC3tHmZSUsLHBp2QJlHasxxxxPW47QIY1VBKpFB+FcDvX+MxER6UzgLQZ0xDzJ9s48B9JbOCTqA==",
       "license": "MIT",
       "dependencies": {
         "@petamoriken/float16": "^3.4.7",
@@ -24195,14 +22720,10 @@
     },
     "node_modules/geotiff/node_modules/pako": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-2.1.0.tgz",
-      "integrity": "sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug==",
       "license": "(MIT AND Zlib)"
     },
     "node_modules/geotiff/node_modules/quick-lru": {
       "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-6.1.2.tgz",
-      "integrity": "sha512-AAFUA5O1d83pIHEhJwWCq/RQcRukCkn/NSm2QsTEMle5f2hP0ChI2+3Xb051PZCkLryI/Ir1MVKviT2FIloaTQ==",
       "license": "MIT",
       "engines": {
         "node": ">=12"
@@ -24213,8 +22734,6 @@
     },
     "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==",
       "license": "ISC",
       "engines": {
         "node": "6.* || 8.* || >= 10.*"
@@ -24222,10 +22741,8 @@
     },
     "node_modules/get-east-asian-width": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.3.0.tgz",
-      "integrity": "sha512-vpeMIQKxczTD/0s2CdEWHcb0eeJe6TFjxb+J5xgX7hScxqrGuyjmv4c1D4A/gelKfyox0gJJwIHF+fLjeaM8kQ==",
-      "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=18"
       },
@@ -24234,17 +22751,15 @@
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
-      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
+      "version": "1.2.7",
       "license": "MIT",
       "dependencies": {
-        "call-bind-apply-helpers": "^1.0.2",
+        "call-bind-apply-helpers": "^1.0.1",
         "es-define-property": "^1.0.1",
         "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.1.1",
+        "es-object-atoms": "^1.0.0",
         "function-bind": "^1.1.2",
-        "get-proto": "^1.0.1",
+        "get-proto": "^1.0.0",
         "gopd": "^1.2.0",
         "has-symbols": "^1.1.0",
         "hasown": "^2.0.2",
@@ -24268,8 +22783,6 @@
     },
     "node_modules/get-npm-tarball-url": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/get-npm-tarball-url/-/get-npm-tarball-url-2.1.0.tgz",
-      "integrity": "sha512-ro+DiMu5DXgRBabqXupW38h7WPZ9+Ad8UjwhvsmmN8w1sU7ab0nzAXvVZ4kqYg57OrqomRtJvepX5/xvFKNtjA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -24278,8 +22791,6 @@
     },
     "node_modules/get-package-type": {
       "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
-      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -24288,8 +22799,6 @@
     },
     "node_modules/get-pkg-repo": {
       "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/get-pkg-repo/-/get-pkg-repo-4.2.1.tgz",
-      "integrity": "sha512-2+QbHjFRfGB74v/pYWjd5OhU3TDIC2Gv/YKUTk/tCvAz0pkn/Mz6P3uByuBimLOcPvN2jYdScl3xGFSrx0jEcA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -24307,8 +22816,6 @@
     },
     "node_modules/get-pkg-repo/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": {
@@ -24319,8 +22826,6 @@
     },
     "node_modules/get-pkg-repo/node_modules/hosted-git-info": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
-      "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -24332,8 +22837,6 @@
     },
     "node_modules/get-pkg-repo/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,
       "license": "ISC",
       "dependencies": {
@@ -24345,8 +22848,6 @@
     },
     "node_modules/get-pkg-repo/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": {
@@ -24363,15 +22864,11 @@
     },
     "node_modules/get-pkg-repo/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,
       "license": "ISC"
     },
     "node_modules/get-pkg-repo/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": {
@@ -24389,8 +22886,6 @@
     },
     "node_modules/get-pkg-repo/node_modules/yargs-parser": {
       "version": "20.2.9",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
       "dev": true,
       "license": "ISC",
       "engines": {
@@ -24399,8 +22894,6 @@
     },
     "node_modules/get-port": {
       "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/get-port/-/get-port-5.1.1.tgz",
-      "integrity": "sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -24412,8 +22905,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "dunder-proto": "^1.0.1",
@@ -24425,8 +22916,6 @@
     },
     "node_modules/get-stdin": {
       "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-9.0.0.tgz",
-      "integrity": "sha512-dVKBjfWisLAicarI2Sf+JuBE/DghV4UzNAVe9yhEJuzeREd3JhOTE9cUaJTeSa77fsbQUK3pcOpJfM59+VKZaA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -24438,8 +22927,6 @@
     },
     "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==",
       "license": "MIT",
       "engines": {
         "node": ">=10"
@@ -24450,8 +22937,6 @@
     },
     "node_modules/get-symbol-description": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz",
-      "integrity": "sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==",
       "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.3",
@@ -24466,9 +22951,7 @@
       }
     },
     "node_modules/get-tsconfig": {
-      "version": "4.10.1",
-      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.10.1.tgz",
-      "integrity": "sha512-auHyJ4AgMz7vgS8Hp3N6HXSmlMdUyhSUrfBF16w153rxtLIEOE+HGqaBppczZvnHLqQJfiHotCYpNhl0lUROFQ==",
+      "version": "4.10.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -24480,8 +22963,6 @@
     },
     "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,
       "license": "MIT",
       "dependencies": {
@@ -24495,8 +22976,6 @@
     },
     "node_modules/getos": {
       "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/getos/-/getos-3.2.1.tgz",
-      "integrity": "sha512-U56CfOK17OKgTVqozZjUKNdkfEv6jk5WISBJ8SHoagjE6L69zOwl3Z+O8myjY9MEW3i2HPWQBt/LTbCgcC973Q==",
       "license": "MIT",
       "dependencies": {
         "async": "^3.2.0"
@@ -24513,8 +22992,6 @@
     },
     "node_modules/gettext-parser": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/gettext-parser/-/gettext-parser-1.1.0.tgz",
-      "integrity": "sha512-zL3eayB0jF+cr6vogH/VJKoKcj7uQj2TPByaaj6a4k/3elk9iq7fiwCM2FqdzS/umo021RetSanVisarzeb9Wg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -24523,8 +23000,6 @@
     },
     "node_modules/gh-pages": {
       "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/gh-pages/-/gh-pages-6.3.0.tgz",
-      "integrity": "sha512-Ot5lU6jK0Eb+sszG8pciXdjMXdBJ5wODvgjR+imihTqsUWF2K6dJ9HST55lgqcs8wWcw6o6wAsUzfcYRhJPXbA==",
       "license": "MIT",
       "dependencies": {
         "async": "^3.2.4",
@@ -24545,8 +23020,6 @@
     },
     "node_modules/gh-pages/node_modules/commander": {
       "version": "13.1.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-13.1.0.tgz",
-      "integrity": "sha512-/rFeCpNJQbhSZjGVwO9RFV3xPqbnERS8MmIQzCtD/zl6gpJuV/bMLuN92oG3F7d8oDEHHRrujSXNUr8fpjntKw==",
       "license": "MIT",
       "engines": {
         "node": ">=18"
@@ -24554,8 +23027,6 @@
     },
     "node_modules/gh-pages/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==",
       "license": "MIT",
       "dependencies": {
         "commondir": "^1.0.1",
@@ -24571,8 +23042,6 @@
     },
     "node_modules/gh-pages/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==",
       "license": "MIT",
       "dependencies": {
         "locate-path": "^5.0.0",
@@ -24584,8 +23053,6 @@
     },
     "node_modules/gh-pages/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==",
       "license": "MIT",
       "dependencies": {
         "p-locate": "^4.1.0"
@@ -24596,8 +23063,6 @@
     },
     "node_modules/gh-pages/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==",
       "license": "MIT",
       "dependencies": {
         "semver": "^6.0.0"
@@ -24611,8 +23076,6 @@
     },
     "node_modules/gh-pages/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==",
       "license": "MIT",
       "dependencies": {
         "p-try": "^2.0.0"
@@ -24626,8 +23089,6 @@
     },
     "node_modules/gh-pages/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==",
       "license": "MIT",
       "dependencies": {
         "p-limit": "^2.2.0"
@@ -24638,8 +23099,6 @@
     },
     "node_modules/gh-pages/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==",
       "license": "MIT",
       "dependencies": {
         "find-up": "^4.0.0"
@@ -24650,46 +23109,68 @@
     },
     "node_modules/gh-pages/node_modules/semver": {
       "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
     },
     "node_modules/giget": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/giget/-/giget-1.2.5.tgz",
-      "integrity": "sha512-r1ekGw/Bgpi3HLV3h1MRBIlSAdHoIMklpaQ3OQLFcRw9PwAj2rqigvIbg+dBUI51OxVI2jsEtDywDBjSiuf7Ug==",
+      "version": "1.2.3",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "citty": "^0.1.6",
-        "consola": "^3.4.0",
+        "consola": "^3.2.3",
         "defu": "^6.1.4",
-        "node-fetch-native": "^1.6.6",
-        "nypm": "^0.5.4",
-        "pathe": "^2.0.3",
-        "tar": "^6.2.1"
+        "node-fetch-native": "^1.6.3",
+        "nypm": "^0.3.8",
+        "ohash": "^1.1.3",
+        "pathe": "^1.1.2",
+        "tar": "^6.2.0"
       },
       "bin": {
         "giget": "dist/cli.mjs"
       }
     },
     "node_modules/git-hooks-list": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/git-hooks-list/-/git-hooks-list-4.1.1.tgz",
-      "integrity": "sha512-cmP497iLq54AZnv4YRAEMnEyQ1eIn4tGKbmswqwmFV4GBnAqE8NLtWxxdXa++AalfgL5EBH4IxTPyquEuGY/jA==",
+      "version": "3.1.0",
       "dev": true,
       "license": "MIT",
       "funding": {
         "url": "https://github.com/fisker/git-hooks-list?sponsor=1"
       }
     },
+    "node_modules/git-log-parser": {
+      "version": "1.2.1",
+      "license": "MIT",
+      "dependencies": {
+        "argv-formatter": "~1.0.0",
+        "spawn-error-forwarder": "~1.0.0",
+        "split2": "~1.0.0",
+        "stream-combiner2": "~1.1.1",
+        "through2": "~2.0.0",
+        "traverse": "0.6.8"
+      }
+    },
+    "node_modules/git-log-parser/node_modules/split2": {
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "through2": "~2.0.0"
+      }
+    },
+    "node_modules/git-log-parser/node_modules/traverse": {
+      "version": "0.6.8",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/git-raw-commits": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-3.0.0.tgz",
-      "integrity": "sha512-b5OHmZ3vAgGrDn/X0kS+9qCfNKWe4K/jFnhwzVWWg0/k5eLa3060tZShrRg8Dja5kPc+YjS0Gc6y7cRr44Lpjw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -24706,8 +23187,6 @@
     },
     "node_modules/git-remote-origin-url": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz",
-      "integrity": "sha512-eU+GGrZgccNJcsDH5LkXR3PB9M958hxc7sbA8DFJjrv9j4L2P/eZfKhM+QD6wyzpiv+b1BpK0XrYCxkovtjSLw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -24720,8 +23199,6 @@
     },
     "node_modules/git-semver-tags": {
       "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-5.0.1.tgz",
-      "integrity": "sha512-hIvOeZwRbQ+7YEUmCkHqo8FOLQZCEn18yevLHADlFPZY02KJGsu5FZt9YW/lybfK2uhWFI7Qg/07LekJiTv7iA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -24737,8 +23214,6 @@
     },
     "node_modules/git-up": {
       "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/git-up/-/git-up-7.0.0.tgz",
-      "integrity": "sha512-ONdIrbBCFusq1Oy0sC71F5azx8bVkvtZtMJAsv+a6lz5YAmbNnLD6HAB4gptHZVLPR8S2/kVN6Gab7lryq5+lQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -24748,8 +23223,6 @@
     },
     "node_modules/git-url-parse": {
       "version": "14.0.0",
-      "resolved": "https://registry.npmjs.org/git-url-parse/-/git-url-parse-14.0.0.tgz",
-      "integrity": "sha512-NnLweV+2A4nCvn4U/m2AoYu0pPKlsmhK9cknG7IMwsjFY1S2jxM+mAhsDxyxfCIGfGaD+dozsyX4b6vkYc83yQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -24758,8 +23231,6 @@
     },
     "node_modules/gitconfiglocal": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz",
-      "integrity": "sha512-spLUXeTAVHxDtKsJc8FkFVgFtMdEN9qPGpL23VfSHx4fP4+Ds097IXLvymbnDH8FnmxX5Nr9bPw3A+AQ6mWEaQ==",
       "dev": true,
       "license": "BSD",
       "dependencies": {
@@ -24768,262 +23239,52 @@
     },
     "node_modules/gitconfiglocal/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/github-slugger": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/github-slugger/-/github-slugger-2.0.0.tgz",
-      "integrity": "sha512-IaOQ9puYtjrkq7Y0Ygl9KDZnrf/aiUJYUpVf89y8kyaxbRG7Y1SrX/jaumrv81vc61+kiMempujsM3Yw7w5qcw==",
       "dev": true,
       "license": "ISC"
     },
     "node_modules/github-username": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/github-username/-/github-username-9.0.0.tgz",
-      "integrity": "sha512-lY7+mymwQUEhRwWTLxieKkxcZkVNnUh8iAGnl30DMB1ZtYODHkMAckZk8Jx5dLQs1YKPYM2ibnzQu02aCLFcYQ==",
+      "version": "8.0.0",
+      "dev": true,
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "@octokit/rest": "^21.1.1"
+        "@octokit/rest": "^19.0.13"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=16"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/github-username/node_modules/@octokit/auth-token": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-5.1.2.tgz",
-      "integrity": "sha512-JcQDsBdg49Yky2w2ld20IHAlwr8d/d8N6NiOXbtuoPCqzbsiJgF633mVUw3x4mo0H5ypataQIX7SFu3yy44Mpw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 18"
-      }
-    },
-    "node_modules/github-username/node_modules/@octokit/core": {
-      "version": "6.1.5",
-      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-6.1.5.tgz",
-      "integrity": "sha512-vvmsN0r7rguA+FySiCsbaTTobSftpIDIpPW81trAmsv9TGxg3YCujAxRYp/Uy8xmDgYCzzgulG62H7KYUFmeIg==",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/auth-token": "^5.0.0",
-        "@octokit/graphql": "^8.2.2",
-        "@octokit/request": "^9.2.3",
-        "@octokit/request-error": "^6.1.8",
-        "@octokit/types": "^14.0.0",
-        "before-after-hook": "^3.0.2",
-        "universal-user-agent": "^7.0.0"
-      },
-      "engines": {
-        "node": ">= 18"
-      }
-    },
-    "node_modules/github-username/node_modules/@octokit/core/node_modules/@octokit/types": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-14.1.0.tgz",
-      "integrity": "sha512-1y6DgTy8Jomcpu33N+p5w58l6xyt55Ar2I91RPiIA0xCJBXyUAhXCcmZaDWSANiha7R9a6qJJ2CRomGPZ6f46g==",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/openapi-types": "^25.1.0"
-      }
-    },
-    "node_modules/github-username/node_modules/@octokit/endpoint": {
-      "version": "10.1.4",
-      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-10.1.4.tgz",
-      "integrity": "sha512-OlYOlZIsfEVZm5HCSR8aSg02T2lbUWOsCQoPKfTXJwDzcHQBrVBGdGXb89dv2Kw2ToZaRtudp8O3ZIYoaOjKlA==",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/types": "^14.0.0",
-        "universal-user-agent": "^7.0.2"
-      },
-      "engines": {
-        "node": ">= 18"
-      }
-    },
-    "node_modules/github-username/node_modules/@octokit/endpoint/node_modules/@octokit/types": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-14.1.0.tgz",
-      "integrity": "sha512-1y6DgTy8Jomcpu33N+p5w58l6xyt55Ar2I91RPiIA0xCJBXyUAhXCcmZaDWSANiha7R9a6qJJ2CRomGPZ6f46g==",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/openapi-types": "^25.1.0"
-      }
-    },
-    "node_modules/github-username/node_modules/@octokit/graphql": {
-      "version": "8.2.2",
-      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-8.2.2.tgz",
-      "integrity": "sha512-Yi8hcoqsrXGdt0yObxbebHXFOiUA+2v3n53epuOg1QUgOB6c4XzvisBNVXJSl8RYA5KrDuSL2yq9Qmqe5N0ryA==",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/request": "^9.2.3",
-        "@octokit/types": "^14.0.0",
-        "universal-user-agent": "^7.0.0"
-      },
-      "engines": {
-        "node": ">= 18"
-      }
-    },
-    "node_modules/github-username/node_modules/@octokit/graphql/node_modules/@octokit/types": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-14.1.0.tgz",
-      "integrity": "sha512-1y6DgTy8Jomcpu33N+p5w58l6xyt55Ar2I91RPiIA0xCJBXyUAhXCcmZaDWSANiha7R9a6qJJ2CRomGPZ6f46g==",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/openapi-types": "^25.1.0"
-      }
-    },
-    "node_modules/github-username/node_modules/@octokit/openapi-types": {
-      "version": "25.1.0",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-25.1.0.tgz",
-      "integrity": "sha512-idsIggNXUKkk0+BExUn1dQ92sfysJrje03Q0bv0e+KPLrvyqZF8MnBpFz8UNfYDwB3Ie7Z0TByjWfzxt7vseaA==",
-      "license": "MIT"
-    },
-    "node_modules/github-username/node_modules/@octokit/plugin-paginate-rest": {
-      "version": "11.6.0",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-11.6.0.tgz",
-      "integrity": "sha512-n5KPteiF7pWKgBIBJSk8qzoZWcUkza2O6A0za97pMGVrGfPdltxrfmfF5GucHYvHGZD8BdaZmmHGz5cX/3gdpw==",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/types": "^13.10.0"
-      },
-      "engines": {
-        "node": ">= 18"
-      },
-      "peerDependencies": {
-        "@octokit/core": ">=6"
-      }
-    },
-    "node_modules/github-username/node_modules/@octokit/plugin-request-log": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-5.3.1.tgz",
-      "integrity": "sha512-n/lNeCtq+9ofhC15xzmJCNKP2BWTv8Ih2TTy+jatNCCq/gQP/V7rK3fjIfuz0pDWDALO/o/4QY4hyOF6TQQFUw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 18"
-      },
-      "peerDependencies": {
-        "@octokit/core": ">=6"
-      }
-    },
-    "node_modules/github-username/node_modules/@octokit/plugin-rest-endpoint-methods": {
-      "version": "13.5.0",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-13.5.0.tgz",
-      "integrity": "sha512-9Pas60Iv9ejO3WlAX3maE1+38c5nqbJXV5GrncEfkndIpZrJ/WPMRd2xYDcPPEt5yzpxcjw9fWNoPhsSGzqKqw==",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/types": "^13.10.0"
-      },
-      "engines": {
-        "node": ">= 18"
-      },
-      "peerDependencies": {
-        "@octokit/core": ">=6"
-      }
-    },
-    "node_modules/github-username/node_modules/@octokit/request": {
-      "version": "9.2.3",
-      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-9.2.3.tgz",
-      "integrity": "sha512-Ma+pZU8PXLOEYzsWf0cn/gY+ME57Wq8f49WTXA8FMHp2Ps9djKw//xYJ1je8Hm0pR2lU9FUGeJRWOtxq6olt4w==",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/endpoint": "^10.1.4",
-        "@octokit/request-error": "^6.1.8",
-        "@octokit/types": "^14.0.0",
-        "fast-content-type-parse": "^2.0.0",
-        "universal-user-agent": "^7.0.2"
-      },
-      "engines": {
-        "node": ">= 18"
-      }
-    },
-    "node_modules/github-username/node_modules/@octokit/request-error": {
-      "version": "6.1.8",
-      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-6.1.8.tgz",
-      "integrity": "sha512-WEi/R0Jmq+IJKydWlKDmryPcmdYSVjL3ekaiEL1L9eo1sUnqMJ+grqmC9cjk7CA7+b2/T397tO5d8YLOH3qYpQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/types": "^14.0.0"
-      },
-      "engines": {
-        "node": ">= 18"
-      }
-    },
-    "node_modules/github-username/node_modules/@octokit/request-error/node_modules/@octokit/types": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-14.1.0.tgz",
-      "integrity": "sha512-1y6DgTy8Jomcpu33N+p5w58l6xyt55Ar2I91RPiIA0xCJBXyUAhXCcmZaDWSANiha7R9a6qJJ2CRomGPZ6f46g==",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/openapi-types": "^25.1.0"
-      }
-    },
-    "node_modules/github-username/node_modules/@octokit/request/node_modules/@octokit/types": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-14.1.0.tgz",
-      "integrity": "sha512-1y6DgTy8Jomcpu33N+p5w58l6xyt55Ar2I91RPiIA0xCJBXyUAhXCcmZaDWSANiha7R9a6qJJ2CRomGPZ6f46g==",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/openapi-types": "^25.1.0"
-      }
-    },
     "node_modules/github-username/node_modules/@octokit/rest": {
-      "version": "21.1.1",
-      "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-21.1.1.tgz",
-      "integrity": "sha512-sTQV7va0IUVZcntzy1q3QqPm/r8rWtDCqpRAmb8eXXnKkjoQEtFe3Nt5GTVsHft+R6jJoHeSiVLcgcvhtue/rg==",
+      "version": "19.0.13",
+      "dev": true,
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "@octokit/core": "^6.1.4",
-        "@octokit/plugin-paginate-rest": "^11.4.2",
-        "@octokit/plugin-request-log": "^5.3.1",
-        "@octokit/plugin-rest-endpoint-methods": "^13.3.0"
+        "@octokit/core": "^4.2.1",
+        "@octokit/plugin-paginate-rest": "^6.1.2",
+        "@octokit/plugin-request-log": "^1.0.4",
+        "@octokit/plugin-rest-endpoint-methods": "^7.1.2"
       },
       "engines": {
-        "node": ">= 18"
+        "node": ">= 14"
       }
     },
-    "node_modules/github-username/node_modules/before-after-hook": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-3.0.2.tgz",
-      "integrity": "sha512-Nik3Sc0ncrMK4UUdXQmAnRtzmNQTAAXmXIopizwZ1W1t8QmfJj+zL4OA2I7XPTPW5z5TDqv4hRo/JzouDJnX3A==",
-      "license": "Apache-2.0"
-    },
-    "node_modules/github-username/node_modules/fast-content-type-parse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fast-content-type-parse/-/fast-content-type-parse-2.0.1.tgz",
-      "integrity": "sha512-nGqtvLrj5w0naR6tDPfB4cUmYCqouzyQiz6C5y/LtcDllJdrcc6WaWW6iXyIIOErTa/XRybj28aasdn4LkVk6Q==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fastify"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/fastify"
-        }
-      ],
-      "license": "MIT"
-    },
-    "node_modules/github-username/node_modules/universal-user-agent": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-7.0.3.tgz",
-      "integrity": "sha512-TmnEAEAsBJVZM/AADELsK76llnwcf9vMKuPz8JflO1frO8Lchitr0fNaN9d+Ap0BjKtqWqd/J17qeDnXh8CL2A==",
-      "license": "ISC"
-    },
     "node_modules/gl-matrix": {
       "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/gl-matrix/-/gl-matrix-3.4.3.tgz",
-      "integrity": "sha512-wcCp8vu8FT22BnvKVPjXa/ICBWRq/zjFfdofZy1WSpQZpphblv12/bOQLBC1rMM7SGOFS9ltVmKOHil5+Ml7gA==",
       "license": "MIT"
     },
     "node_modules/glob": {
       "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "deprecated": "Glob versions prior to v9 are no longer supported",
       "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
@@ -25042,8 +23303,6 @@
     },
     "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==",
       "license": "ISC",
       "dependencies": {
         "is-glob": "^4.0.1"
@@ -25054,22 +23313,36 @@
     },
     "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,
       "license": "BSD-2-Clause"
     },
     "node_modules/global-box": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/global-box/-/global-box-2.0.2.tgz",
-      "integrity": "sha512-vVSNq3+oEEqG565ProXN7iKHcK8hehtbXNLjsOmywHDTBXlwgP/Bt1Soqf4NGeOq3W3u1o7UE3t0RgiNG0BTkQ==",
       "license": "Apache-2.0",
       "peer": true
     },
+    "node_modules/global-directory": {
+      "version": "4.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "ini": "4.1.1"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/global-directory/node_modules/ini": {
+      "version": "4.1.1",
+      "license": "ISC",
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
     "node_modules/global-dirs": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.1.tgz",
-      "integrity": "sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA==",
       "license": "MIT",
       "dependencies": {
         "ini": "2.0.0"
@@ -25083,8 +23356,6 @@
     },
     "node_modules/global-dirs/node_modules/ini": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz",
-      "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==",
       "license": "ISC",
       "engines": {
         "node": ">=10"
@@ -25092,8 +23363,6 @@
     },
     "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==",
       "license": "MIT",
       "engines": {
         "node": ">=4"
@@ -25101,8 +23370,6 @@
     },
     "node_modules/globalthis": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz",
-      "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
       "license": "MIT",
       "dependencies": {
         "define-properties": "^1.2.1",
@@ -25117,8 +23384,6 @@
     },
     "node_modules/globby": {
       "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
       "license": "MIT",
       "dependencies": {
         "array-union": "^2.1.0",
@@ -25137,17 +23402,13 @@
     },
     "node_modules/globby/node_modules/slash": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
       "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/google-auth-library": {
-      "version": "9.15.1",
-      "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-9.15.1.tgz",
-      "integrity": "sha512-Jb6Z0+nvECVz+2lzSMt9u98UsoakXxA2HGHMCxh+so3n90XgYWkq5dur19JAJV7ONiJY22yBTyJB1TSkvPq9Ng==",
+      "version": "9.15.0",
       "license": "Apache-2.0",
       "dependencies": {
         "base64-js": "^1.3.0",
@@ -25161,19 +23422,8 @@
         "node": ">=14"
       }
     },
-    "node_modules/google-logging-utils": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/google-logging-utils/-/google-logging-utils-0.0.2.tgz",
-      "integrity": "sha512-NEgUnEcBiP5HrPzufUkBzJOD/Sxsco3rLNo1F1TNf7ieU8ryUzBhqba8r756CjLX7rn3fHl6iLEwPYuqpoKgQQ==",
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=14"
-      }
-    },
     "node_modules/googleapis": {
       "version": "130.0.0",
-      "resolved": "https://registry.npmjs.org/googleapis/-/googleapis-130.0.0.tgz",
-      "integrity": "sha512-+ZSOowVv+vGBTueu1Ot9O7EqC0U4PS9l7fUjzc0ThCT4w4g+r78Vgn17q7eGBB5JMu4hxYC1hbbm1U/MCnYFdg==",
       "license": "Apache-2.0",
       "dependencies": {
         "google-auth-library": "^9.0.0",
@@ -25185,8 +23435,6 @@
     },
     "node_modules/googleapis-common": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/googleapis-common/-/googleapis-common-7.2.0.tgz",
-      "integrity": "sha512-/fhDZEJZvOV3X5jmD+fKxMqma5q2Q9nZNSF3kn1F18tpxmA86BcTxAGBQdM0N89Z3bEaIs+HVznSmFJEAmMTjA==",
       "license": "Apache-2.0",
       "dependencies": {
         "extend": "^3.0.2",
@@ -25202,8 +23450,6 @@
     },
     "node_modules/gopd": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
-      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"
@@ -25214,8 +23460,6 @@
     },
     "node_modules/got": {
       "version": "11.8.6",
-      "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz",
-      "integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -25240,26 +23484,18 @@
     },
     "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==",
       "license": "ISC"
     },
     "node_modules/graphemer": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
-      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
       "license": "MIT"
     },
     "node_modules/grid-index": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/grid-index/-/grid-index-1.1.0.tgz",
-      "integrity": "sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA==",
       "license": "ISC"
     },
     "node_modules/gtoken": {
       "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-7.1.0.tgz",
-      "integrity": "sha512-pCcEwRi+TKpMlxAQObHDQ56KawURgyAf6jtIY046fJ5tIv3zDe/LEIubckAO8fj6JnAxLdmWkUfNyulQ2iKdEw==",
       "license": "MIT",
       "dependencies": {
         "gaxios": "^6.0.0",
@@ -25271,8 +23507,6 @@
     },
     "node_modules/gunzip-maybe": {
       "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/gunzip-maybe/-/gunzip-maybe-1.4.2.tgz",
-      "integrity": "sha512-4haO1M4mLO91PW57BMsDFf75UmwoRX0GkdD+Faw+Lr+r/OZrOCS0pIBwOL1xCKQqnQzbNFGgK2V2CpBUPeFNTw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -25289,8 +23523,6 @@
     },
     "node_modules/gzip-size": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz",
-      "integrity": "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -25305,8 +23537,6 @@
     },
     "node_modules/hammerjs": {
       "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz",
-      "integrity": "sha512-tSQXBXS/MWQOn/RKckawJ61vvsDpCom87JgxiYdGwHdOa0ht0vzUWDlfioofFCRU0L+6NGDt6XzbgoJvZkMeRQ==",
       "license": "MIT",
       "engines": {
         "node": ">=0.8.0"
@@ -25314,15 +23544,11 @@
     },
     "node_modules/handle-thing": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
-      "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/handlebars": {
       "version": "4.7.8",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz",
-      "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==",
       "license": "MIT",
       "dependencies": {
         "minimist": "^1.2.5",
@@ -25342,8 +23568,6 @@
     },
     "node_modules/handlebars-group-by": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/handlebars-group-by/-/handlebars-group-by-1.0.1.tgz",
-      "integrity": "sha512-qwVVDVAJMBKdmnQU8jcEXGOu+4/2YJX1RP3pUw6Ee9t6gdkxt+dJEWDudSFTgqb35KXrktw/Nn/Dp3Rx5muHpg==",
       "license": "MIT",
       "engines": {
         "node": ">= 0.10"
@@ -25351,8 +23575,6 @@
     },
     "node_modules/handlebars/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==",
       "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
@@ -25360,8 +23582,6 @@
     },
     "node_modules/hard-rejection": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
-      "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -25370,8 +23590,6 @@
     },
     "node_modules/has": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.4.tgz",
-      "integrity": "sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==",
       "license": "MIT",
       "engines": {
         "node": ">= 0.4.0"
@@ -25379,8 +23597,6 @@
     },
     "node_modules/has-bigints": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz",
-      "integrity": "sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==",
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"
@@ -25391,8 +23607,6 @@
     },
     "node_modules/has-color": {
       "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz",
-      "integrity": "sha512-kaNz5OTAYYmt646Hkqw50/qyxP2vFnTVu5AQ1Zmk22Kk5+4Qx6BpO8+u7IKsML5fOsFk0ZT0AcCJNYwcvaLBvw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -25401,8 +23615,6 @@
     },
     "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==",
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -25410,8 +23622,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "es-define-property": "^1.0.0"
@@ -25422,8 +23632,6 @@
     },
     "node_modules/has-proto": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.2.0.tgz",
-      "integrity": "sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==",
       "license": "MIT",
       "dependencies": {
         "dunder-proto": "^1.0.0"
@@ -25437,8 +23645,6 @@
     },
     "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==",
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"
@@ -25449,8 +23655,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "has-symbols": "^1.0.3"
@@ -25464,18 +23668,12 @@
     },
     "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,
       "license": "ISC"
     },
     "node_modules/hasha": {
       "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/hasha/-/hasha-5.2.2.tgz",
-      "integrity": "sha512-Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ==",
-      "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "is-stream": "^2.0.0",
         "type-fest": "^0.8.0"
@@ -25489,19 +23687,13 @@
     },
     "node_modules/hasha/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,
       "license": "(MIT OR CC0-1.0)",
-      "peer": true,
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/hasown": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
       "license": "MIT",
       "dependencies": {
         "function-bind": "^1.1.2"
@@ -25511,16 +23703,14 @@
       }
     },
     "node_modules/hast-util-from-parse5": {
-      "version": "8.0.3",
-      "resolved": "https://registry.npmjs.org/hast-util-from-parse5/-/hast-util-from-parse5-8.0.3.tgz",
-      "integrity": "sha512-3kxEVkEKt0zvcZ3hCRYI8rqrgwtlIOFMWkbclACvjlDw8Li9S2hk/d51OI0nr/gIpdMHNepwgOKqZ/sy0Clpyg==",
+      "version": "8.0.2",
       "license": "MIT",
       "dependencies": {
         "@types/hast": "^3.0.0",
         "@types/unist": "^3.0.0",
         "devlop": "^1.0.0",
         "hastscript": "^9.0.0",
-        "property-information": "^7.0.0",
+        "property-information": "^6.0.0",
         "vfile": "^6.0.0",
         "vfile-location": "^5.0.0",
         "web-namespaces": "^2.0.0"
@@ -25532,8 +23722,6 @@
     },
     "node_modules/hast-util-from-parse5/node_modules/@types/hast": {
       "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.4.tgz",
-      "integrity": "sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==",
       "license": "MIT",
       "dependencies": {
         "@types/unist": "*"
@@ -25541,14 +23729,10 @@
     },
     "node_modules/hast-util-from-parse5/node_modules/@types/unist": {
       "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz",
-      "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==",
       "license": "MIT"
     },
     "node_modules/hast-util-from-parse5/node_modules/hast-util-parse-selector": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-4.0.0.tgz",
-      "integrity": "sha512-wkQCkSYoOGCRKERFWcxMVMOcYE2K1AaNLU8DXS9arxnLOUEWbOXKXiJUNzEpqZ3JOKpnha3jkFrumEjVliDe7A==",
       "license": "MIT",
       "dependencies": {
         "@types/hast": "^3.0.0"
@@ -25559,15 +23743,13 @@
       }
     },
     "node_modules/hast-util-from-parse5/node_modules/hastscript": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/hastscript/-/hastscript-9.0.1.tgz",
-      "integrity": "sha512-g7df9rMFX/SPi34tyGCyUBREQoKkapwdY/T04Qn9TDWfHhAYt4/I0gMVirzK5wEzeUqIjEB+LXC/ypb7Aqno5w==",
+      "version": "9.0.0",
       "license": "MIT",
       "dependencies": {
         "@types/hast": "^3.0.0",
         "comma-separated-tokens": "^2.0.0",
         "hast-util-parse-selector": "^4.0.0",
-        "property-information": "^7.0.0",
+        "property-information": "^6.0.0",
         "space-separated-tokens": "^2.0.0"
       },
       "funding": {
@@ -25575,20 +23757,8 @@
         "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/hast-util-from-parse5/node_modules/property-information": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/property-information/-/property-information-7.1.0.tgz",
-      "integrity": "sha512-TwEZ+X+yCJmYfL7TPUOcvBZ4QfoT5YenQiJuX//0th53DE6w0xxLEtfK3iyryQFddXuvkIk51EEgrJQ0WJkOmQ==",
-      "license": "MIT",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
     "node_modules/hast-util-from-parse5/node_modules/vfile": {
       "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/vfile/-/vfile-6.0.3.tgz",
-      "integrity": "sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==",
       "license": "MIT",
       "dependencies": {
         "@types/unist": "^3.0.0",
@@ -25601,8 +23771,6 @@
     },
     "node_modules/hast-util-from-parse5/node_modules/vfile-message": {
       "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-4.0.2.tgz",
-      "integrity": "sha512-jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw==",
       "license": "MIT",
       "dependencies": {
         "@types/unist": "^3.0.0",
@@ -25615,8 +23783,6 @@
     },
     "node_modules/hast-util-heading-rank": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/hast-util-heading-rank/-/hast-util-heading-rank-3.0.0.tgz",
-      "integrity": "sha512-EJKb8oMUXVHcWZTDepnr+WNbfnXKFNf9duMesmr4S8SXTJBJ9M4Yok08pu9vxdJwdlGRhVumk9mEhkEvKGifwA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -25629,8 +23795,6 @@
     },
     "node_modules/hast-util-heading-rank/node_modules/@types/hast": {
       "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.4.tgz",
-      "integrity": "sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -25639,8 +23803,6 @@
     },
     "node_modules/hast-util-is-element": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/hast-util-is-element/-/hast-util-is-element-3.0.0.tgz",
-      "integrity": "sha512-Val9mnv2IWpLbNPqc/pUem+a7Ipj2aHacCwgNfTiK0vJKl0LF+4Ba4+v1oPHFpf3bLYmreq0/l3Gud9S5OH42g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -25653,8 +23815,6 @@
     },
     "node_modules/hast-util-is-element/node_modules/@types/hast": {
       "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.4.tgz",
-      "integrity": "sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -25663,8 +23823,6 @@
     },
     "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==",
       "license": "MIT",
       "funding": {
         "type": "opencollective",
@@ -25673,8 +23831,6 @@
     },
     "node_modules/hast-util-raw": {
       "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/hast-util-raw/-/hast-util-raw-9.1.0.tgz",
-      "integrity": "sha512-Y8/SBAHkZGoNkpzqqfCldijcuUKh7/su31kEBp67cFY09Wy0mTRgtsLYsiIxMJxlu0f6AA5SUTbDR8K0rxnbUw==",
       "license": "MIT",
       "dependencies": {
         "@types/hast": "^3.0.0",
@@ -25698,8 +23854,6 @@
     },
     "node_modules/hast-util-raw/node_modules/@types/hast": {
       "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.4.tgz",
-      "integrity": "sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==",
       "license": "MIT",
       "dependencies": {
         "@types/unist": "*"
@@ -25707,38 +23861,10 @@
     },
     "node_modules/hast-util-raw/node_modules/@types/unist": {
       "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz",
-      "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==",
       "license": "MIT"
     },
-    "node_modules/hast-util-raw/node_modules/entities": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.0.tgz",
-      "integrity": "sha512-aKstq2TDOndCn4diEyp9Uq/Flu2i1GlLkc6XIDQSDMuaFE3OPW5OphLCyQ5SpSJZTb4reN+kTcYru5yIfXoRPw==",
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": ">=0.12"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
-    "node_modules/hast-util-raw/node_modules/parse5": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.3.0.tgz",
-      "integrity": "sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==",
-      "license": "MIT",
-      "dependencies": {
-        "entities": "^6.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/inikulin/parse5?sponsor=1"
-      }
-    },
     "node_modules/hast-util-raw/node_modules/unist-util-visit": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-5.0.0.tgz",
-      "integrity": "sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg==",
       "license": "MIT",
       "dependencies": {
         "@types/unist": "^3.0.0",
@@ -25752,8 +23878,6 @@
     },
     "node_modules/hast-util-raw/node_modules/vfile": {
       "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/vfile/-/vfile-6.0.3.tgz",
-      "integrity": "sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==",
       "license": "MIT",
       "dependencies": {
         "@types/unist": "^3.0.0",
@@ -25766,8 +23890,6 @@
     },
     "node_modules/hast-util-raw/node_modules/vfile-message": {
       "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-4.0.2.tgz",
-      "integrity": "sha512-jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw==",
       "license": "MIT",
       "dependencies": {
         "@types/unist": "^3.0.0",
@@ -25780,8 +23902,6 @@
     },
     "node_modules/hast-util-sanitize": {
       "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/hast-util-sanitize/-/hast-util-sanitize-5.0.2.tgz",
-      "integrity": "sha512-3yTWghByc50aGS7JlGhk61SPenfE/p1oaFeNwkOOyrscaOkMGrcW9+Cy/QAIOBpZxP1yqDIzFMR0+Np0i0+usg==",
       "license": "MIT",
       "dependencies": {
         "@types/hast": "^3.0.0",
@@ -25795,8 +23915,6 @@
     },
     "node_modules/hast-util-sanitize/node_modules/@types/hast": {
       "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.4.tgz",
-      "integrity": "sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==",
       "license": "MIT",
       "dependencies": {
         "@types/unist": "*"
@@ -25804,8 +23922,6 @@
     },
     "node_modules/hast-util-to-parse5": {
       "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/hast-util-to-parse5/-/hast-util-to-parse5-8.0.0.tgz",
-      "integrity": "sha512-3KKrV5ZVI8if87DVSi1vDeByYrkGzg4mEfeu4alwgmmIeARiBLKCZS2uw5Gb6nU9x9Yufyj3iudm6i7nl52PFw==",
       "license": "MIT",
       "dependencies": {
         "@types/hast": "^3.0.0",
@@ -25823,8 +23939,6 @@
     },
     "node_modules/hast-util-to-parse5/node_modules/@types/hast": {
       "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.4.tgz",
-      "integrity": "sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==",
       "license": "MIT",
       "dependencies": {
         "@types/unist": "*"
@@ -25832,8 +23946,6 @@
     },
     "node_modules/hast-util-to-string": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/hast-util-to-string/-/hast-util-to-string-3.0.1.tgz",
-      "integrity": "sha512-XelQVTDWvqcl3axRfI0xSeoVKzyIFPwsAGSLIsKdJKQMXDYJS4WYrBNF/8J7RdhIcFI2BOHgAifggsvsxp/3+A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -25846,8 +23958,6 @@
     },
     "node_modules/hast-util-to-string/node_modules/@types/hast": {
       "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.4.tgz",
-      "integrity": "sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -25856,8 +23966,6 @@
     },
     "node_modules/hast-util-whitespace": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-2.0.1.tgz",
-      "integrity": "sha512-nAxA0v8+vXSBDt3AnRUNjyRIQ0rD+ntpbAp4LnPkumc5M9yUbSMa4XDU9Q6etY4f1Wp4bNgvc1yjiZtsTTrSng==",
       "license": "MIT",
       "funding": {
         "type": "opencollective",
@@ -25866,8 +23974,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "@types/hast": "^2.0.0",
@@ -25883,8 +23989,6 @@
     },
     "node_modules/hastscript/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==",
       "license": "MIT",
       "funding": {
         "type": "github",
@@ -25893,8 +23997,6 @@
     },
     "node_modules/hastscript/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==",
       "license": "MIT",
       "dependencies": {
         "xtend": "^4.0.0"
@@ -25906,8 +24008,6 @@
     },
     "node_modules/hastscript/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==",
       "license": "MIT",
       "funding": {
         "type": "github",
@@ -25916,8 +24016,6 @@
     },
     "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": {
@@ -25926,8 +24024,6 @@
     },
     "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==",
       "license": "BSD-3-Clause",
       "engines": {
         "node": "*"
@@ -25935,14 +24031,10 @@
     },
     "node_modules/highlightjs-vue": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/highlightjs-vue/-/highlightjs-vue-1.0.0.tgz",
-      "integrity": "sha512-PDEfEF102G23vHmPhLyPboFCD+BkMGu+GuJe2d9/eH4FsCwvgBpnc9n0pGE+ffKdph38s6foEZiEjdgHdzp+IA==",
       "license": "CC0-1.0"
     },
     "node_modules/history": {
       "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/history/-/history-5.3.0.tgz",
-      "integrity": "sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -25951,8 +24043,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==",
       "license": "BSD-3-Clause",
       "dependencies": {
         "react-is": "^16.7.0"
@@ -25960,14 +24050,10 @@
     },
     "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==",
       "license": "MIT"
     },
     "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": {
@@ -25977,10 +24063,18 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/hook-std": {
+      "version": "3.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/hosted-git-info": {
       "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.2.tgz",
-      "integrity": "sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==",
       "license": "ISC",
       "dependencies": {
         "lru-cache": "^10.0.1"
@@ -25991,14 +24085,10 @@
     },
     "node_modules/hosted-git-info/node_modules/lru-cache": {
       "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
-      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
       "license": "ISC"
     },
     "node_modules/hpack.js": {
       "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
-      "integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -26010,15 +24100,11 @@
     },
     "node_modules/hpack.js/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/hpack.js/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": {
@@ -26033,25 +24119,33 @@
     },
     "node_modules/hpack.js/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,
       "license": "MIT"
     },
     "node_modules/hpack.js/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,
       "license": "MIT",
       "dependencies": {
         "safe-buffer": "~5.1.0"
       }
     },
+    "node_modules/html-element-map": {
+      "version": "1.3.1",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "array.prototype.filter": "^1.0.0",
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "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,
       "license": "MIT",
       "dependencies": {
@@ -26062,9 +24156,7 @@
       }
     },
     "node_modules/html-entities": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.6.0.tgz",
-      "integrity": "sha512-kig+rMn/QOVRvr7c86gQ8lWXq+Hkv6CbAH1hLu+RG338StTpE8Z0b44SDVaqVu7HGKf27frdmUYEs9hTUX/cLQ==",
+      "version": "2.5.2",
       "dev": true,
       "funding": [
         {
@@ -26080,15 +24172,11 @@
     },
     "node_modules/html-escaper": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/html-minifier-terser": {
       "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
-      "integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -26109,8 +24197,6 @@
     },
     "node_modules/html-minifier-terser/node_modules/commander": {
       "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
-      "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -26119,8 +24205,6 @@
     },
     "node_modules/html-tags": {
       "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.3.1.tgz",
-      "integrity": "sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==",
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -26131,8 +24215,6 @@
     },
     "node_modules/html-void-elements": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/html-void-elements/-/html-void-elements-3.0.0.tgz",
-      "integrity": "sha512-bEqo66MRXsUGxWHV5IP0PUiAWwoEjba4VCzg0LjFJBpchPaTfyfCKTG6bc5F8ucKec3q5y6qOdGyYTSBEvhCrg==",
       "license": "MIT",
       "funding": {
         "type": "github",
@@ -26141,8 +24223,6 @@
     },
     "node_modules/html-webpack-plugin": {
       "version": "5.6.3",
-      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.6.3.tgz",
-      "integrity": "sha512-QSf1yjtSAsmf7rYBV7XX86uua4W/vkhIt0xNXKbsi2foEeW7vjJQz4bhnpL3xH+l1ryl1680uNv968Z+X6jSYg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -26174,8 +24254,6 @@
     },
     "node_modules/html2canvas": {
       "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.4.1.tgz",
-      "integrity": "sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==",
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -26188,8 +24266,6 @@
     },
     "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",
@@ -26206,10 +24282,48 @@
         "entities": "^2.0.0"
       }
     },
+    "node_modules/htmlparser2/node_modules/dom-serializer": {
+      "version": "1.4.1",
+      "dev": true,
+      "license": "MIT",
+      "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/htmlparser2/node_modules/domhandler": {
+      "version": "4.3.1",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "domelementtype": "^2.2.0"
+      },
+      "engines": {
+        "node": ">= 4"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domhandler?sponsor=1"
+      }
+    },
+    "node_modules/htmlparser2/node_modules/domutils": {
+      "version": "2.8.0",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "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/htmlparser2/node_modules/entities": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
       "dev": true,
       "license": "BSD-2-Clause",
       "funding": {
@@ -26217,23 +24331,17 @@
       }
     },
     "node_modules/http-cache-semantics": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz",
-      "integrity": "sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==",
+      "version": "4.1.1",
       "dev": true,
       "license": "BSD-2-Clause"
     },
     "node_modules/http-deceiver": {
       "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
-      "integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==",
       "dev": true,
       "license": "MIT"
     },
     "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",
       "dependencies": {
@@ -26248,16 +24356,12 @@
       }
     },
     "node_modules/http-parser-js": {
-      "version": "0.5.10",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.10.tgz",
-      "integrity": "sha512-Pysuw9XpUq5dVc/2SMHpuTY01RFl8fttgcyunjL7eEMhGM3cI4eOmiCycJDVCo/7O7ClfQD3SaI6ftDzqOXYMA==",
+      "version": "0.5.9",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/http-proxy": {
       "version": "1.18.1",
-      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
-      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -26271,8 +24375,6 @@
     },
     "node_modules/http-proxy-agent": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -26286,8 +24388,6 @@
     },
     "node_modules/http-proxy-middleware": {
       "version": "2.0.9",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.9.tgz",
-      "integrity": "sha512-c1IyJYLYppU574+YI7R4QyX2ystMtVXZwIdzazUIPIJsHuWNd+mho2j+bKoHftndicGj9yh+xjd+l0yj7VeT1Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -26311,8 +24411,6 @@
     },
     "node_modules/http-proxy-middleware/node_modules/is-plain-obj": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
-      "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -26322,6 +24420,11 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/http-proxy/node_modules/eventemitter3": {
+      "version": "4.0.7",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/http-signature": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.4.0.tgz",
@@ -26338,8 +24441,6 @@
     },
     "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==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -26352,8 +24453,6 @@
     },
     "node_modules/http2-wrapper/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,
       "license": "MIT",
       "engines": {
@@ -26365,8 +24464,6 @@
     },
     "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": "MIT",
       "dependencies": {
@@ -26379,17 +24476,21 @@
     },
     "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==",
       "license": "Apache-2.0",
       "engines": {
         "node": ">=10.17.0"
       }
     },
+    "node_modules/hyperdyperid": {
+      "version": "1.2.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.18"
+      }
+    },
     "node_modules/i18next": {
       "version": "23.16.8",
-      "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.16.8.tgz",
-      "integrity": "sha512-06r/TitrM88Mg5FdUXAKL96dJMzgqLE5dv3ryBAra4KCwD9mJ4ndOTS95ZuymIGoE+2hzfdaMak2X11/es7ZWg==",
       "funding": [
         {
           "type": "individual",
@@ -26411,8 +24512,6 @@
     },
     "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==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
@@ -26424,8 +24523,6 @@
     },
     "node_modules/icss-utils": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
-      "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
       "dev": true,
       "license": "ISC",
       "engines": {
@@ -26437,8 +24534,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==",
       "funding": [
         {
           "type": "github",
@@ -26457,8 +24552,6 @@
     },
     "node_modules/ignore": {
       "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
-      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
       "license": "MIT",
       "engines": {
         "node": ">= 4"
@@ -26466,8 +24559,6 @@
     },
     "node_modules/ignore-walk": {
       "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-6.0.5.tgz",
-      "integrity": "sha512-VuuG0wCnjhnylG1ABXT3dAuIpTNDs/G8jlpmwXY03fXoXy/8ZK8/T+hMzt8L4WnrLCJgdybqgPagnF/f97cg3A==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -26479,8 +24570,6 @@
     },
     "node_modules/ignore-walk/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": {
@@ -26489,8 +24578,6 @@
     },
     "node_modules/ignore-walk/node_modules/minimatch": {
       "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": {
@@ -26503,24 +24590,8 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/image-size": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
-      "integrity": "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "bin": {
-        "image-size": "bin/image-size.js"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/immer": {
       "version": "10.1.1",
-      "resolved": "https://registry.npmjs.org/immer/-/immer-10.1.1.tgz",
-      "integrity": "sha512-s2MPrmjovJcoMaHtx6K11Ra7oD05NT97w1IC5zpMkT6Atjr7H8LjaDd81iIxUYpMKSRRNMJE703M1Fhr/TctHw==",
       "license": "MIT",
       "funding": {
         "type": "opencollective",
@@ -26528,9 +24599,7 @@
       }
     },
     "node_modules/import-fresh": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
-      "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==",
+      "version": "3.3.0",
       "license": "MIT",
       "dependencies": {
         "parent-module": "^1.0.0",
@@ -26545,17 +24614,24 @@
     },
     "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==",
       "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
+    "node_modules/import-from-esm": {
+      "version": "2.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.3.4",
+        "import-meta-resolve": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=18.20"
+      }
+    },
     "node_modules/import-local": {
       "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz",
-      "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -26574,8 +24650,6 @@
     },
     "node_modules/import-local/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,
       "license": "MIT",
       "dependencies": {
@@ -26588,8 +24662,6 @@
     },
     "node_modules/import-local/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,
       "license": "MIT",
       "dependencies": {
@@ -26601,8 +24673,6 @@
     },
     "node_modules/import-local/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,
       "license": "MIT",
       "dependencies": {
@@ -26617,8 +24687,6 @@
     },
     "node_modules/import-local/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,
       "license": "MIT",
       "dependencies": {
@@ -26630,8 +24698,6 @@
     },
     "node_modules/import-local/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,
       "license": "MIT",
       "dependencies": {
@@ -26641,10 +24707,16 @@
         "node": ">=8"
       }
     },
+    "node_modules/import-meta-resolve": {
+      "version": "4.1.0",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
     "node_modules/imports-loader": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/imports-loader/-/imports-loader-5.0.0.tgz",
-      "integrity": "sha512-tXgL8xxZFjOjQLLiE7my00UUQfktg4G8fdpXcZphL0bJWbk9eCxKKFaCwmFRcwyRJQl95GXBL1DoE1rCS/tcPw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -26664,8 +24736,6 @@
     },
     "node_modules/imports-loader/node_modules/source-map-js": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
-      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
       "dev": true,
       "license": "BSD-3-Clause",
       "engines": {
@@ -26674,8 +24744,6 @@
     },
     "node_modules/imurmurhash": {
       "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
       "license": "MIT",
       "engines": {
         "node": ">=0.8.19"
@@ -26683,17 +24751,13 @@
     },
     "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==",
       "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/index-to-position": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/index-to-position/-/index-to-position-1.1.0.tgz",
-      "integrity": "sha512-XPdx9Dq4t9Qk1mTMbWONJqU7boCoumEH7fRET37HX5+khDUl3J2W6PdALxhILYlIYx2amlwYcRPp28p0tSiojg==",
+      "version": "0.1.2",
       "license": "MIT",
       "engines": {
         "node": ">=18"
@@ -26704,9 +24768,6 @@
     },
     "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.",
       "license": "ISC",
       "dependencies": {
         "once": "^1.3.0",
@@ -26715,14 +24776,10 @@
     },
     "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": "3.0.1",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-3.0.1.tgz",
-      "integrity": "sha512-it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ==",
       "dev": true,
       "license": "ISC",
       "engines": {
@@ -26731,8 +24788,6 @@
     },
     "node_modules/init-package-json": {
       "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-6.0.3.tgz",
-      "integrity": "sha512-Zfeb5ol+H+eqJWHTaGca9BovufyGeIfr4zaaBorPmJBMrJ+KBnN+kQx2ZtXdsotUTgldHmHQV44xvUWOUA7E2w==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -26750,43 +24805,34 @@
     },
     "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==",
       "license": "MIT"
     },
     "node_modules/inquirer": {
-      "version": "8.2.6",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.6.tgz",
-      "integrity": "sha512-M1WuAmb7pn9zdFRtQYk26ZBoY043Sse0wVDdk4Bppr+JOXyQYybdtvK+l9wUibhtjdjvtoiNy8tk+EgsYIUqKg==",
-      "dev": true,
+      "version": "9.3.7",
       "license": "MIT",
+      "peer": 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",
+        "@inquirer/figures": "^1.0.3",
+        "ansi-escapes": "^4.3.2",
+        "cli-width": "^4.1.0",
+        "external-editor": "^3.1.0",
+        "mute-stream": "1.0.0",
         "ora": "^5.4.1",
-        "run-async": "^2.4.0",
-        "rxjs": "^7.5.5",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "through": "^2.3.6",
-        "wrap-ansi": "^6.0.1"
+        "run-async": "^3.0.0",
+        "rxjs": "^7.8.1",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^6.2.0",
+        "yoctocolors-cjs": "^2.1.2"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=18"
       }
     },
     "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,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -26798,12 +24844,36 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
+    "node_modules/inquirer/node_modules/is-unicode-supported": {
+      "version": "0.1.0",
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/inquirer/node_modules/log-symbols": {
+      "version": "4.1.0",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "chalk": "^4.1.0",
+        "is-unicode-supported": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/inquirer/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==",
-      "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "bl": "^4.1.0",
         "chalk": "^4.1.0",
@@ -26822,10 +24892,19 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/inquirer/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/internal-slot": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz",
-      "integrity": "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==",
       "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0",
@@ -26838,8 +24917,6 @@
     },
     "node_modules/internmap": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz",
-      "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==",
       "license": "ISC",
       "engines": {
         "node": ">=12"
@@ -26847,8 +24924,6 @@
     },
     "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,
       "license": "MIT",
       "engines": {
@@ -26856,9 +24931,7 @@
       }
     },
     "node_modules/interweave": {
-      "version": "13.1.1",
-      "resolved": "https://registry.npmjs.org/interweave/-/interweave-13.1.1.tgz",
-      "integrity": "sha512-5GdAavzK1i2BeeLTPzj0o6/zJMfLqQZq/2Q4c3ALT8ByEWf1syzl2MlQMTUoWzETy1x1/cAkZjiqOlulaoDRxw==",
+      "version": "13.1.0",
       "license": "MIT",
       "dependencies": {
         "escape-html": "^1.0.3"
@@ -26868,13 +24941,25 @@
         "url": "https://ko-fi.com/milesjohnson"
       },
       "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
+    "node_modules/into-stream": {
+      "version": "7.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "from2": "^2.3.0",
+        "p-is-promise": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/invariant": {
       "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
-      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
       "license": "MIT",
       "dependencies": {
         "loose-envify": "^1.0.0"
@@ -26882,8 +24967,6 @@
     },
     "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": {
@@ -26896,15 +24979,11 @@
     },
     "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,
       "license": "BSD-3-Clause"
     },
     "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",
       "engines": {
@@ -26913,8 +24992,6 @@
     },
     "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": {
@@ -26926,8 +25003,6 @@
     },
     "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==",
       "license": "MIT",
       "funding": {
         "type": "github",
@@ -26936,8 +25011,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "is-alphabetical": "^1.0.0",
@@ -26950,8 +25023,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.2",
@@ -26966,8 +25037,6 @@
     },
     "node_modules/is-array-buffer": {
       "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz",
-      "integrity": "sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==",
       "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.8",
@@ -26983,14 +25052,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==",
       "license": "MIT"
     },
     "node_modules/is-async-function": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.1.1.tgz",
-      "integrity": "sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==",
       "license": "MIT",
       "dependencies": {
         "async-function": "^1.0.0",
@@ -27008,8 +25073,6 @@
     },
     "node_modules/is-bigint": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.1.0.tgz",
-      "integrity": "sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==",
       "license": "MIT",
       "dependencies": {
         "has-bigints": "^1.0.2"
@@ -27023,8 +25086,6 @@
     },
     "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": {
@@ -27035,12 +25096,10 @@
       }
     },
     "node_modules/is-boolean-object": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.2.tgz",
-      "integrity": "sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==",
+      "version": "1.2.1",
       "license": "MIT",
       "dependencies": {
-        "call-bound": "^1.0.3",
+        "call-bound": "^1.0.2",
         "has-tostringtag": "^1.0.2"
       },
       "engines": {
@@ -27052,8 +25111,6 @@
     },
     "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==",
       "funding": [
         {
           "type": "github",
@@ -27074,19 +25131,15 @@
       }
     },
     "node_modules/is-bun-module": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-bun-module/-/is-bun-module-2.0.0.tgz",
-      "integrity": "sha512-gNCGbnnnnFAUGKeZ9PdbyeGYJqewpmc2aKHUEMO5nQPWU9lOmv7jcmQIv+qHD8fXW6W7qfuCwX4rY9LNRjXrkQ==",
+      "version": "1.3.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "semver": "^7.7.1"
+        "semver": "^7.6.3"
       }
     },
     "node_modules/is-bun-module/node_modules/semver": {
-      "version": "7.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
-      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "version": "7.6.3",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -27098,8 +25151,6 @@
     },
     "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==",
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"
@@ -27110,8 +25161,6 @@
     },
     "node_modules/is-ci": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz",
-      "integrity": "sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -27123,8 +25172,6 @@
     },
     "node_modules/is-ci/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": [
         {
@@ -27139,8 +25186,6 @@
     },
     "node_modules/is-core-module": {
       "version": "2.16.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
-      "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
       "license": "MIT",
       "dependencies": {
         "hasown": "^2.0.2"
@@ -27154,8 +25199,6 @@
     },
     "node_modules/is-data-view": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.2.tgz",
-      "integrity": "sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==",
       "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.2",
@@ -27171,8 +25214,6 @@
     },
     "node_modules/is-date-object": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.1.0.tgz",
-      "integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==",
       "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.2",
@@ -27187,8 +25228,6 @@
     },
     "node_modules/is-decimal": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz",
-      "integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==",
       "license": "MIT",
       "funding": {
         "type": "github",
@@ -27197,16 +25236,11 @@
     },
     "node_modules/is-deflate": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-deflate/-/is-deflate-1.0.0.tgz",
-      "integrity": "sha512-YDoFpuZWu1VRXlsnlYMzKyVRITXj7Ej/V9gXQ2/pAe7X1J7M/RNOqaIYi6qUn+B7nGyB9pDXrv02dsB58d2ZAQ==",
       "dev": true,
       "license": "MIT"
     },
     "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,
       "license": "MIT",
       "bin": {
         "is-docker": "cli.js"
@@ -27220,8 +25254,6 @@
     },
     "node_modules/is-extglob": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -27229,8 +25261,6 @@
     },
     "node_modules/is-finalizationregistry": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz",
-      "integrity": "sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==",
       "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.3"
@@ -27244,8 +25274,6 @@
     },
     "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==",
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -27253,8 +25281,6 @@
     },
     "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,
       "license": "MIT",
       "engines": {
@@ -27263,8 +25289,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.3",
@@ -27281,8 +25305,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==",
       "license": "MIT",
       "dependencies": {
         "is-extglob": "^2.1.1"
@@ -27293,8 +25315,6 @@
     },
     "node_modules/is-gzip": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-gzip/-/is-gzip-1.0.0.tgz",
-      "integrity": "sha512-rcfALRIb1YewtnksfRIHGcIY93QnK8BIQ/2c9yDYcG/Y6+vRoJuTWBmmSEbyLLYtXm7q35pHOHbZFQBaLrhlWQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -27303,8 +25323,6 @@
     },
     "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==",
       "license": "MIT",
       "funding": {
         "type": "github",
@@ -27313,8 +25331,6 @@
     },
     "node_modules/is-inside-container": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-inside-container/-/is-inside-container-1.0.0.tgz",
-      "integrity": "sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -27332,8 +25348,6 @@
     },
     "node_modules/is-inside-container/node_modules/is-docker": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz",
-      "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -27348,8 +25362,6 @@
     },
     "node_modules/is-installed-globally": {
       "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz",
-      "integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==",
       "license": "MIT",
       "dependencies": {
         "global-dirs": "^3.0.0",
@@ -27364,9 +25376,6 @@
     },
     "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==",
-      "devOptional": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -27374,15 +25383,11 @@
     },
     "node_modules/is-lambda": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz",
-      "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/is-localhost-ip": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-localhost-ip/-/is-localhost-ip-2.0.0.tgz",
-      "integrity": "sha512-vlgs2cSgMOfnKU8c1ewgKPyum9rVrjjLLW2HBdL5i0iAJjOs8NY55ZBd/hqUTaYR0EO9CKZd3hVSC2HlIbygTQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -27391,8 +25396,6 @@
     },
     "node_modules/is-map": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz",
-      "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==",
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"
@@ -27403,8 +25406,6 @@
     },
     "node_modules/is-nan": {
       "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/is-nan/-/is-nan-1.3.2.tgz",
-      "integrity": "sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==",
       "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.0",
@@ -27417,22 +25418,19 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "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==",
+    "node_modules/is-network-error": {
+      "version": "1.1.0",
+      "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=16"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "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==",
       "license": "MIT",
       "engines": {
         "node": ">=0.12.0"
@@ -27440,8 +25438,6 @@
     },
     "node_modules/is-number-object": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz",
-      "integrity": "sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==",
       "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.3",
@@ -27456,9 +25452,6 @@
     },
     "node_modules/is-obj": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
-      "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -27466,8 +25459,6 @@
     },
     "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==",
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -27475,8 +25466,6 @@
     },
     "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": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -27485,8 +25474,6 @@
     },
     "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": {
@@ -27498,15 +25485,11 @@
     },
     "node_modules/is-potential-custom-element-name": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
-      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
       "dev": true,
       "license": "MIT"
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.2",
@@ -27523,8 +25506,6 @@
     },
     "node_modules/is-set": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz",
-      "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==",
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"
@@ -27535,8 +25516,6 @@
     },
     "node_modules/is-shared-array-buffer": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz",
-      "integrity": "sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==",
       "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.3"
@@ -27550,8 +25529,6 @@
     },
     "node_modules/is-ssh": {
       "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/is-ssh/-/is-ssh-1.4.1.tgz",
-      "integrity": "sha512-JNeu1wQsHjyHgn9NcWTaXq6zWSR6hqE0++zhfZlkFBbScNkyvxCdeV8sRkSBaeLKxmbpR21brail63ACNxJ0Tg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -27560,8 +25537,6 @@
     },
     "node_modules/is-stream": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -27572,8 +25547,6 @@
     },
     "node_modules/is-string": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.1.1.tgz",
-      "integrity": "sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==",
       "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.3",
@@ -27588,15 +25561,11 @@
     },
     "node_modules/is-subset": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-subset/-/is-subset-0.1.1.tgz",
-      "integrity": "sha512-6Ybun0IkarhmEqxXCNw/C0bna6Zb/TkfUX9UbwJtK6ObwAVCxmAP308WWTHviM/zAqXk05cdhYsUsZeGQh99iw==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/is-symbol": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.1.1.tgz",
-      "integrity": "sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==",
       "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.2",
@@ -27612,8 +25581,6 @@
     },
     "node_modules/is-text-path": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-text-path/-/is-text-path-1.0.1.tgz",
-      "integrity": "sha512-xFuJpne9oFz5qDaodwmmG08e3CawH/2ZV8Qqza1Ko7Sk8POWbkRdwIoAWVhqvq0XeUzANEhKo2n0IXUGBm7A/w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -27625,8 +25592,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "which-typed-array": "^1.1.16"
@@ -27640,17 +25605,13 @@
     },
     "node_modules/is-typedarray": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
       "license": "MIT"
     },
     "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==",
+      "version": "2.1.0",
       "license": "MIT",
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -27658,14 +25619,11 @@
     },
     "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==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/is-weakmap": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz",
-      "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==",
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"
@@ -27675,12 +25633,10 @@
       }
     },
     "node_modules/is-weakref": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.1.1.tgz",
-      "integrity": "sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==",
+      "version": "1.1.0",
       "license": "MIT",
       "dependencies": {
-        "call-bound": "^1.0.3"
+        "call-bound": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -27691,8 +25647,6 @@
     },
     "node_modules/is-weakset": {
       "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.4.tgz",
-      "integrity": "sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==",
       "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.3",
@@ -27705,17 +25659,8 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-what": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz",
-      "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==",
-      "dev": true,
-      "license": "MIT"
-    },
     "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",
       "peer": true,
@@ -27725,9 +25670,6 @@
     },
     "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",
       "dependencies": {
         "is-docker": "^2.0.0"
@@ -27738,20 +25680,14 @@
     },
     "node_modules/is-zst": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-zst/-/is-zst-1.0.0.tgz",
-      "integrity": "sha512-ZA5lvshKAl8z30dX7saXLpVhpsq3d2EHK9uf7qtUjnOtdw4XBpAoWb2RvZ5kyoaebdoidnGI0g2hn9Z7ObPbww==",
       "license": "MIT"
     },
     "node_modules/isarray": {
       "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
       "license": "MIT"
     },
     "node_modules/isbinaryfile": {
       "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-5.0.3.tgz",
-      "integrity": "sha512-VR4gNjFaDP8csJQvzInG20JvBj8MaHYLxNOMXysxRbGM7tcsHZwCjhch3FubFtZBkuDbN55i4dUukGeIrzF+6g==",
       "license": "MIT",
       "engines": {
         "node": ">= 18.0.0"
@@ -27762,14 +25698,10 @@
     },
     "node_modules/isexe": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
       "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": {
@@ -27782,10 +25714,22 @@
       "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==",
       "license": "MIT"
     },
+    "node_modules/issue-parser": {
+      "version": "7.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "lodash.capitalize": "^4.2.1",
+        "lodash.escaperegexp": "^4.1.2",
+        "lodash.isplainobject": "^4.0.6",
+        "lodash.isstring": "^4.0.1",
+        "lodash.uniqby": "^4.7.0"
+      },
+      "engines": {
+        "node": "^18.17 || >=20.6.1"
+      }
+    },
     "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,
       "license": "BSD-3-Clause",
       "engines": {
@@ -27794,8 +25738,6 @@
     },
     "node_modules/istanbul-lib-hook": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-3.0.0.tgz",
-      "integrity": "sha512-Pt/uge1Q9s+5VAZ+pCo16TYMWPBIl+oaNIjgLQxcX0itS6ueeaA+pEfThZpH8WxhFgCiEb8sAJY6MdUKgiIWaQ==",
       "dev": true,
       "license": "BSD-3-Clause",
       "peer": true,
@@ -27807,36 +25749,22 @@
       }
     },
     "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==",
+      "version": "6.0.3",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
-        "@babel/core": "^7.12.3",
-        "@babel/parser": "^7.14.7",
-        "@istanbuljs/schema": "^0.1.2",
+        "@babel/core": "^7.23.9",
+        "@babel/parser": "^7.23.9",
+        "@istanbuljs/schema": "^0.1.3",
         "istanbul-lib-coverage": "^3.2.0",
-        "semver": "^6.3.0"
+        "semver": "^7.5.4"
       },
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/istanbul-lib-instrument/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": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
+        "node": ">=10"
       }
     },
     "node_modules/istanbul-lib-processinfo": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-processinfo/-/istanbul-lib-processinfo-2.0.3.tgz",
-      "integrity": "sha512-NkwHbo3E00oybX6NGJi6ar0B29vxyvNwoC7eJ4G4Yq28UfY758Hgn/heV8VRFhevPED4LXfFz0DQ8z/0kw9zMg==",
       "dev": true,
       "license": "ISC",
       "peer": true,
@@ -27854,8 +25782,6 @@
     },
     "node_modules/istanbul-lib-processinfo/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,
       "license": "MIT",
       "peer": true,
@@ -27868,9 +25794,6 @@
     },
     "node_modules/istanbul-lib-processinfo/node_modules/rimraf": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "deprecated": "Rimraf versions prior to v4 are no longer supported",
       "dev": true,
       "license": "ISC",
       "peer": true,
@@ -27886,8 +25809,6 @@
     },
     "node_modules/istanbul-lib-processinfo/node_modules/uuid": {
       "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
       "dev": true,
       "license": "MIT",
       "peer": true,
@@ -27897,8 +25818,6 @@
     },
     "node_modules/istanbul-lib-report": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
-      "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
@@ -27912,8 +25831,6 @@
     },
     "node_modules/istanbul-lib-report/node_modules/make-dir": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
-      "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -27928,10 +25845,9 @@
     },
     "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,
       "license": "BSD-3-Clause",
+      "peer": true,
       "dependencies": {
         "debug": "^4.1.1",
         "istanbul-lib-coverage": "^3.0.0",
@@ -27943,18 +25859,15 @@
     },
     "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,
       "license": "BSD-3-Clause",
+      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/istanbul-reports": {
       "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
-      "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
@@ -27967,8 +25880,6 @@
     },
     "node_modules/iterator.prototype": {
       "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.5.tgz",
-      "integrity": "sha512-H0dkQoCa3b2VEeKQBOxFph+JAbcrQdE7KC0UkqwpLmv2EC4P41QXP+rqo9wYodACiG5/WM5s9oDApTU8utwj9g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -27985,8 +25896,6 @@
     },
     "node_modules/jackspeak": {
       "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
-      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
       "license": "BlueOak-1.0.0",
       "dependencies": {
         "@isaacs/cliui": "^8.0.2"
@@ -28000,8 +25909,6 @@
     },
     "node_modules/jake": {
       "version": "10.9.2",
-      "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz",
-      "integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==",
       "license": "Apache-2.0",
       "dependencies": {
         "async": "^3.2.3",
@@ -28018,8 +25925,6 @@
     },
     "node_modules/jake/node_modules/chalk": {
       "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -28032,29 +25937,32 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
+    "node_modules/java-properties": {
+      "version": "1.0.2",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
     "node_modules/jed": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/jed/-/jed-1.1.1.tgz",
-      "integrity": "sha512-z35ZSEcXHxLW4yumw0dF6L464NT36vmx3wxJw8MDpraBcWuNVgUPZgPJKcu1HekNgwlMFNqol7i/IpSbjhqwqA==",
       "license": "MIT"
     },
     "node_modules/jest": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz",
-      "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==",
+      "version": "30.0.3",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/core": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "import-local": "^3.0.2",
-        "jest-cli": "^29.7.0"
+        "@jest/core": "30.0.3",
+        "@jest/types": "30.0.1",
+        "import-local": "^3.2.0",
+        "jest-cli": "30.0.3"
       },
       "bin": {
         "jest": "bin/jest.js"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       },
       "peerDependencies": {
         "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
@@ -28066,56 +25974,196 @@
       }
     },
     "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==",
+      "version": "30.0.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "execa": "^5.0.0",
-        "jest-util": "^29.7.0",
+        "execa": "^5.1.1",
+        "jest-util": "30.0.2",
         "p-limit": "^3.1.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
-    "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==",
+    "node_modules/jest-changed-files/node_modules/@jest/schemas": {
+      "version": "30.0.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@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": "^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"
+        "@sinclair/typebox": "^0.34.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-changed-files/node_modules/@jest/types": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/pattern": "30.0.1",
+        "@jest/schemas": "30.0.1",
+        "@types/istanbul-lib-coverage": "^2.0.6",
+        "@types/istanbul-reports": "^3.0.4",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.33",
+        "chalk": "^4.1.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-changed-files/node_modules/@sinclair/typebox": {
+      "version": "0.34.37",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/jest-changed-files/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/jest-changed-files/node_modules/jest-util": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "chalk": "^4.1.2",
+        "ci-info": "^4.2.0",
+        "graceful-fs": "^4.2.11",
+        "picomatch": "^4.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-changed-files/node_modules/picomatch": {
+      "version": "4.0.2",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/jest-circus": {
+      "version": "30.0.3",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/environment": "30.0.2",
+        "@jest/expect": "30.0.3",
+        "@jest/test-result": "30.0.2",
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "chalk": "^4.1.2",
+        "co": "^4.6.0",
+        "dedent": "^1.6.0",
+        "is-generator-fn": "^2.1.0",
+        "jest-each": "30.0.2",
+        "jest-matcher-utils": "30.0.3",
+        "jest-message-util": "30.0.2",
+        "jest-runtime": "30.0.3",
+        "jest-snapshot": "30.0.3",
+        "jest-util": "30.0.2",
+        "p-limit": "^3.1.0",
+        "pretty-format": "30.0.2",
+        "pure-rand": "^7.0.0",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.6"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-circus/node_modules/@jest/environment": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/fake-timers": "30.0.2",
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "jest-mock": "30.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-circus/node_modules/@jest/fake-timers": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "30.0.1",
+        "@sinonjs/fake-timers": "^13.0.0",
+        "@types/node": "*",
+        "jest-message-util": "30.0.2",
+        "jest-mock": "30.0.2",
+        "jest-util": "30.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-circus/node_modules/@jest/schemas": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@sinclair/typebox": "^0.34.0"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-circus/node_modules/@jest/types": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/pattern": "30.0.1",
+        "@jest/schemas": "30.0.1",
+        "@types/istanbul-lib-coverage": "^2.0.6",
+        "@types/istanbul-reports": "^3.0.4",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.33",
+        "chalk": "^4.1.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-circus/node_modules/@sinclair/typebox": {
+      "version": "0.34.37",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/jest-circus/node_modules/@sinonjs/fake-timers": {
+      "version": "13.0.5",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@sinonjs/commons": "^3.0.1"
       }
     },
     "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==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -28131,8 +26179,6 @@
     },
     "node_modules/jest-circus/node_modules/dedent": {
       "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.6.0.tgz",
-      "integrity": "sha512-F1Z+5UCFpmQUzJa11agbyPVMbpgT/qA3/SKyJ1jyBgm7dUcUEa8v9JwDkerSQXfakBwFljIxhOJqGkjUwZ9FSA==",
       "dev": true,
       "license": "MIT",
       "peerDependencies": {
@@ -28144,25 +26190,108 @@
         }
       }
     },
-    "node_modules/jest-circus/node_modules/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==",
+    "node_modules/jest-circus/node_modules/jest-diff": {
+      "version": "30.0.3",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
+        "@jest/diff-sequences": "30.0.1",
+        "@jest/get-type": "30.0.1",
+        "chalk": "^4.1.2",
+        "pretty-format": "30.0.2"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-circus/node_modules/jest-matcher-utils": {
+      "version": "30.0.3",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/get-type": "30.0.1",
+        "chalk": "^4.1.2",
+        "jest-diff": "30.0.3",
+        "pretty-format": "30.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-circus/node_modules/jest-message-util": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.27.1",
+        "@jest/types": "30.0.1",
+        "@types/stack-utils": "^2.0.3",
+        "chalk": "^4.1.2",
+        "graceful-fs": "^4.2.11",
+        "micromatch": "^4.0.8",
+        "pretty-format": "30.0.2",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.6"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-circus/node_modules/jest-mock": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "jest-util": "30.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-circus/node_modules/jest-util": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "chalk": "^4.1.2",
+        "ci-info": "^4.2.0",
+        "graceful-fs": "^4.2.11",
+        "picomatch": "^4.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-circus/node_modules/picomatch": {
+      "version": "4.0.2",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/jest-circus/node_modules/pretty-format": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/schemas": "30.0.1",
+        "ansi-styles": "^5.2.0",
+        "react-is": "^18.3.1"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-circus/node_modules/pretty-format/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==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -28174,8 +26303,6 @@
     },
     "node_modules/jest-circus/node_modules/slash": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -28183,29 +26310,26 @@
       }
     },
     "node_modules/jest-cli": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz",
-      "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==",
+      "version": "30.0.3",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/core": "^29.7.0",
-        "@jest/test-result": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "chalk": "^4.0.0",
-        "create-jest": "^29.7.0",
-        "exit": "^0.1.2",
-        "import-local": "^3.0.2",
-        "jest-config": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "jest-validate": "^29.7.0",
-        "yargs": "^17.3.1"
+        "@jest/core": "30.0.3",
+        "@jest/test-result": "30.0.2",
+        "@jest/types": "30.0.1",
+        "chalk": "^4.1.2",
+        "exit-x": "^0.2.2",
+        "import-local": "^3.2.0",
+        "jest-config": "30.0.3",
+        "jest-util": "30.0.2",
+        "jest-validate": "30.0.2",
+        "yargs": "^17.7.2"
       },
       "bin": {
         "jest": "bin/jest.js"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       },
       "peerDependencies": {
         "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
@@ -28216,10 +26340,41 @@
         }
       }
     },
+    "node_modules/jest-cli/node_modules/@jest/schemas": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@sinclair/typebox": "^0.34.0"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-cli/node_modules/@jest/types": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/pattern": "30.0.1",
+        "@jest/schemas": "30.0.1",
+        "@types/istanbul-lib-coverage": "^2.0.6",
+        "@types/istanbul-reports": "^3.0.4",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.33",
+        "chalk": "^4.1.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-cli/node_modules/@sinclair/typebox": {
+      "version": "0.34.37",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/jest-cli/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": {
@@ -28233,56 +26388,126 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "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==",
+    "node_modules/jest-cli/node_modules/jest-util": {
+      "version": "30.0.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@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",
-        "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",
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "chalk": "^4.1.2",
+        "ci-info": "^4.2.0",
+        "graceful-fs": "^4.2.11",
+        "picomatch": "^4.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-cli/node_modules/picomatch": {
+      "version": "4.0.2",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/jest-config": {
+      "version": "30.0.3",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/core": "^7.27.4",
+        "@jest/get-type": "30.0.1",
+        "@jest/pattern": "30.0.1",
+        "@jest/test-sequencer": "30.0.2",
+        "@jest/types": "30.0.1",
+        "babel-jest": "30.0.2",
+        "chalk": "^4.1.2",
+        "ci-info": "^4.2.0",
+        "deepmerge": "^4.3.1",
+        "glob": "^10.3.10",
+        "graceful-fs": "^4.2.11",
+        "jest-circus": "30.0.3",
+        "jest-docblock": "30.0.1",
+        "jest-environment-node": "30.0.2",
+        "jest-regex-util": "30.0.1",
+        "jest-resolve": "30.0.2",
+        "jest-runner": "30.0.3",
+        "jest-util": "30.0.2",
+        "jest-validate": "30.0.2",
+        "micromatch": "^4.0.8",
         "parse-json": "^5.2.0",
-        "pretty-format": "^29.7.0",
+        "pretty-format": "30.0.2",
         "slash": "^3.0.0",
         "strip-json-comments": "^3.1.1"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       },
       "peerDependencies": {
         "@types/node": "*",
+        "esbuild-register": ">=3.4.0",
         "ts-node": ">=9.0.0"
       },
       "peerDependenciesMeta": {
         "@types/node": {
           "optional": true
         },
+        "esbuild-register": {
+          "optional": true
+        },
         "ts-node": {
           "optional": true
         }
       }
     },
+    "node_modules/jest-config/node_modules/@jest/schemas": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@sinclair/typebox": "^0.34.0"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-config/node_modules/@jest/types": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/pattern": "30.0.1",
+        "@jest/schemas": "30.0.1",
+        "@types/istanbul-lib-coverage": "^2.0.6",
+        "@types/istanbul-reports": "^3.0.4",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.33",
+        "chalk": "^4.1.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-config/node_modules/@sinclair/typebox": {
+      "version": "0.34.37",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/jest-config/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
     "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==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -28296,41 +26521,81 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "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==",
+    "node_modules/jest-config/node_modules/glob": {
+      "version": "10.4.5",
       "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/sibiraj-s"
-        }
-      ],
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
+      "license": "ISC",
+      "dependencies": {
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/jest-config/node_modules/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==",
+    "node_modules/jest-config/node_modules/jest-util": {
+      "version": "30.0.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "chalk": "^4.1.2",
+        "ci-info": "^4.2.0",
+        "graceful-fs": "^4.2.11",
+        "picomatch": "^4.0.2"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-config/node_modules/minimatch": {
+      "version": "9.0.5",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/jest-config/node_modules/picomatch": {
+      "version": "4.0.2",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/jest-config/node_modules/pretty-format": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/schemas": "30.0.1",
+        "ansi-styles": "^5.2.0",
+        "react-is": "^18.3.1"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-config/node_modules/pretty-format/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==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -28342,8 +26607,6 @@
     },
     "node_modules/jest-config/node_modules/slash": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -28352,8 +26615,6 @@
     },
     "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,
       "license": "MIT",
       "dependencies": {
@@ -28368,8 +26629,6 @@
     },
     "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==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -28385,8 +26644,6 @@
     },
     "node_modules/jest-diff/node_modules/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,
       "license": "MIT",
       "dependencies": {
@@ -28400,8 +26657,6 @@
     },
     "node_modules/jest-diff/node_modules/pretty-format/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==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -28412,39 +26667,66 @@
       }
     },
     "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==",
+      "version": "30.0.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "detect-newline": "^3.0.0"
+        "detect-newline": "^3.1.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.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==",
+      "version": "30.0.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@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"
+        "@jest/get-type": "30.0.1",
+        "@jest/types": "30.0.1",
+        "chalk": "^4.1.2",
+        "jest-util": "30.0.2",
+        "pretty-format": "30.0.2"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
+    "node_modules/jest-each/node_modules/@jest/schemas": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@sinclair/typebox": "^0.34.0"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-each/node_modules/@jest/types": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/pattern": "30.0.1",
+        "@jest/schemas": "30.0.1",
+        "@types/istanbul-lib-coverage": "^2.0.6",
+        "@types/istanbul-reports": "^3.0.4",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.33",
+        "chalk": "^4.1.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-each/node_modules/@sinclair/typebox": {
+      "version": "0.34.37",
+      "dev": true,
+      "license": "MIT"
+    },
     "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==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -28458,25 +26740,48 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-each/node_modules/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==",
+    "node_modules/jest-each/node_modules/jest-util": {
+      "version": "30.0.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "chalk": "^4.1.2",
+        "ci-info": "^4.2.0",
+        "graceful-fs": "^4.2.11",
+        "picomatch": "^4.0.2"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-each/node_modules/picomatch": {
+      "version": "4.0.2",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/jest-each/node_modules/pretty-format": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/schemas": "30.0.1",
+        "ansi-styles": "^5.2.0",
+        "react-is": "^18.3.1"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-each/node_modules/pretty-format/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==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -28488,8 +26793,6 @@
     },
     "node_modules/jest-environment-jsdom": {
       "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.7.0.tgz",
-      "integrity": "sha512-k9iQbsf9OyOfdzWH8HDmrRT0gSIcX+FLNW7IQq94tFX0gynPwqDTW0Ho6iMVNjGz/nb+l/vW3dWM2bbLLpkbXA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -28515,9 +26818,7 @@
       }
     },
     "node_modules/jest-environment-jsdom/node_modules/acorn": {
-      "version": "8.14.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
-      "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
+      "version": "8.14.0",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -28527,10 +26828,33 @@
         "node": ">=0.4.0"
       }
     },
+    "node_modules/jest-environment-jsdom/node_modules/acorn-globals": {
+      "version": "7.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "acorn": "^8.1.0",
+        "acorn-walk": "^8.0.2"
+      }
+    },
+    "node_modules/jest-environment-jsdom/node_modules/acorn-walk": {
+      "version": "8.3.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "acorn": "^8.11.0"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/jest-environment-jsdom/node_modules/cssom": {
+      "version": "0.5.0",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/jest-environment-jsdom/node_modules/cssstyle": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
-      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -28542,15 +26866,11 @@
     },
     "node_modules/jest-environment-jsdom/node_modules/cssstyle/node_modules/cssom": {
       "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
-      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/jest-environment-jsdom/node_modules/data-urls": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz",
-      "integrity": "sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -28562,23 +26882,19 @@
         "node": ">=12"
       }
     },
-    "node_modules/jest-environment-jsdom/node_modules/entities": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.0.tgz",
-      "integrity": "sha512-aKstq2TDOndCn4diEyp9Uq/Flu2i1GlLkc6XIDQSDMuaFE3OPW5OphLCyQ5SpSJZTb4reN+kTcYru5yIfXoRPw==",
+    "node_modules/jest-environment-jsdom/node_modules/domexception": {
+      "version": "4.0.0",
       "dev": true,
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": ">=0.12"
+      "license": "MIT",
+      "dependencies": {
+        "webidl-conversions": "^7.0.0"
       },
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
+      "engines": {
+        "node": ">=12"
       }
     },
     "node_modules/jest-environment-jsdom/node_modules/html-encoding-sniffer": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
-      "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -28590,8 +26906,6 @@
     },
     "node_modules/jest-environment-jsdom/node_modules/jsdom": {
       "version": "20.0.3",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-20.0.3.tgz",
-      "integrity": "sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -28634,23 +26948,8 @@
         }
       }
     },
-    "node_modules/jest-environment-jsdom/node_modules/parse5": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.3.0.tgz",
-      "integrity": "sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "entities": "^6.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/inikulin/parse5?sponsor=1"
-      }
-    },
     "node_modules/jest-environment-jsdom/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,
       "license": "MIT",
       "engines": {
@@ -28659,8 +26958,6 @@
     },
     "node_modules/jest-environment-jsdom/node_modules/tough-cookie": {
       "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": {
@@ -28675,8 +26972,6 @@
     },
     "node_modules/jest-environment-jsdom/node_modules/tr46": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz",
-      "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -28688,8 +26983,6 @@
     },
     "node_modules/jest-environment-jsdom/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,
       "license": "MIT",
       "engines": {
@@ -28698,8 +26991,6 @@
     },
     "node_modules/jest-environment-jsdom/node_modules/w3c-xmlserializer": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz",
-      "integrity": "sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -28711,8 +27002,6 @@
     },
     "node_modules/jest-environment-jsdom/node_modules/whatwg-encoding": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
-      "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -28724,8 +27013,6 @@
     },
     "node_modules/jest-environment-jsdom/node_modules/whatwg-mimetype": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz",
-      "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -28734,8 +27021,6 @@
     },
     "node_modules/jest-environment-jsdom/node_modules/whatwg-url": {
       "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz",
-      "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -28748,8 +27033,6 @@
     },
     "node_modules/jest-environment-jsdom/node_modules/xml-name-validator": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
-      "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -28757,27 +27040,201 @@
       }
     },
     "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==",
+      "version": "30.0.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/environment": "^29.7.0",
-        "@jest/fake-timers": "^29.7.0",
-        "@jest/types": "^29.6.3",
+        "@jest/environment": "30.0.2",
+        "@jest/fake-timers": "30.0.2",
+        "@jest/types": "30.0.1",
         "@types/node": "*",
-        "jest-mock": "^29.7.0",
-        "jest-util": "^29.7.0"
+        "jest-mock": "30.0.2",
+        "jest-util": "30.0.2",
+        "jest-validate": "30.0.2"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-environment-node/node_modules/@jest/environment": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/fake-timers": "30.0.2",
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "jest-mock": "30.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-environment-node/node_modules/@jest/fake-timers": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "30.0.1",
+        "@sinonjs/fake-timers": "^13.0.0",
+        "@types/node": "*",
+        "jest-message-util": "30.0.2",
+        "jest-mock": "30.0.2",
+        "jest-util": "30.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-environment-node/node_modules/@jest/schemas": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@sinclair/typebox": "^0.34.0"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-environment-node/node_modules/@jest/types": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/pattern": "30.0.1",
+        "@jest/schemas": "30.0.1",
+        "@types/istanbul-lib-coverage": "^2.0.6",
+        "@types/istanbul-reports": "^3.0.4",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.33",
+        "chalk": "^4.1.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-environment-node/node_modules/@sinclair/typebox": {
+      "version": "0.34.37",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/jest-environment-node/node_modules/@sinonjs/fake-timers": {
+      "version": "13.0.5",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@sinonjs/commons": "^3.0.1"
+      }
+    },
+    "node_modules/jest-environment-node/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/jest-environment-node/node_modules/jest-message-util": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.27.1",
+        "@jest/types": "30.0.1",
+        "@types/stack-utils": "^2.0.3",
+        "chalk": "^4.1.2",
+        "graceful-fs": "^4.2.11",
+        "micromatch": "^4.0.8",
+        "pretty-format": "30.0.2",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.6"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-environment-node/node_modules/jest-mock": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "jest-util": "30.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-environment-node/node_modules/jest-util": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "chalk": "^4.1.2",
+        "ci-info": "^4.2.0",
+        "graceful-fs": "^4.2.11",
+        "picomatch": "^4.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-environment-node/node_modules/picomatch": {
+      "version": "4.0.2",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/jest-environment-node/node_modules/pretty-format": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/schemas": "30.0.1",
+        "ansi-styles": "^5.2.0",
+        "react-is": "^18.3.1"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-environment-node/node_modules/pretty-format/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-environment-node/node_modules/slash": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
       }
     },
     "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,
       "license": "MIT",
       "engines": {
@@ -28785,57 +27242,203 @@
       }
     },
     "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==",
+      "version": "30.0.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/types": "^29.6.3",
-        "@types/graceful-fs": "^4.1.3",
+        "@jest/types": "30.0.1",
         "@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",
+        "anymatch": "^3.1.3",
+        "fb-watchman": "^2.0.2",
+        "graceful-fs": "^4.2.11",
+        "jest-regex-util": "30.0.1",
+        "jest-util": "30.0.2",
+        "jest-worker": "30.0.2",
+        "micromatch": "^4.0.8",
         "walker": "^1.0.8"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       },
       "optionalDependencies": {
-        "fsevents": "^2.3.2"
+        "fsevents": "^2.3.3"
       }
     },
-    "node_modules/jest-html-reporter": {
-      "version": "3.10.2",
-      "resolved": "https://registry.npmjs.org/jest-html-reporter/-/jest-html-reporter-3.10.2.tgz",
-      "integrity": "sha512-XRBa5ylHPUQoo8aJXEEdKsTruieTdlPbRktMx9WG9evMTxzJEKGFMaw5x+sQxJuClWdNR72GGwbOaz+6HIlksA==",
+    "node_modules/jest-haste-map/node_modules/@jest/schemas": {
+      "version": "30.0.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/test-result": "^29.0.2",
-        "@jest/types": "^29.0.2",
+        "@sinclair/typebox": "^0.34.0"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-haste-map/node_modules/@jest/types": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/pattern": "30.0.1",
+        "@jest/schemas": "30.0.1",
+        "@types/istanbul-lib-coverage": "^2.0.6",
+        "@types/istanbul-reports": "^3.0.4",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.33",
+        "chalk": "^4.1.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-haste-map/node_modules/@sinclair/typebox": {
+      "version": "0.34.37",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/jest-haste-map/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/jest-haste-map/node_modules/jest-util": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "chalk": "^4.1.2",
+        "ci-info": "^4.2.0",
+        "graceful-fs": "^4.2.11",
+        "picomatch": "^4.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-haste-map/node_modules/jest-worker": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*",
+        "@ungap/structured-clone": "^1.3.0",
+        "jest-util": "30.0.2",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.1.1"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-haste-map/node_modules/jest-worker/node_modules/supports-color": {
+      "version": "8.1.1",
+      "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/jest-haste-map/node_modules/picomatch": {
+      "version": "4.0.2",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/jest-html-reporter": {
+      "version": "4.3.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/reporters": "^30.0.2",
+        "@jest/test-result": "^30.0.2",
+        "@jest/types": "^30.0.1",
         "dateformat": "3.0.2",
         "mkdirp": "^1.0.3",
         "strip-ansi": "6.0.1",
         "xmlbuilder": "15.0.0"
       },
       "engines": {
-        "node": ">=4.8.3"
+        "node": ">=14.0.0"
       },
       "peerDependencies": {
-        "jest": "19.x - 29.x",
+        "jest": "19.x - 30.x",
         "typescript": "^3.7.x || ^4.3.x || ^5.x"
       }
     },
+    "node_modules/jest-html-reporter/node_modules/@jest/schemas": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@sinclair/typebox": "^0.34.0"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-html-reporter/node_modules/@jest/types": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/pattern": "30.0.1",
+        "@jest/schemas": "30.0.1",
+        "@types/istanbul-lib-coverage": "^2.0.6",
+        "@types/istanbul-reports": "^3.0.4",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.33",
+        "chalk": "^4.1.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-html-reporter/node_modules/@sinclair/typebox": {
+      "version": "0.34.37",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/jest-html-reporter/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/jest-html-reporter/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": {
@@ -28846,23 +27449,35 @@
       }
     },
     "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==",
+      "version": "30.0.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "jest-get-type": "^29.6.3",
-        "pretty-format": "^29.7.0"
+        "@jest/get-type": "30.0.1",
+        "pretty-format": "30.0.2"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
+    "node_modules/jest-leak-detector/node_modules/@jest/schemas": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@sinclair/typebox": "^0.34.0"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-leak-detector/node_modules/@sinclair/typebox": {
+      "version": "0.34.37",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/jest-leak-detector/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==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -28873,24 +27488,20 @@
       }
     },
     "node_modules/jest-leak-detector/node_modules/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==",
+      "version": "30.0.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
+        "@jest/schemas": "30.0.1",
+        "ansi-styles": "^5.2.0",
+        "react-is": "^18.3.1"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "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,
       "license": "MIT",
       "dependencies": {
@@ -28905,8 +27516,6 @@
     },
     "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==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -28922,8 +27531,6 @@
     },
     "node_modules/jest-matcher-utils/node_modules/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,
       "license": "MIT",
       "dependencies": {
@@ -28937,8 +27544,6 @@
     },
     "node_modules/jest-matcher-utils/node_modules/pretty-format/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==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -28950,8 +27555,6 @@
     },
     "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,
       "license": "MIT",
       "dependencies": {
@@ -28971,8 +27574,6 @@
     },
     "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==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -28988,8 +27589,6 @@
     },
     "node_modules/jest-message-util/node_modules/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,
       "license": "MIT",
       "dependencies": {
@@ -29003,8 +27602,6 @@
     },
     "node_modules/jest-message-util/node_modules/pretty-format/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==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -29016,8 +27613,6 @@
     },
     "node_modules/jest-message-util/node_modules/slash": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -29026,8 +27621,6 @@
     },
     "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,
       "license": "MIT",
       "dependencies": {
@@ -29041,8 +27634,6 @@
     },
     "node_modules/jest-mock-console": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/jest-mock-console/-/jest-mock-console-2.0.0.tgz",
-      "integrity": "sha512-7zrKtXVut+6doalosFxw/2O9spLepQJ9VukODtyLIub2fFkWKe1TyQrxr/GyQogTQcdkHfhvFJdx1OEzLqf/mw==",
       "dev": true,
       "license": "MIT",
       "peerDependencies": {
@@ -29051,8 +27642,6 @@
     },
     "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,
       "license": "MIT",
       "engines": {
@@ -29068,54 +27657,78 @@
       }
     },
     "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==",
+      "version": "30.0.1",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.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==",
+      "version": "30.0.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "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"
+        "chalk": "^4.1.2",
+        "graceful-fs": "^4.2.11",
+        "jest-haste-map": "30.0.2",
+        "jest-pnp-resolver": "^1.2.3",
+        "jest-util": "30.0.2",
+        "jest-validate": "30.0.2",
+        "slash": "^3.0.0",
+        "unrs-resolver": "^1.7.11"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.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==",
+      "version": "30.0.3",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "jest-regex-util": "^29.6.3",
-        "jest-snapshot": "^29.7.0"
+        "jest-regex-util": "30.0.1",
+        "jest-snapshot": "30.0.3"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
+    "node_modules/jest-resolve/node_modules/@jest/schemas": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@sinclair/typebox": "^0.34.0"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-resolve/node_modules/@jest/types": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/pattern": "30.0.1",
+        "@jest/schemas": "30.0.1",
+        "@types/istanbul-lib-coverage": "^2.0.6",
+        "@types/istanbul-reports": "^3.0.4",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.33",
+        "chalk": "^4.1.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-resolve/node_modules/@sinclair/typebox": {
+      "version": "0.34.37",
+      "dev": true,
+      "license": "MIT"
+    },
     "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": {
@@ -29129,10 +27742,35 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
+    "node_modules/jest-resolve/node_modules/jest-util": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "chalk": "^4.1.2",
+        "ci-info": "^4.2.0",
+        "graceful-fs": "^4.2.11",
+        "picomatch": "^4.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-resolve/node_modules/picomatch": {
+      "version": "4.0.2",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
     "node_modules/jest-resolve/node_modules/slash": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -29140,42 +27778,110 @@
       }
     },
     "node_modules/jest-runner": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz",
-      "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==",
+      "version": "30.0.3",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@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",
+        "@jest/console": "30.0.2",
+        "@jest/environment": "30.0.2",
+        "@jest/test-result": "30.0.2",
+        "@jest/transform": "30.0.2",
+        "@jest/types": "30.0.1",
         "@types/node": "*",
-        "chalk": "^4.0.0",
+        "chalk": "^4.1.2",
         "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",
+        "exit-x": "^0.2.2",
+        "graceful-fs": "^4.2.11",
+        "jest-docblock": "30.0.1",
+        "jest-environment-node": "30.0.2",
+        "jest-haste-map": "30.0.2",
+        "jest-leak-detector": "30.0.2",
+        "jest-message-util": "30.0.2",
+        "jest-resolve": "30.0.2",
+        "jest-runtime": "30.0.3",
+        "jest-util": "30.0.2",
+        "jest-watcher": "30.0.2",
+        "jest-worker": "30.0.2",
         "p-limit": "^3.1.0",
         "source-map-support": "0.5.13"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-runner/node_modules/@jest/environment": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/fake-timers": "30.0.2",
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "jest-mock": "30.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-runner/node_modules/@jest/fake-timers": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "30.0.1",
+        "@sinonjs/fake-timers": "^13.0.0",
+        "@types/node": "*",
+        "jest-message-util": "30.0.2",
+        "jest-mock": "30.0.2",
+        "jest-util": "30.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-runner/node_modules/@jest/schemas": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@sinclair/typebox": "^0.34.0"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-runner/node_modules/@jest/types": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/pattern": "30.0.1",
+        "@jest/schemas": "30.0.1",
+        "@types/istanbul-lib-coverage": "^2.0.6",
+        "@types/istanbul-reports": "^3.0.4",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.33",
+        "chalk": "^4.1.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-runner/node_modules/@sinclair/typebox": {
+      "version": "0.34.37",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/jest-runner/node_modules/@sinonjs/fake-timers": {
+      "version": "13.0.5",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@sinonjs/commons": "^3.0.1"
       }
     },
     "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==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -29189,156 +27895,109 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "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,
-      "license": "BSD-3-Clause",
-      "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==",
+    "node_modules/jest-runner/node_modules/jest-message-util": {
+      "version": "30.0.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
-      }
-    },
-    "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,
-      "license": "MIT",
-      "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",
+        "@babel/code-frame": "^7.27.1",
+        "@jest/types": "30.0.1",
+        "@types/stack-utils": "^2.0.3",
+        "chalk": "^4.1.2",
+        "graceful-fs": "^4.2.11",
+        "micromatch": "^4.0.8",
+        "pretty-format": "30.0.2",
         "slash": "^3.0.0",
-        "strip-bom": "^4.0.0"
+        "stack-utils": "^2.0.6"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.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==",
+    "node_modules/jest-runner/node_modules/jest-mock": {
+      "version": "30.0.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "jest-util": "30.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-runner/node_modules/jest-util": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "chalk": "^4.1.2",
+        "ci-info": "^4.2.0",
+        "graceful-fs": "^4.2.11",
+        "picomatch": "^4.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-runner/node_modules/jest-worker": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*",
+        "@ungap/structured-clone": "^1.3.0",
+        "jest-util": "30.0.2",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.1.1"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-runner/node_modules/jest-worker/node_modules/supports-color": {
+      "version": "8.1.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
       },
       "engines": {
         "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
-    "node_modules/jest-runtime/node_modules/slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+    "node_modules/jest-runner/node_modules/picomatch": {
+      "version": "4.0.2",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "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,
-      "license": "MIT",
-      "dependencies": {
-        "@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",
-        "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": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "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==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
+        "node": ">=12"
       },
       "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
-    "node_modules/jest-snapshot/node_modules/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==",
+    "node_modules/jest-runner/node_modules/pretty-format": {
+      "version": "30.0.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
+        "@jest/schemas": "30.0.1",
+        "ansi-styles": "^5.2.0",
+        "react-is": "^18.3.1"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
-    "node_modules/jest-snapshot/node_modules/pretty-format/node_modules/ansi-styles": {
+    "node_modules/jest-runner/node_modules/pretty-format/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==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -29348,10 +28007,549 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
+    "node_modules/jest-runner/node_modules/slash": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-runner/node_modules/source-map": {
+      "version": "0.6.1",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/jest-runner/node_modules/source-map-support": {
+      "version": "0.5.13",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/jest-runtime": {
+      "version": "30.0.3",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/environment": "30.0.2",
+        "@jest/fake-timers": "30.0.2",
+        "@jest/globals": "30.0.3",
+        "@jest/source-map": "30.0.1",
+        "@jest/test-result": "30.0.2",
+        "@jest/transform": "30.0.2",
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "chalk": "^4.1.2",
+        "cjs-module-lexer": "^2.1.0",
+        "collect-v8-coverage": "^1.0.2",
+        "glob": "^10.3.10",
+        "graceful-fs": "^4.2.11",
+        "jest-haste-map": "30.0.2",
+        "jest-message-util": "30.0.2",
+        "jest-mock": "30.0.2",
+        "jest-regex-util": "30.0.1",
+        "jest-resolve": "30.0.2",
+        "jest-snapshot": "30.0.3",
+        "jest-util": "30.0.2",
+        "slash": "^3.0.0",
+        "strip-bom": "^4.0.0"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/@jest/environment": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/fake-timers": "30.0.2",
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "jest-mock": "30.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/@jest/fake-timers": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "30.0.1",
+        "@sinonjs/fake-timers": "^13.0.0",
+        "@types/node": "*",
+        "jest-message-util": "30.0.2",
+        "jest-mock": "30.0.2",
+        "jest-util": "30.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/@jest/schemas": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@sinclair/typebox": "^0.34.0"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/@jest/types": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/pattern": "30.0.1",
+        "@jest/schemas": "30.0.1",
+        "@types/istanbul-lib-coverage": "^2.0.6",
+        "@types/istanbul-reports": "^3.0.4",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.33",
+        "chalk": "^4.1.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/@sinclair/typebox": {
+      "version": "0.34.37",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/jest-runtime/node_modules/@sinonjs/fake-timers": {
+      "version": "13.0.5",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@sinonjs/commons": "^3.0.1"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/jest-runtime/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/jest-runtime/node_modules/cjs-module-lexer": {
+      "version": "2.1.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/jest-runtime/node_modules/glob": {
+      "version": "10.4.5",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/jest-message-util": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.27.1",
+        "@jest/types": "30.0.1",
+        "@types/stack-utils": "^2.0.3",
+        "chalk": "^4.1.2",
+        "graceful-fs": "^4.2.11",
+        "micromatch": "^4.0.8",
+        "pretty-format": "30.0.2",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.6"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/jest-mock": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "jest-util": "30.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/jest-util": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "chalk": "^4.1.2",
+        "ci-info": "^4.2.0",
+        "graceful-fs": "^4.2.11",
+        "picomatch": "^4.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/minimatch": {
+      "version": "9.0.5",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/picomatch": {
+      "version": "4.0.2",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/pretty-format": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/schemas": "30.0.1",
+        "ansi-styles": "^5.2.0",
+        "react-is": "^18.3.1"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/pretty-format/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/slash": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-snapshot": {
+      "version": "30.0.3",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/core": "^7.27.4",
+        "@babel/generator": "^7.27.5",
+        "@babel/plugin-syntax-jsx": "^7.27.1",
+        "@babel/plugin-syntax-typescript": "^7.27.1",
+        "@babel/types": "^7.27.3",
+        "@jest/expect-utils": "30.0.3",
+        "@jest/get-type": "30.0.1",
+        "@jest/snapshot-utils": "30.0.1",
+        "@jest/transform": "30.0.2",
+        "@jest/types": "30.0.1",
+        "babel-preset-current-node-syntax": "^1.1.0",
+        "chalk": "^4.1.2",
+        "expect": "30.0.3",
+        "graceful-fs": "^4.2.11",
+        "jest-diff": "30.0.3",
+        "jest-matcher-utils": "30.0.3",
+        "jest-message-util": "30.0.2",
+        "jest-util": "30.0.2",
+        "pretty-format": "30.0.2",
+        "semver": "^7.7.2",
+        "synckit": "^0.11.8"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/@jest/expect-utils": {
+      "version": "30.0.3",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/get-type": "30.0.1"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/@jest/schemas": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@sinclair/typebox": "^0.34.0"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/@jest/types": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/pattern": "30.0.1",
+        "@jest/schemas": "30.0.1",
+        "@types/istanbul-lib-coverage": "^2.0.6",
+        "@types/istanbul-reports": "^3.0.4",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.33",
+        "chalk": "^4.1.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/@pkgr/core": {
+      "version": "0.2.7",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/pkgr"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/@sinclair/typebox": {
+      "version": "0.34.37",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/jest-snapshot/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/jest-snapshot/node_modules/expect": {
+      "version": "30.0.3",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/expect-utils": "30.0.3",
+        "@jest/get-type": "30.0.1",
+        "jest-matcher-utils": "30.0.3",
+        "jest-message-util": "30.0.2",
+        "jest-mock": "30.0.2",
+        "jest-util": "30.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/jest-diff": {
+      "version": "30.0.3",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/diff-sequences": "30.0.1",
+        "@jest/get-type": "30.0.1",
+        "chalk": "^4.1.2",
+        "pretty-format": "30.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/jest-matcher-utils": {
+      "version": "30.0.3",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/get-type": "30.0.1",
+        "chalk": "^4.1.2",
+        "jest-diff": "30.0.3",
+        "pretty-format": "30.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/jest-message-util": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.27.1",
+        "@jest/types": "30.0.1",
+        "@types/stack-utils": "^2.0.3",
+        "chalk": "^4.1.2",
+        "graceful-fs": "^4.2.11",
+        "micromatch": "^4.0.8",
+        "pretty-format": "30.0.2",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.6"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/jest-mock": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "jest-util": "30.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/jest-util": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "chalk": "^4.1.2",
+        "ci-info": "^4.2.0",
+        "graceful-fs": "^4.2.11",
+        "picomatch": "^4.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/picomatch": {
+      "version": "4.0.2",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/pretty-format": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/schemas": "30.0.1",
+        "ansi-styles": "^5.2.0",
+        "react-is": "^18.3.1"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/pretty-format/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/semver": {
+      "version": "7.7.2",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/slash": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/synckit": {
+      "version": "0.11.8",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@pkgr/core": "^0.2.4"
+      },
+      "engines": {
+        "node": "^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/synckit"
+      }
+    },
     "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": {
@@ -29368,8 +28566,6 @@
     },
     "node_modules/jest-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==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -29385,8 +28581,6 @@
     },
     "node_modules/jest-util/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": [
         {
@@ -29400,27 +28594,56 @@
       }
     },
     "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==",
+      "version": "30.0.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/types": "^29.6.3",
-        "camelcase": "^6.2.0",
-        "chalk": "^4.0.0",
-        "jest-get-type": "^29.6.3",
+        "@jest/get-type": "30.0.1",
+        "@jest/types": "30.0.1",
+        "camelcase": "^6.3.0",
+        "chalk": "^4.1.2",
         "leven": "^3.1.0",
-        "pretty-format": "^29.7.0"
+        "pretty-format": "30.0.2"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
+    "node_modules/jest-validate/node_modules/@jest/schemas": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@sinclair/typebox": "^0.34.0"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-validate/node_modules/@jest/types": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/pattern": "30.0.1",
+        "@jest/schemas": "30.0.1",
+        "@types/istanbul-lib-coverage": "^2.0.6",
+        "@types/istanbul-reports": "^3.0.4",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.33",
+        "chalk": "^4.1.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-validate/node_modules/@sinclair/typebox": {
+      "version": "0.34.37",
+      "dev": true,
+      "license": "MIT"
+    },
     "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": {
@@ -29435,24 +28658,20 @@
       }
     },
     "node_modules/jest-validate/node_modules/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==",
+      "version": "30.0.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
+        "@jest/schemas": "30.0.1",
+        "ansi-styles": "^5.2.0",
+        "react-is": "^18.3.1"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-validate/node_modules/pretty-format/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==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -29463,29 +28682,58 @@
       }
     },
     "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==",
+      "version": "30.0.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/test-result": "^29.7.0",
-        "@jest/types": "^29.6.3",
+        "@jest/test-result": "30.0.2",
+        "@jest/types": "30.0.1",
         "@types/node": "*",
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.0.0",
+        "ansi-escapes": "^4.3.2",
+        "chalk": "^4.1.2",
         "emittery": "^0.13.1",
-        "jest-util": "^29.7.0",
-        "string-length": "^4.0.1"
+        "jest-util": "30.0.2",
+        "string-length": "^4.0.2"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
+    "node_modules/jest-watcher/node_modules/@jest/schemas": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@sinclair/typebox": "^0.34.0"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-watcher/node_modules/@jest/types": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/pattern": "30.0.1",
+        "@jest/schemas": "30.0.1",
+        "@types/istanbul-lib-coverage": "^2.0.6",
+        "@types/istanbul-reports": "^3.0.4",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.33",
+        "chalk": "^4.1.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-watcher/node_modules/@sinclair/typebox": {
+      "version": "0.34.37",
+      "dev": true,
+      "license": "MIT"
+    },
     "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": {
@@ -29499,10 +28747,35 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
+    "node_modules/jest-watcher/node_modules/jest-util": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "chalk": "^4.1.2",
+        "ci-info": "^4.2.0",
+        "graceful-fs": "^4.2.11",
+        "picomatch": "^4.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-watcher/node_modules/picomatch": {
+      "version": "4.0.2",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
     "node_modules/jest-websocket-mock": {
       "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/jest-websocket-mock/-/jest-websocket-mock-2.5.0.tgz",
-      "integrity": "sha512-a+UJGfowNIWvtIKIQBHoEWIUqRxxQHFx4CXT+R5KxxKBtEQ5rS3pPOV/5299sHzqbmeCzxxY5qE4+yfXePePig==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -29512,8 +28785,6 @@
     },
     "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",
       "dependencies": {
@@ -29528,8 +28799,6 @@
     },
     "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": {
@@ -29542,23 +28811,72 @@
         "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
+    "node_modules/jest/node_modules/@jest/schemas": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@sinclair/typebox": "^0.34.0"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest/node_modules/@jest/types": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/pattern": "30.0.1",
+        "@jest/schemas": "30.0.1",
+        "@types/istanbul-lib-coverage": "^2.0.6",
+        "@types/istanbul-reports": "^3.0.4",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.33",
+        "chalk": "^4.1.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest/node_modules/@sinclair/typebox": {
+      "version": "0.34.37",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/jest/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/jiti": {
+      "version": "2.4.2",
+      "license": "MIT",
+      "bin": {
+        "jiti": "lib/jiti-cli.mjs"
+      }
+    },
     "node_modules/jpeg-js": {
       "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.4.4.tgz",
-      "integrity": "sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg==",
       "dev": true,
       "license": "BSD-3-Clause"
     },
     "node_modules/jquery": {
       "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz",
-      "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==",
       "license": "MIT"
     },
     "node_modules/js-levenshtein": {
       "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz",
-      "integrity": "sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==",
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -29566,14 +28884,10 @@
     },
     "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==",
       "license": "MIT"
     },
     "node_modules/js-yaml": {
       "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
       "license": "MIT",
       "dependencies": {
         "argparse": "^1.0.7",
@@ -29585,8 +28899,6 @@
     },
     "node_modules/js-yaml-loader": {
       "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/js-yaml-loader/-/js-yaml-loader-1.2.2.tgz",
-      "integrity": "sha512-H+NeuNrG6uOs/WMjna2SjkaCw13rMWiT/D7l9+9x5n8aq88BDsh2sRmdfxckWPIHtViYHWRG6XiCKYvS1dfyLg==",
       "license": "MIT",
       "dependencies": {
         "js-yaml": "^3.13.1",
@@ -29594,17 +28906,35 @@
         "un-eval": "^1.2.0"
       }
     },
+    "node_modules/js-yaml-loader/node_modules/json5": {
+      "version": "1.0.2",
+      "license": "MIT",
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/js-yaml-loader/node_modules/loader-utils": {
+      "version": "1.4.2",
+      "license": "MIT",
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4.0.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,
       "license": "MIT"
     },
     "node_modules/jscodeshift": {
       "version": "0.15.2",
-      "resolved": "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.15.2.tgz",
-      "integrity": "sha512-FquR7Okgmc4Sd0aEDwqho3rEiKR3BdvuG9jfdHjLJ6JQoWSMpavug3AoIfnfWhxFlf+5pzQh8qjqz0DWFrNQzA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -29643,8 +28973,6 @@
     },
     "node_modules/jscodeshift/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": {
@@ -29660,8 +28988,6 @@
     },
     "node_modules/jscodeshift/node_modules/write-file-atomic": {
       "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz",
-      "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -29670,16 +28996,23 @@
         "signal-exit": "^3.0.2"
       }
     },
+    "node_modules/jsdoc-type-pratt-parser": {
+      "version": "4.1.0",
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
     "node_modules/jsdom": {
-      "version": "26.1.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-26.1.0.tgz",
-      "integrity": "sha512-Cvc9WUhxSMEo4McES3P7oK3QaXldCfNWp7pl2NNeiIFlCoLr3kfq9kb1fxftiwk1FLV7CvpvDfonxtzUDeSOPg==",
+      "version": "26.0.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "cssstyle": "^4.2.1",
         "data-urls": "^5.0.0",
-        "decimal.js": "^10.5.0",
+        "decimal.js": "^10.4.3",
+        "form-data": "^4.0.1",
         "html-encoding-sniffer": "^4.0.0",
         "http-proxy-agent": "^7.0.2",
         "https-proxy-agent": "^7.0.6",
@@ -29689,12 +29022,12 @@
         "rrweb-cssom": "^0.8.0",
         "saxes": "^6.0.0",
         "symbol-tree": "^3.2.4",
-        "tough-cookie": "^5.1.1",
+        "tough-cookie": "^5.0.0",
         "w3c-xmlserializer": "^5.0.0",
         "webidl-conversions": "^7.0.0",
         "whatwg-encoding": "^3.1.1",
         "whatwg-mimetype": "^4.0.0",
-        "whatwg-url": "^14.1.1",
+        "whatwg-url": "^14.1.0",
         "ws": "^8.18.0",
         "xml-name-validator": "^5.0.0"
       },
@@ -29712,31 +29045,14 @@
     },
     "node_modules/jsdom/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,
       "license": "MIT",
       "engines": {
         "node": ">= 14"
       }
     },
-    "node_modules/jsdom/node_modules/entities": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.0.tgz",
-      "integrity": "sha512-aKstq2TDOndCn4diEyp9Uq/Flu2i1GlLkc6XIDQSDMuaFE3OPW5OphLCyQ5SpSJZTb4reN+kTcYru5yIfXoRPw==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": ">=0.12"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
     "node_modules/jsdom/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": {
@@ -29749,8 +29065,6 @@
     },
     "node_modules/jsdom/node_modules/https-proxy-agent": {
       "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,
       "license": "MIT",
       "dependencies": {
@@ -29761,23 +29075,8 @@
         "node": ">= 14"
       }
     },
-    "node_modules/jsdom/node_modules/parse5": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.3.0.tgz",
-      "integrity": "sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "entities": "^6.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/inikulin/parse5?sponsor=1"
-      }
-    },
     "node_modules/jsdom/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,
       "license": "MIT",
       "engines": {
@@ -29785,9 +29084,7 @@
       }
     },
     "node_modules/jsdom/node_modules/tr46": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.1.1.tgz",
-      "integrity": "sha512-hdF5ZgjTqgAntKkklYw0R03MG2x/bSzTtkxmIRw/sTNV8YXsCJ1tfLAX23lhxhHJlEf3CRCOCGGWw3vI3GaSPw==",
+      "version": "5.0.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -29798,13 +29095,11 @@
       }
     },
     "node_modules/jsdom/node_modules/whatwg-url": {
-      "version": "14.2.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.2.0.tgz",
-      "integrity": "sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw==",
+      "version": "14.1.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "tr46": "^5.1.0",
+        "tr46": "^5.0.0",
         "webidl-conversions": "^7.0.0"
       },
       "engines": {
@@ -29812,9 +29107,7 @@
       }
     },
     "node_modules/jsdom/node_modules/ws": {
-      "version": "8.18.2",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.2.tgz",
-      "integrity": "sha512-DMricUmwGZUVr++AEAe2uiVM7UoO9MAVZMDu05UQOaUII0lp+zOzLLU4Xqh/JvTqklB1T4uELaaPBKyjE1r4fQ==",
+      "version": "8.18.0",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -29835,8 +29128,6 @@
     },
     "node_modules/jsesc": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
-      "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
       "license": "MIT",
       "bin": {
         "jsesc": "bin/jsesc"
@@ -29847,8 +29138,6 @@
     },
     "node_modules/json-bigint": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz",
-      "integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==",
       "license": "MIT",
       "dependencies": {
         "bignumber.js": "^9.0.0"
@@ -29856,21 +29145,14 @@
     },
     "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==",
       "license": "MIT"
     },
     "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,
       "license": "MIT"
     },
     "node_modules/json-parse-even-better-errors": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.2.tgz",
-      "integrity": "sha512-fi0NG4bPjCHunUJffmLd0gxssIgkNmArMvis4iNah6Owg1MCJjWhEcDLmsK6iGkJq3tHwbDkTlce70/tmXN4cQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -29879,14 +29161,10 @@
     },
     "node_modules/json-schema": {
       "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
-      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
       "license": "(AFL-2.1 OR BSD-3-Clause)"
     },
     "node_modules/json-schema-compare": {
       "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/json-schema-compare/-/json-schema-compare-0.2.2.tgz",
-      "integrity": "sha512-c4WYmDKyJXhs7WWvAWm3uIYnfyWFoIp+JEoX34rctVvEkMYCPGhXtvmFFXiffBbxfZsvQ0RNnV5H7GvDF5HCqQ==",
       "license": "MIT",
       "dependencies": {
         "lodash": "^4.17.4"
@@ -29894,8 +29172,6 @@
     },
     "node_modules/json-schema-merge-allof": {
       "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/json-schema-merge-allof/-/json-schema-merge-allof-0.8.1.tgz",
-      "integrity": "sha512-CTUKmIlPJbsWfzRRnOXz+0MjIqvnleIXwFTzz+t9T86HnYX/Rozria6ZVGLktAU9e+NygNljveP+yxqtQp/Q4w==",
       "license": "MIT",
       "dependencies": {
         "compute-lcm": "^1.1.2",
@@ -29908,8 +29184,6 @@
     },
     "node_modules/json-schema-ref-resolver": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-schema-ref-resolver/-/json-schema-ref-resolver-1.0.1.tgz",
-      "integrity": "sha512-EJAj1pgHc1hxF6vo2Z3s69fMjO1INq6eGHXZ8Z6wCQeldCuwxGK9Sxf4/cScGn3FZubCVUehfWtcDM/PLteCQw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -29918,20 +29192,14 @@
     },
     "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==",
       "license": "MIT"
     },
     "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==",
       "license": "MIT"
     },
     "node_modules/json-stringify-nice": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/json-stringify-nice/-/json-stringify-nice-1.1.4.tgz",
-      "integrity": "sha512-5Z5RFW63yxReJ7vANgW6eZFGWaQvnPE3WNmZoOJrSkGju2etKA2L5rrOa1sm877TVTFt57A80BH1bArcmlLfPw==",
       "dev": true,
       "license": "ISC",
       "funding": {
@@ -29940,14 +29208,10 @@
     },
     "node_modules/json-stringify-pretty-compact": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/json-stringify-pretty-compact/-/json-stringify-pretty-compact-2.0.0.tgz",
-      "integrity": "sha512-WRitRfs6BGq4q8gTgOy4ek7iPFXjbra0H3PmDLKm2xnZ+Gh1HUhiKGgCZkSPNULlP7mvfu6FV/mOLhCarspADQ==",
       "license": "MIT"
     },
     "node_modules/json-stringify-safe": {
       "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
       "license": "ISC"
     },
     "node_modules/json2mq": {
@@ -29961,8 +29225,6 @@
     },
     "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,
       "license": "MIT",
       "bin": {
@@ -29974,15 +29236,11 @@
     },
     "node_modules/jsonc-parser": {
       "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
-      "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/jsonfile": {
       "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
       "license": "MIT",
       "dependencies": {
         "universalify": "^2.0.0"
@@ -29993,9 +29251,6 @@
     },
     "node_modules/jsonparse": {
       "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
-      "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==",
-      "dev": true,
       "engines": [
         "node >= 0.2.0"
       ],
@@ -30003,8 +29258,6 @@
     },
     "node_modules/jsonpointer": {
       "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-5.0.1.tgz",
-      "integrity": "sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ==",
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -30012,9 +29265,6 @@
     },
     "node_modules/JSONStream": {
       "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
-      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
-      "dev": true,
       "license": "(MIT OR Apache-2.0)",
       "dependencies": {
         "jsonparse": "^1.2.0",
@@ -30029,8 +29279,6 @@
     },
     "node_modules/jspdf": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/jspdf/-/jspdf-3.0.1.tgz",
-      "integrity": "sha512-qaGIxqxetdoNnFQQXxTKUD9/Z7AloLaw94fFsOiJMxbfYdBbrBuhWmbzI8TVjrw7s3jBY1PFHofBKMV/wZPapg==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.26.7",
@@ -30062,8 +29310,6 @@
     },
     "node_modules/jsx-ast-utils": {
       "version": "3.3.5",
-      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz",
-      "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -30078,40 +29324,30 @@
     },
     "node_modules/just-diff": {
       "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/just-diff/-/just-diff-6.0.2.tgz",
-      "integrity": "sha512-S59eriX5u3/QhMNq3v/gm8Kd0w8OS6Tz2FS1NG4blv+z0MuQcBRJyFWjdovM0Rad4/P4aUPFtnkNjMjyMlMSYA==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/just-diff-apply": {
       "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/just-diff-apply/-/just-diff-apply-5.5.0.tgz",
-      "integrity": "sha512-OYTthRfSh55WOItVqwpefPtNt2VdKsq5AnAK6apdtR6yCH8pr0CmSr710J0Mf+WdQy7K/OzMy7K2MgAfdQURDw==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/just-extend": {
       "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-6.2.0.tgz",
-      "integrity": "sha512-cYofQu2Xpom82S6qD778jBDpwvvy39s1l/hrYij2u9AMdQcGRpaBu6kY4mVhuno5kJVi1DAz4aiphA2WI1/OAw==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/jwa": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.1.tgz",
-      "integrity": "sha512-hRF04fqJIP8Abbkq5NKGN0Bbr3JxlQ+qhZufXVr0DvujKy93ZCbXZMHDL4EOtodSbCWxOqR8MS1tXA5hwqCXDg==",
+      "version": "2.0.0",
       "license": "MIT",
       "dependencies": {
-        "buffer-equal-constant-time": "^1.0.1",
+        "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",
-      "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz",
-      "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==",
       "license": "MIT",
       "dependencies": {
         "jwa": "^2.0.0",
@@ -30120,14 +29356,10 @@
     },
     "node_modules/kdbush": {
       "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/kdbush/-/kdbush-4.0.2.tgz",
-      "integrity": "sha512-WbCVYJ27Sz8zi9Q7Q0xHC+05iwkm3Znipc2XTlrnJbsHMYktW4hPhXUE8Ys1engBrvffoSCqbil1JQAa7clRpA==",
       "license": "ISC"
     },
     "node_modules/keyv": {
       "version": "4.5.4",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
-      "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
       "license": "MIT",
       "dependencies": {
         "json-buffer": "3.0.1"
@@ -30135,8 +29367,6 @@
     },
     "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": {
@@ -30145,8 +29375,6 @@
     },
     "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,
       "license": "MIT",
       "engines": {
@@ -30155,8 +29383,6 @@
     },
     "node_modules/ky": {
       "version": "0.30.0",
-      "resolved": "https://registry.npmjs.org/ky/-/ky-0.30.0.tgz",
-      "integrity": "sha512-X/u76z4JtDVq10u1JA5UQfatPxgPaVDMYTrgHyiTpGN2z4TMEJkIHsoSBBSg9SWZEIXTKsi9kHgiQ9o3Y/4yog==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -30168,15 +29394,11 @@
     },
     "node_modules/language-subtag-registry": {
       "version": "0.3.23",
-      "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.23.tgz",
-      "integrity": "sha512-0K65Lea881pHotoGEa5gDlMxt3pctLi2RplBb7Ezh4rRdLEOtgi7n4EwK9lamnUCkKBqaeKRVebTq6BAxSkpXQ==",
       "dev": true,
       "license": "CC0-1.0"
     },
     "node_modules/language-tags": {
       "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.9.tgz",
-      "integrity": "sha512-MbjN408fEndfiQXbFQ1vnd+1NoLDsnQW41410oQBXiyXDMYH5z505juWa4KUE1LqxRC7DgOgZDbKLxHIwm27hA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -30188,8 +29410,6 @@
     },
     "node_modules/latest-version": {
       "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-9.0.0.tgz",
-      "integrity": "sha512-7W0vV3rqv5tokqkBAFV1LbR7HPOWzXQDpDgEuib/aJ1jsZZx6x3c2mBI+TJhJzOhkGeaLbCKEHXEXLfirtG2JA==",
       "license": "MIT",
       "dependencies": {
         "package-json": "^10.0.0"
@@ -30202,9 +29422,7 @@
       }
     },
     "node_modules/launch-editor": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.10.0.tgz",
-      "integrity": "sha512-D7dBRJo/qcGX9xlvt/6wUYzQxjh5G1RvZPgPv8vi4KRU99DVQL/oW7tnVOCCTm2HGeo3C5HvGE5Yrh6UBoZ0vA==",
+      "version": "2.9.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -30214,8 +29432,6 @@
     },
     "node_modules/lazy-ass": {
       "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/lazy-ass/-/lazy-ass-1.6.0.tgz",
-      "integrity": "sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw==",
       "license": "MIT",
       "engines": {
         "node": "> 0.8"
@@ -30223,8 +29439,6 @@
     },
     "node_modules/lazy-universal-dotenv": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/lazy-universal-dotenv/-/lazy-universal-dotenv-4.0.0.tgz",
-      "integrity": "sha512-aXpZJRnTkpK6gQ/z4nk+ZBLd/Qdp118cvPruLSIQzQNRhKwEcdXCOzXuF55VDqIiuAaY3UGZ10DJtvZzDcvsxg==",
       "license": "Apache-2.0",
       "dependencies": {
         "app-root-dir": "^1.0.2",
@@ -30237,18 +29451,14 @@
     },
     "node_modules/lerc": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lerc/-/lerc-3.0.0.tgz",
-      "integrity": "sha512-Rm4J/WaHhRa93nCN2mwWDZFoRVF18G1f47C+kvQWyHGEZxFpTUi73p7lMVSAndyxGt6lJ2/CFbOcf9ra5p8aww==",
       "license": "Apache-2.0"
     },
     "node_modules/lerna": {
-      "version": "8.2.2",
-      "resolved": "https://registry.npmjs.org/lerna/-/lerna-8.2.2.tgz",
-      "integrity": "sha512-GkqBELTG4k7rfzAwRok2pKBvhNo046Hfwcj7TuhDah3q58/BBBAqvIFLfqEI5fglnNOs6maMSn6/MWjccQE55A==",
+      "version": "8.2.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@lerna/create": "8.2.2",
+        "@lerna/create": "8.2.1",
         "@npmcli/arborist": "7.5.4",
         "@npmcli/package-json": "5.2.0",
         "@npmcli/run-script": "8.1.0",
@@ -30338,15 +29548,11 @@
     },
     "node_modules/lerna/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/lerna/node_modules/chalk": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -30360,10 +29566,16 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
+    "node_modules/lerna/node_modules/cli-width": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">= 10"
+      }
+    },
     "node_modules/lerna/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",
       "dependencies": {
@@ -30389,8 +29601,6 @@
     },
     "node_modules/lerna/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": "MIT",
       "peerDependencies": {
@@ -30402,10 +29612,13 @@
         }
       }
     },
+    "node_modules/lerna/node_modules/eventemitter3": {
+      "version": "4.0.7",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/lerna/node_modules/execa": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-5.0.0.tgz",
-      "integrity": "sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -30428,8 +29641,6 @@
     },
     "node_modules/lerna/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,
       "license": "MIT",
       "dependencies": {
@@ -30442,8 +29653,6 @@
     },
     "node_modules/lerna/node_modules/get-stream": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.0.tgz",
-      "integrity": "sha512-A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -30455,8 +29664,6 @@
     },
     "node_modules/lerna/node_modules/glob": {
       "version": "9.3.5",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-9.3.5.tgz",
-      "integrity": "sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -30474,8 +29681,6 @@
     },
     "node_modules/lerna/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": "ISC",
       "dependencies": {
@@ -30487,8 +29692,6 @@
     },
     "node_modules/lerna/node_modules/glob/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": {
@@ -30497,8 +29700,6 @@
     },
     "node_modules/lerna/node_modules/glob/node_modules/minimatch": {
       "version": "8.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-8.0.4.tgz",
-      "integrity": "sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -30513,8 +29714,6 @@
     },
     "node_modules/lerna/node_modules/import-local": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
-      "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -30533,25 +29732,70 @@
     },
     "node_modules/lerna/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/lerna/node_modules/inquirer": {
+      "version": "8.2.6",
+      "dev": true,
+      "license": "MIT",
+      "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.5.5",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0",
+        "through": "^2.3.6",
+        "wrap-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/lerna/node_modules/inquirer/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/lerna/node_modules/is-stream": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
-      "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
       "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
+    "node_modules/lerna/node_modules/is-unicode-supported": {
+      "version": "0.1.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/lerna/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": {
@@ -30563,8 +29807,6 @@
     },
     "node_modules/lerna/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,
       "license": "MIT",
       "dependencies": {
@@ -30574,10 +29816,23 @@
         "node": ">=8"
       }
     },
+    "node_modules/lerna/node_modules/log-symbols": {
+      "version": "4.1.0",
+      "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/lerna/node_modules/make-dir": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
-      "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -30592,8 +29847,6 @@
     },
     "node_modules/lerna/node_modules/minimatch": {
       "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz",
-      "integrity": "sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -30605,18 +29858,41 @@
     },
     "node_modules/lerna/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": ">=8"
       }
     },
+    "node_modules/lerna/node_modules/mute-stream": {
+      "version": "0.0.8",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/lerna/node_modules/ora": {
+      "version": "5.4.1",
+      "dev": true,
+      "license": "MIT",
+      "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_modules/lerna/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,
       "license": "MIT",
       "dependencies": {
@@ -30631,8 +29907,6 @@
     },
     "node_modules/lerna/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,
       "license": "MIT",
       "dependencies": {
@@ -30642,10 +29916,34 @@
         "node": ">=8"
       }
     },
+    "node_modules/lerna/node_modules/p-queue": {
+      "version": "6.6.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "eventemitter3": "^4.0.4",
+        "p-timeout": "^3.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/lerna/node_modules/p-timeout": {
+      "version": "3.2.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-finally": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/lerna/node_modules/pify": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz",
-      "integrity": "sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -30657,8 +29955,6 @@
     },
     "node_modules/lerna/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,
       "license": "MIT",
       "dependencies": {
@@ -30670,8 +29966,6 @@
     },
     "node_modules/lerna/node_modules/rimraf": {
       "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-4.4.1.tgz",
-      "integrity": "sha512-Gk8NlF062+T9CqNGn6h4tls3k6T1+/nXdOcSZVikNVtlRdYpA7wRJJMoXmuvOnLW844rPjdQ7JgXCYM6PPC/og==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -30687,20 +29981,35 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/lerna/node_modules/run-async": {
+      "version": "2.4.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
     "node_modules/lerna/node_modules/slash": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
       "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
+    "node_modules/lerna/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/lerna/node_modules/uuid": {
       "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz",
-      "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==",
       "dev": true,
       "funding": [
         "https://github.com/sponsors/broofa",
@@ -30711,102 +30020,8 @@
         "uuid": "dist/bin/uuid"
       }
     },
-    "node_modules/lerna/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": "ISC",
-      "dependencies": {
-        "imurmurhash": "^0.1.4",
-        "signal-exit": "^4.0.1"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/lerna/node_modules/write-file-atomic/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,
-      "license": "ISC",
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/less": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/less/-/less-4.3.0.tgz",
-      "integrity": "sha512-X9RyH9fvemArzfdP8Pi3irr7lor2Ok4rOttDXBhlwDg+wKQsXOXgHWduAJE1EsF7JJx0w0bcO6BC6tCKKYnXKA==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "copy-anything": "^2.0.1",
-        "parse-node-version": "^1.0.1",
-        "tslib": "^2.3.0"
-      },
-      "bin": {
-        "lessc": "bin/lessc"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "optionalDependencies": {
-        "errno": "^0.1.1",
-        "graceful-fs": "^4.1.2",
-        "image-size": "~0.5.0",
-        "make-dir": "^2.1.0",
-        "mime": "^1.4.1",
-        "needle": "^3.1.0",
-        "source-map": "~0.6.0"
-      }
-    },
-    "node_modules/less-loader": {
-      "version": "12.3.0",
-      "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-12.3.0.tgz",
-      "integrity": "sha512-0M6+uYulvYIWs52y0LqN4+QM9TqWAohYSNTo4htE8Z7Cn3G/qQMEmktfHmyJT23k+20kU9zHH2wrfFXkxNLtVw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 18.12.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "@rspack/core": "0.x || 1.x",
-        "less": "^3.5.0 || ^4.0.0",
-        "webpack": "^5.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@rspack/core": {
-          "optional": true
-        },
-        "webpack": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/less/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",
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/leven": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -30815,8 +30030,6 @@
     },
     "node_modules/levn": {
       "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
       "license": "MIT",
       "dependencies": {
         "prelude-ls": "^1.2.1",
@@ -30828,8 +30041,6 @@
     },
     "node_modules/libnpmaccess": {
       "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/libnpmaccess/-/libnpmaccess-8.0.6.tgz",
-      "integrity": "sha512-uM8DHDEfYG6G5gVivVl+yQd4pH3uRclHC59lzIbSvy7b5FEwR+mU49Zq1jEyRtRFv7+M99mUW9S0wL/4laT4lw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -30842,8 +30053,6 @@
     },
     "node_modules/libnpmpublish": {
       "version": "9.0.9",
-      "resolved": "https://registry.npmjs.org/libnpmpublish/-/libnpmpublish-9.0.9.tgz",
-      "integrity": "sha512-26zzwoBNAvX9AWOPiqqF6FG4HrSCPsHFkQm7nT+xU1ggAujL/eae81RnCv4CJ2In9q9fh10B88sYSzKCUh/Ghg==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -30862,8 +30071,6 @@
     },
     "node_modules/light-my-request": {
       "version": "5.14.0",
-      "resolved": "https://registry.npmjs.org/light-my-request/-/light-my-request-5.14.0.tgz",
-      "integrity": "sha512-aORPWntbpH5esaYpGOOmri0OHDOe3wC5M2MQxZ9dvMLZm6DnaAn0kJlcbU9hwsQgLzmZyReKwFwwPkR+nHu5kA==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
@@ -30874,8 +30081,6 @@
     },
     "node_modules/lilconfig": {
       "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz",
-      "integrity": "sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -30887,8 +30092,6 @@
     },
     "node_modules/lines-and-columns": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-2.0.3.tgz",
-      "integrity": "sha512-cNOjgCnLB+FnvWWtyRTzmB3POJ+cXxTA81LoW7u8JdmhfXzriropYwpjShnz1QLLWsQwY7nIxoDmcPTwphDK9w==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -30897,8 +30100,6 @@
     },
     "node_modules/listr2": {
       "version": "3.14.0",
-      "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.14.0.tgz",
-      "integrity": "sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g==",
       "license": "MIT",
       "dependencies": {
         "cli-truncate": "^2.1.0",
@@ -30924,8 +30125,6 @@
     },
     "node_modules/listr2/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==",
       "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
@@ -30941,8 +30140,6 @@
     },
     "node_modules/load-json-file": {
       "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-6.2.0.tgz",
-      "integrity": "sha512-gUD/epcRms75Cw8RT1pUdHugZYM5ce64ucs2GEISABwkRsOQr0q2wm/MV2TKThycIe5e0ytRweW2RZxclogCdQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -30957,8 +30154,6 @@
     },
     "node_modules/load-json-file/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,
       "license": "(MIT OR CC0-1.0)",
       "engines": {
@@ -30967,44 +30162,14 @@
     },
     "node_modules/loader-runner": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
-      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
       "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.11.5"
       }
     },
-    "node_modules/loader-utils": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
-      "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
-      "license": "MIT",
-      "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.2",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
-      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
-      "license": "MIT",
-      "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==",
       "license": "MIT",
       "dependencies": {
         "p-locate": "^5.0.0"
@@ -31018,134 +30183,125 @@
     },
     "node_modules/lodash": {
       "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "license": "MIT"
     },
     "node_modules/lodash-es": {
       "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
-      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==",
+      "license": "MIT"
+    },
+    "node_modules/lodash.camelcase": {
+      "version": "4.3.0",
+      "license": "MIT"
+    },
+    "node_modules/lodash.capitalize": {
+      "version": "4.2.1",
       "license": "MIT"
     },
     "node_modules/lodash.curry": {
       "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.curry/-/lodash.curry-4.1.1.tgz",
-      "integrity": "sha512-/u14pXGviLaweY5JI0IUzgzF2J6Ne8INyzAZjImcryjgkZ+ebruBxy2/JaOOkTqScddcYtakjhSaeemV8lR0tA==",
       "license": "MIT"
     },
     "node_modules/lodash.debounce": {
       "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-      "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/lodash.escape": {
+      "version": "4.0.1",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/lodash.escaperegexp": {
+      "version": "4.1.2",
+      "license": "MIT"
+    },
     "node_modules/lodash.flattendeep": {
       "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
-      "integrity": "sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ==",
       "dev": true,
       "license": "MIT",
       "peer": true
     },
     "node_modules/lodash.get": {
       "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-      "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==",
-      "deprecated": "This package is deprecated. Use the optional chaining (?.) operator instead.",
       "license": "MIT"
     },
     "node_modules/lodash.isequal": {
       "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-      "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==",
-      "deprecated": "This package is deprecated. Use require('node:util').isDeepStrictEqual instead.",
       "license": "MIT"
     },
     "node_modules/lodash.ismatch": {
       "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz",
-      "integrity": "sha512-fPMfXjGQEV9Xsq/8MTSgUf255gawYRbjwMyDbcvDhXgV7enSZA0hynz6vMPnpAb5iONEzBHBPsT+0zes5Z301g==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/lodash.isplainobject": {
       "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-      "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==",
-      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.isstring": {
+      "version": "4.0.1",
+      "license": "MIT"
+    },
+    "node_modules/lodash.kebabcase": {
+      "version": "4.1.1",
       "license": "MIT"
     },
     "node_modules/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,
       "license": "MIT"
     },
     "node_modules/lodash.merge": {
       "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "license": "MIT"
+    },
+    "node_modules/lodash.mergewith": {
+      "version": "4.6.2",
       "license": "MIT"
     },
     "node_modules/lodash.once": {
       "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
-      "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==",
       "license": "MIT"
     },
-    "node_modules/lodash.sortby": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
-      "integrity": "sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==",
-      "dev": true,
+    "node_modules/lodash.snakecase": {
+      "version": "4.1.1",
+      "license": "MIT"
+    },
+    "node_modules/lodash.startcase": {
+      "version": "4.4.0",
       "license": "MIT"
     },
     "node_modules/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,
+      "license": "MIT"
+    },
+    "node_modules/lodash.uniqby": {
+      "version": "4.7.0",
+      "license": "MIT"
+    },
+    "node_modules/lodash.upperfirst": {
+      "version": "4.3.1",
       "license": "MIT"
     },
     "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==",
+      "version": "7.0.0",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "chalk": "^4.1.0",
-        "is-unicode-supported": "^0.1.0"
+        "is-unicode-supported": "^2.0.0",
+        "yoctocolors": "^2.1.1"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "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==",
-      "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/log-update": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz",
-      "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==",
       "license": "MIT",
       "dependencies": {
         "ansi-escapes": "^4.3.0",
@@ -31162,8 +30318,6 @@
     },
     "node_modules/log-update/node_modules/slice-ansi": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
       "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
@@ -31179,8 +30333,6 @@
     },
     "node_modules/loglevel": {
       "version": "1.9.2",
-      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.9.2.tgz",
-      "integrity": "sha512-HgMmCqIJSAKqo68l0rS2AanEWfkxaZ5wNiEFb5ggm08lDs9Xl2KxBlX3PTcaD2chBM1gXAYf491/M2Rv8Jwayg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -31193,15 +30345,11 @@
     },
     "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,
       "license": "MIT"
     },
     "node_modules/longest-streak": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-3.1.0.tgz",
-      "integrity": "sha512-9Ri+o0JYgehTaVBBDoMqIl8GXtbWg711O3srftcHhZ0dqnETqLaoIK0x17fUw9rFSlK/0NlsKe0Ahhyl5pXE2g==",
       "license": "MIT",
       "funding": {
         "type": "github",
@@ -31210,8 +30358,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "js-tokens": "^3.0.0 || ^4.0.0"
@@ -31222,8 +30368,6 @@
     },
     "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,
       "license": "MIT",
       "dependencies": {
@@ -31232,8 +30376,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==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -31242,8 +30384,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "fault": "^1.0.0",
@@ -31256,8 +30396,6 @@
     },
     "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": {
@@ -31265,9 +30403,7 @@
       }
     },
     "node_modules/luxon": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.6.1.tgz",
-      "integrity": "sha512-tJLxrKJhO2ukZ5z0gyjY1zPh3Rh88Ej9P7jNrZiHMUXHae1yvI2imgOZtL1TO8TW6biMMKfTtAOoEJANgtWBMQ==",
+      "version": "3.5.0",
       "license": "MIT",
       "engines": {
         "node": ">=12"
@@ -31275,8 +30411,6 @@
     },
     "node_modules/lz-string": {
       "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz",
-      "integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==",
       "license": "MIT",
       "bin": {
         "lz-string": "bin/bin.js"
@@ -31284,8 +30418,6 @@
     },
     "node_modules/magic-string": {
       "version": "0.30.17",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz",
-      "integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -31294,8 +30426,6 @@
     },
     "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,
       "license": "MIT",
       "dependencies": {
@@ -31308,8 +30438,6 @@
     },
     "node_modules/make-dir/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,
       "license": "MIT",
       "engines": {
@@ -31318,8 +30446,6 @@
     },
     "node_modules/make-dir/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": {
@@ -31328,14 +30454,10 @@
     },
     "node_modules/make-error": {
       "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
-      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
       "license": "ISC"
     },
     "node_modules/make-fetch-happen": {
       "version": "13.0.1",
-      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz",
-      "integrity": "sha512-cKTUFc/rbKUd/9meOvgrpJ2WrNzymt6jfRDdwg5UCnVzv9dTpEj9JS5m3wtziXVCjluIXyL8pcaukYqezIzZQA==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -31358,8 +30480,6 @@
     },
     "node_modules/makeerror": {
       "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
-      "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
@@ -31368,8 +30488,6 @@
     },
     "node_modules/map-obj": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz",
-      "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -31381,56 +30499,61 @@
     },
     "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==",
       "license": "MIT"
     },
     "node_modules/mapbox-gl": {
-      "version": "2.15.0",
-      "resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-2.15.0.tgz",
-      "integrity": "sha512-fjv+aYrd5TIHiL7wRa+W7KjtUqKWziJMZUkK5hm8TvJ3OLeNPx4NmW/DgfYhd/jHej8wWL+QJBDbdMMAKvNC0A==",
+      "version": "3.13.0",
       "license": "SEE LICENSE IN LICENSE.txt",
+      "workspaces": [
+        "src/style-spec",
+        "test/build/typings"
+      ],
       "dependencies": {
-        "@mapbox/geojson-rewind": "^0.5.2",
         "@mapbox/jsonlint-lines-primitives": "^2.0.2",
-        "@mapbox/mapbox-gl-supported": "^2.0.1",
+        "@mapbox/mapbox-gl-supported": "^3.0.0",
         "@mapbox/point-geometry": "^0.1.0",
         "@mapbox/tiny-sdf": "^2.0.6",
         "@mapbox/unitbezier": "^0.0.1",
         "@mapbox/vector-tile": "^1.3.1",
         "@mapbox/whoots-js": "^3.1.0",
+        "@types/geojson": "^7946.0.16",
+        "@types/geojson-vt": "^3.2.5",
+        "@types/mapbox__point-geometry": "^0.1.4",
+        "@types/mapbox__vector-tile": "^1.3.4",
+        "@types/pbf": "^3.0.5",
+        "@types/supercluster": "^7.1.3",
+        "cheap-ruler": "^4.0.0",
         "csscolorparser": "~1.0.3",
-        "earcut": "^2.2.4",
-        "geojson-vt": "^3.2.1",
+        "earcut": "^3.0.1",
+        "geojson-vt": "^4.0.2",
         "gl-matrix": "^3.4.3",
         "grid-index": "^1.1.0",
-        "kdbush": "^4.0.1",
+        "kdbush": "^4.0.2",
+        "martinez-polygon-clipping": "^0.7.4",
         "murmurhash-js": "^1.0.0",
         "pbf": "^3.2.1",
         "potpack": "^2.0.0",
-        "quickselect": "^2.0.0",
-        "rw": "^1.3.3",
-        "supercluster": "^8.0.0",
-        "tinyqueue": "^2.0.3",
+        "quickselect": "^3.0.0",
+        "serialize-to-js": "^3.1.2",
+        "supercluster": "^8.0.1",
+        "tinyqueue": "^3.0.0",
         "vt-pbf": "^3.1.3"
       }
     },
-    "node_modules/mapbox-gl/node_modules/rw": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz",
-      "integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==",
-      "license": "BSD-3-Clause"
+    "node_modules/mapbox-gl/node_modules/earcut": {
+      "version": "3.0.1",
+      "license": "ISC"
+    },
+    "node_modules/mapbox-gl/node_modules/quickselect": {
+      "version": "3.0.0",
+      "license": "ISC"
     },
     "node_modules/mapbox-to-css-font": {
       "version": "2.4.5",
-      "resolved": "https://registry.npmjs.org/mapbox-to-css-font/-/mapbox-to-css-font-2.4.5.tgz",
-      "integrity": "sha512-VJ6nB8emkO9VODI0Fk+TQ/0zKBTqmf/Pkt8Xv0kHstoc0iXRajA00DAid4Kc3K5xeFIOoiZrVxijEzj0GLVO2w==",
       "license": "BSD-2-Clause"
     },
     "node_modules/markdown-table": {
       "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-3.0.4.tgz",
-      "integrity": "sha512-wiYz4+JrLyb/DqW2hkFJxP7Vd7JuTDm77fvbM8VfEQdmSMqcImWeeRbHwZjBjIFki/VaMK2BhFi7oUUZeM5bqw==",
       "license": "MIT",
       "funding": {
         "type": "github",
@@ -31438,9 +30561,7 @@
       }
     },
     "node_modules/markdown-to-jsx": {
-      "version": "7.7.6",
-      "resolved": "https://registry.npmjs.org/markdown-to-jsx/-/markdown-to-jsx-7.7.6.tgz",
-      "integrity": "sha512-/PWFFoKKMidk4Ut06F5hs5sluq1aJ0CGvUJWsnCK6hx/LPM8vlhvKAxtGHJ+U+V2Il2wmnfO6r81ICD3xZRVaw==",
+      "version": "7.7.4",
       "license": "MIT",
       "engines": {
         "node": ">= 10"
@@ -31449,10 +30570,87 @@
         "react": ">= 0.14.0"
       }
     },
+    "node_modules/marked": {
+      "version": "15.0.12",
+      "license": "MIT",
+      "bin": {
+        "marked": "bin/marked.js"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/marked-terminal": {
+      "version": "7.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-escapes": "^7.0.0",
+        "ansi-regex": "^6.1.0",
+        "chalk": "^5.4.1",
+        "cli-highlight": "^2.1.11",
+        "cli-table3": "^0.6.5",
+        "node-emoji": "^2.2.0",
+        "supports-hyperlinks": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      },
+      "peerDependencies": {
+        "marked": ">=1 <16"
+      }
+    },
+    "node_modules/marked-terminal/node_modules/ansi-escapes": {
+      "version": "7.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "environment": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/marked-terminal/node_modules/ansi-regex": {
+      "version": "6.1.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/marked-terminal/node_modules/chalk": {
+      "version": "5.4.1",
+      "license": "MIT",
+      "engines": {
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/martinez-polygon-clipping": {
+      "version": "0.7.4",
+      "license": "MIT",
+      "dependencies": {
+        "robust-predicates": "^2.0.4",
+        "splaytree": "^0.1.4",
+        "tinyqueue": "^1.2.0"
+      }
+    },
+    "node_modules/martinez-polygon-clipping/node_modules/robust-predicates": {
+      "version": "2.0.4",
+      "license": "Unlicense"
+    },
+    "node_modules/martinez-polygon-clipping/node_modules/tinyqueue": {
+      "version": "1.2.3",
+      "license": "ISC"
+    },
     "node_modules/match-sorter": {
       "version": "6.3.4",
-      "resolved": "https://registry.npmjs.org/match-sorter/-/match-sorter-6.3.4.tgz",
-      "integrity": "sha512-jfZW7cWS5y/1xswZo8VBOdudUiSd9nifYRWphc9M5D/ee4w4AoXLgBEdRbgVaxbMuagBPeUC5y2Hi8DO6o9aDg==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.23.8",
@@ -31461,20 +30659,14 @@
     },
     "node_modules/material-colors": {
       "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/material-colors/-/material-colors-1.2.6.tgz",
-      "integrity": "sha512-6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg==",
       "license": "ISC"
     },
     "node_modules/math-expression-evaluator": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.4.0.tgz",
-      "integrity": "sha512-4vRUvPyxdO8cWULGTh9dZWL2tZK6LDBvj+OGHBER7poH9Qdt7kXEoj20wiz4lQUbUXQZFjPbe5mVDo9nutizCw==",
       "license": "MIT"
     },
     "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==",
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"
@@ -31482,8 +30674,6 @@
     },
     "node_modules/mdast-util-definitions": {
       "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-5.1.2.tgz",
-      "integrity": "sha512-8SVPMuHqlPME/z3gqVwWY4zVXn8lqKv/pAhC57FuJ40ImXyBpmO5ukh98zB2v7Blql2FiHjHv9LVztSIqjY+MA==",
       "license": "MIT",
       "dependencies": {
         "@types/mdast": "^3.0.0",
@@ -31497,8 +30687,6 @@
     },
     "node_modules/mdast-util-definitions/node_modules/@types/mdast": {
       "version": "3.0.15",
-      "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.15.tgz",
-      "integrity": "sha512-LnwD+mUEfxWMa1QpDraczIn6k0Ee3SMicuYSSzS6ZYl2gKS09EClnJYGd8Du6rfc5r/GZEk5o1mRb8TaTj03sQ==",
       "license": "MIT",
       "dependencies": {
         "@types/unist": "^2"
@@ -31506,8 +30694,6 @@
     },
     "node_modules/mdast-util-find-and-replace": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/mdast-util-find-and-replace/-/mdast-util-find-and-replace-3.0.2.tgz",
-      "integrity": "sha512-Tmd1Vg/m3Xz43afeNxDIhWRtFZgM2VLyaf4vSTYwudTyeuTneoL3qtWMA5jeLyz/O1vDJmmV4QuScFCA2tBPwg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -31523,8 +30709,6 @@
     },
     "node_modules/mdast-util-find-and-replace/node_modules/escape-string-regexp": {
       "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": {
@@ -31536,8 +30720,6 @@
     },
     "node_modules/mdast-util-from-markdown": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-2.0.2.tgz",
-      "integrity": "sha512-uZhTV/8NBuw0WHkPTrCqDOl0zVe1BIng5ZtHoDk49ME1qqcjYmmLmOf0gELgcRMxN4w2iuIeVso5/6QymSrgmA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -31561,15 +30743,11 @@
     },
     "node_modules/mdast-util-from-markdown/node_modules/@types/unist": {
       "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz",
-      "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/mdast-util-gfm": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-gfm/-/mdast-util-gfm-3.1.0.tgz",
-      "integrity": "sha512-0ulfdQOM3ysHhCJ1p06l0b0VKlhU0wuQs3thxZQagjcjPrlFRqY215uZGHHJan9GEAXd9MbfPjFJz+qMkVR6zQ==",
+      "version": "3.0.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -31588,8 +30766,6 @@
     },
     "node_modules/mdast-util-gfm-autolink-literal": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/mdast-util-gfm-autolink-literal/-/mdast-util-gfm-autolink-literal-2.0.1.tgz",
-      "integrity": "sha512-5HVP2MKaP6L+G6YaxPNjuL0BPrq9orG3TsrZ9YXbA3vDw/ACI4MEsnoDpn6ZNm7GnZgtAcONJyPhOP8tNJQavQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -31605,9 +30781,7 @@
       }
     },
     "node_modules/mdast-util-gfm-footnote": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-gfm-footnote/-/mdast-util-gfm-footnote-2.1.0.tgz",
-      "integrity": "sha512-sqpDWlsHn7Ac9GNZQMeUzPQSMzR6Wv0WKRNvQRg0KqHh02fpTz69Qc1QSseNX29bhz1ROIyNyxExfawVKTm1GQ==",
+      "version": "2.0.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -31624,8 +30798,6 @@
     },
     "node_modules/mdast-util-gfm-strikethrough": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-2.0.0.tgz",
-      "integrity": "sha512-mKKb915TF+OC5ptj5bJ7WFRPdYtuHv0yTRxK2tJvi+BDqbkiG7h7u/9SI89nRAYcmap2xHQL9D+QG/6wSrTtXg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -31640,8 +30812,6 @@
     },
     "node_modules/mdast-util-gfm-table": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-gfm-table/-/mdast-util-gfm-table-2.0.0.tgz",
-      "integrity": "sha512-78UEvebzz/rJIxLvE7ZtDd/vIQ0RHv+3Mh5DR96p7cS7HsBhYIICDBCu8csTNWNO6tBWfqXPWekRuj2FNOGOZg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -31658,8 +30828,6 @@
     },
     "node_modules/mdast-util-gfm-task-list-item": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-gfm-task-list-item/-/mdast-util-gfm-task-list-item-2.0.0.tgz",
-      "integrity": "sha512-IrtvNvjxC1o06taBAVJznEnkiHxLFTzgonUdy8hzFVeDun0uTjxxrRGVaNFqkU1wJR3RBPEfsxmU6jDWPofrTQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -31675,8 +30843,6 @@
     },
     "node_modules/mdast-util-phrasing": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-phrasing/-/mdast-util-phrasing-4.1.0.tgz",
-      "integrity": "sha512-TqICwyvJJpBwvGAMZjj4J2n0X8QWp21b9l0o7eXyVJ25YNWYbJDVIyD1bZXE6WtV6RmKJVYmQAKWa0zWOABz2w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -31690,8 +30856,6 @@
     },
     "node_modules/mdast-util-to-hast": {
       "version": "13.2.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-13.2.0.tgz",
-      "integrity": "sha512-QGYKEuUsYT9ykKBCMOEDLsU5JRObWQusAolFMeko/tYPufNkRffBAQjIE+99jbA87xv6FgmjLtwjh9wBWajwAA==",
       "license": "MIT",
       "dependencies": {
         "@types/hast": "^3.0.0",
@@ -31711,8 +30875,6 @@
     },
     "node_modules/mdast-util-to-hast/node_modules/@types/hast": {
       "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.4.tgz",
-      "integrity": "sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==",
       "license": "MIT",
       "dependencies": {
         "@types/unist": "*"
@@ -31720,14 +30882,10 @@
     },
     "node_modules/mdast-util-to-hast/node_modules/@types/unist": {
       "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz",
-      "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==",
       "license": "MIT"
     },
     "node_modules/mdast-util-to-hast/node_modules/unist-util-visit": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-5.0.0.tgz",
-      "integrity": "sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg==",
       "license": "MIT",
       "dependencies": {
         "@types/unist": "^3.0.0",
@@ -31741,8 +30899,6 @@
     },
     "node_modules/mdast-util-to-hast/node_modules/vfile": {
       "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/vfile/-/vfile-6.0.3.tgz",
-      "integrity": "sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==",
       "license": "MIT",
       "dependencies": {
         "@types/unist": "^3.0.0",
@@ -31755,8 +30911,6 @@
     },
     "node_modules/mdast-util-to-hast/node_modules/vfile-message": {
       "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-4.0.2.tgz",
-      "integrity": "sha512-jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw==",
       "license": "MIT",
       "dependencies": {
         "@types/unist": "^3.0.0",
@@ -31769,8 +30923,6 @@
     },
     "node_modules/mdast-util-to-markdown": {
       "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-2.1.2.tgz",
-      "integrity": "sha512-xj68wMTvGXVOKonmog6LwyJKrYXZPvlwabaryTjLh9LuvovB/KAH+kvi8Gjj+7rJjsFi23nkUxRQv1KqSroMqA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -31791,15 +30943,11 @@
     },
     "node_modules/mdast-util-to-markdown/node_modules/@types/unist": {
       "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz",
-      "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/mdast-util-to-markdown/node_modules/unist-util-visit": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-5.0.0.tgz",
-      "integrity": "sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -31814,8 +30962,6 @@
     },
     "node_modules/mdast-util-to-string": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-4.0.0.tgz",
-      "integrity": "sha512-0H44vDimn51F0YwvxSJSm0eCDOJTRlmN0R1yBh4HLj9wiV1Dn0QoXGbvFAWj2hSItVTlCmBF1hqKlIyUBVFLPg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -31828,15 +30974,11 @@
     },
     "node_modules/mdn-data": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.1.0.tgz",
-      "integrity": "sha512-dbAWH6A+2NGuVJlQFrTKHJc07Vqn5frnhyTOGz+7BsK7V2hHdoBcwoiyV3QVhLHYpM/zqe2OSUn5ZWbVXLBB8A==",
       "dev": true,
       "license": "CC0-1.0"
     },
     "node_modules/media-typer": {
       "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -31845,9 +30987,8 @@
     },
     "node_modules/mem-fs": {
       "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/mem-fs/-/mem-fs-4.1.2.tgz",
-      "integrity": "sha512-CMwusHK+Kz0tu1qjgbd0rwcJxzgg76jlkPpqK+pDTv8Hth8JyM7JlgxNWaAFRKe969HATPTz/sp8T63QflyI+w==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/node": ">=18",
         "@types/vinyl": "^2.0.8",
@@ -31860,8 +31001,6 @@
     },
     "node_modules/mem-fs-editor": {
       "version": "11.1.4",
-      "resolved": "https://registry.npmjs.org/mem-fs-editor/-/mem-fs-editor-11.1.4.tgz",
-      "integrity": "sha512-Z4QX14Ev6eOVTuVSayS5rdiOua6C3gHcFw+n9Qc7WiaVTbC+H8b99c32MYGmbQN9UFHJeI/p3lf3LAxiIzwEmA==",
       "license": "MIT",
       "dependencies": {
         "@types/ejs": "^3.1.4",
@@ -31890,8 +31029,6 @@
     },
     "node_modules/mem-fs-editor/node_modules/array-differ": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-4.0.0.tgz",
-      "integrity": "sha512-Q6VPTLMsmXZ47ENG3V+wQyZS1ZxXMxFyYzA+Z/GMrJ6yIutAIEf9wTyroTzmGjNfox9/h3GdGBCVh43GVFx4Uw==",
       "license": "MIT",
       "engines": {
         "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
@@ -31902,8 +31039,6 @@
     },
     "node_modules/mem-fs-editor/node_modules/array-union": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-3.0.1.tgz",
-      "integrity": "sha512-1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw==",
       "license": "MIT",
       "engines": {
         "node": ">=12"
@@ -31914,25 +31049,21 @@
     },
     "node_modules/mem-fs-editor/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==",
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
       }
     },
     "node_modules/mem-fs-editor/node_modules/globby": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-14.1.0.tgz",
-      "integrity": "sha512-0Ia46fDOaT7k4og1PDW4YbodWWr3scS2vAr2lTbsplOt2WkKp0vQbkI9wKis/T5LV/dqPjO3bpS/z6GTJB82LA==",
+      "version": "14.0.2",
       "license": "MIT",
       "dependencies": {
         "@sindresorhus/merge-streams": "^2.1.0",
-        "fast-glob": "^3.3.3",
-        "ignore": "^7.0.3",
-        "path-type": "^6.0.0",
+        "fast-glob": "^3.3.2",
+        "ignore": "^5.2.4",
+        "path-type": "^5.0.0",
         "slash": "^5.1.0",
-        "unicorn-magic": "^0.3.0"
+        "unicorn-magic": "^0.1.0"
       },
       "engines": {
         "node": ">=18"
@@ -31941,19 +31072,8 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/mem-fs-editor/node_modules/ignore": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
-      "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 4"
-      }
-    },
     "node_modules/mem-fs-editor/node_modules/minimatch": {
       "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "license": "ISC",
       "dependencies": {
         "brace-expansion": "^2.0.1"
@@ -31967,8 +31087,6 @@
     },
     "node_modules/mem-fs-editor/node_modules/multimatch": {
       "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-7.0.0.tgz",
-      "integrity": "sha512-SYU3HBAdF4psHEL/+jXDKHO95/m5P2RvboHT2Y0WtTttvJLP4H/2WS9WlQPFvF6C8d6SpLw8vjCnQOnVIVOSJQ==",
       "license": "MIT",
       "dependencies": {
         "array-differ": "^4.0.0",
@@ -31983,12 +31101,10 @@
       }
     },
     "node_modules/mem-fs-editor/node_modules/path-type": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-6.0.0.tgz",
-      "integrity": "sha512-Vj7sf++t5pBD637NSfkxpHSMfWaeig5+DKWLhcqIYx6mWQz5hdJTGDVMQiJcw1ZYkhs7AazKDGpRVji1LJCZUQ==",
+      "version": "5.0.0",
       "license": "MIT",
       "engines": {
-        "node": ">=18"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -31996,8 +31112,6 @@
     },
     "node_modules/mem-fs-editor/node_modules/slash": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz",
-      "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==",
       "license": "MIT",
       "engines": {
         "node": ">=14.16"
@@ -32008,8 +31122,6 @@
     },
     "node_modules/memfs": {
       "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz",
-      "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==",
       "dev": true,
       "license": "Unlicense",
       "dependencies": {
@@ -32021,14 +31133,10 @@
     },
     "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==",
       "license": "MIT"
     },
     "node_modules/memoizerific": {
       "version": "1.11.3",
-      "resolved": "https://registry.npmjs.org/memoizerific/-/memoizerific-1.11.3.tgz",
-      "integrity": "sha512-/EuHYwAPdLtXwAwSZkh/Gutery6pD2KYd44oQLhAvQp/50mpyduZh8Q7PYHXTCJ+wuXxt7oij2LXyIJOOYFPog==",
       "license": "MIT",
       "dependencies": {
         "map-or-similar": "^1.5.0"
@@ -32036,8 +31144,6 @@
     },
     "node_modules/meow": {
       "version": "8.1.2",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-8.1.2.tgz",
-      "integrity": "sha512-r85E3NdZ+mpYk1C6RjPFEMSE+s1iZMuHtsHAqY0DT3jZczl0diWUZ8g6oU7h0M9cD2EL+PzaYghhCLzR0ZNn5Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -32062,8 +31168,6 @@
     },
     "node_modules/meow/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,
       "license": "MIT",
       "dependencies": {
@@ -32076,8 +31180,6 @@
     },
     "node_modules/meow/node_modules/hosted-git-info": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
-      "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -32089,8 +31191,6 @@
     },
     "node_modules/meow/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,
       "license": "MIT",
       "dependencies": {
@@ -32102,8 +31202,6 @@
     },
     "node_modules/meow/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,
       "license": "ISC",
       "dependencies": {
@@ -32115,8 +31213,6 @@
     },
     "node_modules/meow/node_modules/normalize-package-data": {
       "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
-      "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
@@ -32131,8 +31227,6 @@
     },
     "node_modules/meow/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,
       "license": "MIT",
       "dependencies": {
@@ -32147,8 +31241,6 @@
     },
     "node_modules/meow/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,
       "license": "MIT",
       "dependencies": {
@@ -32160,8 +31252,6 @@
     },
     "node_modules/meow/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,
       "license": "MIT",
       "dependencies": {
@@ -32176,8 +31266,6 @@
     },
     "node_modules/meow/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,
       "license": "MIT",
       "dependencies": {
@@ -32194,8 +31282,6 @@
     },
     "node_modules/meow/node_modules/read-pkg-up/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,
       "license": "(MIT OR CC0-1.0)",
       "engines": {
@@ -32204,15 +31290,11 @@
     },
     "node_modules/meow/node_modules/read-pkg/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/meow/node_modules/read-pkg/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": {
@@ -32224,8 +31306,6 @@
     },
     "node_modules/meow/node_modules/read-pkg/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": {
@@ -32234,8 +31314,6 @@
     },
     "node_modules/meow/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,
       "license": "(MIT OR CC0-1.0)",
       "engines": {
@@ -32244,8 +31322,6 @@
     },
     "node_modules/meow/node_modules/type-fest": {
       "version": "0.18.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
-      "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
       "dev": true,
       "license": "(MIT OR CC0-1.0)",
       "engines": {
@@ -32257,15 +31333,11 @@
     },
     "node_modules/meow/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,
       "license": "ISC"
     },
     "node_modules/meow/node_modules/yargs-parser": {
       "version": "20.2.9",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
       "dev": true,
       "license": "ISC",
       "engines": {
@@ -32274,8 +31346,6 @@
     },
     "node_modules/merge-descriptors": {
       "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": {
@@ -32284,8 +31354,6 @@
     },
     "node_modules/merge-source-map": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.0.4.tgz",
-      "integrity": "sha512-PGSmS0kfnTnMJCzJ16BLLCEe6oeYCamKFFdQKshi4BmM6FUwipjVOcBFGxqtQtirtAG4iZvHlqST9CpZKqlRjA==",
       "license": "MIT",
       "dependencies": {
         "source-map": "^0.5.6"
@@ -32293,8 +31361,6 @@
     },
     "node_modules/merge-source-map/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==",
       "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
@@ -32302,14 +31368,10 @@
     },
     "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==",
       "license": "MIT"
     },
     "node_modules/merge2": {
       "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
       "license": "MIT",
       "engines": {
         "node": ">= 8"
@@ -32317,18 +31379,18 @@
     },
     "node_modules/methods": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
       "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
+    "node_modules/mgrs": {
+      "version": "1.0.0",
+      "license": "MIT"
+    },
     "node_modules/micromark": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/micromark/-/micromark-4.0.2.tgz",
-      "integrity": "sha512-zpe98Q6kvavpCr1NPVSCMebCKfD7CA2NqZ+rykeNhONIJBpc1tFKt9hucLGwha3jNTNI8lHpctWJWoimVF4PfA==",
+      "version": "4.0.1",
       "dev": true,
       "funding": [
         {
@@ -32362,9 +31424,7 @@
       }
     },
     "node_modules/micromark-core-commonmark": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/micromark-core-commonmark/-/micromark-core-commonmark-2.0.3.tgz",
-      "integrity": "sha512-RDBrHEMSxVFLg6xvnXmb1Ayr2WzLAWjeSATAoxwKYJV94TeNavgoIdA0a9ytzDSVzBy2YKFK+emCPOEibLeCrg==",
+      "version": "2.0.2",
       "dev": true,
       "funding": [
         {
@@ -32398,8 +31458,6 @@
     },
     "node_modules/micromark-extension-gfm": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm/-/micromark-extension-gfm-3.0.0.tgz",
-      "integrity": "sha512-vsKArQsicm7t0z2GugkCKtZehqUm31oeGBV/KVSorWSy8ZlNAv7ytjFhvaryUiCUJYqs+NoE6AFhpQvBTM6Q4w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -32419,8 +31477,6 @@
     },
     "node_modules/micromark-extension-gfm-autolink-literal": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-autolink-literal/-/micromark-extension-gfm-autolink-literal-2.1.0.tgz",
-      "integrity": "sha512-oOg7knzhicgQ3t4QCjCWgTmfNhvQbDDnJeVu9v81r7NltNCVmhPy1fJRX27pISafdjL+SVc4d3l48Gb6pbRypw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -32436,8 +31492,6 @@
     },
     "node_modules/micromark-extension-gfm-footnote": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-footnote/-/micromark-extension-gfm-footnote-2.1.0.tgz",
-      "integrity": "sha512-/yPhxI1ntnDNsiHtzLKYnE3vf9JZ6cAisqVDauhp4CEHxlb4uoOTxOCJ+9s51bIB8U1N1FJ1RXOKTIlD5B/gqw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -32457,8 +31511,6 @@
     },
     "node_modules/micromark-extension-gfm-strikethrough": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-strikethrough/-/micromark-extension-gfm-strikethrough-2.1.0.tgz",
-      "integrity": "sha512-ADVjpOOkjz1hhkZLlBiYA9cR2Anf8F4HqZUO6e5eDcPQd0Txw5fxLzzxnEkSkfnD0wziSGiv7sYhk/ktvbf1uw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -32476,8 +31528,6 @@
     },
     "node_modules/micromark-extension-gfm-table": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-table/-/micromark-extension-gfm-table-2.1.1.tgz",
-      "integrity": "sha512-t2OU/dXXioARrC6yWfJ4hqB7rct14e8f7m0cbI5hUmDyyIlwv5vEtooptH8INkbLzOatzKuVbQmAYcbWoyz6Dg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -32494,8 +31544,6 @@
     },
     "node_modules/micromark-extension-gfm-tagfilter": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-tagfilter/-/micromark-extension-gfm-tagfilter-2.0.0.tgz",
-      "integrity": "sha512-xHlTOmuCSotIA8TW1mDIM6X2O1SiX5P9IuDtqGonFhEK0qgRI4yeC6vMxEV2dgyr2TiD+2PQ10o+cOhdVAcwfg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -32508,8 +31556,6 @@
     },
     "node_modules/micromark-extension-gfm-task-list-item": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-task-list-item/-/micromark-extension-gfm-task-list-item-2.1.0.tgz",
-      "integrity": "sha512-qIBZhqxqI6fjLDYFTBIa4eivDMnP+OZqsNwmQ3xNLE4Cxwc+zfQEfbs6tzAo2Hjq+bh6q5F+Z8/cksrLFYWQQw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -32526,8 +31572,6 @@
     },
     "node_modules/micromark-factory-destination": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/micromark-factory-destination/-/micromark-factory-destination-2.0.1.tgz",
-      "integrity": "sha512-Xe6rDdJlkmbFRExpTOmRj9N3MaWmbAgdpSrBQvCFqhezUn4AHqJHbaEnfbVYYiexVSs//tqOdY/DxhjdCiJnIA==",
       "dev": true,
       "funding": [
         {
@@ -32548,8 +31592,6 @@
     },
     "node_modules/micromark-factory-label": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/micromark-factory-label/-/micromark-factory-label-2.0.1.tgz",
-      "integrity": "sha512-VFMekyQExqIW7xIChcXn4ok29YE3rnuyveW3wZQWWqF4Nv9Wk5rgJ99KzPvHjkmPXF93FXIbBp6YdW3t71/7Vg==",
       "dev": true,
       "funding": [
         {
@@ -32571,8 +31613,6 @@
     },
     "node_modules/micromark-factory-space": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/micromark-factory-space/-/micromark-factory-space-2.0.1.tgz",
-      "integrity": "sha512-zRkxjtBxxLd2Sc0d+fbnEunsTj46SWXgXciZmHq0kDYGnck/ZSGj9/wULTV95uoeYiK5hRXP2mJ98Uo4cq/LQg==",
       "dev": true,
       "funding": [
         {
@@ -32592,8 +31632,6 @@
     },
     "node_modules/micromark-factory-title": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/micromark-factory-title/-/micromark-factory-title-2.0.1.tgz",
-      "integrity": "sha512-5bZ+3CjhAd9eChYTHsjy6TGxpOFSKgKKJPJxr293jTbfry2KDoWkhBb6TcPVB4NmzaPhMs1Frm9AZH7OD4Cjzw==",
       "dev": true,
       "funding": [
         {
@@ -32615,8 +31653,6 @@
     },
     "node_modules/micromark-factory-whitespace": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/micromark-factory-whitespace/-/micromark-factory-whitespace-2.0.1.tgz",
-      "integrity": "sha512-Ob0nuZ3PKt/n0hORHyvoD9uZhr+Za8sFoP+OnMcnWK5lngSzALgQYKMr9RJVOWLqQYuyn6ulqGWSXdwf6F80lQ==",
       "dev": true,
       "funding": [
         {
@@ -32638,8 +31674,6 @@
     },
     "node_modules/micromark-util-character": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.1.tgz",
-      "integrity": "sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==",
       "funding": [
         {
           "type": "GitHub Sponsors",
@@ -32658,8 +31692,6 @@
     },
     "node_modules/micromark-util-chunked": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/micromark-util-chunked/-/micromark-util-chunked-2.0.1.tgz",
-      "integrity": "sha512-QUNFEOPELfmvv+4xiNg2sRYeS/P84pTW0TCgP5zc9FpXetHY0ab7SxKyAQCNCc1eK0459uoLI1y5oO5Vc1dbhA==",
       "dev": true,
       "funding": [
         {
@@ -32678,8 +31710,6 @@
     },
     "node_modules/micromark-util-classify-character": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/micromark-util-classify-character/-/micromark-util-classify-character-2.0.1.tgz",
-      "integrity": "sha512-K0kHzM6afW/MbeWYWLjoHQv1sgg2Q9EccHEDzSkxiP/EaagNzCm7T/WMKZ3rjMbvIpvBiZgwR3dKMygtA4mG1Q==",
       "dev": true,
       "funding": [
         {
@@ -32700,8 +31730,6 @@
     },
     "node_modules/micromark-util-combine-extensions": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/micromark-util-combine-extensions/-/micromark-util-combine-extensions-2.0.1.tgz",
-      "integrity": "sha512-OnAnH8Ujmy59JcyZw8JSbK9cGpdVY44NKgSM7E9Eh7DiLS2E9RNQf0dONaGDzEG9yjEl5hcqeIsj4hfRkLH/Bg==",
       "dev": true,
       "funding": [
         {
@@ -32721,8 +31749,6 @@
     },
     "node_modules/micromark-util-decode-numeric-character-reference": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/micromark-util-decode-numeric-character-reference/-/micromark-util-decode-numeric-character-reference-2.0.2.tgz",
-      "integrity": "sha512-ccUbYk6CwVdkmCQMyr64dXz42EfHGkPQlBj5p7YVGzq8I7CtjXZJrubAYezf7Rp+bjPseiROqe7G6foFd+lEuw==",
       "dev": true,
       "funding": [
         {
@@ -32741,8 +31767,6 @@
     },
     "node_modules/micromark-util-decode-string": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/micromark-util-decode-string/-/micromark-util-decode-string-2.0.1.tgz",
-      "integrity": "sha512-nDV/77Fj6eH1ynwscYTOsbK7rR//Uj0bZXBwJZRfaLEJ1iGBR6kIfNmlNqaqJf649EP0F3NWNdeJi03elllNUQ==",
       "dev": true,
       "funding": [
         {
@@ -32764,8 +31788,6 @@
     },
     "node_modules/micromark-util-encode": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/micromark-util-encode/-/micromark-util-encode-2.0.1.tgz",
-      "integrity": "sha512-c3cVx2y4KqUnwopcO9b/SCdo2O67LwJJ/UyqGfbigahfegL9myoEFoDYZgkT7f36T0bLrM9hZTAaAyH+PCAXjw==",
       "funding": [
         {
           "type": "GitHub Sponsors",
@@ -32780,8 +31802,6 @@
     },
     "node_modules/micromark-util-html-tag-name": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/micromark-util-html-tag-name/-/micromark-util-html-tag-name-2.0.1.tgz",
-      "integrity": "sha512-2cNEiYDhCWKI+Gs9T0Tiysk136SnR13hhO8yW6BGNyhOC4qYFnwF1nKfD3HFAIXA5c45RrIG1ub11GiXeYd1xA==",
       "dev": true,
       "funding": [
         {
@@ -32797,8 +31817,6 @@
     },
     "node_modules/micromark-util-normalize-identifier": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/micromark-util-normalize-identifier/-/micromark-util-normalize-identifier-2.0.1.tgz",
-      "integrity": "sha512-sxPqmo70LyARJs0w2UclACPUUEqltCkJ6PhKdMIDuJ3gSf/Q+/GIe3WKl0Ijb/GyH9lOpUkRAO2wp0GVkLvS9Q==",
       "dev": true,
       "funding": [
         {
@@ -32817,8 +31835,6 @@
     },
     "node_modules/micromark-util-resolve-all": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/micromark-util-resolve-all/-/micromark-util-resolve-all-2.0.1.tgz",
-      "integrity": "sha512-VdQyxFWFT2/FGJgwQnJYbe1jjQoNTS4RjglmSjTUlpUMa95Htx9NHeYW4rGDJzbjvCsl9eLjMQwGeElsqmzcHg==",
       "dev": true,
       "funding": [
         {
@@ -32837,8 +31853,6 @@
     },
     "node_modules/micromark-util-sanitize-uri": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-2.0.1.tgz",
-      "integrity": "sha512-9N9IomZ/YuGGZZmQec1MbgxtlgougxTodVwDzzEouPKo3qFWvymFHWcnDi2vzV1ff6kas9ucW+o3yzJK9YB1AQ==",
       "funding": [
         {
           "type": "GitHub Sponsors",
@@ -32857,9 +31871,7 @@
       }
     },
     "node_modules/micromark-util-subtokenize": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/micromark-util-subtokenize/-/micromark-util-subtokenize-2.1.0.tgz",
-      "integrity": "sha512-XQLu552iSctvnEcgXw6+Sx75GflAPNED1qx7eBJ+wydBb2KCbRZe+NwvIEEMM83uml1+2WSXpBAcp9IUCgCYWA==",
+      "version": "2.0.4",
       "dev": true,
       "funding": [
         {
@@ -32881,8 +31893,6 @@
     },
     "node_modules/micromark-util-symbol": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.1.tgz",
-      "integrity": "sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==",
       "funding": [
         {
           "type": "GitHub Sponsors",
@@ -32896,9 +31906,7 @@
       "license": "MIT"
     },
     "node_modules/micromark-util-types": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/micromark-util-types/-/micromark-util-types-2.0.2.tgz",
-      "integrity": "sha512-Yw0ECSpJoViF1qTU4DC6NwtC4aWGt1EkzaQB8KPPyCRR8z9TWeV0HbEFGTO+ZY1wB22zmxnJqhPyTpOVCpeHTA==",
+      "version": "2.0.1",
       "funding": [
         {
           "type": "GitHub Sponsors",
@@ -32913,8 +31921,6 @@
     },
     "node_modules/micromatch": {
       "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
-      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
       "license": "MIT",
       "dependencies": {
         "braces": "^3.0.3",
@@ -32926,8 +31932,6 @@
     },
     "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,
       "license": "MIT",
       "bin": {
@@ -32939,8 +31943,6 @@
     },
     "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==",
       "license": "MIT",
       "engines": {
         "node": ">= 0.6"
@@ -32948,8 +31950,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "mime-db": "1.52.0"
@@ -32960,8 +31960,6 @@
     },
     "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==",
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -32969,10 +31967,8 @@
     },
     "node_modules/mimic-function": {
       "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/mimic-function/-/mimic-function-5.0.1.tgz",
-      "integrity": "sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==",
-      "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=18"
       },
@@ -32982,8 +31978,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,
       "license": "MIT",
       "engines": {
@@ -32992,8 +31986,6 @@
     },
     "node_modules/min-indent": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
-      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
       "license": "MIT",
       "engines": {
         "node": ">=4"
@@ -33001,8 +31993,6 @@
     },
     "node_modules/mini-css-extract-plugin": {
       "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.2.tgz",
-      "integrity": "sha512-GJuACcS//jtq4kCtd5ii/M0SZf7OZRH+BxdqXZHaJfb8TJiVl+NgQRPwiYt2EuqeSkNydn/7vP+bcE27C5mb9w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -33020,31 +32010,13 @@
         "webpack": "^5.0.0"
       }
     },
-    "node_modules/mini-store": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/mini-store/-/mini-store-3.0.6.tgz",
-      "integrity": "sha512-YzffKHbYsMQGUWQRKdsearR79QsMzzJcDDmZKlJBqt5JNkqpyJHYlK6gP61O36X+sLf76sO9G6mhKBe83gIZIQ==",
-      "license": "MIT",
-      "dependencies": {
-        "hoist-non-react-statics": "^3.3.2",
-        "shallowequal": "^1.0.2"
-      },
-      "peerDependencies": {
-        "react": ">=16.9.0",
-        "react-dom": ">=16.9.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,
       "license": "ISC"
     },
     "node_modules/minimatch": {
       "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
@@ -33055,8 +32027,6 @@
     },
     "node_modules/minimist": {
       "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
-      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
       "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -33064,8 +32034,6 @@
     },
     "node_modules/minimist-options": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
-      "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -33079,8 +32047,6 @@
     },
     "node_modules/minipass": {
       "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
-      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
       "license": "ISC",
       "engines": {
         "node": ">=16 || 14 >=14.17"
@@ -33088,8 +32054,6 @@
     },
     "node_modules/minipass-collect": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-2.0.1.tgz",
-      "integrity": "sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -33101,8 +32065,6 @@
     },
     "node_modules/minipass-fetch": {
       "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz",
-      "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -33119,8 +32081,6 @@
     },
     "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,
       "license": "ISC",
       "dependencies": {
@@ -33132,8 +32092,6 @@
     },
     "node_modules/minipass-flush/node_modules/minipass": {
       "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -33145,15 +32103,11 @@
     },
     "node_modules/minipass-flush/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,
       "license": "ISC"
     },
     "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,
       "license": "ISC",
       "dependencies": {
@@ -33165,8 +32119,6 @@
     },
     "node_modules/minipass-pipeline/node_modules/minipass": {
       "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -33178,15 +32130,11 @@
     },
     "node_modules/minipass-pipeline/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,
       "license": "ISC"
     },
     "node_modules/minipass-sized": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz",
-      "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -33198,8 +32146,6 @@
     },
     "node_modules/minipass-sized/node_modules/minipass": {
       "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -33211,15 +32157,11 @@
     },
     "node_modules/minipass-sized/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,
       "license": "ISC"
     },
     "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,
       "license": "MIT",
       "dependencies": {
@@ -33232,8 +32174,6 @@
     },
     "node_modules/minizlib/node_modules/minipass": {
       "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -33245,27 +32185,19 @@
     },
     "node_modules/minizlib/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,
       "license": "ISC"
     },
     "node_modules/mitt": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mitt/-/mitt-2.1.0.tgz",
-      "integrity": "sha512-ILj2TpLiysu2wkBbWjAmww7TkZb65aiQO+DkVdUTBpBXq+MHYiETENkKFMtsJZX1Lf4pe4QOrTSjIfUwN5lRdg==",
       "license": "MIT"
     },
     "node_modules/mjolnir.js": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/mjolnir.js/-/mjolnir.js-3.0.0.tgz",
-      "integrity": "sha512-siX3YCG7N2HnmN1xMH3cK4JkUZJhbkhRFJL+G5N1vH0mh1t5088rJknIoqDFWDIU6NPGvRRgLnYW3ZHjSMEBLA==",
       "license": "MIT"
     },
     "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": "MIT",
       "bin": {
@@ -33277,15 +32209,11 @@
     },
     "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,
       "license": "MIT"
     },
     "node_modules/mlly": {
       "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.7.4.tgz",
-      "integrity": "sha512-qmdSIPC4bDJXgZTCR7XosJiNKySV7O215tsPtDN9iEO/7q/76b/ijtgRu/+epFXSJhijtTCCGp3DWS549P3xKw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -33296,9 +32224,7 @@
       }
     },
     "node_modules/mlly/node_modules/acorn": {
-      "version": "8.14.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
-      "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
+      "version": "8.14.0",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -33308,10 +32234,13 @@
         "node": ">=0.4.0"
       }
     },
+    "node_modules/mlly/node_modules/pathe": {
+      "version": "2.0.2",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/mock-socket": {
       "version": "9.3.1",
-      "resolved": "https://registry.npmjs.org/mock-socket/-/mock-socket-9.3.1.tgz",
-      "integrity": "sha512-qxBgB7Qa2sEQgHFjj0dSigq7fX4k6Saisd5Nelwp2q8mlbAFh5dHV9JTTlF8viYJLSSWgMCZFUom8PJcMNBoJw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -33320,8 +32249,6 @@
     },
     "node_modules/modify-values": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/modify-values/-/modify-values-1.0.1.tgz",
-      "integrity": "sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -33330,38 +32257,36 @@
     },
     "node_modules/moment": {
       "version": "2.30.1",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
-      "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": "*"
       }
     },
     "node_modules/monaco-editor": {
-      "version": "0.34.1",
-      "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.34.1.tgz",
-      "integrity": "sha512-FKc80TyiMaruhJKKPz5SpJPIjL+dflGvz4CpuThaPMc94AyN7SeC9HQ8hrvaxX7EyHdJcUY5i4D0gNyJj1vSZQ==",
+      "version": "0.49.0",
       "license": "MIT"
     },
+    "node_modules/moo": {
+      "version": "0.5.2",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "optional": true,
+      "peer": true
+    },
     "node_modules/mousetrap": {
       "version": "1.6.5",
-      "resolved": "https://registry.npmjs.org/mousetrap/-/mousetrap-1.6.5.tgz",
-      "integrity": "sha512-QNo4kEepaIBwiT8CDhP98umTetp+JNfQYBWvC1pc6/OAibuXtRcxZ58Qz8skvEHYvURne/7R8T5VoOI7rDsEUA==",
       "license": "Apache-2.0 WITH LLVM-exception"
     },
     "node_modules/mri": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz",
-      "integrity": "sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==",
       "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/mrmime": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-2.0.1.tgz",
-      "integrity": "sha512-Y3wQdFg2Va6etvQ5I82yUhGdsKrcYox6p7FfL1LbK2J4V01F9TGlepTIhnK24t7koZibmg82KGglhA1XK5IsLQ==",
+      "version": "2.0.0",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -33370,14 +32295,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==",
       "license": "MIT"
     },
     "node_modules/multicast-dns": {
       "version": "7.2.5",
-      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz",
-      "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -33390,8 +32311,6 @@
     },
     "node_modules/multimatch": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-5.0.0.tgz",
-      "integrity": "sha512-ypMKuglUrZUD99Tk2bUQ+xNQj43lPEfAeX2o9cTteAmShXy2VHDJpuwu1o0xqoKCt9jLVAvwyFKdLTPXKAfJyA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -33410,8 +32329,6 @@
     },
     "node_modules/multimatch/node_modules/arrify": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
-      "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -33420,30 +32337,33 @@
     },
     "node_modules/murmurhash-js": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/murmurhash-js/-/murmurhash-js-1.0.0.tgz",
-      "integrity": "sha512-TvmkNhkv8yct0SVBSy+o8wYzXjE4Zz3PCesbfs8HiCXXdcTuocApFv11UWlNFWKYsP2okqrhb7JNlSm9InBhIw==",
       "license": "MIT"
     },
     "node_modules/mustache": {
       "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/mustache/-/mustache-4.2.0.tgz",
-      "integrity": "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==",
       "license": "MIT",
       "bin": {
         "mustache": "bin/mustache"
       }
     },
     "node_modules/mute-stream": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
-      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
-      "dev": true,
-      "license": "ISC"
+      "version": "1.0.0",
+      "license": "ISC",
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/mz": {
+      "version": "2.7.0",
+      "license": "MIT",
+      "dependencies": {
+        "any-promise": "^1.0.0",
+        "object-assign": "^4.0.1",
+        "thenify-all": "^1.0.0"
+      }
     },
     "node_modules/nanoid": {
-      "version": "5.1.5",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.1.5.tgz",
-      "integrity": "sha512-Ir/+ZpE9fDsNH0hQ3C68uyThDXzYcim2EqcZ8zn8Chtt1iylPT9xXJB0kPCnqzgcEGikO9RxSrh63MsmVCU7Fw==",
+      "version": "5.0.9",
       "funding": [
         {
           "type": "github",
@@ -33460,8 +32380,6 @@
     },
     "node_modules/nanospinner": {
       "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/nanospinner/-/nanospinner-1.2.2.tgz",
-      "integrity": "sha512-Zt/AmG6qRU3e+WnzGGLuMCEAO/dAu45stNbHY223tUxldaDAeE+FxSPsd9Q+j+paejmm0ZbrNVs5Sraqy3dRxA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -33469,9 +32387,7 @@
       }
     },
     "node_modules/napi-postinstall": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/napi-postinstall/-/napi-postinstall-0.2.4.tgz",
-      "integrity": "sha512-ZEzHJwBhZ8qQSbknHqYcdtQVr8zUgGyM/q6h6qAyhtyVMNrSgDhrC4disf03dYW0e+czXyLnZINnCTEkWy0eJg==",
+      "version": "0.2.5",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -33486,39 +32402,40 @@
     },
     "node_modules/natural-compare": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
       "license": "MIT"
     },
-    "node_modules/natural-compare-lite": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz",
-      "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==",
-      "dev": true,
-      "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==",
+    "node_modules/nearley": {
+      "version": "2.20.1",
       "dev": true,
       "license": "MIT",
       "optional": true,
+      "peer": true,
       "dependencies": {
-        "iconv-lite": "^0.6.3",
-        "sax": "^1.2.4"
+        "commander": "^2.19.0",
+        "moo": "^0.5.0",
+        "railroad-diagrams": "^1.0.0",
+        "randexp": "0.4.6"
       },
       "bin": {
-        "needle": "bin/needle"
+        "nearley-railroad": "bin/nearley-railroad.js",
+        "nearley-test": "bin/nearley-test.js",
+        "nearley-unparse": "bin/nearley-unparse.js",
+        "nearleyc": "bin/nearleyc.js"
       },
-      "engines": {
-        "node": ">= 4.4.x"
+      "funding": {
+        "type": "individual",
+        "url": "https://nearley.js.org/#give-to-nearley"
       }
     },
+    "node_modules/nearley/node_modules/commander": {
+      "version": "2.20.3",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true
+    },
     "node_modules/negotiator": {
       "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": {
@@ -33527,14 +32444,14 @@
     },
     "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==",
+      "license": "MIT"
+    },
+    "node_modules/nerf-dart": {
+      "version": "1.0.0",
       "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,
       "license": "MIT",
       "engines": {
@@ -33543,8 +32460,6 @@
     },
     "node_modules/nise": {
       "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/nise/-/nise-6.1.1.tgz",
-      "integrity": "sha512-aMSAzLVY7LyeM60gvBS423nBmIPP+Wy7St7hsb+8/fc1HmeoHJfLO8CKse4u3BtOZvQLJghYPI2i/1WZrEj5/g==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
@@ -33557,8 +32472,6 @@
     },
     "node_modules/nise/node_modules/@sinonjs/fake-timers": {
       "version": "13.0.5",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-13.0.5.tgz",
-      "integrity": "sha512-36/hTbH2uaWuGVERyC6da9YwGWnzUZXuPro/F2LfsdOsLnCojz/iSH8MxUt/FD2S5XBSVPhmArFUXcpCQ2Hkiw==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
@@ -33567,8 +32480,6 @@
     },
     "node_modules/nise/node_modules/path-to-regexp": {
       "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.2.0.tgz",
-      "integrity": "sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -33577,8 +32488,6 @@
     },
     "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,
       "license": "MIT",
       "dependencies": {
@@ -33588,22 +32497,16 @@
     },
     "node_modules/node-abort-controller": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.1.1.tgz",
-      "integrity": "sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/node-cleanup": {
       "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/node-cleanup/-/node-cleanup-2.1.2.tgz",
-      "integrity": "sha512-qN8v/s2PAJwGUtr1/hYTpNKlD6Y9rc4p8KSmJXyGdYGZsDGKXrGThikLFP9OCHFeLeEpQzPwiAtdIvBLqm//Hw==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/node-dir": {
       "version": "0.1.17",
-      "resolved": "https://registry.npmjs.org/node-dir/-/node-dir-0.1.17.tgz",
-      "integrity": "sha512-tmPX422rYgofd4epzrNoOXiE8XFZYOcCq1vD7MAXCDO+O+zndlA2ztdKKMa+EeuBG5tHETpr4ml4RGgpqDCCAg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -33615,9 +32518,6 @@
     },
     "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==",
-      "deprecated": "Use your platform's native DOMException instead",
       "dev": true,
       "funding": [
         {
@@ -33634,10 +32534,21 @@
         "node": ">=10.5.0"
       }
     },
+    "node_modules/node-emoji": {
+      "version": "2.2.0",
+      "license": "MIT",
+      "dependencies": {
+        "@sindresorhus/is": "^4.6.0",
+        "char-regex": "^1.0.2",
+        "emojilib": "^2.4.0",
+        "skin-tone": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/node-environment-flags": {
       "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz",
-      "integrity": "sha512-5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -33647,8 +32558,6 @@
     },
     "node_modules/node-environment-flags/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": {
@@ -33657,8 +32566,6 @@
     },
     "node_modules/node-fetch": {
       "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
       "license": "MIT",
       "dependencies": {
         "whatwg-url": "^5.0.0"
@@ -33677,27 +32584,19 @@
     },
     "node_modules/node-fetch-native": {
       "version": "1.6.6",
-      "resolved": "https://registry.npmjs.org/node-fetch-native/-/node-fetch-native-1.6.6.tgz",
-      "integrity": "sha512-8Mc2HhqPdlIfedsuZoc3yioPuzp6b+L5jRCRY1QzuWZh2EGJVQrGppC6V6cF0bLdbW0+O2YpqCA25aF/1lvipQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/node-fetch/node_modules/tr46": {
       "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
       "license": "MIT"
     },
     "node_modules/node-fetch/node_modules/webidl-conversions": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
       "license": "BSD-2-Clause"
     },
     "node_modules/node-fetch/node_modules/whatwg-url": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
       "license": "MIT",
       "dependencies": {
         "tr46": "~0.0.3",
@@ -33706,8 +32605,6 @@
     },
     "node_modules/node-forge": {
       "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
-      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
       "dev": true,
       "license": "(BSD-3-Clause OR GPL-2.0)",
       "engines": {
@@ -33716,8 +32613,6 @@
     },
     "node_modules/node-gyp": {
       "version": "10.3.1",
-      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.3.1.tgz",
-      "integrity": "sha512-Pp3nFHBThHzVtNY7U6JfPjvT/DTE8+o/4xKsLQtBoU+j2HLsGlhcfzflAoUreaJbNmYnX+LlLi0qjV8kpyO6xQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -33741,8 +32636,6 @@
     },
     "node_modules/node-gyp/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": {
@@ -33751,8 +32644,6 @@
     },
     "node_modules/node-gyp/node_modules/glob": {
       "version": "10.4.5",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
-      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -33772,8 +32663,6 @@
     },
     "node_modules/node-gyp/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,
       "license": "ISC",
       "engines": {
@@ -33782,8 +32671,6 @@
     },
     "node_modules/node-gyp/node_modules/minimatch": {
       "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": {
@@ -33798,8 +32685,6 @@
     },
     "node_modules/node-gyp/node_modules/which": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
-      "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -33814,22 +32699,16 @@
     },
     "node_modules/node-int64": {
       "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-      "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/node-machine-id": {
       "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/node-machine-id/-/node-machine-id-1.1.12.tgz",
-      "integrity": "sha512-QNABxbrPa3qEIfrE6GOJ7BYIuignnJw7iQ2YPbc3Nla1HzRJjXzZOiikfF8m7eAMfichLt3M4VgLOetqgDmgGQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/node-preload": {
       "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/node-preload/-/node-preload-0.2.1.tgz",
-      "integrity": "sha512-RM5oyBy45cLEoHqCeh+MNuFAxO0vTFBLskvQbOKnEE7YTTSN4tbN8QWDIPQ6L+WvKsB/qLEGpYe2ZZ9d4W9OIQ==",
       "dev": true,
       "license": "MIT",
       "peer": true,
@@ -33842,16 +32721,11 @@
     },
     "node_modules/node-releases": {
       "version": "2.0.19",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
-      "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/nomnom": {
       "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/nomnom/-/nomnom-1.8.1.tgz",
-      "integrity": "sha512-5s0JxqhDx9/rksG2BTMVN1enjWSvPidpoSgViZU4ZXULyTe+7jxcCRLB6f42Z0l1xYJpleCBtSyY6Lwg3uu5CQ==",
-      "deprecated": "Package no longer supported. Contact support@npmjs.com for more info.",
       "dev": true,
       "dependencies": {
         "chalk": "~0.4.0",
@@ -33860,8 +32734,6 @@
     },
     "node_modules/nomnom/node_modules/ansi-styles": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz",
-      "integrity": "sha512-3iF4FIKdxaVYT3JqQuY3Wat/T2t7TRbbQ94Fu50ZUCbLy4TFbTzr90NOHQodQkNqmeEGCw8WbeP78WNi6SKYUA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -33870,8 +32742,6 @@
     },
     "node_modules/nomnom/node_modules/chalk": {
       "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz",
-      "integrity": "sha512-sQfYDlfv2DGVtjdoQqxS0cEZDroyG8h6TamA6rvxwlrU5BaSLDx9xhatBYl2pxZ7gmpNaPFVwBtdGdu5rQ+tYQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -33885,8 +32755,6 @@
     },
     "node_modules/nomnom/node_modules/strip-ansi": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz",
-      "integrity": "sha512-behete+3uqxecWlDAm5lmskaSaISA+ThQ4oNNBDTBJt0x2ppR6IPqfZNuj6BLaLJ/Sji4TPZlcRyOis8wXQTLg==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -33898,8 +32766,6 @@
     },
     "node_modules/nopt": {
       "version": "7.2.1",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz",
-      "integrity": "sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -33914,8 +32780,6 @@
     },
     "node_modules/normalize-package-data": {
       "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-6.0.2.tgz",
-      "integrity": "sha512-V6gygoYb/5EmNI+MEGrWkC+e6+Rr7mTmfHrxDbLzxQogBkgzo76rkok0Am6thgSF7Mv2nLOajAJj5vDJZEFn7g==",
       "license": "BSD-2-Clause",
       "dependencies": {
         "hosted-git-info": "^7.0.0",
@@ -33928,8 +32792,6 @@
     },
     "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==",
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -33937,8 +32799,6 @@
     },
     "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,
       "license": "MIT",
       "engines": {
@@ -33948,10 +32808,166 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/npm": {
+      "version": "10.9.2",
+      "bundleDependencies": [
+        "@isaacs/string-locale-compare",
+        "@npmcli/arborist",
+        "@npmcli/config",
+        "@npmcli/fs",
+        "@npmcli/map-workspaces",
+        "@npmcli/package-json",
+        "@npmcli/promise-spawn",
+        "@npmcli/redact",
+        "@npmcli/run-script",
+        "@sigstore/tuf",
+        "abbrev",
+        "archy",
+        "cacache",
+        "chalk",
+        "ci-info",
+        "cli-columns",
+        "fastest-levenshtein",
+        "fs-minipass",
+        "glob",
+        "graceful-fs",
+        "hosted-git-info",
+        "ini",
+        "init-package-json",
+        "is-cidr",
+        "json-parse-even-better-errors",
+        "libnpmaccess",
+        "libnpmdiff",
+        "libnpmexec",
+        "libnpmfund",
+        "libnpmhook",
+        "libnpmorg",
+        "libnpmpack",
+        "libnpmpublish",
+        "libnpmsearch",
+        "libnpmteam",
+        "libnpmversion",
+        "make-fetch-happen",
+        "minimatch",
+        "minipass",
+        "minipass-pipeline",
+        "ms",
+        "node-gyp",
+        "nopt",
+        "normalize-package-data",
+        "npm-audit-report",
+        "npm-install-checks",
+        "npm-package-arg",
+        "npm-pick-manifest",
+        "npm-profile",
+        "npm-registry-fetch",
+        "npm-user-validate",
+        "p-map",
+        "pacote",
+        "parse-conflict-json",
+        "proc-log",
+        "qrcode-terminal",
+        "read",
+        "semver",
+        "spdx-expression-parse",
+        "ssri",
+        "supports-color",
+        "tar",
+        "text-table",
+        "tiny-relative-date",
+        "treeverse",
+        "validate-npm-package-name",
+        "which",
+        "write-file-atomic"
+      ],
+      "license": "Artistic-2.0",
+      "workspaces": [
+        "docs",
+        "smoke-tests",
+        "mock-globals",
+        "mock-registry",
+        "workspaces/*"
+      ],
+      "dependencies": {
+        "@isaacs/string-locale-compare": "^1.1.0",
+        "@npmcli/arborist": "^8.0.0",
+        "@npmcli/config": "^9.0.0",
+        "@npmcli/fs": "^4.0.0",
+        "@npmcli/map-workspaces": "^4.0.2",
+        "@npmcli/package-json": "^6.1.0",
+        "@npmcli/promise-spawn": "^8.0.2",
+        "@npmcli/redact": "^3.0.0",
+        "@npmcli/run-script": "^9.0.1",
+        "@sigstore/tuf": "^3.0.0",
+        "abbrev": "^3.0.0",
+        "archy": "~1.0.0",
+        "cacache": "^19.0.1",
+        "chalk": "^5.3.0",
+        "ci-info": "^4.1.0",
+        "cli-columns": "^4.0.0",
+        "fastest-levenshtein": "^1.0.16",
+        "fs-minipass": "^3.0.3",
+        "glob": "^10.4.5",
+        "graceful-fs": "^4.2.11",
+        "hosted-git-info": "^8.0.2",
+        "ini": "^5.0.0",
+        "init-package-json": "^7.0.2",
+        "is-cidr": "^5.1.0",
+        "json-parse-even-better-errors": "^4.0.0",
+        "libnpmaccess": "^9.0.0",
+        "libnpmdiff": "^7.0.0",
+        "libnpmexec": "^9.0.0",
+        "libnpmfund": "^6.0.0",
+        "libnpmhook": "^11.0.0",
+        "libnpmorg": "^7.0.0",
+        "libnpmpack": "^8.0.0",
+        "libnpmpublish": "^10.0.1",
+        "libnpmsearch": "^8.0.0",
+        "libnpmteam": "^7.0.0",
+        "libnpmversion": "^7.0.0",
+        "make-fetch-happen": "^14.0.3",
+        "minimatch": "^9.0.5",
+        "minipass": "^7.1.1",
+        "minipass-pipeline": "^1.2.4",
+        "ms": "^2.1.2",
+        "node-gyp": "^11.0.0",
+        "nopt": "^8.0.0",
+        "normalize-package-data": "^7.0.0",
+        "npm-audit-report": "^6.0.0",
+        "npm-install-checks": "^7.1.1",
+        "npm-package-arg": "^12.0.0",
+        "npm-pick-manifest": "^10.0.0",
+        "npm-profile": "^11.0.1",
+        "npm-registry-fetch": "^18.0.2",
+        "npm-user-validate": "^3.0.0",
+        "p-map": "^4.0.0",
+        "pacote": "^19.0.1",
+        "parse-conflict-json": "^4.0.0",
+        "proc-log": "^5.0.0",
+        "qrcode-terminal": "^0.12.0",
+        "read": "^4.0.0",
+        "semver": "^7.6.3",
+        "spdx-expression-parse": "^4.0.0",
+        "ssri": "^12.0.0",
+        "supports-color": "^9.4.0",
+        "tar": "^6.2.1",
+        "text-table": "~0.2.0",
+        "tiny-relative-date": "^1.3.0",
+        "treeverse": "^3.0.0",
+        "validate-npm-package-name": "^6.0.0",
+        "which": "^5.0.0",
+        "write-file-atomic": "^6.0.0"
+      },
+      "bin": {
+        "npm": "bin/npm-cli.js",
+        "npx": "bin/npx-cli.js"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
     "node_modules/npm-bundled": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-3.0.1.tgz",
-      "integrity": "sha512-+AvaheE/ww1JEwRHOrn4WHNzOxGtVp+adrg2AeZS/7KuxGUYFuBta98wYpfHBbJp6Tg6j1NKSEVHNcfZzJHQwQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -33963,8 +32979,6 @@
     },
     "node_modules/npm-install-checks": {
       "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.3.0.tgz",
-      "integrity": "sha512-W29RiK/xtpCGqn6f3ixfRYGk+zRyr+Ew9F2E20BfXxT5/euLdA/Nm7fO7OeTGuAmTs30cpgInyJ0cYe708YTZw==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
@@ -33976,8 +32990,6 @@
     },
     "node_modules/npm-normalize-package-bin": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz",
-      "integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==",
       "dev": true,
       "license": "ISC",
       "engines": {
@@ -33986,8 +32998,6 @@
     },
     "node_modules/npm-package-arg": {
       "version": "11.0.2",
-      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-11.0.2.tgz",
-      "integrity": "sha512-IGN0IAwmhDJwy13Wc8k+4PEbTPhpJnMtfR53ZbOyjkvmEcLS4nCwp6mvMWjS5sUjeiW3mpx6cHmuhKEu9XmcQw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -34002,8 +33012,6 @@
     },
     "node_modules/npm-packlist": {
       "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-8.0.2.tgz",
-      "integrity": "sha512-shYrPFIS/JLP4oQmAwDyk5HcyysKW8/JLTEA32S0Z5TzvpaeeX2yMFfoK1fjEBnCBvVyIB/Jj/GBFdm0wsgzbA==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -34015,8 +33023,6 @@
     },
     "node_modules/npm-pick-manifest": {
       "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-9.1.0.tgz",
-      "integrity": "sha512-nkc+3pIIhqHVQr085X9d2JzPzLyjzQS96zbruppqC9aZRm/x8xx6xhI98gHtsfELP2bE+loHq8ZaHFHhe+NauA==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -34031,8 +33037,6 @@
     },
     "node_modules/npm-registry-fetch": {
       "version": "17.1.0",
-      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-17.1.0.tgz",
-      "integrity": "sha512-5+bKQRH0J1xG1uZ1zMNvxW0VEyoNWgJpY9UDuluPFLKDfJ9u2JmmjmTJV1srBGQOROfdBMiVvnH2Zvpbm+xkVA==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -34051,8 +33055,6 @@
     },
     "node_modules/npm-run-path": {
       "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
       "license": "MIT",
       "dependencies": {
         "path-key": "^3.0.0"
@@ -34061,10 +33063,2393 @@
         "node": ">=8"
       }
     },
+    "node_modules/npm/node_modules/@isaacs/cliui": {
+      "version": "8.0.2",
+      "inBundle": true,
+      "license": "ISC",
+      "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/npm/node_modules/@isaacs/cliui/node_modules/ansi-regex": {
+      "version": "6.1.0",
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/npm/node_modules/@isaacs/cliui/node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/npm/node_modules/@isaacs/cliui/node_modules/string-width": {
+      "version": "5.1.2",
+      "inBundle": true,
+      "license": "MIT",
+      "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/npm/node_modules/@isaacs/cliui/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/npm/node_modules/@isaacs/fs-minipass": {
+      "version": "4.0.1",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "minipass": "^7.0.4"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/npm/node_modules/@isaacs/string-locale-compare": {
+      "version": "1.1.0",
+      "inBundle": true,
+      "license": "ISC"
+    },
+    "node_modules/npm/node_modules/@npmcli/agent": {
+      "version": "3.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "agent-base": "^7.1.0",
+        "http-proxy-agent": "^7.0.0",
+        "https-proxy-agent": "^7.0.1",
+        "lru-cache": "^10.0.1",
+        "socks-proxy-agent": "^8.0.3"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/@npmcli/arborist": {
+      "version": "8.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "@isaacs/string-locale-compare": "^1.1.0",
+        "@npmcli/fs": "^4.0.0",
+        "@npmcli/installed-package-contents": "^3.0.0",
+        "@npmcli/map-workspaces": "^4.0.1",
+        "@npmcli/metavuln-calculator": "^8.0.0",
+        "@npmcli/name-from-folder": "^3.0.0",
+        "@npmcli/node-gyp": "^4.0.0",
+        "@npmcli/package-json": "^6.0.1",
+        "@npmcli/query": "^4.0.0",
+        "@npmcli/redact": "^3.0.0",
+        "@npmcli/run-script": "^9.0.1",
+        "bin-links": "^5.0.0",
+        "cacache": "^19.0.1",
+        "common-ancestor-path": "^1.0.1",
+        "hosted-git-info": "^8.0.0",
+        "json-parse-even-better-errors": "^4.0.0",
+        "json-stringify-nice": "^1.1.4",
+        "lru-cache": "^10.2.2",
+        "minimatch": "^9.0.4",
+        "nopt": "^8.0.0",
+        "npm-install-checks": "^7.1.0",
+        "npm-package-arg": "^12.0.0",
+        "npm-pick-manifest": "^10.0.0",
+        "npm-registry-fetch": "^18.0.1",
+        "pacote": "^19.0.0",
+        "parse-conflict-json": "^4.0.0",
+        "proc-log": "^5.0.0",
+        "proggy": "^3.0.0",
+        "promise-all-reject-late": "^1.0.0",
+        "promise-call-limit": "^3.0.1",
+        "read-package-json-fast": "^4.0.0",
+        "semver": "^7.3.7",
+        "ssri": "^12.0.0",
+        "treeverse": "^3.0.0",
+        "walk-up-path": "^3.0.1"
+      },
+      "bin": {
+        "arborist": "bin/index.js"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/@npmcli/config": {
+      "version": "9.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "@npmcli/map-workspaces": "^4.0.1",
+        "@npmcli/package-json": "^6.0.1",
+        "ci-info": "^4.0.0",
+        "ini": "^5.0.0",
+        "nopt": "^8.0.0",
+        "proc-log": "^5.0.0",
+        "semver": "^7.3.5",
+        "walk-up-path": "^3.0.1"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/@npmcli/fs": {
+      "version": "4.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "semver": "^7.3.5"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/@npmcli/git": {
+      "version": "6.0.1",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "@npmcli/promise-spawn": "^8.0.0",
+        "ini": "^5.0.0",
+        "lru-cache": "^10.0.1",
+        "npm-pick-manifest": "^10.0.0",
+        "proc-log": "^5.0.0",
+        "promise-inflight": "^1.0.1",
+        "promise-retry": "^2.0.1",
+        "semver": "^7.3.5",
+        "which": "^5.0.0"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/@npmcli/installed-package-contents": {
+      "version": "3.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "npm-bundled": "^4.0.0",
+        "npm-normalize-package-bin": "^4.0.0"
+      },
+      "bin": {
+        "installed-package-contents": "bin/index.js"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/@npmcli/map-workspaces": {
+      "version": "4.0.2",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "@npmcli/name-from-folder": "^3.0.0",
+        "@npmcli/package-json": "^6.0.0",
+        "glob": "^10.2.2",
+        "minimatch": "^9.0.0"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/@npmcli/metavuln-calculator": {
+      "version": "8.0.1",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "cacache": "^19.0.0",
+        "json-parse-even-better-errors": "^4.0.0",
+        "pacote": "^20.0.0",
+        "proc-log": "^5.0.0",
+        "semver": "^7.3.5"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/@npmcli/metavuln-calculator/node_modules/pacote": {
+      "version": "20.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "@npmcli/git": "^6.0.0",
+        "@npmcli/installed-package-contents": "^3.0.0",
+        "@npmcli/package-json": "^6.0.0",
+        "@npmcli/promise-spawn": "^8.0.0",
+        "@npmcli/run-script": "^9.0.0",
+        "cacache": "^19.0.0",
+        "fs-minipass": "^3.0.0",
+        "minipass": "^7.0.2",
+        "npm-package-arg": "^12.0.0",
+        "npm-packlist": "^9.0.0",
+        "npm-pick-manifest": "^10.0.0",
+        "npm-registry-fetch": "^18.0.0",
+        "proc-log": "^5.0.0",
+        "promise-retry": "^2.0.1",
+        "sigstore": "^3.0.0",
+        "ssri": "^12.0.0",
+        "tar": "^6.1.11"
+      },
+      "bin": {
+        "pacote": "bin/index.js"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/@npmcli/name-from-folder": {
+      "version": "3.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/@npmcli/node-gyp": {
+      "version": "4.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/@npmcli/package-json": {
+      "version": "6.1.0",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "@npmcli/git": "^6.0.0",
+        "glob": "^10.2.2",
+        "hosted-git-info": "^8.0.0",
+        "json-parse-even-better-errors": "^4.0.0",
+        "normalize-package-data": "^7.0.0",
+        "proc-log": "^5.0.0",
+        "semver": "^7.5.3"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/@npmcli/promise-spawn": {
+      "version": "8.0.2",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "which": "^5.0.0"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/@npmcli/query": {
+      "version": "4.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "postcss-selector-parser": "^6.1.2"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/@npmcli/redact": {
+      "version": "3.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/@npmcli/run-script": {
+      "version": "9.0.2",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "@npmcli/node-gyp": "^4.0.0",
+        "@npmcli/package-json": "^6.0.0",
+        "@npmcli/promise-spawn": "^8.0.0",
+        "node-gyp": "^11.0.0",
+        "proc-log": "^5.0.0",
+        "which": "^5.0.0"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/@pkgjs/parseargs": {
+      "version": "0.11.0",
+      "inBundle": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/npm/node_modules/@sigstore/protobuf-specs": {
+      "version": "0.3.2",
+      "inBundle": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/npm/node_modules/@sigstore/tuf": {
+      "version": "3.0.0",
+      "inBundle": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@sigstore/protobuf-specs": "^0.3.2",
+        "tuf-js": "^3.0.1"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/@tufjs/canonical-json": {
+      "version": "2.0.0",
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/npm/node_modules/abbrev": {
+      "version": "3.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/agent-base": {
+      "version": "7.1.1",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/npm/node_modules/aggregate-error": {
+      "version": "3.1.0",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "clean-stack": "^2.0.0",
+        "indent-string": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/npm/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/npm/node_modules/ansi-styles": {
+      "version": "6.2.1",
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/npm/node_modules/aproba": {
+      "version": "2.0.0",
+      "inBundle": true,
+      "license": "ISC"
+    },
+    "node_modules/npm/node_modules/archy": {
+      "version": "1.0.0",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/npm/node_modules/balanced-match": {
+      "version": "1.0.2",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/npm/node_modules/bin-links": {
+      "version": "5.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "cmd-shim": "^7.0.0",
+        "npm-normalize-package-bin": "^4.0.0",
+        "proc-log": "^5.0.0",
+        "read-cmd-shim": "^5.0.0",
+        "write-file-atomic": "^6.0.0"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/binary-extensions": {
+      "version": "2.3.0",
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/npm/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/npm/node_modules/cacache": {
+      "version": "19.0.1",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "@npmcli/fs": "^4.0.0",
+        "fs-minipass": "^3.0.0",
+        "glob": "^10.2.2",
+        "lru-cache": "^10.0.1",
+        "minipass": "^7.0.3",
+        "minipass-collect": "^2.0.1",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.4",
+        "p-map": "^7.0.2",
+        "ssri": "^12.0.0",
+        "tar": "^7.4.3",
+        "unique-filename": "^4.0.0"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/cacache/node_modules/chownr": {
+      "version": "3.0.0",
+      "inBundle": true,
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/npm/node_modules/cacache/node_modules/minizlib": {
+      "version": "3.0.1",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "minipass": "^7.0.4",
+        "rimraf": "^5.0.5"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/npm/node_modules/cacache/node_modules/mkdirp": {
+      "version": "3.0.1",
+      "inBundle": true,
+      "license": "MIT",
+      "bin": {
+        "mkdirp": "dist/cjs/src/bin.js"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/npm/node_modules/cacache/node_modules/p-map": {
+      "version": "7.0.2",
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/npm/node_modules/cacache/node_modules/tar": {
+      "version": "7.4.3",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "@isaacs/fs-minipass": "^4.0.0",
+        "chownr": "^3.0.0",
+        "minipass": "^7.1.2",
+        "minizlib": "^3.0.1",
+        "mkdirp": "^3.0.1",
+        "yallist": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/npm/node_modules/cacache/node_modules/yallist": {
+      "version": "5.0.0",
+      "inBundle": true,
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/npm/node_modules/chalk": {
+      "version": "5.3.0",
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/npm/node_modules/chownr": {
+      "version": "2.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/npm/node_modules/ci-info": {
+      "version": "4.1.0",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/npm/node_modules/cidr-regex": {
+      "version": "4.1.1",
+      "inBundle": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "ip-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/npm/node_modules/clean-stack": {
+      "version": "2.2.0",
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/npm/node_modules/cli-columns": {
+      "version": "4.0.0",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/npm/node_modules/cmd-shim": {
+      "version": "7.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/color-convert": {
+      "version": "2.0.1",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/npm/node_modules/color-name": {
+      "version": "1.1.4",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/npm/node_modules/common-ancestor-path": {
+      "version": "1.0.1",
+      "inBundle": true,
+      "license": "ISC"
+    },
+    "node_modules/npm/node_modules/cross-spawn": {
+      "version": "7.0.6",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/npm/node_modules/cross-spawn/node_modules/which": {
+      "version": "2.0.2",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/npm/node_modules/cssesc": {
+      "version": "3.0.0",
+      "inBundle": true,
+      "license": "MIT",
+      "bin": {
+        "cssesc": "bin/cssesc"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/npm/node_modules/debug": {
+      "version": "4.3.7",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/npm/node_modules/diff": {
+      "version": "5.2.0",
+      "inBundle": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.3.1"
+      }
+    },
+    "node_modules/npm/node_modules/eastasianwidth": {
+      "version": "0.2.0",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/npm/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/npm/node_modules/encoding": {
+      "version": "0.1.13",
+      "inBundle": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "iconv-lite": "^0.6.2"
+      }
+    },
+    "node_modules/npm/node_modules/env-paths": {
+      "version": "2.2.1",
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/npm/node_modules/err-code": {
+      "version": "2.0.3",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/npm/node_modules/exponential-backoff": {
+      "version": "3.1.1",
+      "inBundle": true,
+      "license": "Apache-2.0"
+    },
+    "node_modules/npm/node_modules/fastest-levenshtein": {
+      "version": "1.0.16",
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4.9.1"
+      }
+    },
+    "node_modules/npm/node_modules/foreground-child": {
+      "version": "3.3.0",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "cross-spawn": "^7.0.0",
+        "signal-exit": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/npm/node_modules/fs-minipass": {
+      "version": "3.0.3",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "minipass": "^7.0.3"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/npm/node_modules/glob": {
+      "version": "10.4.5",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/npm/node_modules/graceful-fs": {
+      "version": "4.2.11",
+      "inBundle": true,
+      "license": "ISC"
+    },
+    "node_modules/npm/node_modules/hosted-git-info": {
+      "version": "8.0.2",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "lru-cache": "^10.0.1"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/http-cache-semantics": {
+      "version": "4.1.1",
+      "inBundle": true,
+      "license": "BSD-2-Clause"
+    },
+    "node_modules/npm/node_modules/http-proxy-agent": {
+      "version": "7.0.2",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^7.1.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/npm/node_modules/https-proxy-agent": {
+      "version": "7.0.5",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^7.0.2",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/npm/node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "inBundle": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/npm/node_modules/ignore-walk": {
+      "version": "7.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "minimatch": "^9.0.0"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.19"
+      }
+    },
+    "node_modules/npm/node_modules/indent-string": {
+      "version": "4.0.0",
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/npm/node_modules/ini": {
+      "version": "5.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/init-package-json": {
+      "version": "7.0.2",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "@npmcli/package-json": "^6.0.0",
+        "npm-package-arg": "^12.0.0",
+        "promzard": "^2.0.0",
+        "read": "^4.0.0",
+        "semver": "^7.3.5",
+        "validate-npm-package-license": "^3.0.4",
+        "validate-npm-package-name": "^6.0.0"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/ip-address": {
+      "version": "9.0.5",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "jsbn": "1.1.0",
+        "sprintf-js": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/npm/node_modules/ip-regex": {
+      "version": "5.0.0",
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/npm/node_modules/is-cidr": {
+      "version": "5.1.0",
+      "inBundle": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "cidr-regex": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/npm/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/npm/node_modules/isexe": {
+      "version": "2.0.0",
+      "inBundle": true,
+      "license": "ISC"
+    },
+    "node_modules/npm/node_modules/jackspeak": {
+      "version": "3.4.3",
+      "inBundle": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "@isaacs/cliui": "^8.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
+      }
+    },
+    "node_modules/npm/node_modules/jsbn": {
+      "version": "1.1.0",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/npm/node_modules/json-parse-even-better-errors": {
+      "version": "4.0.0",
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/json-stringify-nice": {
+      "version": "1.1.4",
+      "inBundle": true,
+      "license": "ISC",
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/npm/node_modules/jsonparse": {
+      "version": "1.3.1",
+      "engines": [
+        "node >= 0.2.0"
+      ],
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/npm/node_modules/just-diff": {
+      "version": "6.0.2",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/npm/node_modules/just-diff-apply": {
+      "version": "5.5.0",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/npm/node_modules/libnpmaccess": {
+      "version": "9.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "npm-package-arg": "^12.0.0",
+        "npm-registry-fetch": "^18.0.1"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/libnpmdiff": {
+      "version": "7.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "@npmcli/arborist": "^8.0.0",
+        "@npmcli/installed-package-contents": "^3.0.0",
+        "binary-extensions": "^2.3.0",
+        "diff": "^5.1.0",
+        "minimatch": "^9.0.4",
+        "npm-package-arg": "^12.0.0",
+        "pacote": "^19.0.0",
+        "tar": "^6.2.1"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/libnpmexec": {
+      "version": "9.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "@npmcli/arborist": "^8.0.0",
+        "@npmcli/run-script": "^9.0.1",
+        "ci-info": "^4.0.0",
+        "npm-package-arg": "^12.0.0",
+        "pacote": "^19.0.0",
+        "proc-log": "^5.0.0",
+        "read": "^4.0.0",
+        "read-package-json-fast": "^4.0.0",
+        "semver": "^7.3.7",
+        "walk-up-path": "^3.0.1"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/libnpmfund": {
+      "version": "6.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "@npmcli/arborist": "^8.0.0"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/libnpmhook": {
+      "version": "11.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "aproba": "^2.0.0",
+        "npm-registry-fetch": "^18.0.1"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/libnpmorg": {
+      "version": "7.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "aproba": "^2.0.0",
+        "npm-registry-fetch": "^18.0.1"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/libnpmpack": {
+      "version": "8.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "@npmcli/arborist": "^8.0.0",
+        "@npmcli/run-script": "^9.0.1",
+        "npm-package-arg": "^12.0.0",
+        "pacote": "^19.0.0"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/libnpmpublish": {
+      "version": "10.0.1",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "ci-info": "^4.0.0",
+        "normalize-package-data": "^7.0.0",
+        "npm-package-arg": "^12.0.0",
+        "npm-registry-fetch": "^18.0.1",
+        "proc-log": "^5.0.0",
+        "semver": "^7.3.7",
+        "sigstore": "^3.0.0",
+        "ssri": "^12.0.0"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/libnpmsearch": {
+      "version": "8.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "npm-registry-fetch": "^18.0.1"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/libnpmteam": {
+      "version": "7.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "aproba": "^2.0.0",
+        "npm-registry-fetch": "^18.0.1"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/libnpmversion": {
+      "version": "7.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "@npmcli/git": "^6.0.1",
+        "@npmcli/run-script": "^9.0.1",
+        "json-parse-even-better-errors": "^4.0.0",
+        "proc-log": "^5.0.0",
+        "semver": "^7.3.7"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/lru-cache": {
+      "version": "10.4.3",
+      "inBundle": true,
+      "license": "ISC"
+    },
+    "node_modules/npm/node_modules/make-fetch-happen": {
+      "version": "14.0.3",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "@npmcli/agent": "^3.0.0",
+        "cacache": "^19.0.1",
+        "http-cache-semantics": "^4.1.1",
+        "minipass": "^7.0.2",
+        "minipass-fetch": "^4.0.0",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.4",
+        "negotiator": "^1.0.0",
+        "proc-log": "^5.0.0",
+        "promise-retry": "^2.0.1",
+        "ssri": "^12.0.0"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/make-fetch-happen/node_modules/negotiator": {
+      "version": "1.0.0",
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/npm/node_modules/minimatch": {
+      "version": "9.0.5",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/npm/node_modules/minipass": {
+      "version": "7.1.2",
+      "inBundle": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/npm/node_modules/minipass-collect": {
+      "version": "2.0.1",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "minipass": "^7.0.3"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/npm/node_modules/minipass-fetch": {
+      "version": "4.0.0",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "minipass": "^7.0.3",
+        "minipass-sized": "^1.0.3",
+        "minizlib": "^3.0.1"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      },
+      "optionalDependencies": {
+        "encoding": "^0.1.13"
+      }
+    },
+    "node_modules/npm/node_modules/minipass-fetch/node_modules/minizlib": {
+      "version": "3.0.1",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "minipass": "^7.0.4",
+        "rimraf": "^5.0.5"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/npm/node_modules/minipass-flush": {
+      "version": "1.0.5",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/npm/node_modules/minipass-flush/node_modules/minipass": {
+      "version": "3.3.6",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/npm/node_modules/minipass-pipeline": {
+      "version": "1.2.4",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/npm/node_modules/minipass-pipeline/node_modules/minipass": {
+      "version": "3.3.6",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/npm/node_modules/minipass-sized": {
+      "version": "1.0.3",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/npm/node_modules/minipass-sized/node_modules/minipass": {
+      "version": "3.3.6",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/npm/node_modules/minizlib": {
+      "version": "2.1.2",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "minipass": "^3.0.0",
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/npm/node_modules/minizlib/node_modules/minipass": {
+      "version": "3.3.6",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/npm/node_modules/mkdirp": {
+      "version": "1.0.4",
+      "inBundle": true,
+      "license": "MIT",
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/npm/node_modules/ms": {
+      "version": "2.1.3",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/npm/node_modules/mute-stream": {
+      "version": "2.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/node-gyp": {
+      "version": "11.0.0",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "env-paths": "^2.2.0",
+        "exponential-backoff": "^3.1.1",
+        "glob": "^10.3.10",
+        "graceful-fs": "^4.2.6",
+        "make-fetch-happen": "^14.0.3",
+        "nopt": "^8.0.0",
+        "proc-log": "^5.0.0",
+        "semver": "^7.3.5",
+        "tar": "^7.4.3",
+        "which": "^5.0.0"
+      },
+      "bin": {
+        "node-gyp": "bin/node-gyp.js"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/node-gyp/node_modules/chownr": {
+      "version": "3.0.0",
+      "inBundle": true,
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/npm/node_modules/node-gyp/node_modules/minizlib": {
+      "version": "3.0.1",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "minipass": "^7.0.4",
+        "rimraf": "^5.0.5"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/npm/node_modules/node-gyp/node_modules/mkdirp": {
+      "version": "3.0.1",
+      "inBundle": true,
+      "license": "MIT",
+      "bin": {
+        "mkdirp": "dist/cjs/src/bin.js"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/npm/node_modules/node-gyp/node_modules/tar": {
+      "version": "7.4.3",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "@isaacs/fs-minipass": "^4.0.0",
+        "chownr": "^3.0.0",
+        "minipass": "^7.1.2",
+        "minizlib": "^3.0.1",
+        "mkdirp": "^3.0.1",
+        "yallist": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/npm/node_modules/node-gyp/node_modules/yallist": {
+      "version": "5.0.0",
+      "inBundle": true,
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/npm/node_modules/nopt": {
+      "version": "8.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "abbrev": "^2.0.0"
+      },
+      "bin": {
+        "nopt": "bin/nopt.js"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/nopt/node_modules/abbrev": {
+      "version": "2.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/npm/node_modules/normalize-package-data": {
+      "version": "7.0.0",
+      "inBundle": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "hosted-git-info": "^8.0.0",
+        "semver": "^7.3.5",
+        "validate-npm-package-license": "^3.0.4"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/npm-audit-report": {
+      "version": "6.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/npm-bundled": {
+      "version": "4.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "npm-normalize-package-bin": "^4.0.0"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/npm-install-checks": {
+      "version": "7.1.1",
+      "inBundle": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "semver": "^7.1.1"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/npm-normalize-package-bin": {
+      "version": "4.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/npm-package-arg": {
+      "version": "12.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "hosted-git-info": "^8.0.0",
+        "proc-log": "^5.0.0",
+        "semver": "^7.3.5",
+        "validate-npm-package-name": "^6.0.0"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/npm-packlist": {
+      "version": "9.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "ignore-walk": "^7.0.0"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/npm-pick-manifest": {
+      "version": "10.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "npm-install-checks": "^7.1.0",
+        "npm-normalize-package-bin": "^4.0.0",
+        "npm-package-arg": "^12.0.0",
+        "semver": "^7.3.5"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/npm-profile": {
+      "version": "11.0.1",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "npm-registry-fetch": "^18.0.0",
+        "proc-log": "^5.0.0"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/npm-registry-fetch": {
+      "version": "18.0.2",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "@npmcli/redact": "^3.0.0",
+        "jsonparse": "^1.3.1",
+        "make-fetch-happen": "^14.0.0",
+        "minipass": "^7.0.2",
+        "minipass-fetch": "^4.0.0",
+        "minizlib": "^3.0.1",
+        "npm-package-arg": "^12.0.0",
+        "proc-log": "^5.0.0"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/npm-registry-fetch/node_modules/minizlib": {
+      "version": "3.0.1",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "minipass": "^7.0.4",
+        "rimraf": "^5.0.5"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/npm/node_modules/npm-user-validate": {
+      "version": "3.0.0",
+      "inBundle": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/p-map": {
+      "version": "4.0.0",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "aggregate-error": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/npm/node_modules/package-json-from-dist": {
+      "version": "1.0.1",
+      "inBundle": true,
+      "license": "BlueOak-1.0.0"
+    },
+    "node_modules/npm/node_modules/pacote": {
+      "version": "19.0.1",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "@npmcli/git": "^6.0.0",
+        "@npmcli/installed-package-contents": "^3.0.0",
+        "@npmcli/package-json": "^6.0.0",
+        "@npmcli/promise-spawn": "^8.0.0",
+        "@npmcli/run-script": "^9.0.0",
+        "cacache": "^19.0.0",
+        "fs-minipass": "^3.0.0",
+        "minipass": "^7.0.2",
+        "npm-package-arg": "^12.0.0",
+        "npm-packlist": "^9.0.0",
+        "npm-pick-manifest": "^10.0.0",
+        "npm-registry-fetch": "^18.0.0",
+        "proc-log": "^5.0.0",
+        "promise-retry": "^2.0.1",
+        "sigstore": "^3.0.0",
+        "ssri": "^12.0.0",
+        "tar": "^6.1.11"
+      },
+      "bin": {
+        "pacote": "bin/index.js"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/parse-conflict-json": {
+      "version": "4.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "json-parse-even-better-errors": "^4.0.0",
+        "just-diff": "^6.0.0",
+        "just-diff-apply": "^5.2.0"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/path-key": {
+      "version": "3.1.1",
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/npm/node_modules/path-scurry": {
+      "version": "1.11.1",
+      "inBundle": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "lru-cache": "^10.2.0",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/npm/node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/npm/node_modules/proc-log": {
+      "version": "5.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/proggy": {
+      "version": "3.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/promise-all-reject-late": {
+      "version": "1.0.1",
+      "inBundle": true,
+      "license": "ISC",
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/npm/node_modules/promise-call-limit": {
+      "version": "3.0.2",
+      "inBundle": true,
+      "license": "ISC",
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/npm/node_modules/promise-inflight": {
+      "version": "1.0.1",
+      "inBundle": true,
+      "license": "ISC"
+    },
+    "node_modules/npm/node_modules/promise-retry": {
+      "version": "2.0.1",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "err-code": "^2.0.2",
+        "retry": "^0.12.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/npm/node_modules/promzard": {
+      "version": "2.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "read": "^4.0.0"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/qrcode-terminal": {
+      "version": "0.12.0",
+      "inBundle": true,
+      "bin": {
+        "qrcode-terminal": "bin/qrcode-terminal.js"
+      }
+    },
+    "node_modules/npm/node_modules/read": {
+      "version": "4.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "mute-stream": "^2.0.0"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/read-cmd-shim": {
+      "version": "5.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/read-package-json-fast": {
+      "version": "4.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "json-parse-even-better-errors": "^4.0.0",
+        "npm-normalize-package-bin": "^4.0.0"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/retry": {
+      "version": "0.12.0",
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/npm/node_modules/rimraf": {
+      "version": "5.0.10",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "glob": "^10.3.7"
+      },
+      "bin": {
+        "rimraf": "dist/esm/bin.mjs"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/npm/node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "inBundle": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/npm/node_modules/semver": {
+      "version": "7.6.3",
+      "inBundle": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/npm/node_modules/shebang-command": {
+      "version": "2.0.0",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/npm/node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/npm/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "inBundle": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/npm/node_modules/sigstore": {
+      "version": "3.0.0",
+      "inBundle": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@sigstore/bundle": "^3.0.0",
+        "@sigstore/core": "^2.0.0",
+        "@sigstore/protobuf-specs": "^0.3.2",
+        "@sigstore/sign": "^3.0.0",
+        "@sigstore/tuf": "^3.0.0",
+        "@sigstore/verify": "^2.0.0"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/sigstore/node_modules/@sigstore/bundle": {
+      "version": "3.0.0",
+      "inBundle": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@sigstore/protobuf-specs": "^0.3.2"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/sigstore/node_modules/@sigstore/core": {
+      "version": "2.0.0",
+      "inBundle": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/sigstore/node_modules/@sigstore/sign": {
+      "version": "3.0.0",
+      "inBundle": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@sigstore/bundle": "^3.0.0",
+        "@sigstore/core": "^2.0.0",
+        "@sigstore/protobuf-specs": "^0.3.2",
+        "make-fetch-happen": "^14.0.1",
+        "proc-log": "^5.0.0",
+        "promise-retry": "^2.0.1"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/sigstore/node_modules/@sigstore/verify": {
+      "version": "2.0.0",
+      "inBundle": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@sigstore/bundle": "^3.0.0",
+        "@sigstore/core": "^2.0.0",
+        "@sigstore/protobuf-specs": "^0.3.2"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/smart-buffer": {
+      "version": "4.2.0",
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 6.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/npm/node_modules/socks": {
+      "version": "2.8.3",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "ip-address": "^9.0.5",
+        "smart-buffer": "^4.2.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/npm/node_modules/socks-proxy-agent": {
+      "version": "8.0.4",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^7.1.1",
+        "debug": "^4.3.4",
+        "socks": "^2.8.3"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/npm/node_modules/spdx-correct": {
+      "version": "3.2.0",
+      "inBundle": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/npm/node_modules/spdx-correct/node_modules/spdx-expression-parse": {
+      "version": "3.0.1",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/npm/node_modules/spdx-exceptions": {
+      "version": "2.5.0",
+      "inBundle": true,
+      "license": "CC-BY-3.0"
+    },
+    "node_modules/npm/node_modules/spdx-expression-parse": {
+      "version": "4.0.0",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/npm/node_modules/spdx-license-ids": {
+      "version": "3.0.20",
+      "inBundle": true,
+      "license": "CC0-1.0"
+    },
+    "node_modules/npm/node_modules/sprintf-js": {
+      "version": "1.1.3",
+      "inBundle": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/npm/node_modules/ssri": {
+      "version": "12.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "minipass": "^7.0.3"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/string-width": {
+      "version": "4.2.3",
+      "inBundle": 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/npm/node_modules/string-width-cjs": {
+      "name": "string-width",
+      "version": "4.2.3",
+      "inBundle": 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/npm/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/npm/node_modules/strip-ansi-cjs": {
+      "name": "strip-ansi",
+      "version": "6.0.1",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/npm/node_modules/supports-color": {
+      "version": "9.4.0",
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/npm/node_modules/tar": {
+      "version": "6.2.1",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.0.0",
+        "minipass": "^5.0.0",
+        "minizlib": "^2.1.1",
+        "mkdirp": "^1.0.3",
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/npm/node_modules/tar/node_modules/fs-minipass": {
+      "version": "2.1.0",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/npm/node_modules/tar/node_modules/fs-minipass/node_modules/minipass": {
+      "version": "3.3.6",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/npm/node_modules/tar/node_modules/minipass": {
+      "version": "5.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/npm/node_modules/text-table": {
+      "version": "0.2.0",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/npm/node_modules/tiny-relative-date": {
+      "version": "1.3.0",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/npm/node_modules/treeverse": {
+      "version": "3.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/npm/node_modules/tuf-js": {
+      "version": "3.0.1",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "@tufjs/models": "3.0.1",
+        "debug": "^4.3.6",
+        "make-fetch-happen": "^14.0.1"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/tuf-js/node_modules/@tufjs/models": {
+      "version": "3.0.1",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "@tufjs/canonical-json": "2.0.0",
+        "minimatch": "^9.0.5"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/unique-filename": {
+      "version": "4.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "unique-slug": "^5.0.0"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/unique-slug": {
+      "version": "5.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "imurmurhash": "^0.1.4"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/npm/node_modules/validate-npm-package-license": {
+      "version": "3.0.4",
+      "inBundle": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "node_modules/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse": {
+      "version": "3.0.1",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/npm/node_modules/validate-npm-package-name": {
+      "version": "6.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/walk-up-path": {
+      "version": "3.0.1",
+      "inBundle": true,
+      "license": "ISC"
+    },
+    "node_modules/npm/node_modules/which": {
+      "version": "5.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "isexe": "^3.1.1"
+      },
+      "bin": {
+        "node-which": "bin/which.js"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/which/node_modules/isexe": {
+      "version": "3.1.1",
+      "inBundle": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/npm/node_modules/wrap-ansi": {
+      "version": "8.1.0",
+      "inBundle": true,
+      "license": "MIT",
+      "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/npm/node_modules/wrap-ansi-cjs": {
+      "name": "wrap-ansi",
+      "version": "7.0.0",
+      "inBundle": 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/npm/node_modules/wrap-ansi-cjs/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/npm/node_modules/wrap-ansi/node_modules/ansi-regex": {
+      "version": "6.1.0",
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/npm/node_modules/wrap-ansi/node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/npm/node_modules/wrap-ansi/node_modules/string-width": {
+      "version": "5.1.2",
+      "inBundle": true,
+      "license": "MIT",
+      "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/npm/node_modules/wrap-ansi/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/npm/node_modules/write-file-atomic": {
+      "version": "6.0.0",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "imurmurhash": "^0.1.4",
+        "signal-exit": "^4.0.1"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm/node_modules/yallist": {
+      "version": "4.0.0",
+      "inBundle": true,
+      "license": "ISC"
+    },
     "node_modules/nth-check": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
-      "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
@@ -34076,24 +35461,18 @@
     },
     "node_modules/nvd3-fork": {
       "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/nvd3-fork/-/nvd3-fork-2.0.5.tgz",
-      "integrity": "sha512-Sq3q2rvR/9FJ35LVmqdQJAnfmD15BaIHSBg5wZZL/WLcq/nthff8ukabwFdbW0zeE1c/yPq+DKl6MxnUTR45DA==",
       "license": "Apache-2.0",
       "peerDependencies": {
         "d3": "^3.4.4"
       }
     },
     "node_modules/nwsapi": {
-      "version": "2.2.20",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.20.tgz",
-      "integrity": "sha512-/ieB+mDe4MrrKMT8z+mQL8klXydZWGR5Dowt4RAGKbJ3kIGEx3X4ljUo+6V73IXtUPWgfOlU5B9MlGxFO5T+cA==",
+      "version": "2.2.16",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/nx": {
-      "version": "20.8.2",
-      "resolved": "https://registry.npmjs.org/nx/-/nx-20.8.2.tgz",
-      "integrity": "sha512-mDKpbH3vEpUFDx0rrLh+tTqLq1PYU8KiD/R7OVZGd1FxQxghx2HOl32MiqNsfPcw6AvKlXhslbwIESV+N55FLQ==",
+      "version": "20.7.0",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -34138,16 +35517,16 @@
         "nx-cloud": "bin/nx-cloud.js"
       },
       "optionalDependencies": {
-        "@nx/nx-darwin-arm64": "20.8.2",
-        "@nx/nx-darwin-x64": "20.8.2",
-        "@nx/nx-freebsd-x64": "20.8.2",
-        "@nx/nx-linux-arm-gnueabihf": "20.8.2",
-        "@nx/nx-linux-arm64-gnu": "20.8.2",
-        "@nx/nx-linux-arm64-musl": "20.8.2",
-        "@nx/nx-linux-x64-gnu": "20.8.2",
-        "@nx/nx-linux-x64-musl": "20.8.2",
-        "@nx/nx-win32-arm64-msvc": "20.8.2",
-        "@nx/nx-win32-x64-msvc": "20.8.2"
+        "@nx/nx-darwin-arm64": "20.7.0",
+        "@nx/nx-darwin-x64": "20.7.0",
+        "@nx/nx-freebsd-x64": "20.7.0",
+        "@nx/nx-linux-arm-gnueabihf": "20.7.0",
+        "@nx/nx-linux-arm64-gnu": "20.7.0",
+        "@nx/nx-linux-arm64-musl": "20.7.0",
+        "@nx/nx-linux-x64-gnu": "20.7.0",
+        "@nx/nx-linux-x64-musl": "20.7.0",
+        "@nx/nx-win32-arm64-msvc": "20.7.0",
+        "@nx/nx-win32-x64-msvc": "20.7.0"
       },
       "peerDependencies": {
         "@swc-node/register": "^1.8.0",
@@ -34164,8 +35543,6 @@
     },
     "node_modules/nx/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": {
@@ -34174,8 +35551,6 @@
     },
     "node_modules/nx/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": {
@@ -34189,23 +35564,8 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/nx/node_modules/dotenv": {
-      "version": "16.4.7",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.7.tgz",
-      "integrity": "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://dotenvx.com"
-      }
-    },
     "node_modules/nx/node_modules/dotenv-expand": {
       "version": "11.0.7",
-      "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-11.0.7.tgz",
-      "integrity": "sha512-zIHwmZPRshsCdpMDyVsqGmgyP0yT8GAgXUnkdAoJisxvf33k7yO6OuoKmcTGuXPWSsm8Oh88nZicRLA9Y0rUeA==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
@@ -34220,8 +35580,6 @@
     },
     "node_modules/nx/node_modules/enquirer": {
       "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -34231,10 +35589,34 @@
         "node": ">=8.6"
       }
     },
+    "node_modules/nx/node_modules/is-unicode-supported": {
+      "version": "0.1.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/nx/node_modules/log-symbols": {
+      "version": "4.1.0",
+      "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/nx/node_modules/minimatch": {
       "version": "9.0.3",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -34249,8 +35631,6 @@
     },
     "node_modules/nx/node_modules/ora": {
       "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-5.3.0.tgz",
-      "integrity": "sha512-zAKMgGXUim0Jyd6CXK9lraBnD3H5yPGBPPOkC23a2BG6hsm4Zu6OQSjQuEtV0BHDf4aKHcUFvJiGRrFuW3MG8g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -34272,8 +35652,6 @@
     },
     "node_modules/nyc": {
       "version": "17.1.0",
-      "resolved": "https://registry.npmjs.org/nyc/-/nyc-17.1.0.tgz",
-      "integrity": "sha512-U42vQ4czpKa0QdI1hu950XuNhYqgoM+ZF1HT+VuUHL9hPfDPVvNQyltmMqdE9bUHMVa+8yNbc3QKTj8zQhlVxQ==",
       "dev": true,
       "license": "ISC",
       "peer": true,
@@ -34315,8 +35693,6 @@
     },
     "node_modules/nyc/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,
       "license": "MIT",
       "peer": true,
@@ -34326,8 +35702,6 @@
     },
     "node_modules/nyc/node_modules/cliui": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
-      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
       "dev": true,
       "license": "ISC",
       "peer": true,
@@ -34339,16 +35713,12 @@
     },
     "node_modules/nyc/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",
       "peer": true
     },
     "node_modules/nyc/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,
       "license": "MIT",
       "peer": true,
@@ -34366,8 +35736,6 @@
     },
     "node_modules/nyc/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,
       "license": "MIT",
       "peer": true,
@@ -34379,28 +35747,8 @@
         "node": ">=8"
       }
     },
-    "node_modules/nyc/node_modules/istanbul-lib-instrument": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz",
-      "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "peer": true,
-      "dependencies": {
-        "@babel/core": "^7.23.9",
-        "@babel/parser": "^7.23.9",
-        "@istanbuljs/schema": "^0.1.3",
-        "istanbul-lib-coverage": "^3.2.0",
-        "semver": "^7.5.4"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/nyc/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,
       "license": "MIT",
       "peer": true,
@@ -34413,8 +35761,6 @@
     },
     "node_modules/nyc/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,
       "license": "MIT",
       "peer": true,
@@ -34430,8 +35776,6 @@
     },
     "node_modules/nyc/node_modules/make-dir/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": "ISC",
       "peer": true,
@@ -34441,8 +35785,6 @@
     },
     "node_modules/nyc/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,
       "license": "MIT",
       "peer": true,
@@ -34458,8 +35800,6 @@
     },
     "node_modules/nyc/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,
       "license": "MIT",
       "peer": true,
@@ -34472,8 +35812,6 @@
     },
     "node_modules/nyc/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,
       "license": "MIT",
       "peer": true,
@@ -34486,8 +35824,6 @@
     },
     "node_modules/nyc/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,
       "license": "MIT",
       "peer": true,
@@ -34500,9 +35836,6 @@
     },
     "node_modules/nyc/node_modules/rimraf": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "deprecated": "Rimraf versions prior to v4 are no longer supported",
       "dev": true,
       "license": "ISC",
       "peer": true,
@@ -34518,16 +35851,12 @@
     },
     "node_modules/nyc/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,
       "license": "ISC",
       "peer": true
     },
     "node_modules/nyc/node_modules/yargs": {
       "version": "15.4.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
-      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
       "dev": true,
       "license": "MIT",
       "peer": true,
@@ -34550,8 +35879,6 @@
     },
     "node_modules/nyc/node_modules/yargs-parser": {
       "version": "18.1.3",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
-      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
       "dev": true,
       "license": "ISC",
       "peer": true,
@@ -34564,17 +35891,15 @@
       }
     },
     "node_modules/nypm": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/nypm/-/nypm-0.5.4.tgz",
-      "integrity": "sha512-X0SNNrZiGU8/e/zAB7sCTtdxWTMSIO73q+xuKgglm2Yvzwlo8UoC5FNySQFCvl84uPaeADkqHUZUkWy4aH4xOA==",
+      "version": "0.3.12",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "citty": "^0.1.6",
-        "consola": "^3.4.0",
-        "pathe": "^2.0.3",
-        "pkg-types": "^1.3.1",
-        "tinyexec": "^0.3.2",
+        "consola": "^3.2.3",
+        "execa": "^8.0.1",
+        "pathe": "^1.1.2",
+        "pkg-types": "^1.2.0",
         "ufo": "^1.5.4"
       },
       "bin": {
@@ -34584,19 +35909,139 @@
         "node": "^14.16.0 || >=16.10.0"
       }
     },
+    "node_modules/nypm/node_modules/execa": {
+      "version": "8.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^8.0.1",
+        "human-signals": "^5.0.0",
+        "is-stream": "^3.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^5.1.0",
+        "onetime": "^6.0.0",
+        "signal-exit": "^4.1.0",
+        "strip-final-newline": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=16.17"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "node_modules/nypm/node_modules/get-stream": {
+      "version": "8.0.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/nypm/node_modules/human-signals": {
+      "version": "5.0.0",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=16.17.0"
+      }
+    },
+    "node_modules/nypm/node_modules/is-stream": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/nypm/node_modules/mimic-fn": {
+      "version": "4.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/nypm/node_modules/npm-run-path": {
+      "version": "5.3.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "path-key": "^4.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/nypm/node_modules/onetime": {
+      "version": "6.0.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mimic-fn": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/nypm/node_modules/path-key": {
+      "version": "4.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/nypm/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/nypm/node_modules/strip-final-newline": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "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==",
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.13.4",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
-      "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
+      "version": "1.13.3",
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"
@@ -34607,8 +36052,6 @@
     },
     "node_modules/object-is": {
       "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.6.tgz",
-      "integrity": "sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==",
       "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.7",
@@ -34623,8 +36066,6 @@
     },
     "node_modules/object-keys": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"
@@ -34632,8 +36073,6 @@
     },
     "node_modules/object.assign": {
       "version": "4.1.7",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz",
-      "integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==",
       "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.8",
@@ -34651,16 +36090,13 @@
       }
     },
     "node_modules/object.entries": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.9.tgz",
-      "integrity": "sha512-8u/hfXFRBD1O0hPUjioLhoWFHRmt6tKA4/vZPyckBr18l1KE9uHrFaFaUi8MDRTpi4uak2goyPTSNJLXX2k2Hw==",
+      "version": "1.1.8",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.4",
+        "call-bind": "^1.0.7",
         "define-properties": "^1.2.1",
-        "es-object-atoms": "^1.1.1"
+        "es-object-atoms": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -34668,8 +36104,6 @@
     },
     "node_modules/object.fromentries": {
       "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": {
@@ -34687,8 +36121,6 @@
     },
     "node_modules/object.getownpropertydescriptors": {
       "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.8.tgz",
-      "integrity": "sha512-qkHIGe4q0lSYMv0XI4SsBTJz3WaURhLvd0lKSgtVuOsJ2krg4SgMw3PIRQFMp07yi++UR3se2mkcLqsBNpBb/A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -34709,8 +36141,6 @@
     },
     "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": {
@@ -34724,8 +36154,6 @@
     },
     "node_modules/object.values": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.1.tgz",
-      "integrity": "sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -34743,22 +36171,21 @@
     },
     "node_modules/objectorarray": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/objectorarray/-/objectorarray-1.0.5.tgz",
-      "integrity": "sha512-eJJDYkhJFFbBBAxeh8xW+weHlkI28n2ZdQV/J/DNfWfSKlGEf2xcfAbZTv3riEXHAhL9SVOTs2pRmXiSTf78xg==",
       "dev": true,
       "license": "ISC"
     },
     "node_modules/obuf": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
-      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/ohash": {
+      "version": "1.1.4",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/ol": {
       "version": "7.5.2",
-      "resolved": "https://registry.npmjs.org/ol/-/ol-7.5.2.tgz",
-      "integrity": "sha512-HJbb3CxXrksM6ct367LsP3N+uh+iBBMdP3DeGGipdV9YAYTP0vTJzqGnoqQ6C2IW4qf8krw9yuyQbc9fjOIaOQ==",
       "license": "BSD-2-Clause",
       "dependencies": {
         "earcut": "^2.2.3",
@@ -34774,8 +36201,6 @@
     },
     "node_modules/ol-mapbox-style": {
       "version": "10.7.0",
-      "resolved": "https://registry.npmjs.org/ol-mapbox-style/-/ol-mapbox-style-10.7.0.tgz",
-      "integrity": "sha512-S/UdYBuOjrotcR95Iq9AejGYbifKeZE85D9VtH11ryJLQPTZXZSW1J5bIXcr4AlAH6tyjPPHTK34AdkwB32Myw==",
       "license": "BSD-2-Clause",
       "dependencies": {
         "@mapbox/mapbox-gl-style-spec": "^13.23.1",
@@ -34785,8 +36210,6 @@
     },
     "node_modules/ol/node_modules/pbf": {
       "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/pbf/-/pbf-3.2.1.tgz",
-      "integrity": "sha512-ClrV7pNOn7rtmoQVF4TS1vyU0WhYRnP92fzbfF75jAIwpnzdJXf8iTd4CMEqO4yUenH6NDqLiwjqlh6QgZzgLQ==",
       "license": "BSD-3-Clause",
       "dependencies": {
         "ieee754": "^1.1.12",
@@ -34798,15 +36221,11 @@
     },
     "node_modules/omggif": {
       "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/omggif/-/omggif-1.0.10.tgz",
-      "integrity": "sha512-LMJTtvgc/nugXj0Vcrrs68Mn2D1r0zf630VNtqtpI1FEO7e+O9FP4gqs9AcnBaSEeoHIPm28u6qgPR0oyEpGSw==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/on-exit-leak-free": {
       "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/on-exit-leak-free/-/on-exit-leak-free-2.1.2.tgz",
-      "integrity": "sha512-0eJJY6hXLGf1udHwfNftBqH+g73EU4B504nZeKpz1sYRKafAghwxEJunB2O7rDZkL4PGfsMVnTXZ2EjibbqcsA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -34815,8 +36234,6 @@
     },
     "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": {
@@ -34828,8 +36245,6 @@
     },
     "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,
       "license": "MIT",
       "engines": {
@@ -34838,8 +36253,6 @@
     },
     "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==",
       "license": "ISC",
       "dependencies": {
         "wrappy": "1"
@@ -34847,8 +36260,6 @@
     },
     "node_modules/onetime": {
       "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
       "license": "MIT",
       "dependencies": {
         "mimic-fn": "^2.1.0"
@@ -34862,9 +36273,6 @@
     },
     "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",
       "dependencies": {
         "define-lazy-prop": "^2.0.0",
@@ -34880,8 +36288,6 @@
     },
     "node_modules/open-cli": {
       "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/open-cli/-/open-cli-8.0.0.tgz",
-      "integrity": "sha512-3muD3BbfLyzl+aMVSEfn2FfOqGdPYR0O4KNnxXsLEPE2q9OSjBfJAaB6XKbrUzLgymoSMejvb5jpXJfru/Ko2A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -34903,8 +36309,6 @@
     },
     "node_modules/open-cli/node_modules/define-lazy-prop": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz",
-      "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -34916,8 +36320,6 @@
     },
     "node_modules/open-cli/node_modules/is-wsl": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-3.1.0.tgz",
-      "integrity": "sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -34932,8 +36334,6 @@
     },
     "node_modules/open-cli/node_modules/meow": {
       "version": "12.1.1",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-12.1.1.tgz",
-      "integrity": "sha512-BhXM0Au22RwUneMPwSCnyhTOizdWoIEPU9sp0Aqa1PnDMR5Wv2FGXYDjuzJEIX+Eo2Rb8xuYe5jrnm5QowQFkw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -34944,9 +36344,7 @@
       }
     },
     "node_modules/open-cli/node_modules/open": {
-      "version": "10.1.2",
-      "resolved": "https://registry.npmjs.org/open/-/open-10.1.2.tgz",
-      "integrity": "sha512-cxN6aIDPz6rm8hbebcP7vrQNhvRcveZoJU72Y7vskh4oIm+BZwBECnx5nTmrlres1Qapvx27Qo1Auukpf8PKXw==",
+      "version": "10.1.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -34964,8 +36362,6 @@
     },
     "node_modules/opener": {
       "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
-      "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==",
       "dev": true,
       "license": "(WTFPL OR MIT)",
       "bin": {
@@ -34974,8 +36370,6 @@
     },
     "node_modules/optimist": {
       "version": "0.3.7",
-      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz",
-      "integrity": "sha512-TCx0dXQzVtSCg2OgY/bO9hjM9cV4XYx09TVK+s3+FhkjT6LovsLe+pPMzpWf+6yXK/hUizs2gUoTw3jHM0VaTQ==",
       "license": "MIT/X11",
       "dependencies": {
         "wordwrap": "~0.0.2"
@@ -34983,8 +36377,6 @@
     },
     "node_modules/optimist/node_modules/wordwrap": {
       "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
-      "integrity": "sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw==",
       "license": "MIT",
       "engines": {
         "node": ">=0.4.0"
@@ -34992,8 +36384,6 @@
     },
     "node_modules/optionator": {
       "version": "0.9.4",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
-      "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
       "license": "MIT",
       "dependencies": {
         "deep-is": "^0.1.3",
@@ -35009,8 +36399,6 @@
     },
     "node_modules/ora": {
       "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-3.4.0.tgz",
-      "integrity": "sha512-eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -35027,8 +36415,6 @@
     },
     "node_modules/ora/node_modules/ansi-regex": {
       "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -35037,8 +36423,6 @@
     },
     "node_modules/ora/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,
       "license": "MIT",
       "dependencies": {
@@ -35050,8 +36434,6 @@
     },
     "node_modules/ora/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,
       "license": "MIT",
       "dependencies": {
@@ -35065,8 +36447,6 @@
     },
     "node_modules/ora/node_modules/cli-cursor": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
-      "integrity": "sha512-8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -35078,8 +36458,6 @@
     },
     "node_modules/ora/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,
       "license": "MIT",
       "dependencies": {
@@ -35088,15 +36466,11 @@
     },
     "node_modules/ora/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,
       "license": "MIT"
     },
     "node_modules/ora/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,
       "license": "MIT",
       "engines": {
@@ -35105,8 +36479,6 @@
     },
     "node_modules/ora/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,
       "license": "MIT",
       "engines": {
@@ -35115,8 +36487,6 @@
     },
     "node_modules/ora/node_modules/log-symbols": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
-      "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -35128,8 +36498,6 @@
     },
     "node_modules/ora/node_modules/mimic-fn": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -35138,8 +36506,6 @@
     },
     "node_modules/ora/node_modules/onetime": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
-      "integrity": "sha512-oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -35151,8 +36517,6 @@
     },
     "node_modules/ora/node_modules/restore-cursor": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
-      "integrity": "sha512-6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -35165,8 +36529,6 @@
     },
     "node_modules/ora/node_modules/strip-ansi": {
       "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -35178,8 +36540,6 @@
     },
     "node_modules/ora/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,
       "license": "MIT",
       "dependencies": {
@@ -35191,9 +36551,6 @@
     },
     "node_modules/os-tmpdir": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
-      "devOptional": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -35201,14 +36558,10 @@
     },
     "node_modules/ospath": {
       "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/ospath/-/ospath-1.2.2.tgz",
-      "integrity": "sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA==",
       "license": "MIT"
     },
     "node_modules/own-keys": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz",
-      "integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==",
       "license": "MIT",
       "dependencies": {
         "get-intrinsic": "^1.2.6",
@@ -35224,28 +36577,62 @@
     },
     "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,
       "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
+    "node_modules/p-each-series": {
+      "version": "3.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-filter": {
+      "version": "4.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "p-map": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-filter/node_modules/p-map": {
+      "version": "7.0.3",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/p-finally": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-      "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==",
       "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
+    "node_modules/p-is-promise": {
+      "version": "3.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/p-iteration": {
       "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/p-iteration/-/p-iteration-1.1.8.tgz",
-      "integrity": "sha512-IMFBSDIYcPNnW7uWYGrBqmvTiq7W0uB0fJn6shQZs7dlF3OvrHOre+JT9ikSZ7gZS3vWqclVgoQSvToJrns7uQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -35254,8 +36641,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "yocto-queue": "^0.1.0"
@@ -35269,8 +36654,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "p-limit": "^3.0.2"
@@ -35284,8 +36667,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==",
       "license": "MIT",
       "dependencies": {
         "aggregate-error": "^3.0.0"
@@ -35299,8 +36680,6 @@
     },
     "node_modules/p-map-series": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-map-series/-/p-map-series-2.1.0.tgz",
-      "integrity": "sha512-RpYIIK1zXSNEOdwxcfe7FdvGcs7+y5n8rifMhMNWvaxRNMPINJHF5GDeuVxWqnfrcHPSCnp7Oo5yNXHId9Av2Q==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -35309,8 +36688,6 @@
     },
     "node_modules/p-pipe": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-pipe/-/p-pipe-3.1.0.tgz",
-      "integrity": "sha512-08pj8ATpzMR0Y80x50yJHn37NF6vjrqHutASaX5LiH5npS9XPvrUmscd9MF5R4fuYRHOxQR1FfMIlF7AzwoPqw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -35321,17 +36698,15 @@
       }
     },
     "node_modules/p-queue": {
-      "version": "6.6.2",
-      "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-6.6.2.tgz",
-      "integrity": "sha512-RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ==",
-      "dev": true,
+      "version": "8.1.0",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "eventemitter3": "^4.0.4",
-        "p-timeout": "^3.2.0"
+        "eventemitter3": "^5.0.1",
+        "p-timeout": "^6.1.2"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -35339,9 +36714,6 @@
     },
     "node_modules/p-reduce": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-reduce/-/p-reduce-2.1.0.tgz",
-      "integrity": "sha512-2USApvnsutq8uoxZBGbbWM0JIYLiEMJ9RlaN7fAzVNb9OZN0SHjjTTfIcb667XynS5Y1VhwDJVDa72TnPzAYWw==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -35349,8 +36721,6 @@
     },
     "node_modules/p-retry": {
       "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz",
-      "integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -35362,22 +36732,18 @@
       }
     },
     "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,
+      "version": "6.1.4",
       "license": "MIT",
-      "dependencies": {
-        "p-finally": "^1.0.0"
-      },
+      "peer": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=14.16"
+      },
+      "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==",
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -35385,8 +36751,6 @@
     },
     "node_modules/p-waterfall": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/p-waterfall/-/p-waterfall-2.1.1.tgz",
-      "integrity": "sha512-RRTnDb2TBG/epPRI2yYXsimO0v3BXC8Yd3ogr1545IaqKK17VGhbWVeGGN+XfCm/08OK8635nH31c8bATkHuSw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -35401,8 +36765,6 @@
     },
     "node_modules/pac-proxy-agent": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.2.0.tgz",
-      "integrity": "sha512-TEB8ESquiLMc0lV8vcd5Ql/JAKAoyzHFXaStwjkzpOpC5Yv+pIzLfHvjTSdf3vpa2bMiUQrg9i6276yn8666aA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -35421,8 +36783,6 @@
     },
     "node_modules/pac-proxy-agent/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,
       "license": "MIT",
       "engines": {
@@ -35431,8 +36791,6 @@
     },
     "node_modules/pac-proxy-agent/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": {
@@ -35445,8 +36803,6 @@
     },
     "node_modules/pac-proxy-agent/node_modules/https-proxy-agent": {
       "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,
       "license": "MIT",
       "dependencies": {
@@ -35459,8 +36815,6 @@
     },
     "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": {
@@ -35473,8 +36827,6 @@
     },
     "node_modules/package-hash": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/package-hash/-/package-hash-4.0.0.tgz",
-      "integrity": "sha512-whdkPIooSu/bASggZ96BWVvZTRMOFxnyUG5PnTSGKoJE2gd5mbVNmR2Nj20QFzxYYgAXpoqC+AiXzl+UMRh7zQ==",
       "dev": true,
       "license": "ISC",
       "peer": true,
@@ -35490,8 +36842,6 @@
     },
     "node_modules/package-json": {
       "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/package-json/-/package-json-10.0.1.tgz",
-      "integrity": "sha512-ua1L4OgXSBdsu1FPb7F3tYH0F48a6kxvod4pLUlGY9COeJAJQNX/sNH2IiEmsxw7lqYiAwrdHMjz1FctOsyDQg==",
       "license": "MIT",
       "dependencies": {
         "ky": "^1.2.0",
@@ -35508,14 +36858,10 @@
     },
     "node_modules/package-json-from-dist": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
-      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
       "license": "BlueOak-1.0.0"
     },
     "node_modules/package-json/node_modules/ky": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/ky/-/ky-1.8.1.tgz",
-      "integrity": "sha512-7Bp3TpsE+L+TARSnnDpk3xg8Idi8RwSLdj6CMbNWoOARIrGrbuLGusV0dYwbZOm4bB3jHNxSw8Wk/ByDqJEnDw==",
+      "version": "1.7.4",
       "license": "MIT",
       "engines": {
         "node": ">=18"
@@ -35526,8 +36872,6 @@
     },
     "node_modules/pacote": {
       "version": "18.0.6",
-      "resolved": "https://registry.npmjs.org/pacote/-/pacote-18.0.6.tgz",
-      "integrity": "sha512-+eK3G27SMwsB8kLIuj4h1FUhHtwiEUo21Tw8wNjmvdlpOEr613edv+8FUsTj/4F/VN5ywGE19X18N7CC2EJk6A==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -35557,21 +36901,15 @@
       }
     },
     "node_modules/pad-component": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/pad-component/-/pad-component-0.0.1.tgz",
-      "integrity": "sha512-8EKVBxCRSvLnsX1p2LlSFSH3c2/wuhY9/BXXWu8boL78FbVKqn2L5SpURt1x5iw6Gq8PTqJ7MdPoe5nCtX3I+g=="
+      "version": "0.0.1"
     },
     "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,
       "license": "(MIT AND Zlib)"
     },
     "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,
       "license": "MIT",
       "dependencies": {
@@ -35581,8 +36919,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==",
       "license": "MIT",
       "dependencies": {
         "callsites": "^3.0.0"
@@ -35593,8 +36929,6 @@
     },
     "node_modules/parse-conflict-json": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/parse-conflict-json/-/parse-conflict-json-3.0.1.tgz",
-      "integrity": "sha512-01TvEktc68vwbJOtWZluyWeVGWjP+bZwXtPDMQVbBKzbJ/vZBif0L69KH1+cHv1SZ6e0FKLvjyHe8mqsIqYOmw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -35608,8 +36942,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "character-entities": "^1.0.0",
@@ -35625,15 +36957,11 @@
       }
     },
     "node_modules/parse-headers": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/parse-headers/-/parse-headers-2.0.6.tgz",
-      "integrity": "sha512-Tz11t3uKztEW5FEVZnj1ox8GKblWn+PvHY9TmJV5Mll2uHEwRdR/5Li1OlXoECjLYkApdhWy44ocONwXLiKO5A==",
+      "version": "2.0.5",
       "license": "MIT"
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.0.0",
@@ -35650,20 +36978,14 @@
     },
     "node_modules/parse-json/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==",
       "license": "MIT"
     },
     "node_modules/parse-json/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==",
       "license": "MIT"
     },
     "node_modules/parse-ms": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-4.0.0.tgz",
-      "integrity": "sha512-TXfryirbmq34y8QBwgqCVLi+8oA3oWx2eAnSn62ITyEhEYaWRlVZ2DvMM9eZbMs/RfxPu/PK/aBLyGj4IrqMHw==",
       "license": "MIT",
       "engines": {
         "node": ">=18"
@@ -35672,20 +36994,8 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "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": {
@@ -35693,9 +37003,7 @@
       }
     },
     "node_modules/parse-path": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/parse-path/-/parse-path-7.1.0.tgz",
-      "integrity": "sha512-EuCycjZtfPcjWk7KTksnJ5xPMvWGA/6i4zrLYhRG0hGvC3GPU/jGUj3Cy+ZR0v30duV3e23R95T1lE2+lsndSw==",
+      "version": "7.0.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -35704,8 +37012,6 @@
     },
     "node_modules/parse-url": {
       "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/parse-url/-/parse-url-8.1.0.tgz",
-      "integrity": "sha512-xDvOoLU5XRrcOZvnI6b8zA6n9O9ejNk/GExuz1yBuWUGn9KA97GI6HTs6u02wKara1CeVmZhH+0TZFdWScR89w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -35713,26 +37019,49 @@
       }
     },
     "node_modules/parse5": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
-      "dev": true,
-      "license": "MIT"
+      "version": "7.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "entities": "^6.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/inikulin/parse5?sponsor=1"
+      }
     },
     "node_modules/parse5-htmlparser2-tree-adapter": {
       "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz",
-      "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "parse5": "^6.0.1"
       }
     },
+    "node_modules/parse5-htmlparser2-tree-adapter/node_modules/parse5": {
+      "version": "6.0.1",
+      "license": "MIT"
+    },
+    "node_modules/parse5-parser-stream": {
+      "version": "7.1.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "parse5": "^7.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/inikulin/parse5?sponsor=1"
+      }
+    },
+    "node_modules/parse5/node_modules/entities": {
+      "version": "6.0.1",
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
     "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,
       "license": "MIT",
       "engines": {
@@ -35741,8 +37070,6 @@
     },
     "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,
       "license": "MIT",
       "dependencies": {
@@ -35752,21 +37079,15 @@
     },
     "node_modules/path-browserify": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
-      "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/path-equal": {
       "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/path-equal/-/path-equal-1.2.5.tgz",
-      "integrity": "sha512-i73IctDr3F2W+bsOWDyyVm/lqsXO47aY9nsFZUjTT/aljSbkxHxxCoyZ9UUrM8jK0JVod+An+rl48RCsvWM+9g==",
       "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==",
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -35774,8 +37095,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": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -35783,8 +37102,6 @@
     },
     "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==",
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -35792,14 +37109,10 @@
     },
     "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==",
       "license": "MIT"
     },
     "node_modules/path-scurry": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
-      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
       "license": "BlueOak-1.0.0",
       "dependencies": {
         "lru-cache": "^10.2.0",
@@ -35814,37 +37127,27 @@
     },
     "node_modules/path-scurry/node_modules/lru-cache": {
       "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
-      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
       "license": "ISC"
     },
     "node_modules/path-to-regexp": {
       "version": "0.1.12",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
-      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==",
       "dev": true,
       "license": "MIT"
     },
     "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==",
       "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/pathe": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz",
-      "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==",
+      "version": "1.1.2",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/pbf": {
       "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/pbf/-/pbf-3.3.0.tgz",
-      "integrity": "sha512-XDF38WCH3z5OV/OVa8GKUNtLAyneuzbCisx7QUCF8Q6Nutx0WnJrQe5O+kOtBlLfRNUws98Y58Lblp+NJG5T4Q==",
       "license": "BSD-3-Clause",
       "dependencies": {
         "ieee754": "^1.1.12",
@@ -35855,9 +37158,7 @@
       }
     },
     "node_modules/peek-readable": {
-      "version": "5.4.2",
-      "resolved": "https://registry.npmjs.org/peek-readable/-/peek-readable-5.4.2.tgz",
-      "integrity": "sha512-peBp3qZyuS6cNIJ2akRNG1uo1WJ1d0wTxg/fxMdZ0BqCVhx242bSFHM9eNqflfJVS9SsgkzgT/1UgnsurBOTMg==",
+      "version": "5.3.1",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -35870,8 +37171,6 @@
     },
     "node_modules/peek-stream": {
       "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/peek-stream/-/peek-stream-1.1.3.tgz",
-      "integrity": "sha512-FhJ+YbOSBb9/rIl2ZeE/QHEsWn7PqNYt8ARAY3kIgNGOk13g9FGyIY6JIl/xB/3TFRVoTv5as0l11weORrTekA==",
       "license": "MIT",
       "dependencies": {
         "buffer-from": "^1.0.0",
@@ -35881,26 +37180,18 @@
     },
     "node_modules/pend": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
       "license": "MIT"
     },
     "node_modules/performance-now": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
       "license": "MIT"
     },
     "node_modules/picocolors": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
-      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
       "license": "ISC"
     },
     "node_modules/picomatch": {
       "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "license": "MIT",
       "engines": {
         "node": ">=8.6"
@@ -35911,8 +37202,6 @@
     },
     "node_modules/pify": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -35920,8 +37209,6 @@
     },
     "node_modules/pino": {
       "version": "9.7.0",
-      "resolved": "https://registry.npmjs.org/pino/-/pino-9.7.0.tgz",
-      "integrity": "sha512-vnMCM6xZTb1WDmLvtG2lE/2p+t9hDEIvTWJsu6FejkE62vB7gDhvzrpFR4Cw2to+9JNQxVnkAKVPA1KPB98vWg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -35943,8 +37230,6 @@
     },
     "node_modules/pino-abstract-transport": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/pino-abstract-transport/-/pino-abstract-transport-2.0.0.tgz",
-      "integrity": "sha512-F63x5tizV6WCh4R6RHyi2Ml+M70DNRXt/+HANowMflpgGFMAym/VKm6G7ZOQRjqN7XbGxK1Lg9t6ZrtzOaivMw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -35953,8 +37238,6 @@
     },
     "node_modules/pino-abstract-transport/node_modules/split2": {
       "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz",
-      "integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==",
       "dev": true,
       "license": "ISC",
       "engines": {
@@ -35963,15 +37246,11 @@
     },
     "node_modules/pino-std-serializers": {
       "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-7.0.0.tgz",
-      "integrity": "sha512-e906FRY0+tV27iq4juKzSYPbUj2do2X2JX4EzSca1631EB2QJQUqGbDuERal7LCtOpxl6x3+nvo9NPZcmjkiFA==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/pino/node_modules/process-warning": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/process-warning/-/process-warning-5.0.0.tgz",
-      "integrity": "sha512-a39t9ApHNx2L4+HBnQKqxxHNs1r7KF+Intd8Q/g1bUh6q0WIp9voPXJ/x0j+ZL45KF1pJd9+q2jLIRMfvEshkA==",
       "dev": true,
       "funding": [
         {
@@ -35987,18 +37266,118 @@
     },
     "node_modules/pirates": {
       "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.7.tgz",
-      "integrity": "sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==",
       "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 6"
       }
     },
+    "node_modules/pkg-conf": {
+      "version": "2.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "find-up": "^2.0.0",
+        "load-json-file": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/pkg-conf/node_modules/find-up": {
+      "version": "2.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "locate-path": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/pkg-conf/node_modules/load-json-file": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^4.0.0",
+        "pify": "^3.0.0",
+        "strip-bom": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/pkg-conf/node_modules/locate-path": {
+      "version": "2.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "p-locate": "^2.0.0",
+        "path-exists": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/pkg-conf/node_modules/p-limit": {
+      "version": "1.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "p-try": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/pkg-conf/node_modules/p-locate": {
+      "version": "2.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "p-limit": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/pkg-conf/node_modules/p-try": {
+      "version": "1.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/pkg-conf/node_modules/parse-json": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "error-ex": "^1.3.1",
+        "json-parse-better-errors": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/pkg-conf/node_modules/path-exists": {
+      "version": "3.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/pkg-conf/node_modules/pify": {
+      "version": "3.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/pkg-conf/node_modules/strip-bom": {
+      "version": "3.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "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==",
       "license": "MIT",
       "dependencies": {
         "find-up": "^5.0.0"
@@ -36009,8 +37388,6 @@
     },
     "node_modules/pkg-types": {
       "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.3.1.tgz",
-      "integrity": "sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -36019,17 +37396,18 @@
         "pathe": "^2.0.1"
       }
     },
+    "node_modules/pkg-types/node_modules/pathe": {
+      "version": "2.0.2",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/png-async": {
       "version": "0.9.4",
-      "resolved": "https://registry.npmjs.org/png-async/-/png-async-0.9.4.tgz",
-      "integrity": "sha512-B//AXX9TkneKfgtOpT1mdUnnhk2BImGD+a98vImsMU8uo1dBeHyW/kM2erWZ/CsYteTPU/xKG+t6T62heHkC3A==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/po2json": {
       "version": "0.4.5",
-      "resolved": "https://registry.npmjs.org/po2json/-/po2json-0.4.5.tgz",
-      "integrity": "sha512-JH0hgi1fC0t9UvdiyS7kcVly0N1WNey4R2YZ/jPaxQKYm6Cfej7ZTgiEy8LP2JwoEhONceiNS8JH5mWPQkiXeA==",
       "dev": true,
       "dependencies": {
         "gettext-parser": "1.1.0",
@@ -36044,8 +37422,6 @@
     },
     "node_modules/polished": {
       "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/polished/-/polished-4.3.1.tgz",
-      "integrity": "sha512-OBatVyC/N7SCW/FaDHrSd+vn0o5cS855TOmYi4OkdWUMSJCET/xip//ch8xGUvtr3i44X9LVyWwQlRMTN3pwSA==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.17.8"
@@ -36055,18 +37431,14 @@
       }
     },
     "node_modules/possible-typed-array-names": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz",
-      "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==",
+      "version": "1.0.0",
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/postcss": {
-      "version": "8.5.4",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.4.tgz",
-      "integrity": "sha512-QSa9EBe+uwlGTFmHsPKokv3B/oEMQZxfqW0QqNCyhpa6mB1afzulwn8hihglqAb2pOw+BJgNlmXQ8la2VeHB7w==",
+      "version": "8.5.1",
       "dev": true,
       "funding": [
         {
@@ -36084,7 +37456,7 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "nanoid": "^3.3.11",
+        "nanoid": "^3.3.8",
         "picocolors": "^1.1.1",
         "source-map-js": "^1.2.1"
       },
@@ -36093,9 +37465,7 @@
       }
     },
     "node_modules/postcss-calc": {
-      "version": "10.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-10.1.1.tgz",
-      "integrity": "sha512-NYEsLHh8DgG/PRH2+G9BTuUdtf9ViS+vdoQ0YA5OQdGsfN4ztiwtDWNtBl9EKeqNMFnIu8IKZ0cLxEQ5r5KVMw==",
+      "version": "10.1.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -36110,9 +37480,7 @@
       }
     },
     "node_modules/postcss-calc/node_modules/postcss-selector-parser": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
-      "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
+      "version": "7.0.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -36124,13 +37492,11 @@
       }
     },
     "node_modules/postcss-colormin": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-7.0.3.tgz",
-      "integrity": "sha512-xZxQcSyIVZbSsl1vjoqZAcMYYdnJsIyG8OvqShuuqf12S88qQboxxEy0ohNCOLwVPXTU+hFHvJPACRL2B5ohTA==",
+      "version": "7.0.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "browserslist": "^4.24.5",
+        "browserslist": "^4.23.3",
         "caniuse-api": "^3.0.0",
         "colord": "^2.9.3",
         "postcss-value-parser": "^4.2.0"
@@ -36139,149 +37505,105 @@
         "node": "^18.12.0 || ^20.9.0 || >=22.0"
       },
       "peerDependencies": {
-        "postcss": "^8.4.32"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-convert-values": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-7.0.5.tgz",
-      "integrity": "sha512-0VFhH8nElpIs3uXKnVtotDJJNX0OGYSZmdt4XfSfvOMrFw1jKfpwpZxfC4iN73CTM/MWakDEmsHQXkISYj4BXw==",
+      "version": "7.0.4",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "browserslist": "^4.24.5",
+        "browserslist": "^4.23.3",
         "postcss-value-parser": "^4.2.0"
       },
       "engines": {
         "node": "^18.12.0 || ^20.9.0 || >=22.0"
       },
       "peerDependencies": {
-        "postcss": "^8.4.32"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-discard-comments": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-7.0.4.tgz",
-      "integrity": "sha512-6tCUoql/ipWwKtVP/xYiFf1U9QgJ0PUvxN7pTcsQ8Ns3Fnwq1pU5D5s1MhT/XySeLq6GXNvn37U46Ded0TckWg==",
+      "version": "7.0.3",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "postcss-selector-parser": "^7.1.0"
+        "postcss-selector-parser": "^6.1.2"
       },
       "engines": {
         "node": "^18.12.0 || ^20.9.0 || >=22.0"
       },
       "peerDependencies": {
-        "postcss": "^8.4.32"
-      }
-    },
-    "node_modules/postcss-discard-comments/node_modules/postcss-selector-parser": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
-      "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=4"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-discard-duplicates": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-7.0.2.tgz",
-      "integrity": "sha512-eTonaQvPZ/3i1ASDHOKkYwAybiM45zFIc7KXils4mQmHLqIswXD9XNOKEVxtTFnsmwYzF66u4LMgSr0abDlh5w==",
+      "version": "7.0.1",
       "dev": true,
       "license": "MIT",
       "engines": {
         "node": "^18.12.0 || ^20.9.0 || >=22.0"
       },
       "peerDependencies": {
-        "postcss": "^8.4.32"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-discard-empty": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-7.0.1.tgz",
-      "integrity": "sha512-cFrJKZvcg/uxB6Ijr4l6qmn3pXQBna9zyrPC+sK0zjbkDUZew+6xDltSF7OeB7rAtzaaMVYSdbod+sZOCWnMOg==",
+      "version": "7.0.0",
       "dev": true,
       "license": "MIT",
       "engines": {
         "node": "^18.12.0 || ^20.9.0 || >=22.0"
       },
       "peerDependencies": {
-        "postcss": "^8.4.32"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-discard-overridden": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-7.0.1.tgz",
-      "integrity": "sha512-7c3MMjjSZ/qYrx3uc1940GSOzN1Iqjtlqe8uoSg+qdVPYyRb0TILSqqmtlSFuE4mTDECwsm397Ya7iXGzfF7lg==",
+      "version": "7.0.0",
       "dev": true,
       "license": "MIT",
       "engines": {
         "node": "^18.12.0 || ^20.9.0 || >=22.0"
       },
       "peerDependencies": {
-        "postcss": "^8.4.32"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-merge-longhand": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-7.0.5.tgz",
-      "integrity": "sha512-Kpu5v4Ys6QI59FxmxtNB/iHUVDn9Y9sYw66D6+SZoIk4QTz1prC4aYkhIESu+ieG1iylod1f8MILMs1Em3mmIw==",
+      "version": "7.0.4",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "postcss-value-parser": "^4.2.0",
-        "stylehacks": "^7.0.5"
+        "stylehacks": "^7.0.4"
       },
       "engines": {
         "node": "^18.12.0 || ^20.9.0 || >=22.0"
       },
       "peerDependencies": {
-        "postcss": "^8.4.32"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-merge-rules": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-7.0.5.tgz",
-      "integrity": "sha512-ZonhuSwEaWA3+xYbOdJoEReKIBs5eDiBVLAGpYZpNFPzXZcEE5VKR7/qBEQvTZpiwjqhhqEQ+ax5O3VShBj9Wg==",
+      "version": "7.0.4",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "browserslist": "^4.24.5",
+        "browserslist": "^4.23.3",
         "caniuse-api": "^3.0.0",
-        "cssnano-utils": "^5.0.1",
-        "postcss-selector-parser": "^7.1.0"
+        "cssnano-utils": "^5.0.0",
+        "postcss-selector-parser": "^6.1.2"
       },
       "engines": {
         "node": "^18.12.0 || ^20.9.0 || >=22.0"
       },
       "peerDependencies": {
-        "postcss": "^8.4.32"
-      }
-    },
-    "node_modules/postcss-merge-rules/node_modules/postcss-selector-parser": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
-      "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=4"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-minify-font-values": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-7.0.1.tgz",
-      "integrity": "sha512-2m1uiuJeTplll+tq4ENOQSzB8LRnSUChBv7oSyFLsJRtUgAAJGP6LLz0/8lkinTgxrmJSPOEhgY1bMXOQ4ZXhQ==",
+      "version": "7.0.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -36291,80 +37613,58 @@
         "node": "^18.12.0 || ^20.9.0 || >=22.0"
       },
       "peerDependencies": {
-        "postcss": "^8.4.32"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-minify-gradients": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-7.0.1.tgz",
-      "integrity": "sha512-X9JjaysZJwlqNkJbUDgOclyG3jZEpAMOfof6PUZjPnPrePnPG62pS17CjdM32uT1Uq1jFvNSff9l7kNbmMSL2A==",
+      "version": "7.0.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "colord": "^2.9.3",
-        "cssnano-utils": "^5.0.1",
+        "cssnano-utils": "^5.0.0",
         "postcss-value-parser": "^4.2.0"
       },
       "engines": {
         "node": "^18.12.0 || ^20.9.0 || >=22.0"
       },
       "peerDependencies": {
-        "postcss": "^8.4.32"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-minify-params": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-7.0.3.tgz",
-      "integrity": "sha512-vUKV2+f5mtjewYieanLX0xemxIp1t0W0H/D11u+kQV/MWdygOO7xPMkbK+r9P6Lhms8MgzKARF/g5OPXhb8tgg==",
+      "version": "7.0.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "browserslist": "^4.24.5",
-        "cssnano-utils": "^5.0.1",
+        "browserslist": "^4.23.3",
+        "cssnano-utils": "^5.0.0",
         "postcss-value-parser": "^4.2.0"
       },
       "engines": {
         "node": "^18.12.0 || ^20.9.0 || >=22.0"
       },
       "peerDependencies": {
-        "postcss": "^8.4.32"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-minify-selectors": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-7.0.5.tgz",
-      "integrity": "sha512-x2/IvofHcdIrAm9Q+p06ZD1h6FPcQ32WtCRVodJLDR+WMn8EVHI1kvLxZuGKz/9EY5nAmI6lIQIrpo4tBy5+ug==",
+      "version": "7.0.4",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "cssesc": "^3.0.0",
-        "postcss-selector-parser": "^7.1.0"
+        "postcss-selector-parser": "^6.1.2"
       },
       "engines": {
         "node": "^18.12.0 || ^20.9.0 || >=22.0"
       },
       "peerDependencies": {
-        "postcss": "^8.4.32"
-      }
-    },
-    "node_modules/postcss-minify-selectors/node_modules/postcss-selector-parser": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
-      "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=4"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-modules-extract-imports": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz",
-      "integrity": "sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==",
       "dev": true,
       "license": "ISC",
       "engines": {
@@ -36376,8 +37676,6 @@
     },
     "node_modules/postcss-modules-local-by-default": {
       "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.2.0.tgz",
-      "integrity": "sha512-5kcJm/zk+GJDSfw+V/42fJ5fhjL5YbFDl8nVdXkJPLLW+Vf9mTD5Xe0wqIaDnLuL2U6cDNpTr+UQ+v2HWIBhzw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -36393,9 +37691,7 @@
       }
     },
     "node_modules/postcss-modules-local-by-default/node_modules/postcss-selector-parser": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
-      "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
+      "version": "7.0.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -36408,8 +37704,6 @@
     },
     "node_modules/postcss-modules-scope": {
       "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.1.tgz",
-      "integrity": "sha512-m9jZstCVaqGjTAuny8MdgE88scJnCiQSlSrOWcTQgM2t32UBe+MUmFSO5t7VMSfAf/FJKImAxBav8ooCHJXCJA==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -36423,9 +37717,7 @@
       }
     },
     "node_modules/postcss-modules-scope/node_modules/postcss-selector-parser": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
-      "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
+      "version": "7.0.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -36438,8 +37730,6 @@
     },
     "node_modules/postcss-modules-values": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
-      "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -36453,22 +37743,18 @@
       }
     },
     "node_modules/postcss-normalize-charset": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-7.0.1.tgz",
-      "integrity": "sha512-sn413ofhSQHlZFae//m9FTOfkmiZ+YQXsbosqOWRiVQncU2BA3daX3n0VF3cG6rGLSFVc5Di/yns0dFfh8NFgQ==",
+      "version": "7.0.0",
       "dev": true,
       "license": "MIT",
       "engines": {
         "node": "^18.12.0 || ^20.9.0 || >=22.0"
       },
       "peerDependencies": {
-        "postcss": "^8.4.32"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-normalize-display-values": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-7.0.1.tgz",
-      "integrity": "sha512-E5nnB26XjSYz/mGITm6JgiDpAbVuAkzXwLzRZtts19jHDUBFxZ0BkXAehy0uimrOjYJbocby4FVswA/5noOxrQ==",
+      "version": "7.0.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -36478,13 +37764,11 @@
         "node": "^18.12.0 || ^20.9.0 || >=22.0"
       },
       "peerDependencies": {
-        "postcss": "^8.4.32"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-normalize-positions": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-7.0.1.tgz",
-      "integrity": "sha512-pB/SzrIP2l50ZIYu+yQZyMNmnAcwyYb9R1fVWPRxm4zcUFCY2ign7rcntGFuMXDdd9L2pPNUgoODDk91PzRZuQ==",
+      "version": "7.0.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -36494,13 +37778,11 @@
         "node": "^18.12.0 || ^20.9.0 || >=22.0"
       },
       "peerDependencies": {
-        "postcss": "^8.4.32"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-normalize-repeat-style": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-7.0.1.tgz",
-      "integrity": "sha512-NsSQJ8zj8TIDiF0ig44Byo3Jk9e4gNt9x2VIlJudnQQ5DhWAHJPF4Tr1ITwyHio2BUi/I6Iv0HRO7beHYOloYQ==",
+      "version": "7.0.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -36510,13 +37792,11 @@
         "node": "^18.12.0 || ^20.9.0 || >=22.0"
       },
       "peerDependencies": {
-        "postcss": "^8.4.32"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-normalize-string": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-7.0.1.tgz",
-      "integrity": "sha512-QByrI7hAhsoze992kpbMlJSbZ8FuCEc1OT9EFbZ6HldXNpsdpZr+YXC5di3UEv0+jeZlHbZcoCADgb7a+lPmmQ==",
+      "version": "7.0.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -36526,13 +37806,11 @@
         "node": "^18.12.0 || ^20.9.0 || >=22.0"
       },
       "peerDependencies": {
-        "postcss": "^8.4.32"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-normalize-timing-functions": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-7.0.1.tgz",
-      "integrity": "sha512-bHifyuuSNdKKsnNJ0s8fmfLMlvsQwYVxIoUBnowIVl2ZAdrkYQNGVB4RxjfpvkMjipqvbz0u7feBZybkl/6NJg==",
+      "version": "7.0.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -36542,30 +37820,26 @@
         "node": "^18.12.0 || ^20.9.0 || >=22.0"
       },
       "peerDependencies": {
-        "postcss": "^8.4.32"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-normalize-unicode": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-7.0.3.tgz",
-      "integrity": "sha512-EcoA29LvG3F+EpOh03iqu+tJY3uYYKzArqKJHxDhUYLa2u58aqGq16K6/AOsXD9yqLN8O6y9mmePKN5cx6krOw==",
+      "version": "7.0.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "browserslist": "^4.24.5",
+        "browserslist": "^4.23.3",
         "postcss-value-parser": "^4.2.0"
       },
       "engines": {
         "node": "^18.12.0 || ^20.9.0 || >=22.0"
       },
       "peerDependencies": {
-        "postcss": "^8.4.32"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-normalize-url": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-7.0.1.tgz",
-      "integrity": "sha512-sUcD2cWtyK1AOL/82Fwy1aIVm/wwj5SdZkgZ3QiUzSzQQofrbq15jWJ3BA7Z+yVRwamCjJgZJN0I9IS7c6tgeQ==",
+      "version": "7.0.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -36575,13 +37849,11 @@
         "node": "^18.12.0 || ^20.9.0 || >=22.0"
       },
       "peerDependencies": {
-        "postcss": "^8.4.32"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-normalize-whitespace": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-7.0.1.tgz",
-      "integrity": "sha512-vsbgFHMFQrJBJKrUFJNZ2pgBeBkC2IvvoHjz1to0/0Xk7sII24T0qFOiJzG6Fu3zJoq/0yI4rKWi7WhApW+EFA==",
+      "version": "7.0.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -36591,47 +37863,41 @@
         "node": "^18.12.0 || ^20.9.0 || >=22.0"
       },
       "peerDependencies": {
-        "postcss": "^8.4.32"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-ordered-values": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-7.0.2.tgz",
-      "integrity": "sha512-AMJjt1ECBffF7CEON/Y0rekRLS6KsePU6PRP08UqYW4UGFRnTXNrByUzYK1h8AC7UWTZdQ9O3Oq9kFIhm0SFEw==",
+      "version": "7.0.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "cssnano-utils": "^5.0.1",
+        "cssnano-utils": "^5.0.0",
         "postcss-value-parser": "^4.2.0"
       },
       "engines": {
         "node": "^18.12.0 || ^20.9.0 || >=22.0"
       },
       "peerDependencies": {
-        "postcss": "^8.4.32"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-reduce-initial": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-7.0.3.tgz",
-      "integrity": "sha512-RFvkZaqiWtGMlVjlUHpaxGqEL27lgt+Q2Ixjf83CRAzqdo+TsDyGPtJUbPx2MuYIJ+sCQc2TrOvRnhcXQfgIVA==",
+      "version": "7.0.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "browserslist": "^4.24.5",
+        "browserslist": "^4.23.3",
         "caniuse-api": "^3.0.0"
       },
       "engines": {
         "node": "^18.12.0 || ^20.9.0 || >=22.0"
       },
       "peerDependencies": {
-        "postcss": "^8.4.32"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-reduce-transforms": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-7.0.1.tgz",
-      "integrity": "sha512-MhyEbfrm+Mlp/36hvZ9mT9DaO7dbncU0CvWI8V93LRkY6IYlu38OPg3FObnuKTUxJ4qA8HpurdQOo5CyqqO76g==",
+      "version": "7.0.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -36641,13 +37907,11 @@
         "node": "^18.12.0 || ^20.9.0 || >=22.0"
       },
       "peerDependencies": {
-        "postcss": "^8.4.32"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-selector-parser": {
       "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
-      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -36659,9 +37923,7 @@
       }
     },
     "node_modules/postcss-svgo": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-7.0.2.tgz",
-      "integrity": "sha512-5Dzy66JlnRM6pkdOTF8+cGsB1fnERTE8Nc+Eed++fOWo1hdsBptCsbG8UuJkgtZt75bRtMJIrPeZmtfANixdFA==",
+      "version": "7.0.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -36672,50 +37934,30 @@
         "node": "^18.12.0 || ^20.9.0 || >= 18"
       },
       "peerDependencies": {
-        "postcss": "^8.4.32"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-unique-selectors": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-7.0.4.tgz",
-      "integrity": "sha512-pmlZjsmEAG7cHd7uK3ZiNSW6otSZ13RHuZ/4cDN/bVglS5EpF2r2oxY99SuOHa8m7AWoBCelTS3JPpzsIs8skQ==",
+      "version": "7.0.3",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "postcss-selector-parser": "^7.1.0"
+        "postcss-selector-parser": "^6.1.2"
       },
       "engines": {
         "node": "^18.12.0 || ^20.9.0 || >=22.0"
       },
       "peerDependencies": {
-        "postcss": "^8.4.32"
-      }
-    },
-    "node_modules/postcss-unique-selectors/node_modules/postcss-selector-parser": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
-      "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=4"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-value-parser": {
       "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,
       "license": "MIT"
     },
     "node_modules/postcss/node_modules/nanoid": {
-      "version": "3.3.11",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
-      "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
+      "version": "3.3.8",
       "dev": true,
       "funding": [
         {
@@ -36733,8 +37975,6 @@
     },
     "node_modules/postcss/node_modules/source-map-js": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
-      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
       "dev": true,
       "license": "BSD-3-Clause",
       "engines": {
@@ -36743,14 +37983,10 @@
     },
     "node_modules/potpack": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/potpack/-/potpack-2.0.0.tgz",
-      "integrity": "sha512-Q+/tYsFU9r7xoOJ+y/ZTtdVQwTWfzjbiXBDMM/JKUux3+QPP02iUuIoeBQ+Ot6oEDlC+/PGjB/5A3K7KKb7hcw==",
       "license": "ISC"
     },
     "node_modules/preact": {
-      "version": "10.26.8",
-      "resolved": "https://registry.npmjs.org/preact/-/preact-10.26.8.tgz",
-      "integrity": "sha512-1nMfdFjucm5hKvq0IClqZwK4FJkGXhRrQstOQ3P4vp8HxKrJEMFcY6RdBRVTdfQS/UlnX6gfbPuTvaqx/bDoeQ==",
+      "version": "10.25.4",
       "license": "MIT",
       "peer": true,
       "funding": {
@@ -36760,8 +37996,6 @@
     },
     "node_modules/prelude-ls": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
       "license": "MIT",
       "engines": {
         "node": ">= 0.8.0"
@@ -36769,8 +38003,6 @@
     },
     "node_modules/prettier": {
       "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.3.tgz",
-      "integrity": "sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==",
       "devOptional": true,
       "license": "MIT",
       "bin": {
@@ -36785,9 +38017,7 @@
     },
     "node_modules/prettier-fallback": {
       "name": "prettier",
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.3.tgz",
-      "integrity": "sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==",
+      "version": "3.4.2",
       "license": "MIT",
       "bin": {
         "prettier": "bin/prettier.cjs"
@@ -36801,8 +38031,6 @@
     },
     "node_modules/prettier-linter-helpers": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz",
-      "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -36813,14 +38041,12 @@
       }
     },
     "node_modules/prettier-plugin-packagejson": {
-      "version": "2.5.15",
-      "resolved": "https://registry.npmjs.org/prettier-plugin-packagejson/-/prettier-plugin-packagejson-2.5.15.tgz",
-      "integrity": "sha512-2QSx6y4IT6LTwXtCvXAopENW5IP/aujC8fobEM2pDbs0IGkiVjW/ipPuYAHuXigbNe64aGWF7vIetukuzM3CBw==",
+      "version": "2.5.8",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "sort-package-json": "3.2.1",
-        "synckit": "0.11.8"
+        "sort-package-json": "2.14.0",
+        "synckit": "0.9.2"
       },
       "peerDependencies": {
         "prettier": ">= 1.16.0"
@@ -36833,8 +38059,6 @@
     },
     "node_modules/pretty-bytes": {
       "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz",
-      "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==",
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -36845,8 +38069,6 @@
     },
     "node_modules/pretty-error": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz",
-      "integrity": "sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -36856,8 +38078,6 @@
     },
     "node_modules/pretty-format": {
       "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
-      "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
       "license": "MIT",
       "dependencies": {
         "ansi-regex": "^5.0.1",
@@ -36870,8 +38090,6 @@
     },
     "node_modules/pretty-format/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==",
       "license": "MIT",
       "engines": {
         "node": ">=10"
@@ -36882,14 +38100,10 @@
     },
     "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==",
       "license": "MIT"
     },
     "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==",
       "license": "MIT",
       "engines": {
         "node": ">= 0.8"
@@ -36897,8 +38111,6 @@
     },
     "node_modules/pretty-ms": {
       "version": "9.2.0",
-      "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-9.2.0.tgz",
-      "integrity": "sha512-4yf0QO/sllf/1zbZWYnvWw3NxCQwLXKzIj0G849LSufP15BXKM0rbD2Z3wVnkMfjdn/CB0Dpp444gYAACdsplg==",
       "license": "MIT",
       "dependencies": {
         "parse-ms": "^4.0.0"
@@ -36911,9 +38123,7 @@
       }
     },
     "node_modules/prismjs": {
-      "version": "1.30.0",
-      "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.30.0.tgz",
-      "integrity": "sha512-DEvV2ZF2r2/63V+tK8hQvrR2ZGn10srHbXviTlcv7Kpzw8jWiNTqbVgjO3IY8RxrrOUF8VPMQQFysYYYv0YZxw==",
+      "version": "1.29.0",
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -36921,8 +38131,6 @@
     },
     "node_modules/proc-log": {
       "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz",
-      "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==",
       "dev": true,
       "license": "ISC",
       "engines": {
@@ -36931,8 +38139,6 @@
     },
     "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==",
       "license": "MIT",
       "engines": {
         "node": ">= 0.6.0"
@@ -36940,14 +38146,10 @@
     },
     "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==",
       "license": "MIT"
     },
     "node_modules/process-on-spawn": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/process-on-spawn/-/process-on-spawn-1.1.0.tgz",
-      "integrity": "sha512-JOnOPQ/8TZgjs1JIH/m9ni7FfimjNa/PRx7y/Wb5qdItsnhO0jE4AT7fC0HjC28DUQWDr50dwSYZLdRMlqDq3Q==",
       "dev": true,
       "license": "MIT",
       "peer": true,
@@ -36960,8 +38162,6 @@
     },
     "node_modules/process-streams": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/process-streams/-/process-streams-1.0.3.tgz",
-      "integrity": "sha512-xkIaM5vYnyekB88WyET78YEqXiaJRy0xcvIdE22n+myhvBT7LlLmX6iAtq7jDvVH8CUx2rqQsd32JdRyJMV3NA==",
       "funding": [
         "https://www.paypal.com/donate/?hosted_button_id=GB656ZSAEQEXN",
         "https://de.liberapay.com/nils.knappmeier/"
@@ -36973,15 +38173,11 @@
     },
     "node_modules/process-warning": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/process-warning/-/process-warning-3.0.0.tgz",
-      "integrity": "sha512-mqn0kFRl0EoqhnL0GQ0veqFHyIN1yig9RHh/InzORTUiZHFRAur+aMtRkELNwGs9aNwKS6tg/An4NYBPGwvtzQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/proggy": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/proggy/-/proggy-2.0.0.tgz",
-      "integrity": "sha512-69agxLtnI8xBs9gUGqEnK26UfiexpHy+KUpBQWabiytQjnn5wFY8rklAi7GRfABIuPNnQ/ik48+LGLkYYJcy4A==",
       "dev": true,
       "license": "ISC",
       "engines": {
@@ -36990,18 +38186,23 @@
     },
     "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,
       "license": "MIT",
       "engines": {
         "node": ">=0.4.0"
       }
     },
+    "node_modules/proj4": {
+      "version": "2.17.0",
+      "license": "MIT",
+      "dependencies": {
+        "geographiclib-geodesic": "^2.1.1",
+        "mgrs": "1.0.0",
+        "wkt-parser": "^1.5.1"
+      }
+    },
     "node_modules/promise-all-reject-late": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/promise-all-reject-late/-/promise-all-reject-late-1.0.1.tgz",
-      "integrity": "sha512-vuf0Lf0lOxyQREH7GDIOUMLS7kz+gs8i6B+Yi8dC68a2sychGrHTJYghMBD6k7eUcH0H5P73EckCA48xijWqXw==",
       "dev": true,
       "license": "ISC",
       "funding": {
@@ -37010,8 +38211,6 @@
     },
     "node_modules/promise-call-limit": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/promise-call-limit/-/promise-call-limit-3.0.2.tgz",
-      "integrity": "sha512-mRPQO2T1QQVw11E7+UdCJu7S61eJVWknzml9sC1heAdj1jxl0fWMBypIt9ZOcLFf8FkG995ZD7RnVk7HH72fZw==",
       "dev": true,
       "license": "ISC",
       "funding": {
@@ -37020,15 +38219,11 @@
     },
     "node_modules/promise-inflight": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
-      "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==",
       "dev": true,
       "license": "ISC"
     },
     "node_modules/promise-retry": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
-      "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -37041,8 +38236,6 @@
     },
     "node_modules/promise-retry/node_modules/retry": {
       "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
-      "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -37051,8 +38244,6 @@
     },
     "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,
       "license": "MIT",
       "dependencies": {
@@ -37065,8 +38256,6 @@
     },
     "node_modules/promzard": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/promzard/-/promzard-1.0.2.tgz",
-      "integrity": "sha512-2FPputGL+mP3jJ3UZg/Dl9YOkovB7DX0oOr+ck5QbZ5MtORtds8k/BZdn+02peDLI8/YWbmzx34k5fA+fHvCVQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -37078,8 +38267,6 @@
     },
     "node_modules/prop-types": {
       "version": "15.8.1",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
-      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
       "license": "MIT",
       "dependencies": {
         "loose-envify": "^1.4.0",
@@ -37089,14 +38276,10 @@
     },
     "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==",
       "license": "MIT"
     },
     "node_modules/property-information": {
       "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/property-information/-/property-information-6.5.0.tgz",
-      "integrity": "sha512-PgTgs/BlvHxOu8QuEN7wi5A0OmXaBcHpmCSTehcs6Uuu9IkDIEo13Hy7n898RHfrQ49vKCoGeWZSaAK01nwVig==",
       "license": "MIT",
       "funding": {
         "type": "github",
@@ -37105,27 +38288,19 @@
     },
     "node_modules/proto-list": {
       "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
-      "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==",
       "license": "ISC"
     },
     "node_modules/protocol-buffers-schema": {
       "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.6.0.tgz",
-      "integrity": "sha512-TdDRD+/QNdrCGCE7v8340QyuXd4kIWIgapsE2+n/SaGiSSbomYl4TjHlvIoCWRpE7wFt02EpB35VVA2ImcBVqw==",
       "license": "MIT"
     },
     "node_modules/protocols": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/protocols/-/protocols-2.0.2.tgz",
-      "integrity": "sha512-hHVTzba3wboROl0/aWRRG9dMytgH6ow//STBZh43l/wQgmMhYhOFi0EHWAPtoCz9IAUymsyP0TSBHkhgMEGNnQ==",
       "dev": true,
       "license": "MIT"
     },
     "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,
       "license": "MIT",
       "dependencies": {
@@ -37138,8 +38313,6 @@
     },
     "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,
       "license": "MIT",
       "dependencies": {
@@ -37158,8 +38331,6 @@
     },
     "node_modules/proxy-agent/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,
       "license": "MIT",
       "engines": {
@@ -37168,8 +38339,6 @@
     },
     "node_modules/proxy-agent/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": {
@@ -37182,8 +38351,6 @@
     },
     "node_modules/proxy-agent/node_modules/https-proxy-agent": {
       "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,
       "license": "MIT",
       "dependencies": {
@@ -37196,8 +38363,6 @@
     },
     "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": "ISC",
       "engines": {
@@ -37206,29 +38371,15 @@
     },
     "node_modules/proxy-agent/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,
       "license": "MIT"
     },
     "node_modules/proxy-from-env": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz",
-      "integrity": "sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A==",
       "license": "MIT"
     },
-    "node_modules/prr": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
-      "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true
-    },
     "node_modules/psl": {
       "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.15.0.tgz",
-      "integrity": "sha512-JZd3gMVBAVQkSs6HdNZo9Sdo0LNcQeMNP3CozBJb3JYC/QUYZTnKxP+f8oWRX4rHP5EurWxqAHTSwUCjlNKa1w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -37240,8 +38391,6 @@
     },
     "node_modules/psl/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,
       "license": "MIT",
       "engines": {
@@ -37250,8 +38399,6 @@
     },
     "node_modules/pump": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz",
-      "integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==",
       "license": "MIT",
       "dependencies": {
         "end-of-stream": "^1.1.0",
@@ -37260,8 +38407,6 @@
     },
     "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": {
@@ -37272,8 +38417,6 @@
     },
     "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,
       "license": "MIT",
       "dependencies": {
@@ -37283,15 +38426,11 @@
     },
     "node_modules/punycode": {
       "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-      "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/puppeteer": {
       "version": "22.15.0",
-      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-22.15.0.tgz",
-      "integrity": "sha512-XjCY1SiSEi1T7iSYuxS82ft85kwDJUS7wj1Z0eGVXKdtr5g4xnVcbjwxhq5xBnpK/E7x1VZZoJDxpjAOasHT4Q==",
       "dev": true,
       "hasInstallScript": true,
       "license": "Apache-2.0",
@@ -37310,8 +38449,6 @@
     },
     "node_modules/puppeteer-core": {
       "version": "22.15.0",
-      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-22.15.0.tgz",
-      "integrity": "sha512-cHArnywCiAAVXa3t4GGL2vttNxh7GqXtIYGym99egkNJ3oG//wL9LkvO4WE8W1TJe95t1F1ocu9X4xWaGsOKOA==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -37327,8 +38464,6 @@
     },
     "node_modules/puppeteer-core/node_modules/debug": {
       "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
-      "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -37345,15 +38480,11 @@
     },
     "node_modules/puppeteer-core/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/puppeteer-core/node_modules/ws": {
-      "version": "8.18.2",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.2.tgz",
-      "integrity": "sha512-DMricUmwGZUVr++AEAe2uiVM7UoO9MAVZMDu05UQOaUII0lp+zOzLLU4Xqh/JvTqklB1T4uELaaPBKyjE1r4fQ==",
+      "version": "8.18.3",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -37374,15 +38505,11 @@
     },
     "node_modules/puppeteer/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/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",
       "dependencies": {
@@ -37408,8 +38535,6 @@
     },
     "node_modules/puppeteer/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": {
@@ -37420,9 +38545,7 @@
       }
     },
     "node_modules/pure-rand": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz",
-      "integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==",
+      "version": "7.0.1",
       "dev": true,
       "funding": [
         {
@@ -37438,8 +38561,6 @@
     },
     "node_modules/qs": {
       "version": "6.14.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz",
-      "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==",
       "license": "BSD-3-Clause",
       "dependencies": {
         "side-channel": "^1.1.0"
@@ -37453,9 +38574,8 @@
     },
     "node_modules/query-string": {
       "version": "6.14.1",
-      "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.14.1.tgz",
-      "integrity": "sha512-XDxAeVmpfu1/6IjyT/gXHOl+S0vQ9owggJ30hhWKdHAsNPOcasn5o9BW0eejZqL2e4vMjhAxoW3jVHcD6mbcYw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "decode-uri-component": "^0.2.0",
         "filter-obj": "^1.1.0",
@@ -37469,28 +38589,13 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/querystring": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.1.tgz",
-      "integrity": "sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg==",
-      "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.4.x"
-      }
-    },
     "node_modules/querystringify": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
-      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
       "dev": true,
       "license": "MIT"
     },
     "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==",
       "funding": [
         {
           "type": "github",
@@ -37507,17 +38612,17 @@
       ],
       "license": "MIT"
     },
+    "node_modules/queue-tick": {
+      "version": "1.0.1",
+      "license": "MIT"
+    },
     "node_modules/quick-format-unescaped": {
       "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/quick-format-unescaped/-/quick-format-unescaped-4.0.4.tgz",
-      "integrity": "sha512-tYC1Q1hgyRuHgloV/YXs2w15unPVh8qfu/qCTfhTYamaw7fyhumKa2yGpdSo87vY32rIclj+4fWYQXUMs9EHvg==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/quick-lru": {
       "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
-      "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -37526,14 +38631,10 @@
     },
     "node_modules/quickselect": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/quickselect/-/quickselect-2.0.0.tgz",
-      "integrity": "sha512-RKJ22hX8mHe3Y6wH/N3wCM6BWtjaxIyyUIkpHOvfFnxdI4yD4tBXEBKSbriGujF6jnSVkJrffuo6vxACiSSxIw==",
       "license": "ISC"
     },
     "node_modules/quote-stream": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/quote-stream/-/quote-stream-1.0.2.tgz",
-      "integrity": "sha512-kKr2uQ2AokadPjvTyKJQad9xELbZwYzWlNfI3Uz2j/ib5u6H9lDP7fUUR//rMycd0gv4Z5P1qXMfXR8YpIxrjQ==",
       "license": "MIT",
       "dependencies": {
         "buffer-equal": "0.0.1",
@@ -37546,28 +38647,43 @@
     },
     "node_modules/raf": {
       "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
-      "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
       "license": "MIT",
       "optional": true,
       "dependencies": {
         "performance-now": "^2.1.0"
       }
     },
+    "node_modules/railroad-diagrams": {
+      "version": "1.0.0",
+      "dev": true,
+      "license": "CC0-1.0",
+      "optional": true,
+      "peer": true
+    },
     "node_modules/ramda": {
       "version": "0.29.0",
-      "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.29.0.tgz",
-      "integrity": "sha512-BBea6L67bYLtdbOqfp8f58fPMqEwx0doL+pAi8TZyp2YWz8R9G8z9x75CZI8W+ftqhFHCpEX2cRnUUXK130iKA==",
       "license": "MIT",
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/ramda"
       }
     },
+    "node_modules/randexp": {
+      "version": "0.4.6",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "discontinuous-range": "1.0.0",
+        "ret": "~0.1.10"
+      },
+      "engines": {
+        "node": ">=0.12"
+      }
+    },
     "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": {
@@ -37576,8 +38692,6 @@
     },
     "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,
       "license": "MIT",
       "engines": {
@@ -37586,8 +38700,6 @@
     },
     "node_modules/raw-body": {
       "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": {
@@ -37602,8 +38714,6 @@
     },
     "node_modules/raw-body/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": "MIT",
       "dependencies": {
@@ -37615,8 +38725,6 @@
     },
     "node_modules/rbush": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/rbush/-/rbush-3.0.1.tgz",
-      "integrity": "sha512-XRaVO0YecOpEuIvbhbpTrZgoiI6xBlz6hnlr6EHhd+0x9ase6EmeN+hdwwUaJvLcsFFQ8iWVF1GAK1yB0BWi0w==",
       "license": "MIT",
       "dependencies": {
         "quickselect": "^2.0.0"
@@ -37624,8 +38732,6 @@
     },
     "node_modules/rc": {
       "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
-      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
       "license": "(BSD-2-Clause OR MIT OR Apache-2.0)",
       "dependencies": {
         "deep-extend": "^0.6.0",
@@ -37637,34 +38743,17 @@
         "rc": "cli.js"
       }
     },
-    "node_modules/rc-align": {
-      "version": "4.0.15",
-      "resolved": "https://registry.npmjs.org/rc-align/-/rc-align-4.0.15.tgz",
-      "integrity": "sha512-wqJtVH60pka/nOX7/IspElA8gjPNQKIx/ZqJ6heATCkXpe1Zg4cPVrMD2vC96wjsFFL8WsmhPbx9tdMo1qqlIA==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.10.1",
-        "classnames": "2.x",
-        "dom-align": "^1.7.0",
-        "rc-util": "^5.26.0",
-        "resize-observer-polyfill": "^1.5.1"
-      },
-      "peerDependencies": {
-        "react": ">=16.9.0",
-        "react-dom": ">=16.9.0"
-      }
-    },
     "node_modules/rc-cascader": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/rc-cascader/-/rc-cascader-1.4.3.tgz",
-      "integrity": "sha512-Q4l9Mv8aaISJ+giVnM9IaXxDeMqHUGLvi4F+LksS6pHlaKlN4awop/L+IMjIXpL+ug/ojaCyv/ixcVopJYYCVA==",
+      "version": "3.34.0",
+      "resolved": "https://registry.npmjs.org/rc-cascader/-/rc-cascader-3.34.0.tgz",
+      "integrity": "sha512-KpXypcvju9ptjW9FaN2NFcA2QH9E9LHKq169Y0eWtH4e/wHQ5Wh5qZakAgvb8EKZ736WZ3B0zLLOBsrsja5Dag==",
       "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.12.5",
-        "array-tree-filter": "^2.1.0",
-        "rc-trigger": "^5.0.4",
-        "rc-util": "^5.0.1",
-        "warning": "^4.0.1"
+        "@babel/runtime": "^7.25.7",
+        "classnames": "^2.3.1",
+        "rc-select": "~14.16.2",
+        "rc-tree": "~5.13.0",
+        "rc-util": "^5.43.0"
       },
       "peerDependencies": {
         "react": ">=16.9.0",
@@ -37672,13 +38761,14 @@
       }
     },
     "node_modules/rc-checkbox": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/rc-checkbox/-/rc-checkbox-2.3.2.tgz",
-      "integrity": "sha512-afVi1FYiGv1U0JlpNH/UaEXdh6WUJjcWokj/nUN2TgG80bfG+MDdbfHKlLcNNba94mbjy2/SXJ1HDgrOkXGAjg==",
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/rc-checkbox/-/rc-checkbox-3.5.0.tgz",
+      "integrity": "sha512-aOAQc3E98HteIIsSqm6Xk2FPKIER6+5vyEFMZfo73TqM+VVAIqOkHoPjgKLqSNtVLWScoaM7vY2ZrGEheI79yg==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.10.1",
-        "classnames": "^2.2.1"
+        "classnames": "^2.3.2",
+        "rc-util": "^5.25.2"
       },
       "peerDependencies": {
         "react": ">=16.9.0",
@@ -37686,16 +38776,15 @@
       }
     },
     "node_modules/rc-collapse": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/rc-collapse/-/rc-collapse-3.1.4.tgz",
-      "integrity": "sha512-WayrhswKMwuJab9xbqFxXTgV0m6X8uOPEO6zm/GJ5YJiJ/wIh/Dd2VtWeI06HYUEnTFv0HNcYv+zWbB+p6OD2A==",
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/rc-collapse/-/rc-collapse-3.9.0.tgz",
+      "integrity": "sha512-swDdz4QZ4dFTo4RAUMLL50qP0EY62N2kvmk2We5xYdRwcRn8WcYtuetCJpwpaCbUfUt5+huLpVxhvmnK+PHrkA==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.10.1",
         "classnames": "2.x",
         "rc-motion": "^2.3.4",
-        "rc-util": "^5.2.1",
-        "shallowequal": "^1.1.0"
+        "rc-util": "^5.27.0"
       },
       "peerDependencies": {
         "react": ">=16.9.0",
@@ -37703,15 +38792,16 @@
       }
     },
     "node_modules/rc-dialog": {
-      "version": "8.5.3",
-      "resolved": "https://registry.npmjs.org/rc-dialog/-/rc-dialog-8.5.3.tgz",
-      "integrity": "sha512-zoamT8L6+rBwnwjPlrZRxiHCHQXrTcWZD3a6ruoqEdUKP1KgO0eSjMDH9WlF3WEPYMVnb2G5SrjHrhnwgPDu5w==",
+      "version": "9.6.0",
+      "resolved": "https://registry.npmjs.org/rc-dialog/-/rc-dialog-9.6.0.tgz",
+      "integrity": "sha512-ApoVi9Z8PaCQg6FsUzS8yvBEQy0ZL2PkuvAgrmohPkN3okps5WZ5WQWPc1RNuiOKaAYv8B97ACdsFU5LizzCqg==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.10.1",
+        "@rc-component/portal": "^1.0.0-8",
         "classnames": "^2.2.6",
         "rc-motion": "^2.3.0",
-        "rc-util": "^5.6.1"
+        "rc-util": "^5.21.0"
       },
       "peerDependencies": {
         "react": ">=16.9.0",
@@ -37719,13 +38809,16 @@
       }
     },
     "node_modules/rc-drawer": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/rc-drawer/-/rc-drawer-4.2.2.tgz",
-      "integrity": "sha512-zw48FATkAmJrEnfeRWiMqvKAzqGzUDLN1UXlluB7q7GgbR6mJFvc+QsmNrgxsFuMz86Lh9mKSIi7rXlPINmuzw==",
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/rc-drawer/-/rc-drawer-7.3.0.tgz",
+      "integrity": "sha512-DX6CIgiBWNpJIMGFO8BAISFkxiuKitoizooj4BDyee8/SnBn0zwO2FHrNDpqqepj0E/TFTDpmEBCyFuTgC7MOg==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.10.1",
+        "@babel/runtime": "^7.23.9",
+        "@rc-component/portal": "^1.1.1",
         "classnames": "^2.2.6",
-        "rc-util": "^5.7.0"
+        "rc-motion": "^2.6.1",
+        "rc-util": "^5.38.1"
       },
       "peerDependencies": {
         "react": ">=16.9.0",
@@ -37733,48 +38826,51 @@
       }
     },
     "node_modules/rc-dropdown": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/rc-dropdown/-/rc-dropdown-3.2.5.tgz",
-      "integrity": "sha512-dVO2eulOSbEf+F4OyhCY5iGiMVhUYY/qeXxL7Ex2jDBt/xc89jU07mNoowV6aWxwVOc70pxEINff0oM2ogjluA==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/rc-dropdown/-/rc-dropdown-4.2.1.tgz",
+      "integrity": "sha512-YDAlXsPv3I1n42dv1JpdM7wJ+gSUBfeyPK59ZpBD9jQhK9jVuxpjj3NmWQHOBceA1zEPVX84T2wbdb2SD0UjmA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.10.1",
+        "@babel/runtime": "^7.18.3",
+        "@rc-component/trigger": "^2.0.0",
         "classnames": "^2.2.6",
-        "rc-trigger": "^5.0.4"
+        "rc-util": "^5.44.1"
       },
       "peerDependencies": {
-        "react": "*",
-        "react-dom": "*"
+        "react": ">=16.11.0",
+        "react-dom": ">=16.11.0"
       }
     },
     "node_modules/rc-field-form": {
-      "version": "1.17.4",
-      "resolved": "https://registry.npmjs.org/rc-field-form/-/rc-field-form-1.17.4.tgz",
-      "integrity": "sha512-QI9fe0F9YAmEX946lQpxTs6Qc/FwaLeakWquiBNEmhtqurj/qDdrv+eLb4TfnHTjkdyxU3G7p901WEuuBrrdkA==",
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/rc-field-form/-/rc-field-form-2.7.0.tgz",
+      "integrity": "sha512-hgKsCay2taxzVnBPZl+1n4ZondsV78G++XVsMIJCAoioMjlMQR9YwAp7JZDIECzIu2Z66R+f4SFIRrO2DjDNAA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.8.4",
-        "async-validator": "^3.0.3",
-        "rc-util": "^5.0.0"
+        "@babel/runtime": "^7.18.0",
+        "@rc-component/async-validator": "^5.0.3",
+        "rc-util": "^5.32.2"
       },
       "engines": {
         "node": ">=8.x"
       },
       "peerDependencies": {
-        "react": ">= 16.9.0",
-        "react-dom": ">= 16.9.0"
+        "react": ">=16.9.0",
+        "react-dom": ">=16.9.0"
       }
     },
     "node_modules/rc-image": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/rc-image/-/rc-image-5.0.2.tgz",
-      "integrity": "sha512-bNCOGxo9ICe2S+MuVQtxVjk2esL0QJX4YcUB10S98z8CWO1sswySH6inH69YU778aCXs8/nKhtZMUmiU1To0bQ==",
+      "version": "7.12.0",
+      "resolved": "https://registry.npmjs.org/rc-image/-/rc-image-7.12.0.tgz",
+      "integrity": "sha512-cZ3HTyyckPnNnUb9/DRqduqzLfrQRyi+CdHjdqgsyDpI3Ln5UX1kXnAhPBSJj9pVRzwRFgqkN7p9b6HBDjmu/Q==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.11.2",
+        "@rc-component/portal": "^1.0.2",
         "classnames": "^2.2.6",
-        "rc-dialog": "~8.5.1",
-        "rc-util": "^5.0.6"
+        "rc-dialog": "~9.6.0",
+        "rc-motion": "^2.6.2",
+        "rc-util": "^5.34.1"
       },
       "peerDependencies": {
         "react": ">=16.9.0",
@@ -37797,14 +38893,16 @@
       }
     },
     "node_modules/rc-input-number": {
-      "version": "6.1.3",
-      "resolved": "https://registry.npmjs.org/rc-input-number/-/rc-input-number-6.1.3.tgz",
-      "integrity": "sha512-qCLWK9NuuKGTsPXjRU/XvSOX7EKdnHlOpg59nPjYSDdH/czsAHZyYq50O6b6RF2TMPOjVpmsZQoMjNJYcnn6JA==",
+      "version": "9.5.0",
+      "resolved": "https://registry.npmjs.org/rc-input-number/-/rc-input-number-9.5.0.tgz",
+      "integrity": "sha512-bKaEvB5tHebUURAEXw35LDcnRZLq3x1k7GxfAqBMzmpHkDGzjAtnUL8y4y5N15rIFIg5IJgwr211jInl3cipag==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.10.1",
+        "@rc-component/mini-decimal": "^1.0.1",
         "classnames": "^2.2.5",
-        "rc-util": "^5.0.1"
+        "rc-input": "~1.8.0",
+        "rc-util": "^5.40.1"
       },
       "peerDependencies": {
         "react": ">=16.9.0",
@@ -37812,17 +38910,18 @@
       }
     },
     "node_modules/rc-mentions": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/rc-mentions/-/rc-mentions-1.5.3.tgz",
-      "integrity": "sha512-NG/KB8YiKBCJPHHvr/QapAb4f9YzLJn7kDHtmI1K6t7ZMM5YgrjIxNNhoRKKP9zJvb9PdPts69Hbg4ZMvLVIFQ==",
+      "version": "2.20.0",
+      "resolved": "https://registry.npmjs.org/rc-mentions/-/rc-mentions-2.20.0.tgz",
+      "integrity": "sha512-w8HCMZEh3f0nR8ZEd466ATqmXFCMGMN5UFCzEUL0bM/nGw/wOS2GgRzKBcm19K++jDyuWCOJOdgcKGXU3fXfbQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.10.1",
+        "@babel/runtime": "^7.22.5",
+        "@rc-component/trigger": "^2.0.0",
         "classnames": "^2.2.6",
-        "rc-menu": "^8.0.1",
-        "rc-textarea": "^0.3.0",
-        "rc-trigger": "^5.0.4",
-        "rc-util": "^5.0.1"
+        "rc-input": "~1.8.0",
+        "rc-menu": "~9.16.0",
+        "rc-textarea": "~1.10.0",
+        "rc-util": "^5.34.1"
       },
       "peerDependencies": {
         "react": ">=16.9.0",
@@ -37830,19 +38929,17 @@
       }
     },
     "node_modules/rc-menu": {
-      "version": "8.10.8",
-      "resolved": "https://registry.npmjs.org/rc-menu/-/rc-menu-8.10.8.tgz",
-      "integrity": "sha512-0gnSR0nmR/60NnK+72EGd+QheHyPSQ3wYg1TwX1zl0JJ9Gm0purFFykCXVv/G0Jynpt0QySPAos+bpHpjMZdoQ==",
+      "version": "9.16.1",
+      "resolved": "https://registry.npmjs.org/rc-menu/-/rc-menu-9.16.1.tgz",
+      "integrity": "sha512-ghHx6/6Dvp+fw8CJhDUHFHDJ84hJE3BXNCzSgLdmNiFErWSOaZNsihDAsKq9ByTALo/xkNIwtDFGIl6r+RPXBg==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.10.1",
+        "@rc-component/trigger": "^2.0.0",
         "classnames": "2.x",
-        "mini-store": "^3.0.1",
-        "rc-motion": "^2.0.1",
-        "rc-trigger": "^5.1.2",
-        "rc-util": "^5.7.0",
-        "resize-observer-polyfill": "^1.5.0",
-        "shallowequal": "^1.1.0"
+        "rc-motion": "^2.4.3",
+        "rc-overflow": "^1.3.1",
+        "rc-util": "^5.27.0"
       },
       "peerDependencies": {
         "react": ">=16.9.0",
@@ -37865,15 +38962,15 @@
       }
     },
     "node_modules/rc-notification": {
-      "version": "4.5.7",
-      "resolved": "https://registry.npmjs.org/rc-notification/-/rc-notification-4.5.7.tgz",
-      "integrity": "sha512-zhTGUjBIItbx96SiRu3KVURcLOydLUHZCPpYEn1zvh+re//Tnq/wSxN4FKgp38n4HOgHSVxcLEeSxBMTeBBDdw==",
+      "version": "5.6.4",
+      "resolved": "https://registry.npmjs.org/rc-notification/-/rc-notification-5.6.4.tgz",
+      "integrity": "sha512-KcS4O6B4qzM3KH7lkwOB7ooLPZ4b6J+VMmQgT51VZCeEcmghdeR4IrMcFq0LG+RPdnbe/ArT086tGM8Snimgiw==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.10.1",
         "classnames": "2.x",
-        "rc-motion": "^2.2.0",
-        "rc-util": "^5.0.1"
+        "rc-motion": "^2.9.0",
+        "rc-util": "^5.20.1"
       },
       "engines": {
         "node": ">=8.x"
@@ -37900,13 +38997,14 @@
       }
     },
     "node_modules/rc-pagination": {
-      "version": "3.1.17",
-      "resolved": "https://registry.npmjs.org/rc-pagination/-/rc-pagination-3.1.17.tgz",
-      "integrity": "sha512-/BQ5UxcBnW28vFAcP2hfh+Xg15W0QZn8TWYwdCApchMH1H0CxiaUUcULP8uXcFM1TygcdKWdt3JqsL9cTAfdkQ==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/rc-pagination/-/rc-pagination-5.1.0.tgz",
+      "integrity": "sha512-8416Yip/+eclTFdHXLKTxZvn70duYVGTvUUWbckCCZoIl3jagqke3GLsFrMs0bsQBikiYpZLD9206Ej4SOdOXQ==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.10.1",
-        "classnames": "^2.2.1"
+        "classnames": "^2.3.2",
+        "rc-util": "^5.38.0"
       },
       "peerDependencies": {
         "react": ">=16.9.0",
@@ -37914,36 +39012,53 @@
       }
     },
     "node_modules/rc-picker": {
-      "version": "2.5.19",
-      "resolved": "https://registry.npmjs.org/rc-picker/-/rc-picker-2.5.19.tgz",
-      "integrity": "sha512-u6myoCu/qiQ0vLbNzSzNrzTQhs7mldArCpPHrEI6OUiifs+IPXmbesqSm0zilJjfzrZJLgYeyyOMSznSlh0GKA==",
+      "version": "4.11.3",
+      "resolved": "https://registry.npmjs.org/rc-picker/-/rc-picker-4.11.3.tgz",
+      "integrity": "sha512-MJ5teb7FlNE0NFHTncxXQ62Y5lytq6sh5nUw0iH8OkHL/TjARSEvSHpr940pWgjGANpjCwyMdvsEV55l5tYNSg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.10.1",
+        "@babel/runtime": "^7.24.7",
+        "@rc-component/trigger": "^2.0.0",
         "classnames": "^2.2.1",
-        "date-fns": "2.x",
-        "dayjs": "1.x",
-        "moment": "^2.24.0",
-        "rc-trigger": "^5.0.4",
-        "rc-util": "^5.4.0",
-        "shallowequal": "^1.1.0"
+        "rc-overflow": "^1.3.2",
+        "rc-resize-observer": "^1.4.0",
+        "rc-util": "^5.43.0"
       },
       "engines": {
         "node": ">=8.x"
       },
       "peerDependencies": {
+        "date-fns": ">= 2.x",
+        "dayjs": ">= 1.x",
+        "luxon": ">= 3.x",
+        "moment": ">= 2.x",
         "react": ">=16.9.0",
         "react-dom": ">=16.9.0"
+      },
+      "peerDependenciesMeta": {
+        "date-fns": {
+          "optional": true
+        },
+        "dayjs": {
+          "optional": true
+        },
+        "luxon": {
+          "optional": true
+        },
+        "moment": {
+          "optional": true
+        }
       }
     },
     "node_modules/rc-progress": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/rc-progress/-/rc-progress-3.1.4.tgz",
-      "integrity": "sha512-XBAif08eunHssGeIdxMXOmRQRULdHaDdIFENQ578CMb4dyewahmmfJRyab+hw4KH4XssEzzYOkAInTLS7JJG+Q==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/rc-progress/-/rc-progress-4.0.0.tgz",
+      "integrity": "sha512-oofVMMafOCokIUIBnZLNcOZFsABaUw8PPrf1/y0ZBvKZNpOiu5h4AO9vv11Sw0p4Hb3D0yGWuEattcQGtNJ/aw==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.10.1",
-        "classnames": "^2.2.6"
+        "classnames": "^2.2.6",
+        "rc-util": "^5.16.1"
       },
       "peerDependencies": {
         "react": ">=16.9.0",
@@ -37951,9 +39066,9 @@
       }
     },
     "node_modules/rc-rate": {
-      "version": "2.9.3",
-      "resolved": "https://registry.npmjs.org/rc-rate/-/rc-rate-2.9.3.tgz",
-      "integrity": "sha512-2THssUSnRhtqIouQIIXqsZGzRczvp4WsH4WvGuhiwm+LG2fVpDUJliP9O1zeDOZvYfBE/Bup4SgHun/eCkbjgQ==",
+      "version": "2.13.1",
+      "resolved": "https://registry.npmjs.org/rc-rate/-/rc-rate-2.13.1.tgz",
+      "integrity": "sha512-QUhQ9ivQ8Gy7mtMZPAjLbxBt5y9GRp65VcUyGUMF3N3fhiftivPHdpuDIaWIMOTEprAjZPC08bls1dQB+I1F2Q==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.10.1",
@@ -38001,18 +39116,18 @@
       }
     },
     "node_modules/rc-select": {
-      "version": "12.1.13",
-      "resolved": "https://registry.npmjs.org/rc-select/-/rc-select-12.1.13.tgz",
-      "integrity": "sha512-cPI+aesP6dgCAaey4t4upDbEukJe+XN0DK6oO/6flcCX5o28o7KNZD7JAiVtC/6fCwqwI/kSs7S/43dvHmBl+A==",
+      "version": "14.16.8",
+      "resolved": "https://registry.npmjs.org/rc-select/-/rc-select-14.16.8.tgz",
+      "integrity": "sha512-NOV5BZa1wZrsdkKaiK7LHRuo5ZjZYMDxPP6/1+09+FB4KoNi8jcG1ZqLE3AVCxEsYMBe65OBx71wFoHRTP3LRg==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.10.1",
+        "@rc-component/trigger": "^2.1.1",
         "classnames": "2.x",
         "rc-motion": "^2.0.1",
-        "rc-overflow": "^1.0.0",
-        "rc-trigger": "^5.0.4",
-        "rc-util": "^5.9.8",
-        "rc-virtual-list": "^3.2.0"
+        "rc-overflow": "^1.3.1",
+        "rc-util": "^5.16.1",
+        "rc-virtual-list": "^3.5.2"
       },
       "engines": {
         "node": ">=8.x"
@@ -38023,16 +39138,14 @@
       }
     },
     "node_modules/rc-slider": {
-      "version": "9.7.5",
-      "resolved": "https://registry.npmjs.org/rc-slider/-/rc-slider-9.7.5.tgz",
-      "integrity": "sha512-LV/MWcXFjco1epPbdw1JlLXlTgmWpB9/Y/P2yinf8Pg3wElHxA9uajN21lJiWtZjf5SCUekfSP6QMJfDo4t1hg==",
+      "version": "11.1.8",
+      "resolved": "https://registry.npmjs.org/rc-slider/-/rc-slider-11.1.8.tgz",
+      "integrity": "sha512-2gg/72YFSpKP+Ja5AjC5DPL1YnV8DEITDQrcc1eASrUYjl0esptaBVJBh5nLTXCCp15eD8EuGjwezVGSHhs9tQ==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.10.1",
         "classnames": "^2.2.5",
-        "rc-tooltip": "^5.0.1",
-        "rc-util": "^5.16.1",
-        "shallowequal": "^1.1.0"
+        "rc-util": "^5.36.0"
       },
       "engines": {
         "node": ">=8.x"
@@ -38043,14 +39156,14 @@
       }
     },
     "node_modules/rc-steps": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/rc-steps/-/rc-steps-4.1.4.tgz",
-      "integrity": "sha512-qoCqKZWSpkh/b03ASGx1WhpKnuZcRWmvuW+ZUu4mvMdfvFzVxblTwUM+9aBd0mlEUFmt6GW8FXhMpHkK3Uzp3w==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/rc-steps/-/rc-steps-6.0.1.tgz",
+      "integrity": "sha512-lKHL+Sny0SeHkQKKDJlAjV5oZ8DwCdS2hFhAkIjuQt1/pB81M0cA0ErVFdHq9+jmPmFw1vJB2F5NBzFXLJxV+g==",
       "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.10.2",
+        "@babel/runtime": "^7.16.7",
         "classnames": "^2.2.3",
-        "rc-util": "^5.0.1"
+        "rc-util": "^5.16.1"
       },
       "engines": {
         "node": ">=8.x"
@@ -38061,14 +39174,14 @@
       }
     },
     "node_modules/rc-switch": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/rc-switch/-/rc-switch-3.2.2.tgz",
-      "integrity": "sha512-+gUJClsZZzvAHGy1vZfnwySxj+MjLlGRyXKXScrtCTcmiYNPzxDFOxdQ/3pK1Kt/0POvwJ/6ALOR8gwdXGhs+A==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/rc-switch/-/rc-switch-4.1.0.tgz",
+      "integrity": "sha512-TI8ufP2Az9oEbvyCeVE4+90PDSljGyuwix3fV58p7HV2o4wBnVToEyomJRVyTaZeqNPAp+vqeo4Wnj5u0ZZQBg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.10.1",
+        "@babel/runtime": "^7.21.0",
         "classnames": "^2.2.1",
-        "rc-util": "^5.0.1"
+        "rc-util": "^5.30.0"
       },
       "peerDependencies": {
         "react": ">=16.9.0",
@@ -38076,16 +39189,17 @@
       }
     },
     "node_modules/rc-table": {
-      "version": "7.12.5",
-      "resolved": "https://registry.npmjs.org/rc-table/-/rc-table-7.12.5.tgz",
-      "integrity": "sha512-XV4m5h0W+NjGkNzvp5ahOhYHyNG8oPNV9pTLre2EsfmyStXUJBICyfkNID7WZulMdCehv/Wa3MdqXwZ4EsJchw==",
+      "version": "7.51.1",
+      "resolved": "https://registry.npmjs.org/rc-table/-/rc-table-7.51.1.tgz",
+      "integrity": "sha512-5iq15mTHhvC42TlBLRCoCBLoCmGlbRZAlyF21FonFnS/DIC8DeRqnmdyVREwt2CFbPceM0zSNdEeVfiGaqYsKw==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.10.1",
+        "@rc-component/context": "^1.4.0",
         "classnames": "^2.2.5",
-        "rc-resize-observer": "^1.0.0",
-        "rc-util": "^5.4.0",
-        "shallowequal": "^1.1.0"
+        "rc-resize-observer": "^1.1.0",
+        "rc-util": "^5.44.3",
+        "rc-virtual-list": "^3.14.2"
       },
       "engines": {
         "node": ">=8.x"
@@ -38096,17 +39210,18 @@
       }
     },
     "node_modules/rc-tabs": {
-      "version": "11.7.3",
-      "resolved": "https://registry.npmjs.org/rc-tabs/-/rc-tabs-11.7.3.tgz",
-      "integrity": "sha512-5nd2NVss9TprPRV9r8N05SjQyAE7zDrLejxFLcbJ+BdLxSwnGnk3ws/Iq0smqKZUnPQC0XEvnpF3+zlllUUT2w==",
+      "version": "15.6.1",
+      "resolved": "https://registry.npmjs.org/rc-tabs/-/rc-tabs-15.6.1.tgz",
+      "integrity": "sha512-/HzDV1VqOsUWyuC0c6AkxVYFjvx9+rFPKZ32ejxX0Uc7QCzcEjTA9/xMgv4HemPKwzBNX8KhGVbbumDjnj92aA==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.11.2",
         "classnames": "2.x",
-        "rc-dropdown": "^3.1.3",
-        "rc-menu": "^8.6.1",
+        "rc-dropdown": "~4.2.0",
+        "rc-menu": "~9.16.0",
+        "rc-motion": "^2.6.2",
         "rc-resize-observer": "^1.0.0",
-        "rc-util": "^5.5.0"
+        "rc-util": "^5.34.1"
       },
       "engines": {
         "node": ">=8.x"
@@ -38117,16 +39232,16 @@
       }
     },
     "node_modules/rc-textarea": {
-      "version": "0.3.7",
-      "resolved": "https://registry.npmjs.org/rc-textarea/-/rc-textarea-0.3.7.tgz",
-      "integrity": "sha512-yCdZ6binKmAQB13hc/oehh0E/QRwoPP1pjF21aHBxlgXO3RzPF6dUu4LG2R4FZ1zx/fQd2L1faktulrXOM/2rw==",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/rc-textarea/-/rc-textarea-1.10.0.tgz",
+      "integrity": "sha512-ai9IkanNuyBS4x6sOL8qu/Ld40e6cEs6pgk93R+XLYg0mDSjNBGey6/ZpDs5+gNLD7urQ14po3V6Ck2dJLt9SA==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.10.1",
         "classnames": "^2.2.1",
+        "rc-input": "~1.8.0",
         "rc-resize-observer": "^1.0.0",
-        "rc-util": "^5.7.0",
-        "shallowequal": "^1.1.0"
+        "rc-util": "^5.27.0"
       },
       "peerDependencies": {
         "react": ">=16.9.0",
@@ -38134,13 +39249,15 @@
       }
     },
     "node_modules/rc-tooltip": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/rc-tooltip/-/rc-tooltip-5.0.2.tgz",
-      "integrity": "sha512-A4FejSG56PzYtSNUU4H1pVzfhtkV/+qMT2clK0CsSj+9mbc4USEtpWeX6A/jjVL+goBOMKj8qlH7BCZmZWh/Nw==",
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/rc-tooltip/-/rc-tooltip-6.4.0.tgz",
+      "integrity": "sha512-kqyivim5cp8I5RkHmpsp1Nn/Wk+1oeloMv9c7LXNgDxUpGm+RbXJGL+OPvDlcRnx9DBeOe4wyOIl4OKUERyH1g==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.11.2",
-        "rc-trigger": "^5.0.0"
+        "@rc-component/trigger": "^2.0.0",
+        "classnames": "^2.3.1",
+        "rc-util": "^5.44.3"
       },
       "peerDependencies": {
         "react": ">=16.9.0",
@@ -38148,19 +39265,19 @@
       }
     },
     "node_modules/rc-tree": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/rc-tree/-/rc-tree-4.1.5.tgz",
-      "integrity": "sha512-q2vjcmnBDylGZ9/ZW4F9oZMKMJdbFWC7um+DAQhZG1nqyg1iwoowbBggUDUaUOEryJP+08bpliEAYnzJXbI5xQ==",
+      "version": "5.13.1",
+      "resolved": "https://registry.npmjs.org/rc-tree/-/rc-tree-5.13.1.tgz",
+      "integrity": "sha512-FNhIefhftobCdUJshO7M8uZTA9F4OPGVXqGfZkkD/5soDeOhwO06T/aKTrg0WD8gRg/pyfq+ql3aMymLHCTC4A==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.10.1",
         "classnames": "2.x",
         "rc-motion": "^2.0.1",
-        "rc-util": "^5.0.0",
-        "rc-virtual-list": "^3.0.1"
+        "rc-util": "^5.16.1",
+        "rc-virtual-list": "^3.5.1"
       },
       "engines": {
-        "node": ">=8.x"
+        "node": ">=10.x"
       },
       "peerDependencies": {
         "react": "*",
@@ -38168,49 +39285,29 @@
       }
     },
     "node_modules/rc-tree-select": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/rc-tree-select/-/rc-tree-select-4.3.3.tgz",
-      "integrity": "sha512-0tilOHLJA6p+TNg4kD559XnDX3PTEYuoSF7m7ryzFLAYvdEEPtjn0QZc5z6L0sMKBiBlj8a2kf0auw8XyHU3lA==",
+      "version": "5.27.0",
+      "resolved": "https://registry.npmjs.org/rc-tree-select/-/rc-tree-select-5.27.0.tgz",
+      "integrity": "sha512-2qTBTzwIT7LRI1o7zLyrCzmo5tQanmyGbSaGTIf7sYimCklAToVVfpMC6OAldSKolcnjorBYPNSKQqJmN3TCww==",
       "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.10.1",
+        "@babel/runtime": "^7.25.7",
         "classnames": "2.x",
-        "rc-select": "^12.0.0",
-        "rc-tree": "^4.0.0",
-        "rc-util": "^5.0.5"
+        "rc-select": "~14.16.2",
+        "rc-tree": "~5.13.0",
+        "rc-util": "^5.43.0"
       },
       "peerDependencies": {
         "react": "*",
         "react-dom": "*"
       }
     },
-    "node_modules/rc-trigger": {
-      "version": "5.3.4",
-      "resolved": "https://registry.npmjs.org/rc-trigger/-/rc-trigger-5.3.4.tgz",
-      "integrity": "sha512-mQv+vas0TwKcjAO2izNPkqR4j86OemLRmvL2nOzdP9OWNWA1ivoTt5hzFqYNW9zACwmTezRiN8bttrC7cZzYSw==",
+    "node_modules/rc-upload": {
+      "version": "4.9.2",
+      "resolved": "https://registry.npmjs.org/rc-upload/-/rc-upload-4.9.2.tgz",
+      "integrity": "sha512-nHx+9rbd1FKMiMRYsqQ3NkXUv7COHPBo3X1Obwq9SWS6/diF/A0aJ5OHubvwUAIDs+4RMleljV0pcrNUc823GQ==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.18.3",
-        "classnames": "^2.2.6",
-        "rc-align": "^4.0.0",
-        "rc-motion": "^2.0.0",
-        "rc-util": "^5.19.2"
-      },
-      "engines": {
-        "node": ">=8.x"
-      },
-      "peerDependencies": {
-        "react": ">=16.9.0",
-        "react-dom": ">=16.9.0"
-      }
-    },
-    "node_modules/rc-upload": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/rc-upload/-/rc-upload-3.3.4.tgz",
-      "integrity": "sha512-v2sirR4JL31UTHD/f0LGUdd+tpFaOVUTPeIEjAXRP9kRN8TFhqOgcXl5ixtyqj90FmtRUmKmafCv0EmhBQUHqQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.10.1",
         "classnames": "^2.2.5",
         "rc-util": "^5.2.0"
       },
@@ -38234,9 +39331,9 @@
       }
     },
     "node_modules/rc-virtual-list": {
-      "version": "3.18.6",
-      "resolved": "https://registry.npmjs.org/rc-virtual-list/-/rc-virtual-list-3.18.6.tgz",
-      "integrity": "sha512-TQ5SsutL3McvWmmxqQtMIbfeoE3dGjJrRSfKekgby7WQMpPIFvv4ghytp5Z0s3D8Nik9i9YNOCqHBfk86AwgAA==",
+      "version": "3.19.1",
+      "resolved": "https://registry.npmjs.org/rc-virtual-list/-/rc-virtual-list-3.19.1.tgz",
+      "integrity": "sha512-DCapO2oyPqmooGhxBuXHM4lFuX+sshQwWqqkuyFA+4rShLe//+GEPVwiDgO+jKtKHtbeYwZoNvetwfHdOf+iUQ==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.20.0",
@@ -38254,23 +39351,17 @@
     },
     "node_modules/rc/node_modules/ini": {
       "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
       "license": "ISC"
     },
     "node_modules/rc/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": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/re-resizable": {
-      "version": "6.11.2",
-      "resolved": "https://registry.npmjs.org/re-resizable/-/re-resizable-6.11.2.tgz",
-      "integrity": "sha512-2xI2P3OHs5qw7K0Ud1aLILK6MQxW50TcO+DetD9eIV58j84TqYeHoZcL9H4GXFXXIh7afhH8mv5iUCXII7OW7A==",
+      "version": "6.10.3",
       "license": "MIT",
       "peerDependencies": {
         "react": "^16.13.1 || ^17.0.0 || ^18.0.0 || ^19.0.0",
@@ -38291,8 +39382,6 @@
     },
     "node_modules/react-ace": {
       "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/react-ace/-/react-ace-10.1.0.tgz",
-      "integrity": "sha512-VkvUjZNhdYTuKOKQpMIZi7uzZZVgzCjM7cLYu6F64V0mejY8a2XTyPUIMszC6A4trbeMIHbK5fYFcT/wkP/8VA==",
       "license": "MIT",
       "dependencies": {
         "ace-builds": "^1.4.14",
@@ -38306,10 +39395,19 @@
         "react-dom": "^0.13.0 || ^0.14.0 || ^15.0.1 || ^16.0.0 || ^17.0.0 || ^18.0.0"
       }
     },
+    "node_modules/react-async-script": {
+      "version": "1.2.0",
+      "license": "MIT",
+      "dependencies": {
+        "hoist-non-react-statics": "^3.3.0",
+        "prop-types": "^15.5.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.4.1"
+      }
+    },
     "node_modules/react-base16-styling": {
       "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/react-base16-styling/-/react-base16-styling-0.9.1.tgz",
-      "integrity": "sha512-1s0CY1zRBOQ5M3T61wetEpvQmsYSNtWEcdYzyZNxKa8t7oDvaOn9d21xrGezGAHFWLM7SHcktPuPTrvoqxSfKw==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.16.7",
@@ -38323,8 +39421,6 @@
     },
     "node_modules/react-base16-styling/node_modules/color": {
       "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz",
-      "integrity": "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==",
       "license": "MIT",
       "dependencies": {
         "color-convert": "^1.9.3",
@@ -38333,8 +39429,6 @@
     },
     "node_modules/react-base16-styling/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==",
       "license": "MIT",
       "dependencies": {
         "color-name": "1.1.3"
@@ -38342,14 +39436,10 @@
     },
     "node_modules/react-base16-styling/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==",
       "license": "MIT"
     },
     "node_modules/react-checkbox-tree": {
       "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/react-checkbox-tree/-/react-checkbox-tree-1.8.0.tgz",
-      "integrity": "sha512-ufC4aorihOvjLpvY1beab2hjVLGZbDTFRzw62foG0+th+KX7e/sdmWu/nD1ZS/U5Yr0rWGwedGH5GOtR0IkUXw==",
       "license": "MIT",
       "dependencies": {
         "classnames": "^2.2.5",
@@ -38362,9 +39452,7 @@
       }
     },
     "node_modules/react-checkbox-tree/node_modules/nanoid": {
-      "version": "3.3.11",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
-      "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
+      "version": "3.3.8",
       "funding": [
         {
           "type": "github",
@@ -38381,8 +39469,6 @@
     },
     "node_modules/react-color": {
       "version": "2.19.3",
-      "resolved": "https://registry.npmjs.org/react-color/-/react-color-2.19.3.tgz",
-      "integrity": "sha512-LEeGE/ZzNLIsFWa1TMe8y5VYqr7bibneWmvJwm1pCn/eNmrabWDh659JSPn9BuaMpEfU83WTOJfnCcjDZwNQTA==",
       "license": "MIT",
       "dependencies": {
         "@icons/material": "^0.2.4",
@@ -38409,8 +39495,6 @@
     },
     "node_modules/react-diff-viewer-continued": {
       "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/react-diff-viewer-continued/-/react-diff-viewer-continued-3.4.0.tgz",
-      "integrity": "sha512-kMZmUyb3Pv5L9vUtCfIGYsdOHs8mUojblGy1U1Sm0D7FhAOEsH9QhnngEIRo5hXWIPNGupNRJls1TJ6Eqx84eg==",
       "license": "MIT",
       "dependencies": {
         "@emotion/css": "^11.11.2",
@@ -38429,14 +39513,10 @@
     },
     "node_modules/react-diff-viewer-continued/node_modules/memoize-one": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-6.0.0.tgz",
-      "integrity": "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==",
       "license": "MIT"
     },
     "node_modules/react-dnd": {
       "version": "11.1.3",
-      "resolved": "https://registry.npmjs.org/react-dnd/-/react-dnd-11.1.3.tgz",
-      "integrity": "sha512-8rtzzT8iwHgdSC89VktwhqdKKtfXaAyC4wiqp0SywpHG12TTLvfOoL6xNEIUWXwIEWu+CFfDn4GZJyynCEuHIQ==",
       "license": "MIT",
       "dependencies": {
         "@react-dnd/shallowequal": "^2.0.0",
@@ -38451,17 +39531,13 @@
     },
     "node_modules/react-dnd-html5-backend": {
       "version": "11.1.3",
-      "resolved": "https://registry.npmjs.org/react-dnd-html5-backend/-/react-dnd-html5-backend-11.1.3.tgz",
-      "integrity": "sha512-/1FjNlJbW/ivkUxlxQd7o3trA5DE33QiRZgxent3zKme8DwF4Nbw3OFVhTRFGaYhHFNL1rZt6Rdj1D78BjnNLw==",
       "license": "MIT",
       "dependencies": {
         "dnd-core": "^11.1.3"
       }
     },
     "node_modules/react-docgen": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/react-docgen/-/react-docgen-7.1.1.tgz",
-      "integrity": "sha512-hlSJDQ2synMPKFZOsKo9Hi8WWZTC7POR8EmWvTSjow+VDgKzkmjQvFm2fk0tmRw+f0vTOIYKlarR0iL4996pdg==",
+      "version": "7.1.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -38482,8 +39558,6 @@
     },
     "node_modules/react-docgen-typescript": {
       "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/react-docgen-typescript/-/react-docgen-typescript-2.2.2.tgz",
-      "integrity": "sha512-tvg2ZtOpOi6QDwsb3GZhOjDkkX0h8Z2gipvTg6OVMUyoYoURhEiRNePT8NZItTVCDh39JJHnLdfCOkzoLbFnTg==",
       "dev": true,
       "license": "MIT",
       "peerDependencies": {
@@ -38492,8 +39566,6 @@
     },
     "node_modules/react-docgen/node_modules/@types/doctrine": {
       "version": "0.0.9",
-      "resolved": "https://registry.npmjs.org/@types/doctrine/-/doctrine-0.0.9.tgz",
-      "integrity": "sha512-eOIHzCUSH7SMfonMG1LsC2f8vxBFtho6NGBznK41R84YzPuvSBzrhEps33IsQiOW9+VL6NQ9DbjQJznk/S4uRA==",
       "dev": true,
       "license": "MIT"
     },
@@ -38510,13 +39582,22 @@
         "react": "^18.3.1"
       }
     },
-    "node_modules/react-draggable": {
-      "version": "4.4.6",
-      "resolved": "https://registry.npmjs.org/react-draggable/-/react-draggable-4.4.6.tgz",
-      "integrity": "sha512-LtY5Xw1zTPqHkVmtM3X8MUOxNDOUhv/khTgBgrUvwaS064bwVvxT+q5El0uUFNx5IEPKXuRejr7UqLwBIg5pdw==",
+    "node_modules/react-dom/node_modules/scheduler": {
+      "version": "0.23.2",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",
+      "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==",
       "license": "MIT",
       "dependencies": {
-        "clsx": "^1.1.1",
+        "loose-envify": "^1.1.0"
+      }
+    },
+    "node_modules/react-draggable": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/react-draggable/-/react-draggable-4.5.0.tgz",
+      "integrity": "sha512-VC+HBLEZ0XJxnOxVAZsdRi8rD04Iz3SiiKOoYzamjylUcju/hP9np/aZdLHf/7WOD268WMoNJMvYfB5yAK45cw==",
+      "license": "MIT",
+      "dependencies": {
+        "clsx": "^2.1.1",
         "prop-types": "^15.8.1"
       },
       "peerDependencies": {
@@ -38556,8 +39637,6 @@
     },
     "node_modules/react-error-boundary": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/react-error-boundary/-/react-error-boundary-5.0.0.tgz",
-      "integrity": "sha512-tnjAxG+IkpLephNcePNA7v6F/QpWLH8He65+DmedchDwg162JZqx4NmbXj0mlAYVVEd81OW7aFhmbsScYfiAFQ==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.12.5"
@@ -38566,10 +39645,19 @@
         "react": ">=16.13.1"
       }
     },
+    "node_modules/react-google-recaptcha": {
+      "version": "3.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "prop-types": "^15.5.0",
+        "react-async-script": "^1.2.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.4.1"
+      }
+    },
     "node_modules/react-intersection-observer": {
       "version": "9.16.0",
-      "resolved": "https://registry.npmjs.org/react-intersection-observer/-/react-intersection-observer-9.16.0.tgz",
-      "integrity": "sha512-w9nJSEp+DrW9KmQmeWHQyfaP6b03v+TdXynaoA964Wxt7mdR3An11z4NNCQgL4gKSK7y1ver2Fq+JKH6CWEzUA==",
       "license": "MIT",
       "peerDependencies": {
         "react": "^17.0.0 || ^18.0.0 || ^19.0.0",
@@ -38583,25 +39671,10 @@
     },
     "node_modules/react-is": {
       "version": "18.3.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
-      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
       "license": "MIT"
     },
-    "node_modules/react-js-cron": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/react-js-cron/-/react-js-cron-2.1.2.tgz",
-      "integrity": "sha512-749P2P+6ezWbYrNxjzEejLfep+c9TLeY2+QSVcTwTV5awkgozs8ZYtjUB6jJ6XCBKt0jAdlFN0l3yNoQF5cGsQ==",
-      "license": "MIT",
-      "peerDependencies": {
-        "antd": ">=4.6.0",
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0"
-      }
-    },
     "node_modules/react-json-tree": {
       "version": "0.17.0",
-      "resolved": "https://registry.npmjs.org/react-json-tree/-/react-json-tree-0.17.0.tgz",
-      "integrity": "sha512-hcWjibI/fAvsKnfYk+lka5OrE1Lvb1jH5pSnFhIU5T8cCCxB85r6h/NOzDPggSSgErjmx4rl3+2EkeclIKBOhg==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.18.3",
@@ -38617,8 +39690,6 @@
     },
     "node_modules/react-lines-ellipsis": {
       "version": "0.15.4",
-      "resolved": "https://registry.npmjs.org/react-lines-ellipsis/-/react-lines-ellipsis-0.15.4.tgz",
-      "integrity": "sha512-bIcoVRulN6RdBb9QByRPan7vDjxJv4jhII9eMs5ZkCK4QYEbPiY+8g+IM7/B0kb8UbRRRgR7KwpPWI9j8d2FYg==",
       "license": "MIT",
       "peerDependencies": {
         "react": "*",
@@ -38627,8 +39698,6 @@
     },
     "node_modules/react-loadable": {
       "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/react-loadable/-/react-loadable-5.5.0.tgz",
-      "integrity": "sha512-C8Aui0ZpMd4KokxRdVAm2bQtI03k2RMRNzOB+IipV3yxFTSVICv7WoUr5L9ALB5BmKO1iHgZtWM8EvYG83otdg==",
       "license": "MIT",
       "dependencies": {
         "prop-types": "^15.5.0"
@@ -38639,8 +39708,6 @@
     },
     "node_modules/react-map-gl": {
       "version": "6.1.21",
-      "resolved": "https://registry.npmjs.org/react-map-gl/-/react-map-gl-6.1.21.tgz",
-      "integrity": "sha512-7ENXxAeYaI4dhol5bir3iK6TeR9teA3MF0WH6VIhmkMRdYY3lgA4t1GzDh2BwpSO340Ngw+5mC0nTsc6gd1O4w==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.0.0",
@@ -38660,10 +39727,44 @@
         "react": ">=16.3.0"
       }
     },
+    "node_modules/react-map-gl/node_modules/@mapbox/mapbox-gl-supported": {
+      "version": "2.0.1",
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/react-map-gl/node_modules/geojson-vt": {
+      "version": "3.2.1",
+      "license": "ISC"
+    },
+    "node_modules/react-map-gl/node_modules/mapbox-gl": {
+      "version": "2.15.0",
+      "license": "SEE LICENSE IN LICENSE.txt",
+      "dependencies": {
+        "@mapbox/geojson-rewind": "^0.5.2",
+        "@mapbox/jsonlint-lines-primitives": "^2.0.2",
+        "@mapbox/mapbox-gl-supported": "^2.0.1",
+        "@mapbox/point-geometry": "^0.1.0",
+        "@mapbox/tiny-sdf": "^2.0.6",
+        "@mapbox/unitbezier": "^0.0.1",
+        "@mapbox/vector-tile": "^1.3.1",
+        "@mapbox/whoots-js": "^3.1.0",
+        "csscolorparser": "~1.0.3",
+        "earcut": "^2.2.4",
+        "geojson-vt": "^3.2.1",
+        "gl-matrix": "^3.4.3",
+        "grid-index": "^1.1.0",
+        "kdbush": "^4.0.1",
+        "murmurhash-js": "^1.0.0",
+        "pbf": "^3.2.1",
+        "potpack": "^2.0.0",
+        "quickselect": "^2.0.0",
+        "rw": "^1.3.3",
+        "supercluster": "^8.0.0",
+        "tinyqueue": "^2.0.3",
+        "vt-pbf": "^3.1.3"
+      }
+    },
     "node_modules/react-map-gl/node_modules/mjolnir.js": {
       "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/mjolnir.js/-/mjolnir.js-2.7.3.tgz",
-      "integrity": "sha512-Z5z/+FzZqOSO3juSVKV3zcm4R2eAlWwlKMcqHmyFEJAaLILNcDKnIbnb4/kbcGyIuhtdWrzu8WOIR7uM6I34aw==",
       "license": "MIT",
       "dependencies": {
         "@types/hammerjs": "^2.0.41",
@@ -38674,10 +39775,16 @@
         "npm": ">= 3"
       }
     },
+    "node_modules/react-map-gl/node_modules/rw": {
+      "version": "1.3.3",
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/react-map-gl/node_modules/tinyqueue": {
+      "version": "2.0.3",
+      "license": "ISC"
+    },
     "node_modules/react-markdown": {
       "version": "8.0.7",
-      "resolved": "https://registry.npmjs.org/react-markdown/-/react-markdown-8.0.7.tgz",
-      "integrity": "sha512-bvWbzG4MtOU62XqBx3Xx+zB2raaFFsq4mYiAzfjXJMEz2sixgeAfraA3tvzULF02ZdOMUOKTBFFaZJDDrq+BJQ==",
       "license": "MIT",
       "dependencies": {
         "@types/hast": "^2.0.0",
@@ -38707,8 +39814,6 @@
     },
     "node_modules/react-redux": {
       "version": "7.2.9",
-      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.9.tgz",
-      "integrity": "sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.15.4",
@@ -38732,8 +39837,6 @@
     },
     "node_modules/react-redux/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==",
       "license": "MIT"
     },
     "node_modules/react-remove-scroll": {
@@ -38785,8 +39888,6 @@
     },
     "node_modules/react-resizable": {
       "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/react-resizable/-/react-resizable-3.0.5.tgz",
-      "integrity": "sha512-vKpeHhI5OZvYn82kXOs1bC8aOXktGU5AmKAgaZS4F5JPburCtbmDPqE7Pzp+1kN4+Wb81LlF33VpGwWwtXem+w==",
       "license": "MIT",
       "dependencies": {
         "prop-types": "15.x",
@@ -38798,8 +39899,6 @@
     },
     "node_modules/react-resize-detector": {
       "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/react-resize-detector/-/react-resize-detector-7.1.2.tgz",
-      "integrity": "sha512-zXnPJ2m8+6oq9Nn8zsep/orts9vQv3elrpA+R8XTcW7DVVUJ9vwDwMXaBtykAYjMnkCIaOoK9vObyR7ZgFNlOw==",
       "license": "MIT",
       "dependencies": {
         "lodash": "^4.17.21"
@@ -38810,40 +39909,15 @@
       }
     },
     "node_modules/react-reverse-portal": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/react-reverse-portal/-/react-reverse-portal-2.3.0.tgz",
-      "integrity": "sha512-kvbPfLPKg6Y3S6tVq83us2RghvDpOS4GcJxbI7cZ0V0tuzUaSzblRIhVnKLOucfqF4lN/i9oWvEmpEi6bAOYlQ==",
+      "version": "2.1.2",
       "license": "Apache-2.0",
       "peerDependencies": {
-        "react": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
-        "react-dom": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+        "react": "^16.0.0 || ^17.0.0 || ^18.0.0",
+        "react-dom": "^16.0.0 || ^17.0.0 || ^18.0.0"
       }
     },
-    "node_modules/react-rnd": {
-      "version": "10.5.2",
-      "resolved": "https://registry.npmjs.org/react-rnd/-/react-rnd-10.5.2.tgz",
-      "integrity": "sha512-0Tm4x7k7pfHf2snewJA8x7Nwgt3LV+58MVEWOVsFjk51eYruFEa6Wy7BNdxt4/lH0wIRsu7Gm3KjSXY2w7YaNw==",
-      "license": "MIT",
-      "dependencies": {
-        "re-resizable": "6.11.2",
-        "react-draggable": "4.4.6",
-        "tslib": "2.6.2"
-      },
-      "peerDependencies": {
-        "react": ">=16.3.0",
-        "react-dom": ">=16.3.0"
-      }
-    },
-    "node_modules/react-rnd/node_modules/tslib": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
-      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==",
-      "license": "0BSD"
-    },
     "node_modules/react-router": {
       "version": "5.3.4",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.3.4.tgz",
-      "integrity": "sha512-Ys9K+ppnJah3QuaRiLxk+jDWOR1MekYQrlytiXxC1RyfbdsZkS5pvKAzCCr031xHixZwpnsYNT5xysdFHQaYsA==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.12.13",
@@ -38862,8 +39936,6 @@
     },
     "node_modules/react-router-dom": {
       "version": "5.3.4",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.3.4.tgz",
-      "integrity": "sha512-m4EqFMHv/Ih4kpcBCONHbkT68KoAeHN4p3lAGoNryfHi0dMy0kCzEZakiKRsvg5wHZ/JLrLW8o8KomWiz/qbYQ==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.12.13",
@@ -38880,8 +39952,6 @@
     },
     "node_modules/react-router-dom/node_modules/history": {
       "version": "4.10.1",
-      "resolved": "https://registry.npmjs.org/history/-/history-4.10.1.tgz",
-      "integrity": "sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.1.2",
@@ -38894,8 +39964,6 @@
     },
     "node_modules/react-router/node_modules/history": {
       "version": "4.10.1",
-      "resolved": "https://registry.npmjs.org/history/-/history-4.10.1.tgz",
-      "integrity": "sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.1.2",
@@ -38908,14 +39976,10 @@
     },
     "node_modules/react-router/node_modules/isarray": {
       "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
       "license": "MIT"
     },
     "node_modules/react-router/node_modules/path-to-regexp": {
       "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.9.0.tgz",
-      "integrity": "sha512-xIp7/apCFJuUHdDLWe8O1HIkb0kQrOMb/0u6FXQjemHn/ii5LrIzU6bdECnsiTF/GjZkMEKg1xdiZwNqDYlZ6g==",
       "license": "MIT",
       "dependencies": {
         "isarray": "0.0.1"
@@ -38923,14 +39987,10 @@
     },
     "node_modules/react-router/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==",
       "license": "MIT"
     },
     "node_modules/react-search-input": {
       "version": "0.11.3",
-      "resolved": "https://registry.npmjs.org/react-search-input/-/react-search-input-0.11.3.tgz",
-      "integrity": "sha512-Yo05lNR5YLeIY+mTEk0lMkYHX0qkTlElJmxMTw5JlZPu92EP8YWwIY3QSbEFULvX4wiTfyDdUovTUpp2VockpA==",
       "license": "MIT",
       "dependencies": {
         "fuse.js": "^3.0.0",
@@ -38939,8 +39999,6 @@
     },
     "node_modules/react-search-input/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==",
       "license": "Apache-2.0",
       "engines": {
         "node": ">=6"
@@ -38948,8 +40006,6 @@
     },
     "node_modules/react-sortable-hoc": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/react-sortable-hoc/-/react-sortable-hoc-2.0.0.tgz",
-      "integrity": "sha512-JZUw7hBsAHXK7PTyErJyI7SopSBFRcFHDjWW5SWjcugY0i6iH7f+eJkY8cJmGMlZ1C9xz1J3Vjz0plFpavVeRg==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.2.0",
@@ -38964,8 +40020,6 @@
     },
     "node_modules/react-split": {
       "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/react-split/-/react-split-2.0.14.tgz",
-      "integrity": "sha512-bKWydgMgaKTg/2JGQnaJPg51T6dmumTWZppFgEbbY0Fbme0F5TuatAScCLaqommbGQQf/ZT1zaejuPDriscISA==",
       "license": "MIT",
       "dependencies": {
         "prop-types": "^15.5.7",
@@ -38999,8 +40053,6 @@
     },
     "node_modules/react-syntax-highlighter": {
       "version": "15.6.1",
-      "resolved": "https://registry.npmjs.org/react-syntax-highlighter/-/react-syntax-highlighter-15.6.1.tgz",
-      "integrity": "sha512-OqJ2/vL7lEeV5zTJyG7kmARppUjiB9h9udl4qHQjjgEos66z00Ia0OckwYfRxCSFrW8RJIBnsBwQsHZbVPspqg==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.3.1",
@@ -39016,8 +40068,6 @@
     },
     "node_modules/react-table": {
       "version": "7.8.0",
-      "resolved": "https://registry.npmjs.org/react-table/-/react-table-7.8.0.tgz",
-      "integrity": "sha512-hNaz4ygkZO4bESeFfnfOft73iBUj8K5oKi1EcSHPAibEydfsX2MyU6Z8KCr3mv3C9Kqqh71U+DhZkFvibbnPbA==",
       "license": "MIT",
       "funding": {
         "type": "github",
@@ -39029,8 +40079,6 @@
     },
     "node_modules/react-transition-group": {
       "version": "4.4.5",
-      "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz",
-      "integrity": "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==",
       "license": "BSD-3-Clause",
       "dependencies": {
         "@babel/runtime": "^7.5.5",
@@ -39045,8 +40093,6 @@
     },
     "node_modules/react-ultimate-pagination": {
       "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/react-ultimate-pagination/-/react-ultimate-pagination-1.3.2.tgz",
-      "integrity": "sha512-TDrUFR0hcI4nx9/EK3Gj4nlbhNQ5cXi6/7CGuF3j7k0vur7NUFOczm3POlGnuhTku2KUnpoM4Jf7E0l8Fpi2/Q==",
       "license": "MIT",
       "dependencies": {
         "prop-types": "^15.0.0",
@@ -39073,9 +40119,7 @@
       }
     },
     "node_modules/react-virtualized-auto-sizer": {
-      "version": "1.0.26",
-      "resolved": "https://registry.npmjs.org/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.26.tgz",
-      "integrity": "sha512-CblNyiNVw2o+hsa5/49NH2ogGxZ+t+3aweRvNSq7TVjDIlwk7ir4lencEg5HxHeSzwNarSkNkiu0qJSOXtxm5A==",
+      "version": "1.0.25",
       "license": "MIT",
       "peerDependencies": {
         "react": "^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0 || ^19.0.0",
@@ -39084,8 +40128,6 @@
     },
     "node_modules/react-window": {
       "version": "1.8.11",
-      "resolved": "https://registry.npmjs.org/react-window/-/react-window-1.8.11.tgz",
-      "integrity": "sha512-+SRbUVT2scadgFSWx+R1P754xHPEqvcfSfVX10QYg6POOz+WNgkN48pS+BtZNIMGiL1HYrSEiCkwsMS15QogEQ==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.0.0",
@@ -39101,8 +40143,6 @@
     },
     "node_modules/reactable": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/reactable/-/reactable-1.1.0.tgz",
-      "integrity": "sha512-SnvZ3CXyFFxGotw9cqNiVUGb2oW16UlIypGQZRJGgPiJuFqW22jO7A+Y/Tvv8no8F/bZoLdZ+QJP7eZfcc9kCw==",
       "license": "MIT",
       "peerDependencies": {
         "react": "* || ^0.14.0"
@@ -39110,8 +40150,6 @@
     },
     "node_modules/reactcss": {
       "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/reactcss/-/reactcss-1.2.3.tgz",
-      "integrity": "sha512-KiwVUcFu1RErkI97ywr8nvx8dNOpT03rbnma0SSalTYjkrPYaEajR4a/MRt6DZ46K6arDRbWMNHF+xH7G7n/8A==",
       "license": "MIT",
       "dependencies": {
         "lodash": "^4.0.1"
@@ -39119,8 +40157,6 @@
     },
     "node_modules/read": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/read/-/read-3.0.1.tgz",
-      "integrity": "sha512-SLBrDU/Srs/9EoWhU5GdbAoxG1GzpQHo/6qiGItaoLJ1thmYpcNIM1qISEUvyHBzfGlWIyd6p2DNi1oV1VmAuw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -39132,8 +40168,6 @@
     },
     "node_modules/read-cmd-shim": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-4.0.0.tgz",
-      "integrity": "sha512-yILWifhaSEEytfXI76kB9xEEiG1AiozaCJZ83A87ytjRiN+jVibXjedjCRNjoZviinhG+4UkalO3mWTd8u5O0Q==",
       "dev": true,
       "license": "ISC",
       "engines": {
@@ -39142,8 +40176,6 @@
     },
     "node_modules/read-package-json-fast": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-3.0.2.tgz",
-      "integrity": "sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -39156,8 +40188,6 @@
     },
     "node_modules/read-package-up": {
       "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/read-package-up/-/read-package-up-11.0.0.tgz",
-      "integrity": "sha512-MbgfoNPANMdb4oRBNg5eqLbB2t2r+o5Ua1pNt8BqGp4I0FJZhuVSOj3PaBPni4azWuSzEdNn2evevzVmEk1ohQ==",
       "license": "MIT",
       "dependencies": {
         "find-up-simple": "^1.0.0",
@@ -39172,14 +40202,12 @@
       }
     },
     "node_modules/read-package-up/node_modules/parse-json": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-8.3.0.tgz",
-      "integrity": "sha512-ybiGyvspI+fAoRQbIPRddCcSTV9/LsJbf0e/S85VLowVGzRmokfneg2kwVW/KU5rOXrPSbF1qAKPMgNTqqROQQ==",
+      "version": "8.1.0",
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.26.2",
-        "index-to-position": "^1.1.0",
-        "type-fest": "^4.39.1"
+        "@babel/code-frame": "^7.22.13",
+        "index-to-position": "^0.1.2",
+        "type-fest": "^4.7.1"
       },
       "engines": {
         "node": ">=18"
@@ -39190,8 +40218,6 @@
     },
     "node_modules/read-package-up/node_modules/read-pkg": {
       "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-9.0.1.tgz",
-      "integrity": "sha512-9viLL4/n1BJUCT1NXVTdS1jtm80yDEgR5T4yCelII49Mbj0v1rZdKqj7zCiYdbB0CuCgdrvHcNogAKTFPBocFA==",
       "license": "MIT",
       "dependencies": {
         "@types/normalize-package-data": "^2.4.3",
@@ -39208,9 +40234,7 @@
       }
     },
     "node_modules/read-package-up/node_modules/type-fest": {
-      "version": "4.41.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.41.0.tgz",
-      "integrity": "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==",
+      "version": "4.33.0",
       "license": "(MIT OR CC0-1.0)",
       "engines": {
         "node": ">=16"
@@ -39219,22 +40243,8 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/read-package-up/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==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/read-pkg": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
-      "integrity": "sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -39248,8 +40258,6 @@
     },
     "node_modules/read-pkg-up": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
-      "integrity": "sha512-YFzFrVvpC6frF1sz8psoHDBGF7fLPc+llq/8NB43oagqWkx8ar5zYtsTORtOjw9W2RHLpWP+zTWwBvf1bCmcSw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -39262,8 +40270,6 @@
     },
     "node_modules/read-pkg-up/node_modules/find-up": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-      "integrity": "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -39275,8 +40281,6 @@
     },
     "node_modules/read-pkg-up/node_modules/locate-path": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-      "integrity": "sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -39289,8 +40293,6 @@
     },
     "node_modules/read-pkg-up/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==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -39302,8 +40304,6 @@
     },
     "node_modules/read-pkg-up/node_modules/p-locate": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-      "integrity": "sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -39315,8 +40315,6 @@
     },
     "node_modules/read-pkg-up/node_modules/p-try": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-      "integrity": "sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -39325,8 +40323,6 @@
     },
     "node_modules/read-pkg-up/node_modules/path-exists": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -39335,15 +40331,11 @@
     },
     "node_modules/read-pkg/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/read-pkg/node_modules/load-json-file": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
-      "integrity": "sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -39358,8 +40350,6 @@
     },
     "node_modules/read-pkg/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": {
@@ -39371,8 +40361,6 @@
     },
     "node_modules/read-pkg/node_modules/parse-json": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -39385,8 +40373,6 @@
     },
     "node_modules/read-pkg/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,
       "license": "MIT",
       "dependencies": {
@@ -39398,8 +40384,6 @@
     },
     "node_modules/read-pkg/node_modules/pify": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-      "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -39408,8 +40392,6 @@
     },
     "node_modules/read-pkg/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": {
@@ -39418,28 +40400,14 @@
     },
     "node_modules/read-pkg/node_modules/strip-bom": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
       "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
-    "node_modules/read/node_modules/mute-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-1.0.0.tgz",
-      "integrity": "sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
     "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",
@@ -39451,13 +40419,11 @@
       }
     },
     "node_modules/readable-web-to-node-stream": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.4.tgz",
-      "integrity": "sha512-9nX56alTf5bwXQ3ZDipHJhusu9NTQJ/CVPtb/XHAJCXihZeitfJvIRS4GqQ/mfIoOE3IelHMrpayVrosdHBuLw==",
+      "version": "3.0.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "readable-stream": "^4.7.0"
+        "readable-stream": "^3.6.0"
       },
       "engines": {
         "node": ">=8"
@@ -39467,52 +40433,8 @@
         "url": "https://github.com/sponsors/Borewit"
       }
     },
-    "node_modules/readable-web-to-node-stream/node_modules/buffer": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
-      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
-      "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.2.1"
-      }
-    },
-    "node_modules/readable-web-to-node-stream/node_modules/readable-stream": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.7.0.tgz",
-      "integrity": "sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "abort-controller": "^3.0.0",
-        "buffer": "^6.0.3",
-        "events": "^3.3.0",
-        "process": "^0.11.10",
-        "string_decoder": "^1.3.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
     "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": {
@@ -39524,8 +40446,6 @@
     },
     "node_modules/real-require": {
       "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/real-require/-/real-require-0.2.0.tgz",
-      "integrity": "sha512-57frrGM/OCTLqLOAh0mhVA9VBMHd+9U7Zb2THMGdBUoZVOtGbJzjxsYGDJ3A9AYYCP4hn6y1TVbaOfzWtm5GFg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -39533,9 +40453,7 @@
       }
     },
     "node_modules/recast": {
-      "version": "0.23.11",
-      "resolved": "https://registry.npmjs.org/recast/-/recast-0.23.11.tgz",
-      "integrity": "sha512-YTUo+Flmw4ZXiWfQKGcwwc11KnoRAYgzAE2E7mXKCjSviTKShtxBsN6YUUBB2gtaBzKzeKunxhUwNHQuRryhWA==",
+      "version": "0.23.9",
       "license": "MIT",
       "dependencies": {
         "ast-types": "^0.16.1",
@@ -39550,8 +40468,6 @@
     },
     "node_modules/recast/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==",
       "license": "MIT",
       "dependencies": {
         "tslib": "^2.0.1"
@@ -39562,8 +40478,6 @@
     },
     "node_modules/recast/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==",
       "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
@@ -39571,8 +40485,6 @@
     },
     "node_modules/rechoir": {
       "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz",
-      "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -39584,8 +40496,6 @@
     },
     "node_modules/redent": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
-      "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
       "license": "MIT",
       "dependencies": {
         "indent-string": "^4.0.0",
@@ -39597,8 +40507,6 @@
     },
     "node_modules/redent/node_modules/strip-indent": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
-      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
       "license": "MIT",
       "dependencies": {
         "min-indent": "^1.0.0"
@@ -39609,8 +40517,6 @@
     },
     "node_modules/reduce-css-calc": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz",
-      "integrity": "sha512-0dVfwYVOlf/LBA2ec4OwQ6p3X9mYxn/wOl2xTcLwjnPYrkgEfPx3VI4eGCH3rQLlPISG5v9I9bkZosKsNRTRKA==",
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^0.4.2",
@@ -39620,14 +40526,10 @@
     },
     "node_modules/reduce-css-calc/node_modules/balanced-match": {
       "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-      "integrity": "sha512-STw03mQKnGUYtoNjmowo4F2cRmIIxYEGiMsjjwla/u5P1lxadj/05WkNaFjNiKTgJkj8KiXbgAiRTmcQRwQNtg==",
       "license": "MIT"
     },
     "node_modules/reduce-function-call": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.3.tgz",
-      "integrity": "sha512-Hl/tuV2VDgWgCSEeWMLwxLZqX7OK59eU1guxXsRKTAyeYimivsKdtcV4fu3r710tpG5GmDKDhQ0HSZLExnNmyQ==",
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
@@ -39635,8 +40537,6 @@
     },
     "node_modules/redux": {
       "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz",
-      "integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.9.2"
@@ -39644,14 +40544,10 @@
     },
     "node_modules/redux-localstorage": {
       "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/redux-localstorage/-/redux-localstorage-0.4.1.tgz",
-      "integrity": "sha512-dUha0YoH+BSZ2q15pakB+JWeqiuXUf3Ir4rObOpNrZ96HEdciGAjkL10k3KGdLI7qvQw/c096asw/SQ6TPjU/A==",
       "license": "MIT"
     },
     "node_modules/redux-mock-store": {
       "version": "1.5.5",
-      "resolved": "https://registry.npmjs.org/redux-mock-store/-/redux-mock-store-1.5.5.tgz",
-      "integrity": "sha512-YxX+ofKUTQkZE4HbhYG4kKGr7oCTJfB0GLy7bSeqx86GLpGirrbUWstMnqXkqHNaQpcnbMGbof2dYs5KsPE6Zg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -39663,8 +40559,6 @@
     },
     "node_modules/redux-thunk": {
       "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.4.2.tgz",
-      "integrity": "sha512-+P3TjtnP0k/FEjcBL5FZpoovtvrTNT/UXd4/sluaSyrURlSlhLSzEdfsTBW7WsKB6yPvgd7q/iZPICFjW4o57Q==",
       "license": "MIT",
       "peerDependencies": {
         "redux": "^4"
@@ -39672,14 +40566,10 @@
     },
     "node_modules/redux-undo": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/redux-undo/-/redux-undo-1.1.0.tgz",
-      "integrity": "sha512-zzLFh2qeF0MTIlzDhDLm9NtkfBqCllQJ3OCuIl5RKlG/ayHw6GUdIFdMhzMS9NnrnWdBX5u//ExMOHpfudGGOg==",
       "license": "MIT"
     },
     "node_modules/reflect.getprototypeof": {
       "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz",
-      "integrity": "sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==",
       "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.8",
@@ -39700,8 +40590,6 @@
     },
     "node_modules/refractor": {
       "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/refractor/-/refractor-3.6.0.tgz",
-      "integrity": "sha512-MY9W41IOWxxk31o+YvFCNyNzdkc9M20NoZK5vq6jkv4I/uh2zkWcfudj0Q1fovjUQJrNewS9NMzeTtqPf+n5EA==",
       "license": "MIT",
       "dependencies": {
         "hastscript": "^6.0.0",
@@ -39715,8 +40603,6 @@
     },
     "node_modules/refractor/node_modules/prismjs": {
       "version": "1.27.0",
-      "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.27.0.tgz",
-      "integrity": "sha512-t13BGPUlFDR7wRB5kQDG4jjl7XeuH6jbJGt11JHPL96qwsEHNX2+68tFXqc1/k+/jALsbSWJKUOT/hcYAZ5LkA==",
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -39724,15 +40610,11 @@
     },
     "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,
       "license": "MIT"
     },
     "node_modules/regenerate-unicode-properties": {
       "version": "10.2.0",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.0.tgz",
-      "integrity": "sha512-DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -39744,14 +40626,10 @@
     },
     "node_modules/regenerator-runtime": {
       "version": "0.14.1",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
-      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
       "license": "MIT"
     },
     "node_modules/regexp.prototype.flags": {
       "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz",
-      "integrity": "sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==",
       "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.8",
@@ -39768,10 +40646,16 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/regexparam": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/regexpu-core": {
       "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.2.0.tgz",
-      "integrity": "sha512-H66BPQMrv+V16t8xtmq+UC0CBpiTBA60V8ibS1QVReIp8T1z8hwFxqcGzm9K6lgsN7sB5edVH8a+ze6Fqm4weA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -39787,9 +40671,7 @@
       }
     },
     "node_modules/registry-auth-token": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-5.1.0.tgz",
-      "integrity": "sha512-GdekYuwLXLxMuFTwAPg5UKGLW/UXzQrZvH/Zj791BQif5T05T0RsaLfHc9q3ZOKi7n+BoprPD9mJ0O0k4xzUlw==",
+      "version": "5.0.3",
       "license": "MIT",
       "dependencies": {
         "@pnpm/npm-conf": "^2.1.0"
@@ -39800,8 +40682,6 @@
     },
     "node_modules/registry-url": {
       "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-6.0.1.tgz",
-      "integrity": "sha512-+crtS5QjFRqFCoQmvGduwYWEBng99ZvmFvF+cUJkGYF1L1BfU8C6Zp9T7f5vPAwyLkUExpvK+ANVZmGU49qi4Q==",
       "license": "MIT",
       "dependencies": {
         "rc": "1.2.8"
@@ -39815,15 +40695,11 @@
     },
     "node_modules/regjsgen": {
       "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.8.0.tgz",
-      "integrity": "sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/regjsparser": {
       "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.12.0.tgz",
-      "integrity": "sha512-cnE+y8bz4NhMjISKbgeVJtqNbtf5QpjZP+Bslo+UqkIt9QPnX9q095eiRRASJG1/tz6dlNr6Z5NsBiWYokp6EQ==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
@@ -39835,8 +40711,6 @@
     },
     "node_modules/regjsparser/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,
       "license": "MIT",
       "bin": {
@@ -39848,8 +40722,6 @@
     },
     "node_modules/rehype-external-links": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/rehype-external-links/-/rehype-external-links-3.0.0.tgz",
-      "integrity": "sha512-yp+e5N9V3C6bwBeAC4n796kc86M4gJCdlVhiMTxIrJG5UHDMh+PJANf9heqORJbt1nrCbDwIlAZKjANIaVBbvw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -39867,8 +40739,6 @@
     },
     "node_modules/rehype-external-links/node_modules/@types/hast": {
       "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.4.tgz",
-      "integrity": "sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -39877,15 +40747,11 @@
     },
     "node_modules/rehype-external-links/node_modules/@types/unist": {
       "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz",
-      "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/rehype-external-links/node_modules/unist-util-visit": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-5.0.0.tgz",
-      "integrity": "sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -39900,8 +40766,6 @@
     },
     "node_modules/rehype-raw": {
       "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/rehype-raw/-/rehype-raw-7.0.0.tgz",
-      "integrity": "sha512-/aE8hCfKlQeA8LmyeyQvQF3eBiLRGNlfBJEvWH7ivp9sBqs7TNqBL5X3v157rM4IFETqDnIOO+z5M/biZbo9Ww==",
       "license": "MIT",
       "dependencies": {
         "@types/hast": "^3.0.0",
@@ -39915,8 +40779,6 @@
     },
     "node_modules/rehype-raw/node_modules/@types/hast": {
       "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.4.tgz",
-      "integrity": "sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==",
       "license": "MIT",
       "dependencies": {
         "@types/unist": "*"
@@ -39924,14 +40786,10 @@
     },
     "node_modules/rehype-raw/node_modules/@types/unist": {
       "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz",
-      "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==",
       "license": "MIT"
     },
     "node_modules/rehype-raw/node_modules/vfile": {
       "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/vfile/-/vfile-6.0.3.tgz",
-      "integrity": "sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==",
       "license": "MIT",
       "dependencies": {
         "@types/unist": "^3.0.0",
@@ -39944,8 +40802,6 @@
     },
     "node_modules/rehype-raw/node_modules/vfile-message": {
       "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-4.0.2.tgz",
-      "integrity": "sha512-jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw==",
       "license": "MIT",
       "dependencies": {
         "@types/unist": "^3.0.0",
@@ -39958,8 +40814,6 @@
     },
     "node_modules/rehype-sanitize": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/rehype-sanitize/-/rehype-sanitize-6.0.0.tgz",
-      "integrity": "sha512-CsnhKNsyI8Tub6L4sm5ZFsme4puGfc6pYylvXo1AeqaGbjOYyzNv3qZPwvs0oMJ39eryyeOdmxwUIo94IpEhqg==",
       "license": "MIT",
       "dependencies": {
         "@types/hast": "^3.0.0",
@@ -39972,8 +40826,6 @@
     },
     "node_modules/rehype-sanitize/node_modules/@types/hast": {
       "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.4.tgz",
-      "integrity": "sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==",
       "license": "MIT",
       "dependencies": {
         "@types/unist": "*"
@@ -39981,8 +40833,6 @@
     },
     "node_modules/rehype-slug": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/rehype-slug/-/rehype-slug-6.0.0.tgz",
-      "integrity": "sha512-lWyvf/jwu+oS5+hL5eClVd3hNdmwM1kAC0BUvEGD19pajQMIzcNUd/k9GsfQ+FfECvX+JE+e9/btsKH0EjJT6A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -39999,8 +40849,6 @@
     },
     "node_modules/rehype-slug/node_modules/@types/hast": {
       "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.4.tgz",
-      "integrity": "sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -40009,15 +40857,11 @@
     },
     "node_modules/rehype-slug/node_modules/@types/unist": {
       "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz",
-      "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/rehype-slug/node_modules/unist-util-visit": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-5.0.0.tgz",
-      "integrity": "sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -40032,8 +40876,6 @@
     },
     "node_modules/relateurl": {
       "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
-      "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -40042,8 +40884,6 @@
     },
     "node_modules/release-zalgo": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/release-zalgo/-/release-zalgo-1.0.0.tgz",
-      "integrity": "sha512-gUAyHVHPPC5wdqX/LG4LWtRYtgjxyX78oanFNTMMyFEfOqdC54s3eE82imuWKbOeqYht2CrNf64Qb8vgmmtZGA==",
       "dev": true,
       "license": "ISC",
       "peer": true,
@@ -40056,8 +40896,6 @@
     },
     "node_modules/remark-gfm": {
       "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/remark-gfm/-/remark-gfm-4.0.1.tgz",
-      "integrity": "sha512-1quofZ2RQ9EWdeN34S79+KExV1764+wCUGop5CPL1WGdD0ocPpu91lzPGbwWMECpEpd42kJGQwzRfyov9j4yNg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -40075,15 +40913,11 @@
     },
     "node_modules/remark-gfm/node_modules/@types/unist": {
       "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz",
-      "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/remark-gfm/node_modules/is-plain-obj": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz",
-      "integrity": "sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -40095,8 +40929,6 @@
     },
     "node_modules/remark-gfm/node_modules/remark-parse": {
       "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-11.0.0.tgz",
-      "integrity": "sha512-FCxlKLNGknS5ba/1lmpYijMUzX2esxW5xQqjWxw2eHFfS2MSdaHVINFmhjo+qN1WhZhNimq0dZATN9pH0IDrpA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -40112,8 +40944,6 @@
     },
     "node_modules/remark-gfm/node_modules/unified": {
       "version": "11.0.5",
-      "resolved": "https://registry.npmjs.org/unified/-/unified-11.0.5.tgz",
-      "integrity": "sha512-xKvGhPWw3k84Qjh8bI3ZeJjqnyadK+GEFtazSfZv/rKeTkTjOJho6mFqh2SM96iIcZokxiOpg78GazTSg8+KHA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -40132,8 +40962,6 @@
     },
     "node_modules/remark-gfm/node_modules/vfile": {
       "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/vfile/-/vfile-6.0.3.tgz",
-      "integrity": "sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -40147,8 +40975,6 @@
     },
     "node_modules/remark-gfm/node_modules/vfile-message": {
       "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-4.0.2.tgz",
-      "integrity": "sha512-jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -40162,8 +40988,6 @@
     },
     "node_modules/remark-parse": {
       "version": "10.0.2",
-      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-10.0.2.tgz",
-      "integrity": "sha512-3ydxgHa/ZQzG8LvC7jTXccARYDcRld3VfcgIIFs7bI6vbRSxJJmzgLEIIoYKyrfhaY+ujuWaf/PJiMZXoiCXgw==",
       "license": "MIT",
       "dependencies": {
         "@types/mdast": "^3.0.0",
@@ -40177,8 +41001,6 @@
     },
     "node_modules/remark-parse/node_modules/@types/mdast": {
       "version": "3.0.15",
-      "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.15.tgz",
-      "integrity": "sha512-LnwD+mUEfxWMa1QpDraczIn6k0Ee3SMicuYSSzS6ZYl2gKS09EClnJYGd8Du6rfc5r/GZEk5o1mRb8TaTj03sQ==",
       "license": "MIT",
       "dependencies": {
         "@types/unist": "^2"
@@ -40186,8 +41008,6 @@
     },
     "node_modules/remark-parse/node_modules/mdast-util-from-markdown": {
       "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-1.3.1.tgz",
-      "integrity": "sha512-4xTO/M8c82qBcnQc1tgpNtubGUW/Y1tBQ1B0i5CtSoelOLKFYlElIr3bvgREYYO5iRqbMY1YuqZng0GVOI8Qww==",
       "license": "MIT",
       "dependencies": {
         "@types/mdast": "^3.0.0",
@@ -40210,8 +41030,6 @@
     },
     "node_modules/remark-parse/node_modules/mdast-util-to-string": {
       "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-3.2.0.tgz",
-      "integrity": "sha512-V4Zn/ncyN1QNSqSBxTrMOLpjr+IKdHl2v3KVLoWmDPscP4r9GcCi71gjgvUV1SFSKh92AjAG4peFuBl2/YgCJg==",
       "license": "MIT",
       "dependencies": {
         "@types/mdast": "^3.0.0"
@@ -40223,8 +41041,6 @@
     },
     "node_modules/remark-parse/node_modules/micromark": {
       "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/micromark/-/micromark-3.2.0.tgz",
-      "integrity": "sha512-uD66tJj54JLYq0De10AhWycZWGQNUvDI55xPgk2sQM5kn1JYlhbCMTtEeT27+vAhW2FBQxLlOmS3pmA7/2z4aA==",
       "funding": [
         {
           "type": "GitHub Sponsors",
@@ -40258,8 +41074,6 @@
     },
     "node_modules/remark-parse/node_modules/micromark-core-commonmark": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/micromark-core-commonmark/-/micromark-core-commonmark-1.1.0.tgz",
-      "integrity": "sha512-BgHO1aRbolh2hcrzL2d1La37V0Aoz73ymF8rAcKnohLy93titmv62E0gP8Hrx9PKcKrqCZ1BbLGbP3bEhoXYlw==",
       "funding": [
         {
           "type": "GitHub Sponsors",
@@ -40292,8 +41106,6 @@
     },
     "node_modules/remark-parse/node_modules/micromark-factory-destination": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/micromark-factory-destination/-/micromark-factory-destination-1.1.0.tgz",
-      "integrity": "sha512-XaNDROBgx9SgSChd69pjiGKbV+nfHGDPVYFs5dOoDd7ZnMAE+Cuu91BCpsY8RT2NP9vo/B8pds2VQNCLiu0zhg==",
       "funding": [
         {
           "type": "GitHub Sponsors",
@@ -40313,8 +41125,6 @@
     },
     "node_modules/remark-parse/node_modules/micromark-factory-label": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/micromark-factory-label/-/micromark-factory-label-1.1.0.tgz",
-      "integrity": "sha512-OLtyez4vZo/1NjxGhcpDSbHQ+m0IIGnT8BoPamh+7jVlzLJBH98zzuCoUeMxvM6WsNeh8wx8cKvqLiPHEACn0w==",
       "funding": [
         {
           "type": "GitHub Sponsors",
@@ -40335,8 +41145,6 @@
     },
     "node_modules/remark-parse/node_modules/micromark-factory-space": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/micromark-factory-space/-/micromark-factory-space-1.1.0.tgz",
-      "integrity": "sha512-cRzEj7c0OL4Mw2v6nwzttyOZe8XY/Z8G0rzmWQZTBi/jjwyw/U4uqKtUORXQrR5bAZZnbTI/feRV/R7hc4jQYQ==",
       "funding": [
         {
           "type": "GitHub Sponsors",
@@ -40355,8 +41163,6 @@
     },
     "node_modules/remark-parse/node_modules/micromark-factory-title": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/micromark-factory-title/-/micromark-factory-title-1.1.0.tgz",
-      "integrity": "sha512-J7n9R3vMmgjDOCY8NPw55jiyaQnH5kBdV2/UXCtZIpnHH3P6nHUKaH7XXEYuWwx/xUJcawa8plLBEjMPU24HzQ==",
       "funding": [
         {
           "type": "GitHub Sponsors",
@@ -40377,8 +41183,6 @@
     },
     "node_modules/remark-parse/node_modules/micromark-factory-whitespace": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/micromark-factory-whitespace/-/micromark-factory-whitespace-1.1.0.tgz",
-      "integrity": "sha512-v2WlmiymVSp5oMg+1Q0N1Lxmt6pMhIHD457whWM7/GUlEks1hI9xj5w3zbc4uuMKXGisksZk8DzP2UyGbGqNsQ==",
       "funding": [
         {
           "type": "GitHub Sponsors",
@@ -40399,8 +41203,6 @@
     },
     "node_modules/remark-parse/node_modules/micromark-util-character": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-1.2.0.tgz",
-      "integrity": "sha512-lXraTwcX3yH/vMDaFWCQJP1uIszLVebzUa3ZHdrgxr7KEU/9mL4mVgCpGbyhvNLNlauROiNUq7WN5u7ndbY6xg==",
       "funding": [
         {
           "type": "GitHub Sponsors",
@@ -40419,8 +41221,6 @@
     },
     "node_modules/remark-parse/node_modules/micromark-util-chunked": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/micromark-util-chunked/-/micromark-util-chunked-1.1.0.tgz",
-      "integrity": "sha512-Ye01HXpkZPNcV6FiyoW2fGZDUw4Yc7vT0E9Sad83+bEDiCJ1uXu0S3mr8WLpsz3HaG3x2q0HM6CTuPdcZcluFQ==",
       "funding": [
         {
           "type": "GitHub Sponsors",
@@ -40438,8 +41238,6 @@
     },
     "node_modules/remark-parse/node_modules/micromark-util-classify-character": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/micromark-util-classify-character/-/micromark-util-classify-character-1.1.0.tgz",
-      "integrity": "sha512-SL0wLxtKSnklKSUplok1WQFoGhUdWYKggKUiqhX+Swala+BtptGCu5iPRc+xvzJ4PXE/hwM3FNXsfEVgoZsWbw==",
       "funding": [
         {
           "type": "GitHub Sponsors",
@@ -40459,8 +41257,6 @@
     },
     "node_modules/remark-parse/node_modules/micromark-util-combine-extensions": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/micromark-util-combine-extensions/-/micromark-util-combine-extensions-1.1.0.tgz",
-      "integrity": "sha512-Q20sp4mfNf9yEqDL50WwuWZHUrCO4fEyeDCnMGmG5Pr0Cz15Uo7KBs6jq+dq0EgX4DPwwrh9m0X+zPV1ypFvUA==",
       "funding": [
         {
           "type": "GitHub Sponsors",
@@ -40479,8 +41275,6 @@
     },
     "node_modules/remark-parse/node_modules/micromark-util-decode-numeric-character-reference": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/micromark-util-decode-numeric-character-reference/-/micromark-util-decode-numeric-character-reference-1.1.0.tgz",
-      "integrity": "sha512-m9V0ExGv0jB1OT21mrWcuf4QhP46pH1KkfWy9ZEezqHKAxkj4mPCy3nIH1rkbdMlChLHX531eOrymlwyZIf2iw==",
       "funding": [
         {
           "type": "GitHub Sponsors",
@@ -40498,8 +41292,6 @@
     },
     "node_modules/remark-parse/node_modules/micromark-util-decode-string": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/micromark-util-decode-string/-/micromark-util-decode-string-1.1.0.tgz",
-      "integrity": "sha512-YphLGCK8gM1tG1bd54azwyrQRjCFcmgj2S2GoJDNnh4vYtnL38JS8M4gpxzOPNyHdNEpheyWXCTnnTDY3N+NVQ==",
       "funding": [
         {
           "type": "GitHub Sponsors",
@@ -40520,8 +41312,6 @@
     },
     "node_modules/remark-parse/node_modules/micromark-util-encode": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/micromark-util-encode/-/micromark-util-encode-1.1.0.tgz",
-      "integrity": "sha512-EuEzTWSTAj9PA5GOAs992GzNh2dGQO52UvAbtSOMvXTxv3Criqb6IOzJUBCmEqrrXSblJIJBbFFv6zPxpreiJw==",
       "funding": [
         {
           "type": "GitHub Sponsors",
@@ -40536,8 +41326,6 @@
     },
     "node_modules/remark-parse/node_modules/micromark-util-html-tag-name": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/micromark-util-html-tag-name/-/micromark-util-html-tag-name-1.2.0.tgz",
-      "integrity": "sha512-VTQzcuQgFUD7yYztuQFKXT49KghjtETQ+Wv/zUjGSGBioZnkA4P1XXZPT1FHeJA6RwRXSF47yvJ1tsJdoxwO+Q==",
       "funding": [
         {
           "type": "GitHub Sponsors",
@@ -40552,8 +41340,6 @@
     },
     "node_modules/remark-parse/node_modules/micromark-util-normalize-identifier": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/micromark-util-normalize-identifier/-/micromark-util-normalize-identifier-1.1.0.tgz",
-      "integrity": "sha512-N+w5vhqrBihhjdpM8+5Xsxy71QWqGn7HYNUvch71iV2PM7+E3uWGox1Qp90loa1ephtCxG2ftRV/Conitc6P2Q==",
       "funding": [
         {
           "type": "GitHub Sponsors",
@@ -40571,8 +41357,6 @@
     },
     "node_modules/remark-parse/node_modules/micromark-util-resolve-all": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/micromark-util-resolve-all/-/micromark-util-resolve-all-1.1.0.tgz",
-      "integrity": "sha512-b/G6BTMSg+bX+xVCshPTPyAu2tmA0E4X98NSR7eIbeC6ycCqCeE7wjfDIgzEbkzdEVJXRtOG4FbEm/uGbCRouA==",
       "funding": [
         {
           "type": "GitHub Sponsors",
@@ -40590,8 +41374,6 @@
     },
     "node_modules/remark-parse/node_modules/micromark-util-sanitize-uri": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-1.2.0.tgz",
-      "integrity": "sha512-QO4GXv0XZfWey4pYFndLUKEAktKkG5kZTdUNaTAkzbuJxn2tNBOr+QtxR2XpWaMhbImT2dPzyLrPXLlPhph34A==",
       "funding": [
         {
           "type": "GitHub Sponsors",
@@ -40611,8 +41393,6 @@
     },
     "node_modules/remark-parse/node_modules/micromark-util-subtokenize": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/micromark-util-subtokenize/-/micromark-util-subtokenize-1.1.0.tgz",
-      "integrity": "sha512-kUQHyzRoxvZO2PuLzMt2P/dwVsTiivCK8icYTeR+3WgbuPqfHgPPy7nFKbeqRivBvn/3N3GBiNC+JRTMSxEC7A==",
       "funding": [
         {
           "type": "GitHub Sponsors",
@@ -40633,8 +41413,6 @@
     },
     "node_modules/remark-parse/node_modules/micromark-util-symbol": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-1.1.0.tgz",
-      "integrity": "sha512-uEjpEYY6KMs1g7QfJ2eX1SQEV+ZT4rUD3UcF6l57acZvLNK7PBZL+ty82Z1qhK1/yXIY4bdx04FKMgR0g4IAag==",
       "funding": [
         {
           "type": "GitHub Sponsors",
@@ -40649,8 +41427,6 @@
     },
     "node_modules/remark-parse/node_modules/micromark-util-types": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/micromark-util-types/-/micromark-util-types-1.1.0.tgz",
-      "integrity": "sha512-ukRBgie8TIAcacscVHSiddHjO4k/q3pnedmzMQ4iwDcK0FtFCohKOlFbaOL/mPgfnPsL3C1ZyxJa4sbWrBl3jg==",
       "funding": [
         {
           "type": "GitHub Sponsors",
@@ -40665,8 +41441,6 @@
     },
     "node_modules/remark-parse/node_modules/unist-util-stringify-position": {
       "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.3.tgz",
-      "integrity": "sha512-k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg==",
       "license": "MIT",
       "dependencies": {
         "@types/unist": "^2.0.0"
@@ -40678,8 +41452,6 @@
     },
     "node_modules/remark-rehype": {
       "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/remark-rehype/-/remark-rehype-10.1.0.tgz",
-      "integrity": "sha512-EFmR5zppdBp0WQeDVZ/b66CWJipB2q2VLNFMabzDSGR66Z2fQii83G5gTBbgGEnEEA0QRussvrFHxk1HWGJskw==",
       "license": "MIT",
       "dependencies": {
         "@types/hast": "^2.0.0",
@@ -40694,8 +41466,6 @@
     },
     "node_modules/remark-rehype/node_modules/@types/mdast": {
       "version": "3.0.15",
-      "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.15.tgz",
-      "integrity": "sha512-LnwD+mUEfxWMa1QpDraczIn6k0Ee3SMicuYSSzS6ZYl2gKS09EClnJYGd8Du6rfc5r/GZEk5o1mRb8TaTj03sQ==",
       "license": "MIT",
       "dependencies": {
         "@types/unist": "^2"
@@ -40703,8 +41473,6 @@
     },
     "node_modules/remark-rehype/node_modules/mdast-util-to-hast": {
       "version": "12.3.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-12.3.0.tgz",
-      "integrity": "sha512-pits93r8PhnIoU4Vy9bjW39M2jJ6/tdHyja9rrot9uujkN7UTU9SDnE6WNJz/IGyQk3XHX6yNNtrBH6cQzm8Hw==",
       "license": "MIT",
       "dependencies": {
         "@types/hast": "^2.0.0",
@@ -40723,8 +41491,6 @@
     },
     "node_modules/remark-rehype/node_modules/micromark-util-character": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-1.2.0.tgz",
-      "integrity": "sha512-lXraTwcX3yH/vMDaFWCQJP1uIszLVebzUa3ZHdrgxr7KEU/9mL4mVgCpGbyhvNLNlauROiNUq7WN5u7ndbY6xg==",
       "funding": [
         {
           "type": "GitHub Sponsors",
@@ -40743,8 +41509,6 @@
     },
     "node_modules/remark-rehype/node_modules/micromark-util-encode": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/micromark-util-encode/-/micromark-util-encode-1.1.0.tgz",
-      "integrity": "sha512-EuEzTWSTAj9PA5GOAs992GzNh2dGQO52UvAbtSOMvXTxv3Criqb6IOzJUBCmEqrrXSblJIJBbFFv6zPxpreiJw==",
       "funding": [
         {
           "type": "GitHub Sponsors",
@@ -40759,8 +41523,6 @@
     },
     "node_modules/remark-rehype/node_modules/micromark-util-sanitize-uri": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-1.2.0.tgz",
-      "integrity": "sha512-QO4GXv0XZfWey4pYFndLUKEAktKkG5kZTdUNaTAkzbuJxn2tNBOr+QtxR2XpWaMhbImT2dPzyLrPXLlPhph34A==",
       "funding": [
         {
           "type": "GitHub Sponsors",
@@ -40780,8 +41542,6 @@
     },
     "node_modules/remark-rehype/node_modules/micromark-util-symbol": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-1.1.0.tgz",
-      "integrity": "sha512-uEjpEYY6KMs1g7QfJ2eX1SQEV+ZT4rUD3UcF6l57acZvLNK7PBZL+ty82Z1qhK1/yXIY4bdx04FKMgR0g4IAag==",
       "funding": [
         {
           "type": "GitHub Sponsors",
@@ -40796,8 +41556,6 @@
     },
     "node_modules/remark-rehype/node_modules/micromark-util-types": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/micromark-util-types/-/micromark-util-types-1.1.0.tgz",
-      "integrity": "sha512-ukRBgie8TIAcacscVHSiddHjO4k/q3pnedmzMQ4iwDcK0FtFCohKOlFbaOL/mPgfnPsL3C1ZyxJa4sbWrBl3jg==",
       "funding": [
         {
           "type": "GitHub Sponsors",
@@ -40812,8 +41570,6 @@
     },
     "node_modules/remark-rehype/node_modules/unist-util-position": {
       "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-4.0.4.tgz",
-      "integrity": "sha512-kUBE91efOWfIVBo8xzh/uZQ7p9ffYRtUbMRZBNFYwf0RK8koUMx6dGUfwylLOKmaT2cs4wSW96QoYUSXAyEtpg==",
       "license": "MIT",
       "dependencies": {
         "@types/unist": "^2.0.0"
@@ -40825,8 +41581,6 @@
     },
     "node_modules/remark-stringify": {
       "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-11.0.0.tgz",
-      "integrity": "sha512-1OSmLd3awB/t8qdoEOMazZkNsfVTeY4fTsgzcQFdXNq8ToTN4ZGwrMnlda4K6smTFKD+GRV6O48i6Z4iKgPPpw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -40841,15 +41595,11 @@
     },
     "node_modules/remark-stringify/node_modules/@types/unist": {
       "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz",
-      "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/remark-stringify/node_modules/is-plain-obj": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz",
-      "integrity": "sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -40861,8 +41611,6 @@
     },
     "node_modules/remark-stringify/node_modules/unified": {
       "version": "11.0.5",
-      "resolved": "https://registry.npmjs.org/unified/-/unified-11.0.5.tgz",
-      "integrity": "sha512-xKvGhPWw3k84Qjh8bI3ZeJjqnyadK+GEFtazSfZv/rKeTkTjOJho6mFqh2SM96iIcZokxiOpg78GazTSg8+KHA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -40881,8 +41629,6 @@
     },
     "node_modules/remark-stringify/node_modules/vfile": {
       "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/vfile/-/vfile-6.0.3.tgz",
-      "integrity": "sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -40896,8 +41642,6 @@
     },
     "node_modules/remark-stringify/node_modules/vfile-message": {
       "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-4.0.2.tgz",
-      "integrity": "sha512-jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -40911,20 +41655,14 @@
     },
     "node_modules/remove-accents": {
       "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/remove-accents/-/remove-accents-0.5.0.tgz",
-      "integrity": "sha512-8g3/Otx1eJaVD12e31UbJj1YzdtVvzH85HV7t+9MJYk/u3XmkOUJ5Ys9wQrf9PCPK8+xn4ymzqYCiZl6QWKn+A==",
       "license": "MIT"
     },
     "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==",
       "license": "ISC"
     },
     "node_modules/renderkid": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz",
-      "integrity": "sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -40935,10 +41673,71 @@
         "strip-ansi": "^6.0.1"
       }
     },
+    "node_modules/renderkid/node_modules/css-select": {
+      "version": "4.3.0",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "boolbase": "^1.0.0",
+        "css-what": "^6.0.1",
+        "domhandler": "^4.3.1",
+        "domutils": "^2.8.0",
+        "nth-check": "^2.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/renderkid/node_modules/dom-serializer": {
+      "version": "1.4.1",
+      "dev": true,
+      "license": "MIT",
+      "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/renderkid/node_modules/domhandler": {
+      "version": "4.3.1",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "domelementtype": "^2.2.0"
+      },
+      "engines": {
+        "node": ">= 4"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domhandler?sponsor=1"
+      }
+    },
+    "node_modules/renderkid/node_modules/domutils": {
+      "version": "2.8.0",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "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/renderkid/node_modules/entities": {
+      "version": "2.2.0",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
     "node_modules/renderkid/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": {
@@ -40950,8 +41749,6 @@
     },
     "node_modules/replace-ext": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-2.0.0.tgz",
-      "integrity": "sha512-UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug==",
       "license": "MIT",
       "engines": {
         "node": ">= 10"
@@ -40959,8 +41756,6 @@
     },
     "node_modules/request-progress": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-3.0.0.tgz",
-      "integrity": "sha512-MnWzEHHaxHO2iWiQuHrUPBi/1WeBf5PkxQqNyNvLl9VAYSdXkP8tQ3pBSeCPD+yw0v0Aq1zosWLz0BdeXpWwZg==",
       "license": "MIT",
       "dependencies": {
         "throttleit": "^1.0.0"
@@ -40968,8 +41763,6 @@
     },
     "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==",
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -40977,8 +41770,6 @@
     },
     "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==",
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -40986,23 +41777,17 @@
     },
     "node_modules/require-main-filename": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
       "dev": true,
       "license": "ISC",
       "peer": true
     },
     "node_modules/require-package-name": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/require-package-name/-/require-package-name-2.0.1.tgz",
-      "integrity": "sha512-uuoJ1hU/k6M0779t3VMVIYpb2VMJk05cehCaABFhXaibcbvfgR8wKiozLjVFSzJPmQMRqIcO0HMyTFqfV09V6Q==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/requireindex": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/requireindex/-/requireindex-1.2.0.tgz",
-      "integrity": "sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -41011,27 +41796,19 @@
     },
     "node_modules/requires-port": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/reselect": {
       "version": "4.1.8",
-      "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.1.8.tgz",
-      "integrity": "sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ==",
       "license": "MIT"
     },
     "node_modules/resize-observer-polyfill": {
       "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
-      "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==",
       "license": "MIT"
     },
     "node_modules/resolve": {
       "version": "1.22.10",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
-      "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",
       "license": "MIT",
       "dependencies": {
         "is-core-module": "^2.16.0",
@@ -41050,15 +41827,11 @@
     },
     "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==",
       "dev": true,
       "license": "MIT"
     },
     "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": {
@@ -41070,8 +41843,6 @@
     },
     "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==",
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -41079,14 +41850,10 @@
     },
     "node_modules/resolve-pathname": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-3.0.0.tgz",
-      "integrity": "sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng==",
       "license": "MIT"
     },
     "node_modules/resolve-pkg-maps": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz",
-      "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==",
       "dev": true,
       "license": "MIT",
       "funding": {
@@ -41095,8 +41862,6 @@
     },
     "node_modules/resolve-protobuf-schema": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/resolve-protobuf-schema/-/resolve-protobuf-schema-2.1.0.tgz",
-      "integrity": "sha512-kI5ffTiZWmJaS/huM8wZfEMer1eRd7oJQhDuxeCLe3t7N7mX3z94CN0xPxBQxFYQTSNz9T0i+v6inKqSdK8xrQ==",
       "license": "MIT",
       "dependencies": {
         "protocol-buffers-schema": "^3.3.1"
@@ -41104,8 +41869,6 @@
     },
     "node_modules/resolve.exports": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.3.tgz",
-      "integrity": "sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -41114,8 +41877,6 @@
     },
     "node_modules/responselike": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz",
-      "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -41127,8 +41888,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "onetime": "^5.1.0",
@@ -41139,19 +41898,17 @@
       }
     },
     "node_modules/ret": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/ret/-/ret-0.4.3.tgz",
-      "integrity": "sha512-0f4Memo5QP7WQyUEAYUO3esD/XjOc3Zjjg5CPsAq1p8sIu0XPeMbHJemKA0BO7tV0X7+A0FoEpbmHXWxPyD3wQ==",
+      "version": "0.1.15",
       "dev": true,
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "engines": {
-        "node": ">=10"
+        "node": ">=0.12"
       }
     },
     "node_modules/retry": {
       "version": "0.13.1",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
-      "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -41159,9 +41916,7 @@
       }
     },
     "node_modules/reusify": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz",
-      "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==",
+      "version": "1.0.4",
       "license": "MIT",
       "engines": {
         "iojs": ">=1.0.0",
@@ -41170,149 +41925,42 @@
     },
     "node_modules/rfdc": {
       "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz",
-      "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==",
       "license": "MIT"
     },
     "node_modules/rgbcolor": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/rgbcolor/-/rgbcolor-1.0.1.tgz",
-      "integrity": "sha512-9aZLIrhRaD97sgVhtJOW6ckOEh6/GnvQtdVNfdZ6s67+3/XwLS9lBcQYzEEhYVeUowN7pRzMLsyGhK2i/xvWbw==",
       "license": "MIT OR SEE LICENSE IN FEEL-FREE.md",
       "optional": true,
       "engines": {
         "node": ">= 0.8.15"
       }
     },
-    "node_modules/rimraf": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-6.0.1.tgz",
-      "integrity": "sha512-9dkvaxAsk/xNXSJzMgFqqMCuFgt2+KsOFek3TMLfo8NCPfWpBmqwyNn5Y+NX56QUYfCtsyhF3ayiboEoUmJk/A==",
-      "license": "ISC",
-      "dependencies": {
-        "glob": "^11.0.0",
-        "package-json-from-dist": "^1.0.0"
-      },
-      "bin": {
-        "rimraf": "dist/esm/bin.mjs"
-      },
-      "engines": {
-        "node": "20 || >=22"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/rimraf/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==",
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/rimraf/node_modules/glob": {
-      "version": "11.0.2",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-11.0.2.tgz",
-      "integrity": "sha512-YT7U7Vye+t5fZ/QMkBFrTJ7ZQxInIUjwyAjVj84CYXqgBdv30MFUPGnBR6sQaVq6Is15wYJUsnzTuWaGRBhBAQ==",
-      "license": "ISC",
-      "dependencies": {
-        "foreground-child": "^3.1.0",
-        "jackspeak": "^4.0.1",
-        "minimatch": "^10.0.0",
-        "minipass": "^7.1.2",
-        "package-json-from-dist": "^1.0.0",
-        "path-scurry": "^2.0.0"
-      },
-      "bin": {
-        "glob": "dist/esm/bin.mjs"
-      },
-      "engines": {
-        "node": "20 || >=22"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/rimraf/node_modules/jackspeak": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.1.1.tgz",
-      "integrity": "sha512-zptv57P3GpL+O0I7VdMJNBZCu+BPHVQUk55Ft8/QCJjTVxrnJHuVuX/0Bl2A6/+2oyR/ZMEuFKwmzqqZ/U5nPQ==",
-      "license": "BlueOak-1.0.0",
-      "dependencies": {
-        "@isaacs/cliui": "^8.0.2"
-      },
-      "engines": {
-        "node": "20 || >=22"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/rimraf/node_modules/lru-cache": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.1.0.tgz",
-      "integrity": "sha512-QIXZUBJUx+2zHUdQujWejBkcD9+cs94tLn0+YL8UrCh+D5sCXZ4c7LaEH48pNwRY3MLDgqUFyhlCyjJPf1WP0A==",
-      "license": "ISC",
-      "engines": {
-        "node": "20 || >=22"
-      }
-    },
-    "node_modules/rimraf/node_modules/minimatch": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.1.tgz",
-      "integrity": "sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==",
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": "20 || >=22"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/rimraf/node_modules/path-scurry": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.0.tgz",
-      "integrity": "sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==",
-      "license": "BlueOak-1.0.0",
-      "dependencies": {
-        "lru-cache": "^11.0.0",
-        "minipass": "^7.1.2"
-      },
-      "engines": {
-        "node": "20 || >=22"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/rison": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/rison/-/rison-0.1.1.tgz",
-      "integrity": "sha512-8C+/PKKTaAYE2quDtOUwny/eQpNn9YGby7T80wntbVWSGvw0aUT9M0YgLdLkUgIQzQwaB1ZTr80rwLVKyohHig==",
       "license": "Apache-2.0"
     },
     "node_modules/robust-predicates": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/robust-predicates/-/robust-predicates-3.0.2.tgz",
-      "integrity": "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg==",
       "license": "Unlicense"
     },
     "node_modules/rrweb-cssom": {
       "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.8.0.tgz",
-      "integrity": "sha512-guoltQEx+9aMf2gDZ0s62EcV8lsXR+0w8915TC3ITdn2YueuNjdAYh/levpU9nFaoChh9RUS5ZdQMrKfVEN9tw==",
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/rst-selector-parser": {
+      "version": "2.2.3",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "lodash.flattendeep": "^4.4.0",
+        "nearley": "^2.7.10"
+      }
+    },
     "node_modules/run-applescript": {
       "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/run-applescript/-/run-applescript-7.0.0.tgz",
-      "integrity": "sha512-9by4Ij99JUr/MCFBUkDKLWK3G9HVXmabKz9U5MlIAIuvuzkiOicRYs8XJLxX+xahD+mLiiCYDqF9dKAgtzKP1A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -41323,19 +41971,15 @@
       }
     },
     "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,
+      "version": "3.0.0",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=0.12.0"
       }
     },
     "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==",
       "funding": [
         {
           "type": "github",
@@ -41356,14 +42000,10 @@
       }
     },
     "node_modules/rw": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/rw/-/rw-0.1.4.tgz",
-      "integrity": "sha512-vSj3D96kMcjNyqPcp65wBRIDImGSrUuMxngNNxvw8MQaO+aQ6llzRPH7XcJy5zrpb3wU++045+Uz/IDIM684iw=="
+      "version": "0.1.4"
     },
     "node_modules/rxjs": {
-      "version": "7.8.2",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz",
-      "integrity": "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==",
+      "version": "7.8.1",
       "license": "Apache-2.0",
       "dependencies": {
         "tslib": "^2.1.0"
@@ -41371,8 +42011,6 @@
     },
     "node_modules/sade": {
       "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/sade/-/sade-1.8.1.tgz",
-      "integrity": "sha512-xal3CZX1Xlo/k4ApwCFrHVACi9fBqJ7V+mwhBsuf/1IOKbBy098Fex+Wa/5QMubw09pSZ/u8EY8PWgevJsXp1A==",
       "license": "MIT",
       "dependencies": {
         "mri": "^1.1.0"
@@ -41383,8 +42021,6 @@
     },
     "node_modules/safe-array-concat": {
       "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz",
-      "integrity": "sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==",
       "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.8",
@@ -41402,8 +42038,6 @@
     },
     "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==",
       "funding": [
         {
           "type": "github",
@@ -41422,8 +42056,6 @@
     },
     "node_modules/safe-push-apply": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz",
-      "integrity": "sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==",
       "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0",
@@ -41438,8 +42070,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.2",
@@ -41455,18 +42085,22 @@
     },
     "node_modules/safe-regex2": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/safe-regex2/-/safe-regex2-3.1.0.tgz",
-      "integrity": "sha512-RAAZAGbap2kBfbVhvmnTFv73NWLMvDGOITFYTZBAaY8eR+Ir4ef7Up/e7amo+y1+AH+3PtLkrt9mvcTsG9LXug==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "ret": "~0.4.0"
       }
     },
+    "node_modules/safe-regex2/node_modules/ret": {
+      "version": "0.4.3",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/safe-stable-stringify": {
       "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.5.0.tgz",
-      "integrity": "sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA==",
       "license": "MIT",
       "engines": {
         "node": ">=10"
@@ -41474,22 +42108,14 @@
     },
     "node_modules/safer-buffer": {
       "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
       "license": "MIT"
     },
     "node_modules/sax": {
       "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz",
-      "integrity": "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==",
-      "dev": true,
-      "license": "ISC",
-      "optional": true
+      "license": "ISC"
     },
     "node_modules/saxes": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz",
-      "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -41500,18 +42126,16 @@
       }
     },
     "node_modules/scheduler": {
-      "version": "0.23.2",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",
-      "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==",
+      "version": "0.20.2",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "loose-envify": "^1.1.0"
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1"
       }
     },
     "node_modules/schema-utils": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.2.tgz",
-      "integrity": "sha512-Gn/JaSk/Mt9gYubxTtSn/QCV4em9mpAPiR1rqy/Ocu19u/G9J5WWdNoUT4SiV6mFC3y6cxyFcFwdzPM3FgxGAQ==",
+      "version": "4.3.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -41530,8 +42154,6 @@
     },
     "node_modules/scroll-into-view-if-needed": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/scroll-into-view-if-needed/-/scroll-into-view-if-needed-3.1.0.tgz",
-      "integrity": "sha512-49oNpRjWRvnU8NyGVmUaYG4jtTkNonFZI86MmGRDqBphEK2EXT9gdEUoQPZhuBM8yWHxCWbobltqYO5M4XrUvQ==",
       "license": "MIT",
       "dependencies": {
         "compute-scroll-into-view": "^3.0.2"
@@ -41539,28 +42161,20 @@
     },
     "node_modules/secure-json-parse": {
       "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/secure-json-parse/-/secure-json-parse-2.7.0.tgz",
-      "integrity": "sha512-6aU+Rwsezw7VR8/nyvKTx8QpWH9FrcYiXXlqC4z5d5XQBDRqtbfsRjnwGyqbi3gddNtWHuEk9OANUotL26qKUw==",
       "dev": true,
       "license": "BSD-3-Clause"
     },
     "node_modules/seedrandom": {
       "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/seedrandom/-/seedrandom-3.0.5.tgz",
-      "integrity": "sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg==",
       "license": "MIT"
     },
     "node_modules/select-hose": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
-      "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/selfsigned": {
       "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.4.1.tgz",
-      "integrity": "sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -41571,10 +42185,307 @@
         "node": ">=10"
       }
     },
+    "node_modules/semantic-release": {
+      "version": "24.2.5",
+      "license": "MIT",
+      "dependencies": {
+        "@semantic-release/commit-analyzer": "^13.0.0-beta.1",
+        "@semantic-release/error": "^4.0.0",
+        "@semantic-release/github": "^11.0.0",
+        "@semantic-release/npm": "^12.0.0",
+        "@semantic-release/release-notes-generator": "^14.0.0-beta.1",
+        "aggregate-error": "^5.0.0",
+        "cosmiconfig": "^9.0.0",
+        "debug": "^4.0.0",
+        "env-ci": "^11.0.0",
+        "execa": "^9.0.0",
+        "figures": "^6.0.0",
+        "find-versions": "^6.0.0",
+        "get-stream": "^6.0.0",
+        "git-log-parser": "^1.2.0",
+        "hook-std": "^3.0.0",
+        "hosted-git-info": "^8.0.0",
+        "import-from-esm": "^2.0.0",
+        "lodash-es": "^4.17.21",
+        "marked": "^15.0.0",
+        "marked-terminal": "^7.3.0",
+        "micromatch": "^4.0.2",
+        "p-each-series": "^3.0.0",
+        "p-reduce": "^3.0.0",
+        "read-package-up": "^11.0.0",
+        "resolve-from": "^5.0.0",
+        "semver": "^7.3.2",
+        "semver-diff": "^4.0.0",
+        "signale": "^1.2.1",
+        "yargs": "^17.5.1"
+      },
+      "bin": {
+        "semantic-release": "bin/semantic-release.js"
+      },
+      "engines": {
+        "node": ">=20.8.1"
+      }
+    },
+    "node_modules/semantic-release/node_modules/@semantic-release/error": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/semantic-release/node_modules/@sindresorhus/merge-streams": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/semantic-release/node_modules/aggregate-error": {
+      "version": "5.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "clean-stack": "^5.2.0",
+        "indent-string": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/semantic-release/node_modules/argparse": {
+      "version": "2.0.1",
+      "license": "Python-2.0"
+    },
+    "node_modules/semantic-release/node_modules/clean-stack": {
+      "version": "5.2.0",
+      "license": "MIT",
+      "dependencies": {
+        "escape-string-regexp": "5.0.0"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/semantic-release/node_modules/cosmiconfig": {
+      "version": "9.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "env-paths": "^2.2.1",
+        "import-fresh": "^3.3.0",
+        "js-yaml": "^4.1.0",
+        "parse-json": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/d-fischer"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.9.5"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/semantic-release/node_modules/escape-string-regexp": {
+      "version": "5.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/semantic-release/node_modules/execa": {
+      "version": "9.6.0",
+      "license": "MIT",
+      "dependencies": {
+        "@sindresorhus/merge-streams": "^4.0.0",
+        "cross-spawn": "^7.0.6",
+        "figures": "^6.1.0",
+        "get-stream": "^9.0.0",
+        "human-signals": "^8.0.1",
+        "is-plain-obj": "^4.1.0",
+        "is-stream": "^4.0.1",
+        "npm-run-path": "^6.0.0",
+        "pretty-ms": "^9.2.0",
+        "signal-exit": "^4.1.0",
+        "strip-final-newline": "^4.0.0",
+        "yoctocolors": "^2.1.1"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.5.0"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "node_modules/semantic-release/node_modules/execa/node_modules/get-stream": {
+      "version": "9.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "@sec-ant/readable-stream": "^0.4.1",
+        "is-stream": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/semantic-release/node_modules/figures": {
+      "version": "6.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "is-unicode-supported": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/semantic-release/node_modules/hosted-git-info": {
+      "version": "8.1.0",
+      "license": "ISC",
+      "dependencies": {
+        "lru-cache": "^10.0.1"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/semantic-release/node_modules/human-signals": {
+      "version": "8.0.1",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=18.18.0"
+      }
+    },
+    "node_modules/semantic-release/node_modules/indent-string": {
+      "version": "5.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/semantic-release/node_modules/is-plain-obj": {
+      "version": "4.1.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/semantic-release/node_modules/is-stream": {
+      "version": "4.0.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/semantic-release/node_modules/js-yaml": {
+      "version": "4.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/semantic-release/node_modules/lru-cache": {
+      "version": "10.4.3",
+      "license": "ISC"
+    },
+    "node_modules/semantic-release/node_modules/npm-run-path": {
+      "version": "6.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "path-key": "^4.0.0",
+        "unicorn-magic": "^0.3.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/semantic-release/node_modules/p-reduce": {
+      "version": "3.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/semantic-release/node_modules/path-key": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/semantic-release/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "license": "ISC",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/semantic-release/node_modules/strip-final-newline": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/semantic-release/node_modules/unicorn-magic": {
+      "version": "0.3.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/semver": {
       "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
-      "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -41583,10 +42494,31 @@
         "node": ">=10"
       }
     },
+    "node_modules/semver-diff": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "semver": "^7.3.5"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/semver-regex": {
+      "version": "4.0.5",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "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": {
@@ -41610,8 +42542,6 @@
     },
     "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": {
@@ -41620,15 +42550,11 @@
     },
     "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": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "dev": true,
       "license": "MIT"
     },
     "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",
       "engines": {
@@ -41637,15 +42563,11 @@
     },
     "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,
       "license": "MIT"
     },
     "node_modules/serialize-javascript": {
       "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": {
@@ -41654,17 +42576,20 @@
     },
     "node_modules/serialize-query-params": {
       "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/serialize-query-params/-/serialize-query-params-1.3.6.tgz",
-      "integrity": "sha512-VlH7sfWNyPVZClPkRacopn6sn5uQMXBsjPVz1+pBHX895VpcYVznfJtZ49e6jymcrz+l/vowkepCZn/7xEAEdw==",
       "license": "ISC",
       "peerDependencies": {
         "query-string": ">=5.1.1"
       }
     },
+    "node_modules/serialize-to-js": {
+      "version": "3.1.2",
+      "license": "MIT",
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
     "node_modules/serve-index": {
       "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
-      "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -41682,8 +42607,6 @@
     },
     "node_modules/serve-index/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": {
@@ -41692,8 +42615,6 @@
     },
     "node_modules/serve-index/node_modules/depd": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -41702,8 +42623,6 @@
     },
     "node_modules/serve-index/node_modules/http-errors": {
       "version": "1.6.3",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-      "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -41718,29 +42637,21 @@
     },
     "node_modules/serve-index/node_modules/inherits": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
       "dev": true,
       "license": "ISC"
     },
     "node_modules/serve-index/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/serve-index/node_modules/setprototypeof": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
       "dev": true,
       "license": "ISC"
     },
     "node_modules/serve-index/node_modules/statuses": {
       "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -41749,8 +42660,6 @@
     },
     "node_modules/serve-static": {
       "version": "1.16.2",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
-      "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -41765,22 +42674,16 @@
     },
     "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-cookie-parser": {
       "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz",
-      "integrity": "sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ==",
       "dev": true,
       "license": "MIT"
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "define-data-property": "^1.1.4",
@@ -41796,8 +42699,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "define-data-property": "^1.1.4",
@@ -41811,8 +42712,6 @@
     },
     "node_modules/set-proto": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/set-proto/-/set-proto-1.0.0.tgz",
-      "integrity": "sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==",
       "license": "MIT",
       "dependencies": {
         "dunder-proto": "^1.0.1",
@@ -41825,15 +42724,11 @@
     },
     "node_modules/setprototypeof": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
       "dev": true,
       "license": "ISC"
     },
     "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,
       "license": "MIT",
       "dependencies": {
@@ -41845,20 +42740,10 @@
     },
     "node_modules/shallow-copy": {
       "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz",
-      "integrity": "sha512-b6i4ZpVuUxB9h5gfCxPiusKYkqTMOjEbBs4wMaFbkfia4yFv92UKZ6Df8WXcKbn08JNL/abvg3FnMAOfakDvUw==",
-      "license": "MIT"
-    },
-    "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==",
       "license": "MIT"
     },
     "node_modules/shapefile": {
       "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/shapefile/-/shapefile-0.3.1.tgz",
-      "integrity": "sha512-BZoPvnq4ULce0pyKiZUU4D8CdPl0Z1fpE73AeCkwyMbD2hpUeVA0s7jIE/wX8uWNruVeJV6e+rznPHBwuH5J6g==",
       "license": "BSD-3-Clause",
       "dependencies": {
         "d3-queue": "1",
@@ -41873,14 +42758,10 @@
     },
     "node_modules/shapefile/node_modules/d3-queue": {
       "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/d3-queue/-/d3-queue-1.2.3.tgz",
-      "integrity": "sha512-m6KtxX4V5pmVf1PqhH4SkQVMshSJfyCLM2vf2oFPi9FWFVT3+rtbCGerk766b/JXymHQDU3oqXHaZoiQ/e8yUQ==",
       "license": "BSD-3-Clause"
     },
     "node_modules/shapefile/node_modules/iconv-lite": {
       "version": "0.2.11",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz",
-      "integrity": "sha512-KhmFWgaQZY83Cbhi+ADInoUQ8Etn6BG5fikM9syeOjQltvR45h7cRKJ/9uvQEuD61I3Uju77yYce0/LhKVClQw==",
       "license": "MIT",
       "engines": {
         "node": ">=0.4.0"
@@ -41888,8 +42769,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "shebang-regex": "^3.0.0"
@@ -41900,17 +42779,13 @@
     },
     "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==",
       "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/shell-quote": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.3.tgz",
-      "integrity": "sha512-ObmnIF4hXNg1BqhnHmgbDETF8dLPCggZWBjkQfhZpbszZnYur5DUljTcCHii5LC3J5E0yeO/1LIMyH+UvHQgyw==",
+      "version": "1.8.2",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -41922,8 +42797,6 @@
     },
     "node_modules/side-channel": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
-      "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
       "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0",
@@ -41941,8 +42814,6 @@
     },
     "node_modules/side-channel-list": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
-      "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
       "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0",
@@ -41957,8 +42828,6 @@
     },
     "node_modules/side-channel-map": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
-      "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
       "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.2",
@@ -41975,8 +42844,6 @@
     },
     "node_modules/side-channel-weakmap": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
-      "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
       "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.2",
@@ -41994,14 +42861,89 @@
     },
     "node_modules/signal-exit": {
       "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
       "license": "ISC"
     },
+    "node_modules/signale": {
+      "version": "1.4.0",
+      "license": "MIT",
+      "dependencies": {
+        "chalk": "^2.3.2",
+        "figures": "^2.0.0",
+        "pkg-conf": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/signale/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/signale/node_modules/chalk": {
+      "version": "2.4.2",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/signale/node_modules/color-convert": {
+      "version": "1.9.3",
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/signale/node_modules/color-name": {
+      "version": "1.1.3",
+      "license": "MIT"
+    },
+    "node_modules/signale/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/signale/node_modules/figures": {
+      "version": "2.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "escape-string-regexp": "^1.0.5"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/signale/node_modules/has-flag": {
+      "version": "3.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/signale/node_modules/supports-color": {
+      "version": "5.5.0",
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/sigstore": {
       "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-2.3.1.tgz",
-      "integrity": "sha512-8G+/XDU8wNsJOQS5ysDVO0Etg9/2uA5gR9l4ZwijjlwxBcrU6RPfwi2+jJmbP+Ap1Hlp/nVAaEO4Fj22/SL2gQ==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -42017,14 +42959,12 @@
       }
     },
     "node_modules/simple-git": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-3.28.0.tgz",
-      "integrity": "sha512-Rs/vQRwsn1ILH1oBUy8NucJlXmnnLeLCfcvbSehkPzbv3wwoFWIdtfd6Ndo6ZPhlPsCZ60CPI4rxurnwAa+a2w==",
+      "version": "3.27.0",
       "license": "MIT",
       "dependencies": {
         "@kwsites/file-exists": "^1.1.1",
         "@kwsites/promise-deferred": "^1.1.1",
-        "debug": "^4.4.0"
+        "debug": "^4.3.5"
       },
       "funding": {
         "type": "github",
@@ -42032,9 +42972,7 @@
       }
     },
     "node_modules/simple-git/node_modules/debug": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
-      "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
+      "version": "4.4.0",
       "license": "MIT",
       "dependencies": {
         "ms": "^2.1.3"
@@ -42050,14 +42988,10 @@
     },
     "node_modules/simple-git/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==",
       "license": "MIT"
     },
     "node_modules/simple-swizzle": {
       "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
-      "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==",
       "license": "MIT",
       "dependencies": {
         "is-arrayish": "^0.3.1"
@@ -42065,14 +42999,10 @@
     },
     "node_modules/simple-swizzle/node_modules/is-arrayish": {
       "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
-      "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
       "license": "MIT"
     },
     "node_modules/simple-zstd": {
       "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/simple-zstd/-/simple-zstd-1.4.2.tgz",
-      "integrity": "sha512-kGYEvT33M5XfyQvvW4wxl3eKcWbdbCc1V7OZzuElnaXft0qbVzoIIXHXiCm3JCUki+MZKKmvjl8p2VGLJc5Y/A==",
       "license": "MIT",
       "dependencies": {
         "is-zst": "^1.0.0",
@@ -42083,8 +43013,6 @@
     },
     "node_modules/simple-zstd/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"
@@ -42092,8 +43020,6 @@
     },
     "node_modules/sinon": {
       "version": "18.0.1",
-      "resolved": "https://registry.npmjs.org/sinon/-/sinon-18.0.1.tgz",
-      "integrity": "sha512-a2N2TDY1uGviajJ6r4D1CyRAkzE9NNVlYOV1wX5xQDuAk0ONgzgRl0EjCQuRCPxOwp13ghsMwt9Gdldujs39qw==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
@@ -42111,8 +43037,6 @@
     },
     "node_modules/sinon/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": "BSD-3-Clause",
       "dependencies": {
@@ -42121,8 +43045,6 @@
     },
     "node_modules/sirv": {
       "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/sirv/-/sirv-2.0.4.tgz",
-      "integrity": "sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -42136,15 +43058,21 @@
     },
     "node_modules/sisteransi": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
-      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/skin-tone": {
+      "version": "2.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "unicode-emoji-modifier-base": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/slash": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
-      "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -42153,8 +43081,6 @@
     },
     "node_modules/slice-ansi": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
-      "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
       "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
@@ -42167,8 +43093,6 @@
     },
     "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",
       "engines": {
@@ -42178,8 +43102,6 @@
     },
     "node_modules/snake-case": {
       "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/snake-case/-/snake-case-3.0.4.tgz",
-      "integrity": "sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -42189,8 +43111,6 @@
     },
     "node_modules/sockjs": {
       "version": "0.3.24",
-      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
-      "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -42201,8 +43121,6 @@
     },
     "node_modules/sockjs/node_modules/uuid": {
       "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -42210,9 +43128,7 @@
       }
     },
     "node_modules/socks": {
-      "version": "2.8.4",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.4.tgz",
-      "integrity": "sha512-D3YaD0aRxR3mEcqnidIs7ReYJFVzWdd6fXJYUM8ixcQcJRGTka/b3saV0KflYhyVJXKhb947GndU35SxYNResQ==",
+      "version": "2.8.3",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -42226,8 +43142,6 @@
     },
     "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,
       "license": "MIT",
       "dependencies": {
@@ -42241,8 +43155,6 @@
     },
     "node_modules/socks-proxy-agent/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,
       "license": "MIT",
       "engines": {
@@ -42251,8 +43163,6 @@
     },
     "node_modules/sonic-boom": {
       "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/sonic-boom/-/sonic-boom-4.2.0.tgz",
-      "integrity": "sha512-INb7TM37/mAcsGmc9hyyI6+QR3rR1zVRu36B0NeGXKnOOLiZOfER5SA+N7X7k3yUYRzLWafduTDvJAfDswwEww==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -42261,24 +43171,18 @@
     },
     "node_modules/sort-asc": {
       "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/sort-asc/-/sort-asc-0.1.0.tgz",
-      "integrity": "sha512-jBgdDd+rQ+HkZF2/OHCmace5dvpos/aWQpcxuyRs9QUbPRnkEJmYVo81PIGpjIdpOcsnJ4rGjStfDHsbn+UVyw==",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/sort-desc": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/sort-desc/-/sort-desc-0.1.1.tgz",
-      "integrity": "sha512-jfZacW5SKOP97BF5rX5kQfJmRVZP5/adDUTY8fCSPvNcXDVpUEe2pr/iKGlcyZzchRJZrswnp68fgk3qBXgkJw==",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/sort-keys": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz",
-      "integrity": "sha512-/dPCrG1s3ePpWm6yBbxZq5Be1dXGLyLn9Z791chDC3NFrpkVbWGzkBwPN1knaciexFXgRJ7hzdnwZ4stHSDmjg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -42290,8 +43194,6 @@
     },
     "node_modules/sort-object": {
       "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/sort-object/-/sort-object-0.3.2.tgz",
-      "integrity": "sha512-aAQiEdqFTTdsvUFxXm3umdo04J7MRljoVGbBlkH7BgNsMvVNAJyGj7C/wV1A8wHWAJj/YikeZbfuCKqhggNWGA==",
       "dependencies": {
         "sort-asc": "^0.1.0",
         "sort-desc": "^0.1.1"
@@ -42302,25 +43204,22 @@
     },
     "node_modules/sort-object-keys": {
       "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/sort-object-keys/-/sort-object-keys-1.1.3.tgz",
-      "integrity": "sha512-855pvK+VkU7PaKYPc+Jjnmt4EzejQHyhhF33q31qG8x7maDzkeFhAAThdCYay11CISO+qAMwjOBP+fPZe0IPyg==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/sort-package-json": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/sort-package-json/-/sort-package-json-3.2.1.tgz",
-      "integrity": "sha512-rTfRdb20vuoAn7LDlEtCqOkYfl2X+Qze6cLbNOzcDpbmKEhJI30tTN44d5shbKJnXsvz24QQhlCm81Bag7EOKg==",
+      "version": "2.14.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "detect-indent": "^7.0.1",
-        "detect-newline": "^4.0.1",
-        "git-hooks-list": "^4.0.0",
+        "detect-newline": "^4.0.0",
+        "get-stdin": "^9.0.0",
+        "git-hooks-list": "^3.0.0",
         "is-plain-obj": "^4.1.0",
-        "semver": "^7.7.1",
+        "semver": "^7.6.0",
         "sort-object-keys": "^1.1.3",
-        "tinyglobby": "^0.2.12"
+        "tinyglobby": "^0.2.9"
       },
       "bin": {
         "sort-package-json": "cli.js"
@@ -42328,8 +43227,6 @@
     },
     "node_modules/sort-package-json/node_modules/detect-newline": {
       "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-4.0.1.tgz",
-      "integrity": "sha512-qE3Veg1YXzGHQhlA6jzebZN2qVf6NX+A7m7qlhCGG30dJixrAQhYOsJjsnBjJkCSmuOPpCk30145fr8FV0bzog==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -42341,8 +43238,6 @@
     },
     "node_modules/sort-package-json/node_modules/is-plain-obj": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz",
-      "integrity": "sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -42352,30 +43247,13 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/sort-package-json/node_modules/semver": {
-      "version": "7.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
-      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "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,
       "license": "MIT"
     },
     "node_modules/source-map": {
       "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
-      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
       "license": "BSD-3-Clause",
       "engines": {
         "node": ">= 8"
@@ -42383,8 +43261,6 @@
     },
     "node_modules/source-map-js": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.1.tgz",
-      "integrity": "sha512-4+TN2b3tqOCd/kaGRJ/sTYA0tR0mdXx26ipdolxcwtJVqEnqNYvlCAt1q3ypy4QMlYus+Zh34RNtYLoq2oQ4IA==",
       "dev": true,
       "license": "BSD-3-Clause",
       "engines": {
@@ -42393,8 +43269,6 @@
     },
     "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,
       "license": "MIT",
       "dependencies": {
@@ -42404,8 +43278,6 @@
     },
     "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,
       "license": "BSD-3-Clause",
       "engines": {
@@ -42414,18 +43286,18 @@
     },
     "node_modules/space-separated-tokens": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-2.0.2.tgz",
-      "integrity": "sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/wooorm"
       }
     },
+    "node_modules/spawn-error-forwarder": {
+      "version": "1.0.0",
+      "license": "MIT"
+    },
     "node_modules/spawn-wrap": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-2.0.0.tgz",
-      "integrity": "sha512-EeajNjfN9zMnULLwhZZQU3GWBoFNkbngTUPfaawT4RkMiviTxcX0qfhVbGey39mfctfDHkWtuecgQ8NJcyQWHg==",
       "dev": true,
       "license": "ISC",
       "peer": true,
@@ -42443,8 +43315,6 @@
     },
     "node_modules/spawn-wrap/node_modules/foreground-child": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz",
-      "integrity": "sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==",
       "dev": true,
       "license": "ISC",
       "peer": true,
@@ -42458,8 +43328,6 @@
     },
     "node_modules/spawn-wrap/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,
       "license": "MIT",
       "peer": true,
@@ -42475,9 +43343,6 @@
     },
     "node_modules/spawn-wrap/node_modules/rimraf": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "deprecated": "Rimraf versions prior to v4 are no longer supported",
       "dev": true,
       "license": "ISC",
       "peer": true,
@@ -42493,8 +43358,6 @@
     },
     "node_modules/spawn-wrap/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": "ISC",
       "peer": true,
@@ -42504,8 +43367,6 @@
     },
     "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==",
       "license": "Apache-2.0",
       "dependencies": {
         "spdx-expression-parse": "^3.0.0",
@@ -42514,14 +43375,10 @@
     },
     "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==",
       "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==",
       "license": "MIT",
       "dependencies": {
         "spdx-exceptions": "^2.1.0",
@@ -42530,14 +43387,10 @@
     },
     "node_modules/spdx-license-ids": {
       "version": "3.0.21",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.21.tgz",
-      "integrity": "sha512-Bvg/8F5XephndSK3JffaRqdT+gyhfqIPwDHpX80tJrF8QQRYMo8sNMeaZ2Dp5+jhwKnUmIOyFFQfHRkjJm5nXg==",
       "license": "CC0-1.0"
     },
     "node_modules/spdy": {
       "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
-      "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -42553,8 +43406,6 @@
     },
     "node_modules/spdy-transport": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
-      "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -42568,8 +43419,6 @@
     },
     "node_modules/specificity": {
       "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/specificity/-/specificity-0.4.1.tgz",
-      "integrity": "sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -42578,8 +43427,6 @@
     },
     "node_modules/speed-measure-webpack-plugin": {
       "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.5.0.tgz",
-      "integrity": "sha512-Re0wX5CtM6gW7bZA64ONOfEPEhwbiSF/vz6e2GvadjuaPrQcHTQdRGsD8+BE7iUOysXH8tIenkPCQBEcspXsNg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -42594,8 +43441,6 @@
     },
     "node_modules/speed-measure-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,
       "license": "MIT",
       "dependencies": {
@@ -42609,10 +43454,12 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
+    "node_modules/splaytree": {
+      "version": "0.1.4",
+      "license": "MIT"
+    },
     "node_modules/split": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
-      "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -42624,23 +43471,18 @@
     },
     "node_modules/split-on-first": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz",
-      "integrity": "sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/split.js": {
       "version": "1.6.5",
-      "resolved": "https://registry.npmjs.org/split.js/-/split.js-1.6.5.tgz",
-      "integrity": "sha512-mPTnGCiS/RiuTNsVhCm9De9cCAUsrNFFviRbADdKiiV+Kk8HKp/0fWu7Kr8pi3/yBmsqLFHuXGT9UUZ+CNLwFw==",
       "license": "MIT"
     },
     "node_modules/split2": {
       "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz",
-      "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -42649,8 +43491,6 @@
     },
     "node_modules/sprintf-js": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
       "license": "BSD-3-Clause"
     },
     "node_modules/sshpk": {
@@ -42686,8 +43526,6 @@
     },
     "node_modules/ssri": {
       "version": "10.0.6",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz",
-      "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -42698,16 +43536,12 @@
       }
     },
     "node_modules/stable-hash": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/stable-hash/-/stable-hash-0.0.5.tgz",
-      "integrity": "sha512-+L3ccpzibovGXFK+Ap/f8LOS0ahMrHTf3xu7mMLSpEGU0EO9ucaysSylKo9eRDFNhWve/y275iPmIZ4z39a9iA==",
+      "version": "0.0.4",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/stack-utils": {
       "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": {
@@ -42719,8 +43553,6 @@
     },
     "node_modules/stack-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,
       "license": "MIT",
       "engines": {
@@ -42729,8 +43561,6 @@
     },
     "node_modules/stackblur-canvas": {
       "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/stackblur-canvas/-/stackblur-canvas-2.7.0.tgz",
-      "integrity": "sha512-yf7OENo23AGJhBriGx0QivY5JP6Y1HbrrDI6WLt6C5auYZXlQrheoY8hD4ibekFKz1HOfE48Ww8kMWMnJD/zcQ==",
       "license": "MIT",
       "optional": true,
       "engines": {
@@ -42745,8 +43575,6 @@
     },
     "node_modules/static-eval": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/static-eval/-/static-eval-2.1.1.tgz",
-      "integrity": "sha512-MgWpQ/ZjGieSVB3eOJVs4OA2LT/q1vx98KPCTTQPzq/aLr0YUXTsgryTXr4SLfR0ZfUUCiedM9n/ABeDIyy4mA==",
       "license": "MIT",
       "dependencies": {
         "escodegen": "^2.1.0"
@@ -42754,8 +43582,6 @@
     },
     "node_modules/static-module": {
       "version": "2.2.5",
-      "resolved": "https://registry.npmjs.org/static-module/-/static-module-2.2.5.tgz",
-      "integrity": "sha512-D8vv82E/Kpmz3TXHKG8PPsCPg+RAX6cbCOyvjM6x04qZtQ47EtJFVwRsdov3n5d6/6ynrOY9XB4JkaZwB2xoRQ==",
       "license": "MIT",
       "dependencies": {
         "concat-stream": "~1.6.0",
@@ -42776,8 +43602,6 @@
     },
     "node_modules/static-module/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==",
       "engines": [
         "node >= 0.8"
       ],
@@ -42791,14 +43615,10 @@
     },
     "node_modules/static-module/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==",
       "license": "MIT"
     },
     "node_modules/static-module/node_modules/escodegen": {
       "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.1.tgz",
-      "integrity": "sha512-6hTjO1NAWkHnDk3OqQ4YrCuwwmGHL9S3nPlzBOUG/R44rda3wLNrfvQ5fkSGjyhHFKM7ALPKcKGrwvCLe0lC7Q==",
       "license": "BSD-2-Clause",
       "dependencies": {
         "esprima": "^3.1.3",
@@ -42819,8 +43639,6 @@
     },
     "node_modules/static-module/node_modules/esprima": {
       "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
-      "integrity": "sha512-AWwVMNxwhN8+NIPQzAQZCm7RkLC4RbM3B1OobMuyp3i+w73X57KCKaVIxaRZb+DYCojq7rspo+fmuQfAboyhFg==",
       "license": "BSD-2-Clause",
       "bin": {
         "esparse": "bin/esparse.js",
@@ -42832,8 +43650,6 @@
     },
     "node_modules/static-module/node_modules/estraverse": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
       "license": "BSD-2-Clause",
       "engines": {
         "node": ">=4.0"
@@ -42841,14 +43657,10 @@
     },
     "node_modules/static-module/node_modules/isarray": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
       "license": "MIT"
     },
     "node_modules/static-module/node_modules/levn": {
       "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
       "license": "MIT",
       "dependencies": {
         "prelude-ls": "~1.1.2",
@@ -42860,8 +43672,6 @@
     },
     "node_modules/static-module/node_modules/magic-string": {
       "version": "0.22.5",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.22.5.tgz",
-      "integrity": "sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==",
       "license": "MIT",
       "dependencies": {
         "vlq": "^0.2.2"
@@ -42869,14 +43679,10 @@
     },
     "node_modules/static-module/node_modules/object-inspect": {
       "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.4.1.tgz",
-      "integrity": "sha512-wqdhLpfCUbEsoEwl3FXwGyv8ief1k/1aUdIPCqVnupM6e8l63BEJdiF/0swtn04/8p05tG/T0FrpTlfwvljOdw==",
       "license": "MIT"
     },
     "node_modules/static-module/node_modules/optionator": {
       "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
       "license": "MIT",
       "dependencies": {
         "deep-is": "~0.1.3",
@@ -42892,16 +43698,12 @@
     },
     "node_modules/static-module/node_modules/prelude-ls": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
       "engines": {
         "node": ">= 0.8.0"
       }
     },
     "node_modules/static-module/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==",
       "license": "MIT",
       "dependencies": {
         "core-util-is": "~1.0.0",
@@ -42915,14 +43717,10 @@
     },
     "node_modules/static-module/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/static-module/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==",
       "license": "BSD-3-Clause",
       "optional": true,
       "engines": {
@@ -42931,8 +43729,6 @@
     },
     "node_modules/static-module/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"
@@ -42940,8 +43736,6 @@
     },
     "node_modules/static-module/node_modules/type-check": {
       "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
       "license": "MIT",
       "dependencies": {
         "prelude-ls": "~1.1.2"
@@ -42952,8 +43746,6 @@
     },
     "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": {
@@ -42962,10 +43754,8 @@
     },
     "node_modules/stdin-discarder": {
       "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/stdin-discarder/-/stdin-discarder-0.2.2.tgz",
-      "integrity": "sha512-UhDfHmA92YAlNnCfhmq0VeNL5bDbiZGg7sZ2IvPsXubGkiNa9EC+tUTsjBRsYUAz87btI6/1wf4XoVvQ3uRnmQ==",
-      "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=18"
       },
@@ -42975,8 +43765,6 @@
     },
     "node_modules/stop-iteration-iterator": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz",
-      "integrity": "sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==",
       "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0",
@@ -42988,14 +43776,10 @@
     },
     "node_modules/store2": {
       "version": "2.14.4",
-      "resolved": "https://registry.npmjs.org/store2/-/store2-2.14.4.tgz",
-      "integrity": "sha512-srTItn1GOvyvOycgxjAnPA63FZNwy0PTyUBFMHRM+hVFltAeoh0LmNBz9SZqUS9mMqGk8rfyWyXn3GH5ReJ8Zw==",
       "license": "MIT"
     },
     "node_modules/storybook": {
       "version": "8.1.11",
-      "resolved": "https://registry.npmjs.org/storybook/-/storybook-8.1.11.tgz",
-      "integrity": "sha512-3KjIhF8lczXhKKHyHbOqV30dvuRYJSxc0d1as/C8kybuwE7cLaydhWGma7VBv5bTSPv0rDzucx7KcO+achArPg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -43010,19 +43794,67 @@
         "url": "https://opencollective.com/storybook"
       }
     },
+    "node_modules/stream": {
+      "version": "0.0.2",
+      "license": "MIT",
+      "dependencies": {
+        "emitter-component": "^1.1.1"
+      }
+    },
+    "node_modules/stream-browserify": {
+      "version": "3.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "~2.0.4",
+        "readable-stream": "^3.5.0"
+      }
+    },
+    "node_modules/stream-combiner2": {
+      "version": "1.1.1",
+      "license": "MIT",
+      "dependencies": {
+        "duplexer2": "~0.1.0",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "node_modules/stream-combiner2/node_modules/isarray": {
+      "version": "1.0.0",
+      "license": "MIT"
+    },
+    "node_modules/stream-combiner2/node_modules/readable-stream": {
+      "version": "2.3.8",
+      "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/stream-combiner2/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "license": "MIT"
+    },
+    "node_modules/stream-combiner2/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
     "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==",
       "license": "MIT"
     },
     "node_modules/streamx": {
-      "version": "2.22.1",
-      "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.22.1.tgz",
-      "integrity": "sha512-znKXEBxfatz2GBNK02kRnCXjV+AA4kjZIUxeWSr3UGirZMJfTE9uiwKHobnbgxWyL/JWro8tTq+vOqAK1/qbSA==",
+      "version": "2.21.1",
       "license": "MIT",
       "dependencies": {
         "fast-fifo": "^1.3.2",
+        "queue-tick": "^1.0.1",
         "text-decoder": "^1.1.0"
       },
       "optionalDependencies": {
@@ -43031,17 +43863,14 @@
     },
     "node_modules/strict-uri-encode": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz",
-      "integrity": "sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=4"
       }
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "safe-buffer": "~5.2.0"
@@ -43055,8 +43884,6 @@
     },
     "node_modules/string-length": {
       "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
-      "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -43069,8 +43896,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "emoji-regex": "^8.0.0",
@@ -43084,8 +43909,6 @@
     "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==",
       "license": "MIT",
       "dependencies": {
         "emoji-regex": "^8.0.0",
@@ -43098,14 +43921,10 @@
     },
     "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==",
       "license": "MIT"
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "ansi-regex": "^5.0.1"
@@ -43116,14 +43935,10 @@
     },
     "node_modules/string-width/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==",
       "license": "MIT"
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "ansi-regex": "^5.0.1"
@@ -43134,8 +43949,6 @@
     },
     "node_modules/string.prototype.includes": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.includes/-/string.prototype.includes-2.0.1.tgz",
-      "integrity": "sha512-o7+c9bW6zpAdJHTtujeePODAhkuicdAryFsfVKwA+wGw89wJ4GTY484WTucM9hLtDEOpOvI+aHnzqnC5lHp4Rg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -43149,8 +43962,6 @@
     },
     "node_modules/string.prototype.matchall": {
       "version": "4.0.12",
-      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.12.tgz",
-      "integrity": "sha512-6CC9uyBL+/48dYizRf7H7VAYCMCNTBeM78x/VTUe9bFEaxBepPJDa1Ow99LqI/1yF7kuy7Q3cQsYMrcjGUcskA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -43177,8 +43988,6 @@
     },
     "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": {
@@ -43188,8 +43997,6 @@
     },
     "node_modules/string.prototype.trim": {
       "version": "1.2.10",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz",
-      "integrity": "sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==",
       "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.8",
@@ -43209,8 +44016,6 @@
     },
     "node_modules/string.prototype.trimend": {
       "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz",
-      "integrity": "sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==",
       "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.8",
@@ -43227,8 +44032,6 @@
     },
     "node_modules/string.prototype.trimstart": {
       "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz",
-      "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==",
       "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.7",
@@ -43244,8 +44047,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "ansi-regex": "^5.0.0"
@@ -43257,8 +44058,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==",
       "license": "MIT",
       "dependencies": {
         "ansi-regex": "^5.0.1"
@@ -43269,8 +44068,6 @@
     },
     "node_modules/strip-bom": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
-      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -43279,9 +44076,8 @@
     },
     "node_modules/strip-bom-buf": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-bom-buf/-/strip-bom-buf-3.0.1.tgz",
-      "integrity": "sha512-iJaWw2WroigLHzQysdc5WWeUc99p7ea7AEgB6JkY8CMyiO1yTVAA1gIlJJgORElUIR+lcZJkNl1OGChMhvc2Cw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "is-utf8": "^0.2.1"
       },
@@ -43294,9 +44090,8 @@
     },
     "node_modules/strip-bom-stream": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-5.0.0.tgz",
-      "integrity": "sha512-Yo472mU+3smhzqeKlIxClre4s4pwtYZEvDNQvY/sJpnChdaxmKuwU28UVx/v1ORKNMxkmj1GBuvxJQyBk6wYMQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "first-chunk-stream": "^5.0.0",
         "strip-bom-buf": "^3.0.0"
@@ -43310,8 +44105,6 @@
     },
     "node_modules/strip-comments": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-comments/-/strip-comments-2.0.1.tgz",
-      "integrity": "sha512-ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -43320,8 +44113,6 @@
     },
     "node_modules/strip-final-newline": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -43329,8 +44120,6 @@
     },
     "node_modules/strip-indent": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-4.0.0.tgz",
-      "integrity": "sha512-mnVSV2l+Zv6BLpSD/8V87CW/y9EmmbYzGCIavsnsI6/nwn26DwffM/yztm30Z/I2DY9wdS3vXVCMnHDgZaVNoA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -43345,8 +44134,6 @@
     },
     "node_modules/strip-json-comments": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -43357,8 +44144,6 @@
     },
     "node_modules/strip-outer": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz",
-      "integrity": "sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==",
       "license": "MIT",
       "dependencies": {
         "escape-string-regexp": "^1.0.2"
@@ -43369,29 +44154,17 @@
     },
     "node_modules/strip-outer/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==",
       "license": "MIT",
       "engines": {
         "node": ">=0.8.0"
       }
     },
     "node_modules/strnum": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.1.2.tgz",
-      "integrity": "sha512-vrN+B7DBIoTTZjnPNewwhx6cBA/H+IS7rfW68n7XxC1y7uoiGQBxaKzqucGUgavX15dJgiGztLJ8vxuEzwqBdA==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/NaturalIntelligence"
-        }
-      ],
+      "version": "1.0.5",
       "license": "MIT"
     },
     "node_modules/strong-log-transformer": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz",
-      "integrity": "sha512-B3Hgul+z0L9a236FAUC9iZsL+nVHgoCJnqCbN588DjYxvGXaXaaFbfmQ/JhvKjZwsOukuR72XbHv71Qkug0HxA==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -43408,8 +44181,6 @@
     },
     "node_modules/strtok3": {
       "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/strtok3/-/strtok3-7.1.1.tgz",
-      "integrity": "sha512-mKX8HA/cdBqMKUr0MMZAFssCkIGoZeSCMXgnt79yKxNFguMLVFgRe6wB+fsL0NmoHDbeyZXczy7vEPSoo3rkzg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -43426,8 +44197,6 @@
     },
     "node_modules/style-loader": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-4.0.0.tgz",
-      "integrity": "sha512-1V4WqhhZZgjVAVJyt7TdDPZoPBPNHbekX4fWnCJL1yQukhCeZhJySUL+gL9y6sNdN95uEOS83Y55SqHcP7MzLA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -43443,54 +44212,46 @@
     },
     "node_modules/style-to-object": {
       "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/style-to-object/-/style-to-object-0.4.4.tgz",
-      "integrity": "sha512-HYNoHZa2GorYNyqiCaBgsxvcJIn7OHq6inEga+E6Ke3m5JkoqpQbnFssk4jwe+K7AhGa2fcha4wSOf1Kn01dMg==",
       "license": "MIT",
       "dependencies": {
         "inline-style-parser": "0.1.1"
       }
     },
     "node_modules/stylehacks": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-7.0.5.tgz",
-      "integrity": "sha512-5kNb7V37BNf0Q3w+1pxfa+oiNPS++/b4Jil9e/kPDgrk1zjEd6uR7SZeJiYaLYH6RRSC1XX2/37OTeU/4FvuIA==",
+      "version": "7.0.4",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "browserslist": "^4.24.5",
-        "postcss-selector-parser": "^7.1.0"
+        "browserslist": "^4.23.3",
+        "postcss-selector-parser": "^6.1.2"
       },
       "engines": {
         "node": "^18.12.0 || ^20.9.0 || >=22.0"
       },
       "peerDependencies": {
-        "postcss": "^8.4.32"
-      }
-    },
-    "node_modules/stylehacks/node_modules/postcss-selector-parser": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
-      "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=4"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/stylis": {
       "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.2.0.tgz",
-      "integrity": "sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==",
       "license": "MIT"
     },
+    "node_modules/super-regex": {
+      "version": "1.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "function-timeout": "^1.0.1",
+        "time-span": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/supercluster": {
       "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/supercluster/-/supercluster-8.0.1.tgz",
-      "integrity": "sha512-IiOea5kJ9iqzD2t7QJq/cREyLHTtSmUT6gQsweojg9WH2sYJqZK9SswTu6jrscO6D1G5v5vYZ9ru/eq85lXeZQ==",
       "license": "ISC",
       "dependencies": {
         "kdbush": "^4.0.2"
@@ -43498,8 +44259,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
@@ -43508,10 +44267,22 @@
         "node": ">=8"
       }
     },
+    "node_modules/supports-hyperlinks": {
+      "version": "3.2.0",
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0",
+        "supports-color": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=14.18"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-hyperlinks?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==",
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"
@@ -43522,15 +44293,11 @@
     },
     "node_modules/svg-parser": {
       "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/svg-parser/-/svg-parser-2.0.4.tgz",
-      "integrity": "sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/svg-pathdata": {
       "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/svg-pathdata/-/svg-pathdata-6.0.3.tgz",
-      "integrity": "sha512-qsjeeq5YjBZ5eMdFuUa4ZosMLxgr5RZ+F+Y1OrDhuOCEInRMA3x74XdBtggJcj9kOeInz0WE+LgCPDkZFlBYJw==",
       "license": "MIT",
       "optional": true,
       "engines": {
@@ -43539,8 +44306,6 @@
     },
     "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,
       "license": "MIT",
       "dependencies": {
@@ -43565,81 +44330,14 @@
     },
     "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,
       "license": "MIT",
       "engines": {
         "node": ">= 10"
       }
     },
-    "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,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "boolbase": "^1.0.0",
-        "css-what": "^6.1.0",
-        "domhandler": "^5.0.2",
-        "domutils": "^3.0.1",
-        "nth-check": "^2.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
-      }
-    },
-    "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": {
-        "domelementtype": "^2.3.0",
-        "domhandler": "^5.0.2",
-        "entities": "^4.2.0"
-      },
-      "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,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "domelementtype": "^2.3.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domhandler?sponsor=1"
-      }
-    },
-    "node_modules/svgo/node_modules/domutils": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.2.2.tgz",
-      "integrity": "sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "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/symbol-observable": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
-      "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -43648,31 +44346,26 @@
     },
     "node_modules/symbol-tree": {
       "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
-      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/synckit": {
-      "version": "0.11.8",
-      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.8.tgz",
-      "integrity": "sha512-+XZ+r1XGIJGeQk3VvXhT6xx/VpbHsRzsTkGgF6E5RX9TTXD0118l87puaEBZ566FhqblC6U0d4XnubznJDm30A==",
+      "version": "0.9.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@pkgr/core": "^0.2.4"
+        "@pkgr/core": "^0.1.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
         "node": "^14.18.0 || >=16.0.0"
       },
       "funding": {
-        "url": "https://opencollective.com/synckit"
+        "url": "https://opencollective.com/unts"
       }
     },
     "node_modules/tapable": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.2.tgz",
-      "integrity": "sha512-Re10+NauLTMCudc7T5WLFLAwDhQ0JWdrMK+9B2M8zR5hRExKmsRDCBA7/aV/pNJFltmBFO5BAMlQFi/vq3nKOg==",
+      "version": "2.2.1",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -43681,8 +44374,6 @@
     },
     "node_modules/tar": {
       "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": {
@@ -43698,9 +44389,7 @@
       }
     },
     "node_modules/tar-fs": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.9.tgz",
-      "integrity": "sha512-XF4w9Xp+ZQgifKakjZYmFdkLoSWd34VGKcsTCwlNWM7QG3ZbaxnTsaBwnjFZqHRf/rROxaR8rXnbtwdvaDI+lA==",
+      "version": "3.1.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -43714,8 +44403,6 @@
     },
     "node_modules/tar-fs/node_modules/tar-stream": {
       "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.7.tgz",
-      "integrity": "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -43726,8 +44413,6 @@
     },
     "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,
       "license": "MIT",
       "dependencies": {
@@ -43743,8 +44428,6 @@
     },
     "node_modules/tar/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,
       "license": "ISC",
       "dependencies": {
@@ -43756,8 +44439,6 @@
     },
     "node_modules/tar/node_modules/fs-minipass/node_modules/minipass": {
       "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -43769,8 +44450,6 @@
     },
     "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": "ISC",
       "engines": {
@@ -43779,15 +44458,11 @@
     },
     "node_modules/tar/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,
       "license": "ISC"
     },
     "node_modules/teen_process": {
       "version": "1.16.0",
-      "resolved": "https://registry.npmjs.org/teen_process/-/teen_process-1.16.0.tgz",
-      "integrity": "sha512-RnW7HHZD1XuhSTzD3djYOdIl1adE3oNEprE3HOFFxWs5m4FZsqYRhKJ4mDU2udtNGMLUS7jV7l8vVRLWAvmPDw==",
       "dev": true,
       "engines": [
         "node"
@@ -43804,8 +44479,6 @@
     },
     "node_modules/teex": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/teex/-/teex-1.0.1.tgz",
-      "integrity": "sha512-eYE6iEI62Ni1H8oIa7KlDU6uQBtqr4Eajni3wX7rpfXD8ysFx8z0+dri+KWEPWpBsxXfxu58x/0jvTVT1ekOSg==",
       "license": "MIT",
       "dependencies": {
         "streamx": "^2.12.5"
@@ -43813,8 +44486,6 @@
     },
     "node_modules/telejson": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/telejson/-/telejson-7.2.0.tgz",
-      "integrity": "sha512-1QTEcJkJEhc8OnStBx/ILRu5J2p0GjvWsBx56bmZRqnrkdBMUe+nX92jxV+p3dB4CP6PZCdJMQJwCggkNBMzkQ==",
       "license": "MIT",
       "dependencies": {
         "memoizerific": "^1.11.3"
@@ -43822,8 +44493,6 @@
     },
     "node_modules/temp": {
       "version": "0.8.4",
-      "resolved": "https://registry.npmjs.org/temp/-/temp-0.8.4.tgz",
-      "integrity": "sha512-s0ZZzd0BzYv5tLSptZooSjK8oj6C+c19p7Vqta9+6NPOf7r+fxq0cJe6/oN4LTC79sy5NY8ucOJNgwsKCSbfqg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -43835,8 +44504,6 @@
     },
     "node_modules/temp-dir": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz",
-      "integrity": "sha512-xZFXEGbG7SNC3itwBzI3RYjq/cEhBkx2hJuKGIUOcEULmkQExXiHat2z/qkISYsuR+IKumhEfKKbV5qXmhICFQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -43845,9 +44512,6 @@
     },
     "node_modules/temp/node_modules/rimraf": {
       "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-      "deprecated": "Rimraf versions prior to v4 are no longer supported",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -43859,8 +44523,6 @@
     },
     "node_modules/tempy": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/tempy/-/tempy-3.1.0.tgz",
-      "integrity": "sha512-7jDLIdD2Zp0bDe5r3D2qtkd1QOCacylBuL7oa4udvN6v2pqr4+LcCr67C8DR1zkpaZ8XosF5m1yQSabKAW6f2g==",
       "license": "MIT",
       "dependencies": {
         "is-stream": "^3.0.0",
@@ -43877,8 +44539,6 @@
     },
     "node_modules/tempy/node_modules/is-stream": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz",
-      "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==",
       "license": "MIT",
       "engines": {
         "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
@@ -43889,8 +44549,6 @@
     },
     "node_modules/tempy/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==",
       "license": "MIT",
       "engines": {
         "node": ">=14.16"
@@ -43898,8 +44556,6 @@
     },
     "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,
       "license": "MIT",
       "engines": {
@@ -43910,14 +44566,12 @@
       }
     },
     "node_modules/terser": {
-      "version": "5.41.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.41.0.tgz",
-      "integrity": "sha512-H406eLPXpZbAX14+B8psIuvIr8+3c+2hkuYzpMkoE0ij+NdsVATbA78vb8neA/eqrj7rywa2pIkdmWRsXW6wmw==",
+      "version": "5.37.0",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
         "@jridgewell/source-map": "^0.3.3",
-        "acorn": "^8.14.0",
+        "acorn": "^8.8.2",
         "commander": "^2.20.0",
         "source-map-support": "~0.5.20"
       },
@@ -43929,9 +44583,7 @@
       }
     },
     "node_modules/terser-webpack-plugin": {
-      "version": "5.3.14",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.14.tgz",
-      "integrity": "sha512-vkZjpUjb6OMS7dhV+tILUW6BhpDR7P2L/aQSAv+Uwk+m8KATX9EccViHTJR2qDtACKPIYndLGCyl3FMo+r2LMw==",
+      "version": "5.3.11",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -43965,8 +44617,6 @@
     },
     "node_modules/terser-webpack-plugin/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,
       "license": "MIT",
       "dependencies": {
@@ -43980,8 +44630,6 @@
     },
     "node_modules/terser-webpack-plugin/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": {
@@ -43995,9 +44643,7 @@
       }
     },
     "node_modules/terser/node_modules/acorn": {
-      "version": "8.14.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
-      "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
+      "version": "8.14.0",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -44009,15 +44655,11 @@
     },
     "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,
       "license": "MIT"
     },
     "node_modules/test-exclude": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
-      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -44031,8 +44673,6 @@
     },
     "node_modules/text-decoder": {
       "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.3.tgz",
-      "integrity": "sha512-3/o9z3X0X0fTupwsYvR03pJ/DjWuqqrfwBgTQzdWDiQSm9KitAyz/9WqsT2JQW7KV2m+bC2ol/zqpW37NHxLaA==",
       "license": "Apache-2.0",
       "dependencies": {
         "b4a": "^1.6.4"
@@ -44040,8 +44680,6 @@
     },
     "node_modules/text-extensions": {
       "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz",
-      "integrity": "sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -44050,8 +44688,6 @@
     },
     "node_modules/text-segmentation": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/text-segmentation/-/text-segmentation-1.0.3.tgz",
-      "integrity": "sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==",
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -44060,14 +44696,10 @@
     },
     "node_modules/text-table": {
       "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
       "license": "MIT"
     },
     "node_modules/textextensions": {
       "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/textextensions/-/textextensions-6.11.0.tgz",
-      "integrity": "sha512-tXJwSr9355kFJI3lbCkPpUH5cP8/M0GGy2xLO34aZCjMXBaK3SoPnZwr/oWmo1FdCnELcs4npdCIOFtq9W3ruQ==",
       "license": "Artistic-2.0",
       "dependencies": {
         "editions": "^6.21.0"
@@ -44079,10 +44711,36 @@
         "url": "https://bevry.me/fund"
       }
     },
+    "node_modules/thenify": {
+      "version": "3.3.1",
+      "license": "MIT",
+      "dependencies": {
+        "any-promise": "^1.0.0"
+      }
+    },
+    "node_modules/thenify-all": {
+      "version": "1.6.0",
+      "license": "MIT",
+      "dependencies": {
+        "thenify": ">= 3.1.0 < 4"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/thingies": {
+      "version": "1.21.0",
+      "dev": true,
+      "license": "Unlicense",
+      "engines": {
+        "node": ">=10.18"
+      },
+      "peerDependencies": {
+        "tslib": "^2"
+      }
+    },
     "node_modules/thread-loader": {
       "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/thread-loader/-/thread-loader-4.0.4.tgz",
-      "integrity": "sha512-tXagu6Hivd03wB2tiS1bqvw345sc7mKei32EgpYpq31ZLes9FN0mEK2nKzXLRFgwt3PsBB0E/MZDp159rDoqwg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -44104,8 +44762,6 @@
     },
     "node_modules/thread-stream": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/thread-stream/-/thread-stream-3.1.0.tgz",
-      "integrity": "sha512-OqyPZ9u96VohAyMfJykzmivOrY2wfMSf3C5TtFJVgN+Hm6aj+voFhlK+kZEIv2FBh1X6Xp3DlnCOfEQ3B2J86A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -44114,8 +44770,6 @@
     },
     "node_modules/throat": {
       "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/throat/-/throat-6.0.2.tgz",
-      "integrity": "sha512-WKexMoJj3vEuK0yFEapj8y64V0A6xcuPuK9Gt1d0R+dzCSJc0lHqQytAbSB4cDAK0dWh4T0E2ETkoLE2WZ41OQ==",
       "dev": true,
       "license": "MIT"
     },
@@ -44130,8 +44784,6 @@
     },
     "node_modules/throttleit": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.1.tgz",
-      "integrity": "sha512-vDZpf9Chs9mAdfY046mcPt8fg5QSZr37hEH4TXYBnDF+izxgrbRGUAAaBvIk/fJm9aOFCGFd1EsNg5AZCbnQCQ==",
       "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -44139,14 +44791,10 @@
     },
     "node_modules/through": {
       "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
       "license": "MIT"
     },
     "node_modules/through2": {
       "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
       "license": "MIT",
       "dependencies": {
         "readable-stream": "~2.3.6",
@@ -44155,14 +44803,10 @@
     },
     "node_modules/through2/node_modules/isarray": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
       "license": "MIT"
     },
     "node_modules/through2/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==",
       "license": "MIT",
       "dependencies": {
         "core-util-is": "~1.0.0",
@@ -44176,14 +44820,10 @@
     },
     "node_modules/through2/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/through2/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"
@@ -44191,47 +44831,49 @@
     },
     "node_modules/thunky": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
-      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/time-span": {
+      "version": "5.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "convert-hrtime": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/timers": {
+      "version": "0.1.1",
+      "license": "MIT"
+    },
     "node_modules/timezone-mock": {
       "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/timezone-mock/-/timezone-mock-1.3.6.tgz",
-      "integrity": "sha512-YcloWmZfLD9Li5m2VcobkCDNVaLMx8ohAb/97l/wYS3m+0TIEK5PFNMZZfRcusc6sFjIfxu8qcJT0CNnOdpqmg==",
       "dev": true,
       "license": "MIT"
     },
     "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==",
       "license": "MIT"
     },
     "node_modules/tiny-warning": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz",
-      "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==",
       "license": "MIT"
     },
     "node_modules/tinycolor2": {
       "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.6.0.tgz",
-      "integrity": "sha512-XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw==",
       "license": "MIT"
     },
     "node_modules/tinyexec": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.2.tgz",
-      "integrity": "sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==",
-      "dev": true,
+      "version": "1.0.1",
       "license": "MIT"
     },
     "node_modules/tinyglobby": {
       "version": "0.2.14",
-      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.14.tgz",
-      "integrity": "sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -44246,9 +44888,7 @@
       }
     },
     "node_modules/tinyglobby/node_modules/fdir": {
-      "version": "6.4.5",
-      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.5.tgz",
-      "integrity": "sha512-4BG7puHpVsIYxZUbiUE3RqGloLaSSwzYie5jvasC4LWuBWzZawynvYouhjbQKw2JuIGYdm0DzIxl8iVidKlUEw==",
+      "version": "6.4.6",
       "dev": true,
       "license": "MIT",
       "peerDependencies": {
@@ -44262,8 +44902,6 @@
     },
     "node_modules/tinyglobby/node_modules/picomatch": {
       "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
-      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -44274,33 +44912,25 @@
       }
     },
     "node_modules/tinyqueue": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/tinyqueue/-/tinyqueue-2.0.3.tgz",
-      "integrity": "sha512-ppJZNDuKGgxzkHihX8v9v9G5f+18gzaTfrukGrq6ueg0lmH4nqVnA2IPG0AEH3jKEk2GRJCUhDoqpoiw3PHLBA==",
+      "version": "3.0.0",
       "license": "ISC"
     },
     "node_modules/tldts": {
-      "version": "6.1.86",
-      "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.86.tgz",
-      "integrity": "sha512-WMi/OQ2axVTf/ykqCQgXiIct+mSQDFdH2fkwhPwgEwvJ1kSzZRiinb0zF2Xb8u4+OqPChmyI6MEu4EezNJz+FQ==",
+      "version": "6.1.74",
       "license": "MIT",
       "dependencies": {
-        "tldts-core": "^6.1.86"
+        "tldts-core": "^6.1.74"
       },
       "bin": {
         "tldts": "bin/cli.js"
       }
     },
     "node_modules/tldts-core": {
-      "version": "6.1.86",
-      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.86.tgz",
-      "integrity": "sha512-Je6p7pkk+KMzMv2XXKmAE3McmolOQFdxkKw0R8EYNr7sELW46JqnNeTX8ybPiQgvg1ymCoF8LXs5fzFaZvJPTA==",
+      "version": "6.1.74",
       "license": "MIT"
     },
     "node_modules/tmp": {
       "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz",
-      "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==",
       "license": "MIT",
       "engines": {
         "node": ">=14.14"
@@ -44308,15 +44938,11 @@
     },
     "node_modules/tmpl": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
-      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
       "dev": true,
       "license": "BSD-3-Clause"
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "is-number": "^7.0.0"
@@ -44327,8 +44953,6 @@
     },
     "node_modules/toad-cache": {
       "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/toad-cache/-/toad-cache-3.7.0.tgz",
-      "integrity": "sha512-/m8M+2BJUpoJdgAHoG+baCwBT+tf2VraSfkBgl0Y00qIWt41DJ8R5B8nsEw0I58YwF5IZH6z24/2TobDKnqSWw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -44349,8 +44973,6 @@
     },
     "node_modules/toidentifier": {
       "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": {
@@ -44359,8 +44981,6 @@
     },
     "node_modules/token-types": {
       "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/token-types/-/token-types-5.0.1.tgz",
-      "integrity": "sha512-Y2fmSnZjQdDb9W4w4r1tswlMHylzWIeOKpx0aZH9BgGtACHhrk3OkT52AzwcuqTRBZtvvnTjDBh8eynMulu8Vg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -44377,9 +44997,6 @@
     },
     "node_modules/topojson": {
       "version": "1.6.27",
-      "resolved": "https://registry.npmjs.org/topojson/-/topojson-1.6.27.tgz",
-      "integrity": "sha512-JLFtrhClUH/k/yvsiCXqcWcXaOfO3DgFvHnYb+gS2xlDbjbvkKh6YB1CPilmEV++tH33xw6wCxoYA5g6YLZw/Q==",
-      "deprecated": "Use topojson-client, topojson-server or topojson-simplify directly.",
       "license": "BSD-3-Clause",
       "dependencies": {
         "d3": "3",
@@ -44399,14 +45016,10 @@
     },
     "node_modules/topojson/node_modules/rw": {
       "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz",
-      "integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==",
       "license": "BSD-3-Clause"
     },
     "node_modules/totalist": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz",
-      "integrity": "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -44414,9 +45027,7 @@
       }
     },
     "node_modules/tough-cookie": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-5.1.2.tgz",
-      "integrity": "sha512-FVDYdxtnj0G6Qm/DhNPSb8Ju59ULcup3tuJxkFb5K8Bv2pUXILbf0xZWU8PX8Ov19OXljbUyveOFwRMwkXzO+A==",
+      "version": "5.1.0",
       "license": "BSD-3-Clause",
       "dependencies": {
         "tldts": "^6.1.32"
@@ -44425,30 +45036,8 @@
         "node": ">=16"
       }
     },
-    "node_modules/tr46": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
-      "integrity": "sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "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,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/traverse": {
       "version": "0.6.11",
-      "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.11.tgz",
-      "integrity": "sha512-vxXDZg8/+p3gblxB6BhhG5yWVn1kGRlaL8O78UDXc3wRnPizB5g83dcvWV1jpDMIPnjZjOFuxlMmE82XJ4407w==",
       "license": "MIT",
       "dependencies": {
         "gopd": "^1.2.0",
@@ -44462,10 +45051,23 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/tree-dump": {
+      "version": "1.0.3",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=10.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/streamich"
+      },
+      "peerDependencies": {
+        "tslib": "2"
+      }
+    },
     "node_modules/tree-kill": {
       "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
-      "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
       "license": "MIT",
       "bin": {
         "tree-kill": "cli.js"
@@ -44473,8 +45075,6 @@
     },
     "node_modules/treeverse": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/treeverse/-/treeverse-3.0.0.tgz",
-      "integrity": "sha512-gcANaAnd2QDZFmHFEOF4k7uc1J/6a6z3DJMd/QwEyxLoKGiptJRwid582r7QIsFlFMIZ3SnxfS52S4hm2DHkuQ==",
       "dev": true,
       "license": "ISC",
       "engines": {
@@ -44483,8 +45083,6 @@
     },
     "node_modules/trim-lines": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/trim-lines/-/trim-lines-3.0.1.tgz",
-      "integrity": "sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==",
       "license": "MIT",
       "funding": {
         "type": "github",
@@ -44493,8 +45091,6 @@
     },
     "node_modules/trim-newlines": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
-      "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -44503,8 +45099,6 @@
     },
     "node_modules/trim-repeated": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz",
-      "integrity": "sha512-pkonvlKk8/ZuR0D5tLW8ljt5I8kmxp2XKymhepUeOdCEfKpZaktSArkLHZt76OB1ZvO9bssUsDty4SWhLvZpLg==",
       "license": "MIT",
       "dependencies": {
         "escape-string-regexp": "^1.0.2"
@@ -44515,8 +45109,6 @@
     },
     "node_modules/trim-repeated/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==",
       "license": "MIT",
       "engines": {
         "node": ">=0.8.0"
@@ -44524,34 +45116,38 @@
     },
     "node_modules/trough": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/trough/-/trough-2.2.0.tgz",
-      "integrity": "sha512-tmMpK00BjZiUyVyvrBK7knerNgmgvcV/KLVyuma/SC+TQN167GrMRciANTz09+k3zW8L8t60jWO1GpfkZdjTaw==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/wooorm"
       }
     },
+    "node_modules/ts-api-utils": {
+      "version": "1.4.3",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=16"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.2.0"
+      }
+    },
     "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==",
       "license": "MIT",
       "engines": {
         "node": ">=6.10"
       }
     },
     "node_modules/ts-jest": {
-      "version": "29.3.4",
-      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.3.4.tgz",
-      "integrity": "sha512-Iqbrm8IXOmV+ggWHOTEbjwyCf2xZlUMv5npExksXohL+tk8va4Fjhb+X2+Rt9NBmgO7bJ8WpnMLOwih/DnMlFA==",
+      "version": "29.4.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "bs-logger": "^0.2.6",
         "ejs": "^3.1.10",
         "fast-json-stable-stringify": "^2.1.0",
-        "jest-util": "^29.0.0",
         "json5": "^2.2.3",
         "lodash.memoize": "^4.1.2",
         "make-error": "^1.3.6",
@@ -44567,10 +45163,11 @@
       },
       "peerDependencies": {
         "@babel/core": ">=7.0.0-beta.0 <8",
-        "@jest/transform": "^29.0.0",
-        "@jest/types": "^29.0.0",
-        "babel-jest": "^29.0.0",
-        "jest": "^29.0.0",
+        "@jest/transform": "^29.0.0 || ^30.0.0",
+        "@jest/types": "^29.0.0 || ^30.0.0",
+        "babel-jest": "^29.0.0 || ^30.0.0",
+        "jest": "^29.0.0 || ^30.0.0",
+        "jest-util": "^29.0.0 || ^30.0.0",
         "typescript": ">=4.3 <6"
       },
       "peerDependenciesMeta": {
@@ -44588,13 +45185,14 @@
         },
         "esbuild": {
           "optional": true
+        },
+        "jest-util": {
+          "optional": true
         }
       }
     },
     "node_modules/ts-jest/node_modules/semver": {
       "version": "7.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
-      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -44606,8 +45204,6 @@
     },
     "node_modules/ts-jest/node_modules/type-fest": {
       "version": "4.41.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.41.0.tgz",
-      "integrity": "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==",
       "dev": true,
       "license": "(MIT OR CC0-1.0)",
       "engines": {
@@ -44619,8 +45215,6 @@
     },
     "node_modules/ts-loader": {
       "version": "9.5.2",
-      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.5.2.tgz",
-      "integrity": "sha512-Qo4piXvOTWcMGIgRiuFa6nHNm+54HbYaZCKqc9eeZCLRy3XqafQgwX2F7mofrbJG3g7EEb+lkiR+z2Lic2s3Zw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -44640,8 +45234,6 @@
     },
     "node_modules/ts-loader/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": {
@@ -44657,8 +45249,6 @@
     },
     "node_modules/ts-node": {
       "version": "10.9.2",
-      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz",
-      "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==",
       "license": "MIT",
       "dependencies": {
         "@cspotcode/source-map-support": "^0.8.0",
@@ -44699,9 +45289,7 @@
       }
     },
     "node_modules/ts-node/node_modules/acorn": {
-      "version": "8.14.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
-      "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
+      "version": "8.14.0",
       "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
@@ -44712,8 +45300,6 @@
     },
     "node_modules/ts-node/node_modules/acorn-walk": {
       "version": "8.3.4",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz",
-      "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==",
       "license": "MIT",
       "dependencies": {
         "acorn": "^8.11.0"
@@ -44724,8 +45310,6 @@
     },
     "node_modules/ts-node/node_modules/diff": {
       "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
-      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
       "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.3.1"
@@ -44733,8 +45317,6 @@
     },
     "node_modules/tsconfig-paths": {
       "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz",
-      "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -44748,8 +45330,6 @@
     },
     "node_modules/tsconfig-paths/node_modules/strip-bom": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -44758,8 +45338,6 @@
     },
     "node_modules/tscw-config": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/tscw-config/-/tscw-config-1.1.2.tgz",
-      "integrity": "sha512-mrrMxCqC6kjqjuhGc7mTOB3P7JuBebZ0ZnFQTi4e+K0K+2kT1OvTXzFygWCPBor/F8WJ1IWVRrnBLKctFhFwOQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -44773,9 +45351,7 @@
       }
     },
     "node_modules/tscw-config/node_modules/strip-json-comments": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.2.tgz",
-      "integrity": "sha512-4X2FR3UwhNUE9G49aIsJW5hRRR3GXGTBTZRMfv568O60ojM8HcWjV/VxAxCDW3SUND33O6ZY66ZuRcdkj73q2g==",
+      "version": "5.0.1",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -44787,14 +45363,10 @@
     },
     "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==",
       "license": "0BSD"
     },
     "node_modules/tsutils": {
       "version": "3.21.0",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
-      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -44809,15 +45381,83 @@
     },
     "node_modules/tsutils/node_modules/tslib": {
       "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
       "dev": true,
       "license": "0BSD"
     },
+    "node_modules/tsx": {
+      "version": "4.19.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "esbuild": "~0.25.0",
+        "get-tsconfig": "^4.7.5"
+      },
+      "bin": {
+        "tsx": "dist/cli.mjs"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.3"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-x64": {
+      "version": "0.25.5",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/esbuild": {
+      "version": "0.25.5",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "optionalDependencies": {
+        "@esbuild/aix-ppc64": "0.25.5",
+        "@esbuild/android-arm": "0.25.5",
+        "@esbuild/android-arm64": "0.25.5",
+        "@esbuild/android-x64": "0.25.5",
+        "@esbuild/darwin-arm64": "0.25.5",
+        "@esbuild/darwin-x64": "0.25.5",
+        "@esbuild/freebsd-arm64": "0.25.5",
+        "@esbuild/freebsd-x64": "0.25.5",
+        "@esbuild/linux-arm": "0.25.5",
+        "@esbuild/linux-arm64": "0.25.5",
+        "@esbuild/linux-ia32": "0.25.5",
+        "@esbuild/linux-loong64": "0.25.5",
+        "@esbuild/linux-mips64el": "0.25.5",
+        "@esbuild/linux-ppc64": "0.25.5",
+        "@esbuild/linux-riscv64": "0.25.5",
+        "@esbuild/linux-s390x": "0.25.5",
+        "@esbuild/linux-x64": "0.25.5",
+        "@esbuild/netbsd-arm64": "0.25.5",
+        "@esbuild/netbsd-x64": "0.25.5",
+        "@esbuild/openbsd-arm64": "0.25.5",
+        "@esbuild/openbsd-x64": "0.25.5",
+        "@esbuild/sunos-x64": "0.25.5",
+        "@esbuild/win32-arm64": "0.25.5",
+        "@esbuild/win32-ia32": "0.25.5",
+        "@esbuild/win32-x64": "0.25.5"
+      }
+    },
     "node_modules/tuf-js": {
       "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-2.2.1.tgz",
-      "integrity": "sha512-GwIJau9XaA8nLVbUXsN3IlFi7WmQ48gBUrl3FTkkL/XLu/POhBzfmX9hd33FNMX1qAsfl6ozO1iMmW9NC8YniA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -44849,8 +45489,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "prelude-ls": "^1.2.1"
@@ -44861,8 +45499,6 @@
     },
     "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,
       "license": "MIT",
       "engines": {
@@ -44871,8 +45507,6 @@
     },
     "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==",
       "license": "(MIT OR CC0-1.0)",
       "engines": {
         "node": ">=12.20"
@@ -44883,8 +45517,6 @@
     },
     "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,
       "license": "MIT",
       "dependencies": {
@@ -44897,8 +45529,6 @@
     },
     "node_modules/typed-array-buffer": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz",
-      "integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==",
       "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.3",
@@ -44911,8 +45541,6 @@
     },
     "node_modules/typed-array-byte-length": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz",
-      "integrity": "sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==",
       "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.8",
@@ -44930,8 +45558,6 @@
     },
     "node_modules/typed-array-byte-offset": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz",
-      "integrity": "sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==",
       "license": "MIT",
       "dependencies": {
         "available-typed-arrays": "^1.0.7",
@@ -44951,8 +45577,6 @@
     },
     "node_modules/typed-array-length": {
       "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz",
-      "integrity": "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==",
       "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.7",
@@ -44971,14 +45595,10 @@
     },
     "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==",
       "license": "MIT"
     },
     "node_modules/typedarray-to-buffer": {
       "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
-      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
       "dev": true,
       "license": "MIT",
       "peer": true,
@@ -44988,8 +45608,6 @@
     },
     "node_modules/typedarray.prototype.slice": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/typedarray.prototype.slice/-/typedarray.prototype.slice-1.0.5.tgz",
-      "integrity": "sha512-q7QNVDGTdl702bVFiI5eY4l/HkgCM6at9KhcFbgUAzezHFbOVy4+0O/lCjsABEQwbZPravVfBIiBVGo89yzHFg==",
       "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.8",
@@ -45009,9 +45627,7 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz",
-      "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==",
+      "version": "5.4.5",
       "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
@@ -45022,18 +45638,16 @@
       }
     },
     "node_modules/typescript-json-schema": {
-      "version": "0.55.0",
-      "resolved": "https://registry.npmjs.org/typescript-json-schema/-/typescript-json-schema-0.55.0.tgz",
-      "integrity": "sha512-BXaivYecUdiXWWNiUqXgY6A9cMWerwmhtO+lQE7tDZGs7Mf38sORDeQZugfYOZOHPZ9ulsD+w0LWjFDOQoXcwg==",
+      "version": "0.64.0",
       "license": "BSD-3-Clause",
       "dependencies": {
         "@types/json-schema": "^7.0.9",
         "@types/node": "^16.9.2",
         "glob": "^7.1.7",
-        "path-equal": "^1.1.2",
+        "path-equal": "^1.2.5",
         "safe-stable-stringify": "^2.2.0",
         "ts-node": "^10.9.1",
-        "typescript": "~4.8.2",
+        "typescript": "~5.1.0",
         "yargs": "^17.1.1"
       },
       "bin": {
@@ -45042,34 +45656,26 @@
     },
     "node_modules/typescript-json-schema/node_modules/@types/node": {
       "version": "16.18.126",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.126.tgz",
-      "integrity": "sha512-OTcgaiwfGFBKacvfwuHzzn1KLxH/er8mluiy8/uM3sGXHaRe73RrSIj01jow9t4kJEW633Ov+cOexXeiApTyAw==",
       "license": "MIT"
     },
     "node_modules/typescript-json-schema/node_modules/typescript": {
-      "version": "4.8.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz",
-      "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==",
+      "version": "5.1.6",
       "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
       },
       "engines": {
-        "node": ">=4.2.0"
+        "node": ">=14.17"
       }
     },
     "node_modules/ufo": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.6.1.tgz",
-      "integrity": "sha512-9a4/uxlTWJ4+a5i0ooc1rU7C7YOw3wT+UGqdeNNHWnOF9qcMBgLRS+4IYUqbczewFx4mLEig6gawh7X6mFlEkA==",
+      "version": "1.5.4",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/uglify-js": {
       "version": "3.19.3",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz",
-      "integrity": "sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==",
       "license": "BSD-2-Clause",
       "optional": true,
       "bin": {
@@ -45081,20 +45687,14 @@
     },
     "node_modules/ultimate-pagination": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/ultimate-pagination/-/ultimate-pagination-1.0.0.tgz",
-      "integrity": "sha512-bJNroO5GM11McB9RJ1rHZGiXV/jU89Qwc6U5wR8jZuk0uFVajIvUDGPiROVvNMApvh7Ij3cPoeG5V3UlF4GvOA==",
       "license": "MIT"
     },
     "node_modules/un-eval": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/un-eval/-/un-eval-1.2.0.tgz",
-      "integrity": "sha512-Wlj/pum6dQtGTPD/lclDtoVPkSfpjPfy1dwnnKw/sZP5DpBH9fLhBgQfsqNhe5/gS1D+vkZUuB771NRMUPA5CA==",
       "license": "MIT"
     },
     "node_modules/unbox-primitive": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz",
-      "integrity": "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==",
       "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.3",
@@ -45111,8 +45711,6 @@
     },
     "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,
       "license": "MIT",
       "dependencies": {
@@ -45122,30 +45720,37 @@
     },
     "node_modules/underscore": {
       "version": "1.13.7",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.7.tgz",
-      "integrity": "sha512-GMXzWtsc57XAtguZgaQViUOzs0KTkk8ojr3/xAxXLITqf/3EMwxC0inyETfDFjH/Krbhuep0HNbbjI9i/q3F3g==",
       "license": "MIT"
     },
+    "node_modules/undici": {
+      "version": "7.11.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=20.18.1"
+      }
+    },
     "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==",
+      "version": "6.21.0",
       "license": "MIT"
     },
     "node_modules/unicode-canonical-property-names-ecmascript": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.1.tgz",
-      "integrity": "sha512-dA8WbNeb2a6oQzAQ55YlT5vQAWGV9WXOsi3SskE3bcCdM0P4SDd+24zS/OCacdRq5BkdsRj9q3Pg6YyQoxIGqg==",
       "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
+    "node_modules/unicode-emoji-modifier-base": {
+      "version": "1.0.0",
+      "license": "MIT",
+      "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,
       "license": "MIT",
       "dependencies": {
@@ -45158,8 +45763,6 @@
     },
     "node_modules/unicode-match-property-value-ecmascript": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.2.0.tgz",
-      "integrity": "sha512-4IehN3V/+kkr5YeSSDDQG8QLqO26XpL2XP3GQtqwlT/QYSECAwFztxVHjlbh0+gjJ3XmNLS0zDsbgs9jWKExLg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -45168,8 +45771,6 @@
     },
     "node_modules/unicode-property-aliases-ecmascript": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
-      "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -45177,9 +45778,7 @@
       }
     },
     "node_modules/unicorn-magic": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.3.0.tgz",
-      "integrity": "sha512-+QBBXBCvifc56fsbuxZQ6Sic3wqqc3WWaqxs58gvJrcOuN83HGTCwz3oS5phzU9LthRNE9VrJCFCLUgHeeFnfA==",
+      "version": "0.1.0",
       "license": "MIT",
       "engines": {
         "node": ">=18"
@@ -45190,8 +45789,6 @@
     },
     "node_modules/unified": {
       "version": "10.1.2",
-      "resolved": "https://registry.npmjs.org/unified/-/unified-10.1.2.tgz",
-      "integrity": "sha512-pUSWAi/RAnVy1Pif2kAoeWNBa3JVrx0MId2LASj8G+7AiHWoKZNTomq6LG326T68U7/e263X6fTdcXIy7XnF7Q==",
       "license": "MIT",
       "dependencies": {
         "@types/unist": "^2.0.0",
@@ -45209,8 +45806,6 @@
     },
     "node_modules/unified/node_modules/is-plain-obj": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz",
-      "integrity": "sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==",
       "license": "MIT",
       "engines": {
         "node": ">=12"
@@ -45221,8 +45816,6 @@
     },
     "node_modules/unique-filename": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz",
-      "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -45234,8 +45827,6 @@
     },
     "node_modules/unique-slug": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz",
-      "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -45247,8 +45838,6 @@
     },
     "node_modules/unique-string": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-3.0.0.tgz",
-      "integrity": "sha512-VGXBUVwxKMBUznyffQweQABPRRW1vHZAbadFZud4pLFAqRGvv/96vafgjWFqzourzr8YonlQiPgH0YCJfawoGQ==",
       "license": "MIT",
       "dependencies": {
         "crypto-random-string": "^4.0.0"
@@ -45262,8 +45851,6 @@
     },
     "node_modules/unist-util-generated": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/unist-util-generated/-/unist-util-generated-2.0.1.tgz",
-      "integrity": "sha512-qF72kLmPxAw0oN2fwpWIqbXAVyEqUzDHMsbtPvOudIlUzXYFIeQIuxXQCRCFh22B7cixvU0MG7m3MW8FTq/S+A==",
       "license": "MIT",
       "funding": {
         "type": "opencollective",
@@ -45272,8 +45859,6 @@
     },
     "node_modules/unist-util-is": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-6.0.0.tgz",
-      "integrity": "sha512-2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw==",
       "license": "MIT",
       "dependencies": {
         "@types/unist": "^3.0.0"
@@ -45285,14 +45870,10 @@
     },
     "node_modules/unist-util-is/node_modules/@types/unist": {
       "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz",
-      "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==",
       "license": "MIT"
     },
     "node_modules/unist-util-position": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-5.0.0.tgz",
-      "integrity": "sha512-fucsC7HjXvkB5R3kTCO7kUjRdrS0BJt3M/FPxmHMBOm8JQi2BsHAHFsy27E0EolP8rp0NzXsJ+jNPyDWvOJZPA==",
       "license": "MIT",
       "dependencies": {
         "@types/unist": "^3.0.0"
@@ -45304,14 +45885,10 @@
     },
     "node_modules/unist-util-position/node_modules/@types/unist": {
       "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz",
-      "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==",
       "license": "MIT"
     },
     "node_modules/unist-util-stringify-position": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-4.0.0.tgz",
-      "integrity": "sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ==",
       "license": "MIT",
       "dependencies": {
         "@types/unist": "^3.0.0"
@@ -45323,14 +45900,10 @@
     },
     "node_modules/unist-util-stringify-position/node_modules/@types/unist": {
       "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz",
-      "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==",
       "license": "MIT"
     },
     "node_modules/unist-util-visit": {
       "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-4.1.2.tgz",
-      "integrity": "sha512-MSd8OUGISqHdVvfY9TPhyK2VdUrPgxkUtWSuMHF6XAAFuL4LokseigBnZtPnJMu+FbynTkFNnFlyjxpVKujMRg==",
       "license": "MIT",
       "dependencies": {
         "@types/unist": "^2.0.0",
@@ -45344,8 +45917,6 @@
     },
     "node_modules/unist-util-visit-parents": {
       "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-6.0.1.tgz",
-      "integrity": "sha512-L/PqWzfTP9lzzEa6CKs0k2nARxTdZduw3zyh8d2NVBnsyvHjSX4TWse388YrrQKbvI8w20fGjGlhgT96WwKykw==",
       "license": "MIT",
       "dependencies": {
         "@types/unist": "^3.0.0",
@@ -45358,14 +45929,10 @@
     },
     "node_modules/unist-util-visit-parents/node_modules/@types/unist": {
       "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz",
-      "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==",
       "license": "MIT"
     },
     "node_modules/unist-util-visit/node_modules/unist-util-is": {
       "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-5.2.1.tgz",
-      "integrity": "sha512-u9njyyfEh43npf1M+yGKDGVPbY/JWEemg5nH05ncKPfi+kBbKBJoTdsogMu33uhytuLlv9y0O7GH7fEdwLdLQw==",
       "license": "MIT",
       "dependencies": {
         "@types/unist": "^2.0.0"
@@ -45377,8 +45944,6 @@
     },
     "node_modules/unist-util-visit/node_modules/unist-util-visit-parents": {
       "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-5.1.3.tgz",
-      "integrity": "sha512-x6+y8g7wWMyQhL1iZfhIPhDAs7Xwbn9nRosDXl7qoPTSCy0yNxnKc+hWokFifWQIDGi154rdUqKvbCa4+1kLhg==",
       "license": "MIT",
       "dependencies": {
         "@types/unist": "^2.0.0",
@@ -45391,15 +45956,11 @@
     },
     "node_modules/universal-user-agent": {
       "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.1.tgz",
-      "integrity": "sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ==",
       "dev": true,
       "license": "ISC"
     },
     "node_modules/universalify": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
       "license": "MIT",
       "engines": {
         "node": ">= 10.0.0"
@@ -45407,8 +45968,6 @@
     },
     "node_modules/unpipe": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -45417,8 +45976,6 @@
     },
     "node_modules/unplugin": {
       "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-1.16.1.tgz",
-      "integrity": "sha512-4/u/j4FrCKdi17jaxuJA0jClGxB1AvU2hw/IuayPc4ay1XGaJs/rbb4v5WKwAjNifjmXK9PIFyuPiaK8azyR9w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -45430,9 +45987,7 @@
       }
     },
     "node_modules/unplugin/node_modules/acorn": {
-      "version": "8.14.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
-      "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
+      "version": "8.14.0",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -45444,48 +45999,44 @@
     },
     "node_modules/unplugin/node_modules/webpack-virtual-modules": {
       "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.6.2.tgz",
-      "integrity": "sha512-66/V2i5hQanC51vBQKPH4aI8NMAcBW59FVBs+rC7eGHupMyfn34q7rZIE+ETlJ+XTevqfUhVVBgSUNSW2flEUQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/unrs-resolver": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/unrs-resolver/-/unrs-resolver-1.7.11.tgz",
-      "integrity": "sha512-OhuAzBImFPjKNgZ2JwHMfGFUA6NSbRegd1+BPjC1Y0E6X9Y/vJ4zKeGmIMqmlYboj6cMNEwKI+xQisrg4J0HaQ==",
+      "version": "1.9.2",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "napi-postinstall": "^0.2.2"
+        "napi-postinstall": "^0.2.4"
       },
       "funding": {
         "url": "https://opencollective.com/unrs-resolver"
       },
       "optionalDependencies": {
-        "@unrs/resolver-binding-darwin-arm64": "1.7.11",
-        "@unrs/resolver-binding-darwin-x64": "1.7.11",
-        "@unrs/resolver-binding-freebsd-x64": "1.7.11",
-        "@unrs/resolver-binding-linux-arm-gnueabihf": "1.7.11",
-        "@unrs/resolver-binding-linux-arm-musleabihf": "1.7.11",
-        "@unrs/resolver-binding-linux-arm64-gnu": "1.7.11",
-        "@unrs/resolver-binding-linux-arm64-musl": "1.7.11",
-        "@unrs/resolver-binding-linux-ppc64-gnu": "1.7.11",
-        "@unrs/resolver-binding-linux-riscv64-gnu": "1.7.11",
-        "@unrs/resolver-binding-linux-riscv64-musl": "1.7.11",
-        "@unrs/resolver-binding-linux-s390x-gnu": "1.7.11",
-        "@unrs/resolver-binding-linux-x64-gnu": "1.7.11",
-        "@unrs/resolver-binding-linux-x64-musl": "1.7.11",
-        "@unrs/resolver-binding-wasm32-wasi": "1.7.11",
-        "@unrs/resolver-binding-win32-arm64-msvc": "1.7.11",
-        "@unrs/resolver-binding-win32-ia32-msvc": "1.7.11",
-        "@unrs/resolver-binding-win32-x64-msvc": "1.7.11"
+        "@unrs/resolver-binding-android-arm-eabi": "1.9.2",
+        "@unrs/resolver-binding-android-arm64": "1.9.2",
+        "@unrs/resolver-binding-darwin-arm64": "1.9.2",
+        "@unrs/resolver-binding-darwin-x64": "1.9.2",
+        "@unrs/resolver-binding-freebsd-x64": "1.9.2",
+        "@unrs/resolver-binding-linux-arm-gnueabihf": "1.9.2",
+        "@unrs/resolver-binding-linux-arm-musleabihf": "1.9.2",
+        "@unrs/resolver-binding-linux-arm64-gnu": "1.9.2",
+        "@unrs/resolver-binding-linux-arm64-musl": "1.9.2",
+        "@unrs/resolver-binding-linux-ppc64-gnu": "1.9.2",
+        "@unrs/resolver-binding-linux-riscv64-gnu": "1.9.2",
+        "@unrs/resolver-binding-linux-riscv64-musl": "1.9.2",
+        "@unrs/resolver-binding-linux-s390x-gnu": "1.9.2",
+        "@unrs/resolver-binding-linux-x64-gnu": "1.9.2",
+        "@unrs/resolver-binding-linux-x64-musl": "1.9.2",
+        "@unrs/resolver-binding-wasm32-wasi": "1.9.2",
+        "@unrs/resolver-binding-win32-arm64-msvc": "1.9.2",
+        "@unrs/resolver-binding-win32-ia32-msvc": "1.9.2",
+        "@unrs/resolver-binding-win32-x64-msvc": "1.9.2"
       }
     },
     "node_modules/untildify": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
-      "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -45493,8 +46044,6 @@
     },
     "node_modules/upath": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/upath/-/upath-2.0.1.tgz",
-      "integrity": "sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -45503,9 +46052,7 @@
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz",
-      "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==",
+      "version": "1.1.2",
       "dev": true,
       "funding": [
         {
@@ -45535,8 +46082,6 @@
     },
     "node_modules/uri-js": {
       "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
       "license": "BSD-2-Clause",
       "dependencies": {
         "punycode": "^2.1.0"
@@ -45544,8 +46089,6 @@
     },
     "node_modules/uri-js/node_modules/punycode": {
       "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
-      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -45553,14 +46096,10 @@
     },
     "node_modules/urijs": {
       "version": "1.19.11",
-      "resolved": "https://registry.npmjs.org/urijs/-/urijs-1.19.11.tgz",
-      "integrity": "sha512-HXgFDgDommxn5/bIv0cnQZsPhHDA90NPHD6+c/v21U5+Sx5hoP8+dP9IZXBU1gIfvdRfhG8cel9QNPeionfcCQ==",
       "license": "MIT"
     },
     "node_modules/url": {
       "version": "0.11.4",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.11.4.tgz",
-      "integrity": "sha512-oCwdVC7mTuWiPyjLUz/COz5TLk6wgp0RCsN+wHZ2Ekneac9w8uuV0njcbbie2ME+Vs+d6duwmYuR3HgQXs1fOg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -45571,10 +46110,15 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/url-join": {
+      "version": "5.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      }
+    },
     "node_modules/url-parse": {
       "version": "1.5.10",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
-      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -45584,14 +46128,10 @@
     },
     "node_modules/url-template": {
       "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/url-template/-/url-template-2.0.8.tgz",
-      "integrity": "sha512-XdVKMF4SJ0nP/O7XIPB0JwAEuT9lDIYnNsK8yGVe43y0AWoKeJNdv3ZNWh7ksJ6KqQFjOO6ox/VEitLnaVNufw==",
       "license": "BSD"
     },
     "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,
       "license": "MIT"
     },
@@ -45618,8 +46158,6 @@
     },
     "node_modules/use-event-callback": {
       "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/use-event-callback/-/use-event-callback-0.1.0.tgz",
-      "integrity": "sha512-5fTzY5UEXHMK5UR0NRkUz6TPfWmmX9fO8Tx3SnHrfMPdrQ7Rna0gDBy0r56SP68TwsP9DgwSBzeysCu3A/Z2NA==",
       "license": "ISC",
       "peerDependencies": {
         "react": ">=16.8"
@@ -45627,8 +46165,6 @@
     },
     "node_modules/use-immer": {
       "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/use-immer/-/use-immer-0.9.0.tgz",
-      "integrity": "sha512-/L+enLi0nvuZ6j4WlyK0US9/ECUtV5v9RUbtxnn5+WbtaXYUaOBoKHDNL9I5AETdurQ4rIFIj/s+Z5X80ATyKw==",
       "license": "MIT",
       "peerDependencies": {
         "immer": ">=2.0.0",
@@ -45637,8 +46173,6 @@
     },
     "node_modules/use-query-params": {
       "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/use-query-params/-/use-query-params-1.2.3.tgz",
-      "integrity": "sha512-cdG0tgbzK+FzsV6DAt2CN8Saa3WpRnze7uC4Rdh7l15epSFq7egmcB/zuREvPNwO5Yk80nUpDZpiyHsoq50d8w==",
       "license": "ISC",
       "dependencies": {
         "serialize-query-params": "^1.3.5"
@@ -45673,8 +46207,6 @@
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "inherits": "^2.0.3",
@@ -45686,21 +46218,15 @@
     },
     "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/utila": {
       "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
-      "integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/utils-merge": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -45709,8 +46235,6 @@
     },
     "node_modules/utrie": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/utrie/-/utrie-1.0.2.tgz",
-      "integrity": "sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==",
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -45719,8 +46243,6 @@
     },
     "node_modules/uuid": {
       "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
-      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
       "funding": [
         "https://github.com/sponsors/broofa",
         "https://github.com/sponsors/ctavan"
@@ -45732,8 +46254,6 @@
     },
     "node_modules/uvu": {
       "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/uvu/-/uvu-0.5.6.tgz",
-      "integrity": "sha512-+g8ENReyr8YsOc6fv/NVJs2vFdHBnBNdfE49rshrTzDWOlUx4Gq7KOS2GD8eqhy2j+Ejq29+SbKH8yjkAqXqoA==",
       "license": "MIT",
       "dependencies": {
         "dequal": "^2.0.0",
@@ -45750,8 +46270,6 @@
     },
     "node_modules/uvu/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"
@@ -45759,14 +46277,10 @@
     },
     "node_modules/v8-compile-cache-lib": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
-      "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
       "license": "MIT"
     },
     "node_modules/v8-to-istanbul": {
       "version": "9.3.0",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz",
-      "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -45780,8 +46294,6 @@
     },
     "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": {
@@ -45793,8 +46305,6 @@
     },
     "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==",
       "license": "Apache-2.0",
       "dependencies": {
         "spdx-correct": "^3.0.0",
@@ -45803,8 +46313,6 @@
     },
     "node_modules/validate-npm-package-name": {
       "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz",
-      "integrity": "sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==",
       "dev": true,
       "license": "ISC",
       "engines": {
@@ -45813,47 +46321,33 @@
     },
     "node_modules/validate.io-array": {
       "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/validate.io-array/-/validate.io-array-1.0.6.tgz",
-      "integrity": "sha512-DeOy7CnPEziggrOO5CZhVKJw6S3Yi7e9e65R1Nl/RTN1vTQKnzjfvks0/8kQ40FP/dsjRAOd4hxmJ7uLa6vxkg==",
       "license": "MIT"
     },
     "node_modules/validate.io-function": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/validate.io-function/-/validate.io-function-1.0.2.tgz",
-      "integrity": "sha512-LlFybRJEriSuBnUhQyG5bwglhh50EpTL2ul23MPIuR1odjO7XaMLFV8vHGwp7AZciFxtYOeiSCT5st+XSPONiQ=="
+      "version": "1.0.2"
     },
     "node_modules/validate.io-integer": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/validate.io-integer/-/validate.io-integer-1.0.5.tgz",
-      "integrity": "sha512-22izsYSLojN/P6bppBqhgUDjCkr5RY2jd+N2a3DCAUey8ydvrZ/OkGvFPR7qfOpwR2LC5p4Ngzxz36g5Vgr/hQ==",
       "dependencies": {
         "validate.io-number": "^1.0.3"
       }
     },
     "node_modules/validate.io-integer-array": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/validate.io-integer-array/-/validate.io-integer-array-1.0.0.tgz",
-      "integrity": "sha512-mTrMk/1ytQHtCY0oNO3dztafHYyGU88KL+jRxWuzfOmQb+4qqnWmI+gykvGp8usKZOM0H7keJHEbRaFiYA0VrA==",
       "dependencies": {
         "validate.io-array": "^1.0.3",
         "validate.io-integer": "^1.0.4"
       }
     },
     "node_modules/validate.io-number": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/validate.io-number/-/validate.io-number-1.0.3.tgz",
-      "integrity": "sha512-kRAyotcbNaSYoDnXvb4MHg/0a1egJdLwS6oJ38TJY7aw9n93Fl/3blIXdyYvPOp55CNxywooG/3BcrwNrBpcSg=="
+      "version": "1.0.3"
     },
     "node_modules/value-equal": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/value-equal/-/value-equal-1.0.1.tgz",
-      "integrity": "sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw==",
       "license": "MIT"
     },
     "node_modules/vary": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -45876,8 +46370,6 @@
     },
     "node_modules/version-range": {
       "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/version-range/-/version-range-4.14.0.tgz",
-      "integrity": "sha512-gjb0ARm9qlcBAonU4zPwkl9ecKkas+tC2CGwFfptTCWWIVTWY1YUbT2zZKsOAF1jR/tNxxyLwwG0cb42XlYcTg==",
       "license": "Artistic-2.0",
       "engines": {
         "node": ">=4"
@@ -45888,8 +46380,6 @@
     },
     "node_modules/vfile": {
       "version": "5.3.7",
-      "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.7.tgz",
-      "integrity": "sha512-r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g==",
       "license": "MIT",
       "dependencies": {
         "@types/unist": "^2.0.0",
@@ -45904,8 +46394,6 @@
     },
     "node_modules/vfile-location": {
       "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-5.0.3.tgz",
-      "integrity": "sha512-5yXvWDEgqeiYiBe1lbxYF7UMAIm/IcopxMHrMQDq3nvKcjPKIhZklUKL+AE7J7uApI4kwe2snsK+eI6UTj9EHg==",
       "license": "MIT",
       "dependencies": {
         "@types/unist": "^3.0.0",
@@ -45918,14 +46406,10 @@
     },
     "node_modules/vfile-location/node_modules/@types/unist": {
       "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz",
-      "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==",
       "license": "MIT"
     },
     "node_modules/vfile-location/node_modules/vfile": {
       "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/vfile/-/vfile-6.0.3.tgz",
-      "integrity": "sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==",
       "license": "MIT",
       "dependencies": {
         "@types/unist": "^3.0.0",
@@ -45938,8 +46422,6 @@
     },
     "node_modules/vfile-location/node_modules/vfile-message": {
       "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-4.0.2.tgz",
-      "integrity": "sha512-jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw==",
       "license": "MIT",
       "dependencies": {
         "@types/unist": "^3.0.0",
@@ -45952,8 +46434,6 @@
     },
     "node_modules/vfile-message": {
       "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.4.tgz",
-      "integrity": "sha512-fa0Z6P8HUrQN4BZaX05SIVXic+7kE3b05PWAtPuYP9QLHsLKYR7/AlLW3NtOrpXRLeawpDLMsVkmk5DG0NXgWw==",
       "license": "MIT",
       "dependencies": {
         "@types/unist": "^2.0.0",
@@ -45966,8 +46446,6 @@
     },
     "node_modules/vfile-message/node_modules/unist-util-stringify-position": {
       "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.3.tgz",
-      "integrity": "sha512-k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg==",
       "license": "MIT",
       "dependencies": {
         "@types/unist": "^2.0.0"
@@ -45979,8 +46457,6 @@
     },
     "node_modules/vfile/node_modules/unist-util-stringify-position": {
       "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.3.tgz",
-      "integrity": "sha512-k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg==",
       "license": "MIT",
       "dependencies": {
         "@types/unist": "^2.0.0"
@@ -45992,9 +46468,6 @@
     },
     "node_modules/viewport-mercator-project": {
       "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/viewport-mercator-project/-/viewport-mercator-project-7.0.4.tgz",
-      "integrity": "sha512-0jzpL6pIMocCKWg1C3mqi/N4UPgZC3FzwghEm1H+XsUo8hNZAyJc3QR7YqC816ibOR8aWT5pCsV+gCu8/BMJgg==",
-      "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
       "license": "MIT",
       "dependencies": {
         "@math.gl/web-mercator": "^3.5.5"
@@ -46002,8 +46475,6 @@
     },
     "node_modules/viewport-mercator-project/node_modules/@math.gl/web-mercator": {
       "version": "3.6.3",
-      "resolved": "https://registry.npmjs.org/@math.gl/web-mercator/-/web-mercator-3.6.3.tgz",
-      "integrity": "sha512-UVrkSOs02YLehKaehrxhAejYMurehIHPfFQvPFZmdJHglHOU4V2cCUApTVEwOksvCp161ypEqVp+9H6mGhTTcw==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.12.0",
@@ -46011,12 +46482,11 @@
       }
     },
     "node_modules/vinyl": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-3.0.1.tgz",
-      "integrity": "sha512-0QwqXteBNXgnLCdWdvPQBX6FXRHtIH3VhJPTd5Lwn28tJXc34YqSCWUmkOvtJHBmB3gGoPtrOKk3Ts8/kEZ9aA==",
+      "version": "3.0.0",
       "license": "MIT",
       "dependencies": {
         "clone": "^2.1.2",
+        "clone-stats": "^1.0.0",
         "remove-trailing-separator": "^1.1.0",
         "replace-ext": "^2.0.0",
         "teex": "^1.0.1"
@@ -46027,9 +46497,8 @@
     },
     "node_modules/vinyl-file": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/vinyl-file/-/vinyl-file-5.0.0.tgz",
-      "integrity": "sha512-MvkPF/yA1EX7c6p+juVIvp9+Lxp70YUfNKzEWeHMKpUNVSnTZh2coaOqLxI0pmOe2V9nB+OkgFaMDkodaJUyGw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/vinyl": "^2.0.7",
         "strip-bom-buf": "^3.0.1",
@@ -46043,32 +46512,17 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/vinyl/node_modules/clone": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
-      "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
     "node_modules/vlq": {
       "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/vlq/-/vlq-0.2.3.tgz",
-      "integrity": "sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==",
       "license": "MIT"
     },
     "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,
       "license": "MIT"
     },
     "node_modules/vt-pbf": {
       "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/vt-pbf/-/vt-pbf-3.1.3.tgz",
-      "integrity": "sha512-2LzDFzt0mZKZ9IpVF2r69G9bXaP2Q2sArJCmcCgvfTdCCZzSyz4aCLoQyUilu37Ll56tCblIZrXFIjNUpGIlmA==",
       "license": "MIT",
       "dependencies": {
         "@mapbox/point-geometry": "0.1.0",
@@ -46078,8 +46532,6 @@
     },
     "node_modules/w3c-xmlserializer": {
       "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": {
@@ -46091,34 +46543,19 @@
     },
     "node_modules/walk-up-path": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/walk-up-path/-/walk-up-path-3.0.1.tgz",
-      "integrity": "sha512-9YlCL/ynK3CTlrSRrDxZvUauLzAswPCrsaCgilqFevUYpeEW0/3ScEjaa3kbW/T0ghhkEr7mv+fpjqn1Y1YuTA==",
       "dev": true,
       "license": "ISC"
     },
     "node_modules/walker": {
       "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
-      "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
         "makeerror": "1.0.12"
       }
     },
-    "node_modules/warning": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
-      "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
-      "license": "MIT",
-      "dependencies": {
-        "loose-envify": "^1.0.0"
-      }
-    },
     "node_modules/watchpack": {
-      "version": "2.4.4",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.4.tgz",
-      "integrity": "sha512-c5EGNOiyxxV5qmTtAB7rbiXxi1ooX1pQKMLX/MIabJjRA0SJBQOjKF+KSVfHkr9U1cADPon0mRiVe/riyaiDUA==",
+      "version": "2.4.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -46131,8 +46568,6 @@
     },
     "node_modules/wbuf": {
       "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
-      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -46141,9 +46576,6 @@
     },
     "node_modules/wcwidth": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
-      "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==",
-      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "defaults": "^1.0.3"
@@ -46151,8 +46583,6 @@
     },
     "node_modules/web-namespaces": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/web-namespaces/-/web-namespaces-2.0.1.tgz",
-      "integrity": "sha512-bKr1DkiNa2krS7qxNtdrtHAmzuYGFQLiQ13TsorsdT6ULTkPLKuu5+GsFpDlg6JFjUTwX2DyhMPG2be8uPrqsQ==",
       "license": "MIT",
       "funding": {
         "type": "github",
@@ -46161,8 +46591,6 @@
     },
     "node_modules/web-streams-polyfill": {
       "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz",
-      "integrity": "sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -46170,15 +46598,11 @@
       }
     },
     "node_modules/web-worker": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/web-worker/-/web-worker-1.5.0.tgz",
-      "integrity": "sha512-RiMReJrTAiA+mBjGONMnjVDP2u3p9R1vkcGz6gDIrOMT3oGuYwX2WRMYI9ipkphSuE5XKEhydbhNEJh4NY9mlw==",
+      "version": "1.3.0",
       "license": "Apache-2.0"
     },
     "node_modules/webdriver": {
       "version": "7.31.1",
-      "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-7.31.1.tgz",
-      "integrity": "sha512-nCdJLxRnYvOMFqTEX7sqQtF/hV/Jgov0Y6ICeOm1DMTlZSRRDaUsBMlEAPkEwif9uBJYdM0znv8qzfX358AGqQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -46196,10 +46620,16 @@
         "node": ">=12.0.0"
       }
     },
+    "node_modules/webdriver/node_modules/@types/node": {
+      "version": "18.19.115",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
     "node_modules/webdriver/node_modules/@wdio/types": {
       "version": "7.30.2",
-      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.30.2.tgz",
-      "integrity": "sha512-uZ8o7FX8RyBsaXiOWa59UKTCHTtADNvOArYTcHNEIzt+rh4JdB/uwqfc8y4TCNA2kYm7PWaQpUFwpStLeg0H1Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -46220,8 +46650,6 @@
     },
     "node_modules/webdriver/node_modules/typescript": {
       "version": "4.9.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
-      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
       "dev": true,
       "license": "Apache-2.0",
       "optional": true,
@@ -46234,10 +46662,13 @@
         "node": ">=4.2.0"
       }
     },
+    "node_modules/webdriver/node_modules/undici-types": {
+      "version": "5.26.5",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/webidl-conversions": {
       "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": {
@@ -46245,15 +46676,12 @@
       }
     },
     "node_modules/webpack": {
-      "version": "5.99.9",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.99.9.tgz",
-      "integrity": "sha512-brOPwM3JnmOa+7kd3NsmOUOwbDAj8FT9xDsG3IW0MgbN9yZV7Oi/s/+MNQ/EcSMqw7qfoRyXPoeEWT8zLVdVGg==",
+      "version": "5.98.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/eslint-scope": "^3.7.7",
         "@types/estree": "^1.0.6",
-        "@types/json-schema": "^7.0.15",
         "@webassemblyjs/ast": "^1.14.1",
         "@webassemblyjs/wasm-edit": "^1.14.1",
         "@webassemblyjs/wasm-parser": "^1.14.1",
@@ -46270,7 +46698,7 @@
         "loader-runner": "^4.2.0",
         "mime-types": "^2.1.27",
         "neo-async": "^2.6.2",
-        "schema-utils": "^4.3.2",
+        "schema-utils": "^4.3.0",
         "tapable": "^2.1.1",
         "terser-webpack-plugin": "^5.3.11",
         "watchpack": "^2.4.1",
@@ -46294,8 +46722,6 @@
     },
     "node_modules/webpack-bundle-analyzer": {
       "version": "4.10.2",
-      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.10.2.tgz",
-      "integrity": "sha512-vJptkMm9pk5si4Bv922ZbKLV8UTT4zib4FPgXMhgzUny0bfDDkLXAVQs3ly3fS4/TN9ROFtb0NFrm04UXFE/Vw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -46320,9 +46746,7 @@
       }
     },
     "node_modules/webpack-bundle-analyzer/node_modules/acorn": {
-      "version": "8.14.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
-      "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
+      "version": "8.14.0",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -46334,8 +46758,6 @@
     },
     "node_modules/webpack-bundle-analyzer/node_modules/acorn-walk": {
       "version": "8.3.4",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz",
-      "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -46347,8 +46769,6 @@
     },
     "node_modules/webpack-bundle-analyzer/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,
       "license": "MIT",
       "engines": {
@@ -46357,8 +46777,6 @@
     },
     "node_modules/webpack-bundle-analyzer/node_modules/ws": {
       "version": "7.5.10",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
-      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -46379,8 +46797,6 @@
     },
     "node_modules/webpack-cli": {
       "version": "4.10.0",
-      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.10.0.tgz",
-      "integrity": "sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -46427,8 +46843,6 @@
     },
     "node_modules/webpack-cli/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,
       "license": "MIT",
       "engines": {
@@ -46437,8 +46851,6 @@
     },
     "node_modules/webpack-dev-middleware": {
       "version": "6.1.3",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-6.1.3.tgz",
-      "integrity": "sha512-A4ChP0Qj8oGociTs6UdlRUGANIGrCDL3y+pmQMc+dSsraXHCatFpmMey4mYELA+juqwUqwQsUgJJISXl1KWmiw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -46465,55 +46877,51 @@
       }
     },
     "node_modules/webpack-dev-server": {
-      "version": "4.15.2",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.2.tgz",
-      "integrity": "sha512-0XavAZbNJ5sDrCbkpWL8mia0o5WPOd2YGtxrEiZkBK9FjLppIUK2TgxK6qGD2P3hUXTJNNPVibrerKcx5WkR1g==",
+      "version": "5.2.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/bonjour": "^3.5.9",
-        "@types/connect-history-api-fallback": "^1.3.5",
-        "@types/express": "^4.17.13",
-        "@types/serve-index": "^1.9.1",
-        "@types/serve-static": "^1.13.10",
-        "@types/sockjs": "^0.3.33",
-        "@types/ws": "^8.5.5",
+        "@types/bonjour": "^3.5.13",
+        "@types/connect-history-api-fallback": "^1.5.4",
+        "@types/express": "^4.17.21",
+        "@types/express-serve-static-core": "^4.17.21",
+        "@types/serve-index": "^1.9.4",
+        "@types/serve-static": "^1.15.5",
+        "@types/sockjs": "^0.3.36",
+        "@types/ws": "^8.5.10",
         "ansi-html-community": "^0.0.8",
-        "bonjour-service": "^1.0.11",
-        "chokidar": "^3.5.3",
+        "bonjour-service": "^1.2.1",
+        "chokidar": "^3.6.0",
         "colorette": "^2.0.10",
         "compression": "^1.7.4",
         "connect-history-api-fallback": "^2.0.0",
-        "default-gateway": "^6.0.3",
-        "express": "^4.17.3",
+        "express": "^4.21.2",
         "graceful-fs": "^4.2.6",
-        "html-entities": "^2.3.2",
-        "http-proxy-middleware": "^2.0.3",
-        "ipaddr.js": "^2.0.1",
-        "launch-editor": "^2.6.0",
-        "open": "^8.0.9",
-        "p-retry": "^4.5.0",
-        "rimraf": "^3.0.2",
-        "schema-utils": "^4.0.0",
-        "selfsigned": "^2.1.1",
+        "http-proxy-middleware": "^2.0.9",
+        "ipaddr.js": "^2.1.0",
+        "launch-editor": "^2.6.1",
+        "open": "^10.0.3",
+        "p-retry": "^6.2.0",
+        "schema-utils": "^4.2.0",
+        "selfsigned": "^2.4.1",
         "serve-index": "^1.9.1",
         "sockjs": "^0.3.24",
         "spdy": "^4.0.2",
-        "webpack-dev-middleware": "^5.3.4",
-        "ws": "^8.13.0"
+        "webpack-dev-middleware": "^7.4.2",
+        "ws": "^8.18.0"
       },
       "bin": {
         "webpack-dev-server": "bin/webpack-dev-server.js"
       },
       "engines": {
-        "node": ">= 12.13.0"
+        "node": ">= 18.12.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/webpack"
       },
       "peerDependencies": {
-        "webpack": "^4.37.0 || ^5.0.0"
+        "webpack": "^5.0.0"
       },
       "peerDependenciesMeta": {
         "webpack": {
@@ -46524,61 +46932,153 @@
         }
       }
     },
+    "node_modules/webpack-dev-server/node_modules/@types/retry": {
+      "version": "0.12.2",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/webpack-dev-server/node_modules/@types/ws": {
+      "version": "8.18.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/define-lazy-prop": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/webpack-dev-server/node_modules/ipaddr.js": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.2.0.tgz",
-      "integrity": "sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==",
       "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 10"
       }
     },
-    "node_modules/webpack-dev-server/node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "deprecated": "Rimraf versions prior to v4 are no longer supported",
+    "node_modules/webpack-dev-server/node_modules/is-wsl": {
+      "version": "3.1.0",
       "dev": true,
-      "license": "ISC",
+      "license": "MIT",
       "dependencies": {
-        "glob": "^7.1.3"
+        "is-inside-container": "^1.0.0"
       },
-      "bin": {
-        "rimraf": "bin.js"
+      "engines": {
+        "node": ">=16"
       },
       "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/memfs": {
+      "version": "4.17.2",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@jsonjoy.com/json-pack": "^1.0.3",
+        "@jsonjoy.com/util": "^1.3.0",
+        "tree-dump": "^1.0.1",
+        "tslib": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 4.0.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/streamich"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/open": {
+      "version": "10.1.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "default-browser": "^5.2.1",
+        "define-lazy-prop": "^3.0.0",
+        "is-inside-container": "^1.0.0",
+        "is-wsl": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/p-retry": {
+      "version": "6.2.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/retry": "0.12.2",
+        "is-network-error": "^1.0.0",
+        "retry": "^0.13.1"
+      },
+      "engines": {
+        "node": ">=16.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/webpack-dev-server/node_modules/webpack-dev-middleware": {
-      "version": "5.3.4",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz",
-      "integrity": "sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==",
+      "version": "7.4.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "colorette": "^2.0.10",
-        "memfs": "^3.4.3",
+        "memfs": "^4.6.0",
         "mime-types": "^2.1.31",
+        "on-finished": "^2.4.1",
         "range-parser": "^1.2.1",
         "schema-utils": "^4.0.0"
       },
       "engines": {
-        "node": ">= 12.13.0"
+        "node": ">= 18.12.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/webpack"
       },
       "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
+        "webpack": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "webpack": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/ws": {
+      "version": "8.18.3",
+      "dev": true,
+      "license": "MIT",
+      "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/webpack-hot-middleware": {
       "version": "2.26.1",
-      "resolved": "https://registry.npmjs.org/webpack-hot-middleware/-/webpack-hot-middleware-2.26.1.tgz",
-      "integrity": "sha512-khZGfAeJx6I8K9zKohEWWYN6KDlVw2DHownoe+6Vtwj1LP9WFgegXnVMSkZ/dBEBtXFwrkkydsaPFlB7f8wU2A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -46588,9 +47088,7 @@
       }
     },
     "node_modules/webpack-manifest-plugin": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/webpack-manifest-plugin/-/webpack-manifest-plugin-5.0.1.tgz",
-      "integrity": "sha512-xTlX7dC3hrASixA2inuWFMz6qHsNi6MT3Uiqw621sJjRTShtpMjbDYhPPZBwWUKdIYKIjSq9em6+uzWayf38aQ==",
+      "version": "5.0.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -46598,16 +47096,14 @@
         "webpack-sources": "^2.2.0"
       },
       "engines": {
-        "node": ">=14"
+        "node": ">=12.22.0"
       },
       "peerDependencies": {
-        "webpack": "^5.75.0"
+        "webpack": "^5.47.0"
       }
     },
     "node_modules/webpack-manifest-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,
       "license": "BSD-3-Clause",
       "engines": {
@@ -46616,8 +47112,6 @@
     },
     "node_modules/webpack-manifest-plugin/node_modules/webpack-sources": {
       "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.1.tgz",
-      "integrity": "sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -46630,8 +47124,6 @@
     },
     "node_modules/webpack-merge": {
       "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.10.0.tgz",
-      "integrity": "sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -46644,9 +47136,7 @@
       }
     },
     "node_modules/webpack-sources": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.3.2.tgz",
-      "integrity": "sha512-ykKKus8lqlgXX/1WjudpIEjqsafjOTcOJqxnAbMLAu/KCsDCJ6GBtvscewvTkrn24HsnvFwrSCbenFrhtcCsAA==",
+      "version": "3.2.3",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -46655,15 +47145,11 @@
     },
     "node_modules/webpack-virtual-modules": {
       "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.5.0.tgz",
-      "integrity": "sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/webpack-visualizer-plugin2": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/webpack-visualizer-plugin2/-/webpack-visualizer-plugin2-1.2.0.tgz",
-      "integrity": "sha512-Lhykog3Wr8OnusslBwKB6Uhgq6QFxjjwooN89Rfk7GgmC5qqaJ6lAnr+Wiuj3+2UwPNKttiRrvikG3WEbbRwWw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -46679,8 +47165,6 @@
     },
     "node_modules/webpack-visualizer-plugin2/node_modules/mkdirp": {
       "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -46719,28 +47203,13 @@
         "react": "17.0.2"
       }
     },
-    "node_modules/webpack-visualizer-plugin2/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,
-      "license": "MIT",
-      "dependencies": {
-        "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.1"
-      }
-    },
     "node_modules/webpack/node_modules/@types/estree": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
-      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
+      "version": "1.0.6",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/webpack/node_modules/acorn": {
-      "version": "8.14.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
-      "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
+      "version": "8.14.0",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -46752,15 +47221,11 @@
     },
     "node_modules/webpack/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,
       "license": "MIT"
     },
     "node_modules/websocket-driver": {
       "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
-      "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -46774,8 +47239,6 @@
     },
     "node_modules/websocket-extensions": {
       "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
-      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -46783,15 +47246,11 @@
       }
     },
     "node_modules/wgsl_reflect": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/wgsl_reflect/-/wgsl_reflect-1.2.1.tgz",
-      "integrity": "sha512-PY6MdLqLW1NFj/V6f5/9/Nb4ultwlAF7lCLyjKOAkdnlf7LlrGXNFXzHHEV7Okg1zy4C4TpBIcc/G3PXW4py8g==",
+      "version": "1.0.16",
       "license": "MIT"
     },
     "node_modules/whatwg-encoding": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz",
-      "integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -46801,45 +47260,16 @@
         "node": ">=18"
       }
     },
-    "node_modules/whatwg-fetch": {
-      "version": "3.6.20",
-      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.20.tgz",
-      "integrity": "sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg==",
-      "license": "MIT"
-    },
     "node_modules/whatwg-mimetype": {
       "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": "6.5.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz",
-      "integrity": "sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "lodash.sortby": "^4.7.0",
-        "tr46": "^1.0.1",
-        "webidl-conversions": "^4.0.2"
-      }
-    },
-    "node_modules/whatwg-url/node_modules/webidl-conversions": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
-      "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==",
-      "dev": true,
-      "license": "BSD-2-Clause"
-    },
     "node_modules/which": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
       "license": "ISC",
       "dependencies": {
         "isexe": "^2.0.0"
@@ -46853,8 +47283,6 @@
     },
     "node_modules/which-boxed-primitive": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz",
-      "integrity": "sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==",
       "license": "MIT",
       "dependencies": {
         "is-bigint": "^1.1.0",
@@ -46872,8 +47300,6 @@
     },
     "node_modules/which-builtin-type": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.1.tgz",
-      "integrity": "sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==",
       "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.2",
@@ -46899,8 +47325,6 @@
     },
     "node_modules/which-collection": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz",
-      "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==",
       "license": "MIT",
       "dependencies": {
         "is-map": "^2.0.3",
@@ -46917,23 +47341,18 @@
     },
     "node_modules/which-module": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz",
-      "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==",
       "dev": true,
       "license": "ISC",
       "peer": true
     },
     "node_modules/which-typed-array": {
-      "version": "1.1.19",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.19.tgz",
-      "integrity": "sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==",
+      "version": "1.1.18",
       "license": "MIT",
       "dependencies": {
         "available-typed-arrays": "^1.0.7",
         "call-bind": "^1.0.8",
-        "call-bound": "^1.0.4",
-        "for-each": "^0.3.5",
-        "get-proto": "^1.0.1",
+        "call-bound": "^1.0.3",
+        "for-each": "^0.3.3",
         "gopd": "^1.2.0",
         "has-tostringtag": "^1.0.2"
       },
@@ -46946,8 +47365,6 @@
     },
     "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,
       "license": "ISC",
       "dependencies": {
@@ -46956,8 +47373,6 @@
     },
     "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,
       "license": "MIT",
       "dependencies": {
@@ -46969,15 +47384,15 @@
     },
     "node_modules/wildcard": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz",
-      "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==",
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/wkt-parser": {
+      "version": "1.5.2",
+      "license": "MIT"
+    },
     "node_modules/word-wrap": {
       "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
-      "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -46985,14 +47400,10 @@
     },
     "node_modules/wordwrap": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-      "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==",
       "license": "MIT"
     },
     "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==",
       "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
@@ -47006,8 +47417,6 @@
     "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==",
       "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
@@ -47023,28 +47432,33 @@
     },
     "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==",
       "license": "ISC"
     },
     "node_modules/write-file-atomic": {
-      "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==",
+      "version": "5.0.1",
       "dev": true,
       "license": "ISC",
       "dependencies": {
         "imurmurhash": "^0.1.4",
-        "signal-exit": "^3.0.7"
+        "signal-exit": "^4.0.1"
       },
       "engines": {
-        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/write-file-atomic/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/write-json-file": {
       "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/write-json-file/-/write-json-file-3.2.0.tgz",
-      "integrity": "sha512-3xZqT7Byc2uORAatYiP3DHUUAVEkNOswEWNs9H5KXiicRTvzYzYqKjYc4G7p+8pltvAw641lVByKVtMpf+4sYQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -47061,8 +47475,6 @@
     },
     "node_modules/write-json-file/node_modules/detect-indent": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz",
-      "integrity": "sha512-rlpvsxUtM0PQvy9iZe640/IWwWYyBsTApREbA1pHOpmOUIl9MkP/U4z7vTtg4Oaojvqhxt7sdufnT0EzGaR31g==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -47071,8 +47483,6 @@
     },
     "node_modules/write-json-file/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,
       "license": "MIT",
       "engines": {
@@ -47081,8 +47491,6 @@
     },
     "node_modules/write-json-file/node_modules/write-file-atomic": {
       "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz",
-      "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -47093,8 +47501,6 @@
     },
     "node_modules/write-pkg": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/write-pkg/-/write-pkg-4.0.0.tgz",
-      "integrity": "sha512-v2UQ+50TNf2rNHJ8NyWttfm/EJUBWMJcx6ZTYZr6Qp52uuegWw/lBkCtCbnYZEmPRNL61m+u67dAmGxo+HTULA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -47108,8 +47514,6 @@
     },
     "node_modules/write-pkg/node_modules/type-fest": {
       "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.4.1.tgz",
-      "integrity": "sha512-IwzA/LSfD2vC1/YDYMv/zHP4rDF1usCwllsDpbolT3D4fUepIO7f9K70jjmUewU/LmGUKJcwcVtDCpnKk4BPMw==",
       "dev": true,
       "license": "(MIT OR CC0-1.0)",
       "engines": {
@@ -47118,9 +47522,6 @@
     },
     "node_modules/ws": {
       "version": "8.17.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
-      "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=10.0.0"
@@ -47140,8 +47541,6 @@
     },
     "node_modules/xml-name-validator": {
       "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": {
@@ -47149,15 +47548,29 @@
       }
     },
     "node_modules/xml-utils": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/xml-utils/-/xml-utils-1.10.2.tgz",
-      "integrity": "sha512-RqM+2o1RYs6T8+3DzDSoTRAUfrvaejbVHcp3+thnAtDKo8LskR+HomLajEy5UjTz24rpka7AxVBRR3g2wTUkJA==",
+      "version": "1.10.1",
       "license": "CC0-1.0"
     },
+    "node_modules/xml2js": {
+      "version": "0.6.2",
+      "license": "MIT",
+      "dependencies": {
+        "sax": ">=0.6.0",
+        "xmlbuilder": "~11.0.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/xml2js/node_modules/xmlbuilder": {
+      "version": "11.0.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
     "node_modules/xmlbuilder": {
       "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.0.0.tgz",
-      "integrity": "sha512-KLu/G0DoWhkncQ9eHSI6s0/w+T4TM7rQaLhtCaL6tORv8jFlJPlnGumsgTcGfYeS1qZ/IHqrvDG7zJZ4d7e+nw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -47166,15 +47579,11 @@
     },
     "node_modules/xmlchars": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
-      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/xss": {
       "version": "1.0.15",
-      "resolved": "https://registry.npmjs.org/xss/-/xss-1.0.15.tgz",
-      "integrity": "sha512-FVdlVVC67WOIPvfOwhoMETV72f6GbW7aOabBC3WxN/oUdoEMDyLz4OgRv5/gck2ZeNqEQu+Tb0kloovXOfpYVg==",
       "license": "MIT",
       "dependencies": {
         "commander": "^2.20.3",
@@ -47189,14 +47598,10 @@
     },
     "node_modules/xss/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==",
       "license": "MIT"
     },
     "node_modules/xtend": {
       "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
       "license": "MIT",
       "engines": {
         "node": ">=0.4"
@@ -47204,8 +47609,6 @@
     },
     "node_modules/y18n": {
       "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
       "license": "ISC",
       "engines": {
         "node": ">=10"
@@ -47213,28 +47616,22 @@
     },
     "node_modules/yallist": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
       "dev": true,
       "license": "ISC"
     },
     "node_modules/yaml": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.0.tgz",
-      "integrity": "sha512-4lLa/EcQCB0cJkyts+FpIRx5G/llPxfP6VQU5KByHEhLxY3IJCH0f0Hy1MHI8sClTvsIb8qwRJ6R/ZdlDJ/leQ==",
+      "version": "2.7.1",
       "dev": true,
       "license": "ISC",
       "bin": {
         "yaml": "bin.mjs"
       },
       "engines": {
-        "node": ">= 14.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==",
       "license": "MIT",
       "dependencies": {
         "cliui": "^8.0.1",
@@ -47251,8 +47648,6 @@
     },
     "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==",
       "license": "ISC",
       "engines": {
         "node": ">=12"
@@ -47260,8 +47655,6 @@
     },
     "node_modules/yauzl": {
       "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
-      "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
       "license": "MIT",
       "dependencies": {
         "buffer-crc32": "~0.2.3",
@@ -47269,9 +47662,838 @@
       }
     },
     "node_modules/yeoman-generator": {
+      "version": "7.4.0",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@types/lodash-es": "^4.17.9",
+        "@types/node": ">=18.18.5",
+        "@yeoman/namespace": "^1.0.0",
+        "chalk": "^5.3.0",
+        "debug": "^4.1.1",
+        "execa": "^8.0.1",
+        "github-username": "^8.0.0",
+        "json-schema": "^0.4.0",
+        "latest-version": "^9.0.0",
+        "lodash-es": "^4.17.21",
+        "mem-fs-editor": "^11.0.1",
+        "minimist": "^1.2.8",
+        "read-package-up": "^11.0.0",
+        "semver": "^7.5.4",
+        "simple-git": "^3.20.0",
+        "sort-keys": "^5.0.0",
+        "text-table": "^0.2.0"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      },
+      "peerDependencies": {
+        "@yeoman/types": "^1.1.1",
+        "mem-fs": "^4.0.0"
+      }
+    },
+    "node_modules/yeoman-generator/node_modules/chalk": {
+      "version": "5.4.1",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/yeoman-generator/node_modules/execa": {
+      "version": "8.0.1",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^8.0.1",
+        "human-signals": "^5.0.0",
+        "is-stream": "^3.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^5.1.0",
+        "onetime": "^6.0.0",
+        "signal-exit": "^4.1.0",
+        "strip-final-newline": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=16.17"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "node_modules/yeoman-generator/node_modules/get-stream": {
+      "version": "8.0.1",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/yeoman-generator/node_modules/human-signals": {
+      "version": "5.0.0",
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=16.17.0"
+      }
+    },
+    "node_modules/yeoman-generator/node_modules/is-plain-obj": {
+      "version": "4.1.0",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/yeoman-generator/node_modules/is-stream": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/yeoman-generator/node_modules/mimic-fn": {
+      "version": "4.0.0",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/yeoman-generator/node_modules/npm-run-path": {
+      "version": "5.3.0",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "path-key": "^4.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/yeoman-generator/node_modules/onetime": {
+      "version": "6.0.0",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "mimic-fn": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/yeoman-generator/node_modules/path-key": {
+      "version": "4.0.0",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/yeoman-generator/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "dev": true,
+      "license": "ISC",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/yeoman-generator/node_modules/sort-keys": {
+      "version": "5.1.0",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "is-plain-obj": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/yeoman-generator/node_modules/strip-final-newline": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/yeoman-test": {
+      "version": "10.1.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "lodash-es": "^4.17.21",
+        "mem-fs-editor": "^11.1.1",
+        "signal-exit": "^4.1.0",
+        "type-fest": "^4.25.0"
+      },
+      "engines": {
+        "node": "^18.19.0 || >= 20.6.1"
+      },
+      "peerDependencies": {
+        "@yeoman/adapter": "^1.6.0 || ^2.0.0",
+        "@yeoman/types": "^1.5.0",
+        "mem-fs": "^4.1.0",
+        "yeoman-environment": "^4.0.0 || ^5.0.0-beta.0",
+        "yeoman-generator": "^7.0.0 || ^8.0.0-beta.0"
+      },
+      "peerDependenciesMeta": {
+        "yeoman-environment": {
+          "optional": true
+        },
+        "yeoman-generator": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/yeoman-test/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/yeoman-test/node_modules/type-fest": {
+      "version": "4.33.0",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/yn": {
+      "version": "3.1.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/yoctocolors": {
+      "version": "2.1.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/yoctocolors-cjs": {
+      "version": "2.1.2",
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/yosay": {
+      "version": "3.0.0",
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "ansi-regex": "^6.0.1",
+        "ansi-styles": "^6.2.1",
+        "chalk": "^5.3.0",
+        "cli-boxes": "^3.0.0",
+        "meow": "^12.1.1",
+        "pad-component": "0.0.1",
+        "string-width": "^6.1.0",
+        "strip-ansi": "^7.1.0",
+        "wrap-ansi": "^8.1.0"
+      },
+      "bin": {
+        "yosay": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/yosay/node_modules/ansi-regex": {
+      "version": "6.1.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/yosay/node_modules/ansi-styles": {
+      "version": "6.2.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/yosay/node_modules/chalk": {
+      "version": "5.4.1",
+      "license": "MIT",
+      "engines": {
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/yosay/node_modules/cli-boxes": {
+      "version": "3.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/yosay/node_modules/emoji-regex": {
+      "version": "10.4.0",
+      "license": "MIT"
+    },
+    "node_modules/yosay/node_modules/meow": {
+      "version": "12.1.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=16.10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/yosay/node_modules/string-width": {
+      "version": "6.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^10.2.1",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/yosay/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/yosay/node_modules/wrap-ansi": {
+      "version": "8.1.0",
+      "license": "MIT",
+      "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/yosay/node_modules/wrap-ansi/node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "license": "MIT"
+    },
+    "node_modules/yosay/node_modules/wrap-ansi/node_modules/string-width": {
+      "version": "5.1.2",
+      "license": "MIT",
+      "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/zod": {
+      "version": "3.23.8",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/colinhacks"
+      }
+    },
+    "node_modules/zrender": {
+      "version": "5.6.1",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "tslib": "2.3.0"
+      }
+    },
+    "node_modules/zrender/node_modules/tslib": {
+      "version": "2.3.0",
+      "license": "0BSD"
+    },
+    "node_modules/zstddec": {
+      "version": "0.1.0",
+      "license": "MIT AND BSD-3-Clause"
+    },
+    "node_modules/zwitch": {
+      "version": "2.0.4",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "packages/generator-superset": {
+      "name": "@superset-ui/generator-superset",
+      "version": "0.20.3",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "chalk": "^5.4.1",
+        "lodash-es": "^4.17.21",
+        "yeoman-generator": "^7.5.1",
+        "yosay": "^3.0.0"
+      },
+      "devDependencies": {
+        "cross-env": "^7.0.3",
+        "fs-extra": "^11.3.0",
+        "jest": "^30.0.2",
+        "yeoman-test": "^10.1.1"
+      },
+      "engines": {
+        "node": ">= 18.0.0",
+        "npm": ">= 4.0.0"
+      }
+    },
+    "packages/generator-superset/node_modules/@octokit/auth-token": {
+      "version": "5.1.2",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "packages/generator-superset/node_modules/@octokit/core": {
+      "version": "6.1.5",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/auth-token": "^5.0.0",
+        "@octokit/graphql": "^8.2.2",
+        "@octokit/request": "^9.2.3",
+        "@octokit/request-error": "^6.1.8",
+        "@octokit/types": "^14.0.0",
+        "before-after-hook": "^3.0.2",
+        "universal-user-agent": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "packages/generator-superset/node_modules/@octokit/endpoint": {
+      "version": "10.1.4",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^14.0.0",
+        "universal-user-agent": "^7.0.2"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "packages/generator-superset/node_modules/@octokit/graphql": {
+      "version": "8.2.2",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/request": "^9.2.3",
+        "@octokit/types": "^14.0.0",
+        "universal-user-agent": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "packages/generator-superset/node_modules/@octokit/openapi-types": {
+      "version": "25.1.0",
+      "license": "MIT"
+    },
+    "packages/generator-superset/node_modules/@octokit/plugin-paginate-rest": {
+      "version": "11.6.0",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^13.10.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      },
+      "peerDependencies": {
+        "@octokit/core": ">=6"
+      }
+    },
+    "packages/generator-superset/node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/openapi-types": {
+      "version": "24.2.0",
+      "license": "MIT"
+    },
+    "packages/generator-superset/node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/types": {
+      "version": "13.10.0",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/openapi-types": "^24.2.0"
+      }
+    },
+    "packages/generator-superset/node_modules/@octokit/plugin-request-log": {
+      "version": "5.3.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 18"
+      },
+      "peerDependencies": {
+        "@octokit/core": ">=6"
+      }
+    },
+    "packages/generator-superset/node_modules/@octokit/plugin-rest-endpoint-methods": {
+      "version": "13.5.0",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^13.10.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      },
+      "peerDependencies": {
+        "@octokit/core": ">=6"
+      }
+    },
+    "packages/generator-superset/node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/openapi-types": {
+      "version": "24.2.0",
+      "license": "MIT"
+    },
+    "packages/generator-superset/node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types": {
+      "version": "13.10.0",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/openapi-types": "^24.2.0"
+      }
+    },
+    "packages/generator-superset/node_modules/@octokit/request": {
+      "version": "9.2.4",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/endpoint": "^10.1.4",
+        "@octokit/request-error": "^6.1.8",
+        "@octokit/types": "^14.0.0",
+        "fast-content-type-parse": "^2.0.0",
+        "universal-user-agent": "^7.0.2"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "packages/generator-superset/node_modules/@octokit/request-error": {
+      "version": "6.1.8",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^14.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "packages/generator-superset/node_modules/@octokit/rest": {
+      "version": "21.1.1",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/core": "^6.1.4",
+        "@octokit/plugin-paginate-rest": "^11.4.2",
+        "@octokit/plugin-request-log": "^5.3.1",
+        "@octokit/plugin-rest-endpoint-methods": "^13.3.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "packages/generator-superset/node_modules/@octokit/types": {
+      "version": "14.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/openapi-types": "^25.1.0"
+      }
+    },
+    "packages/generator-superset/node_modules/before-after-hook": {
+      "version": "3.0.2",
+      "license": "Apache-2.0"
+    },
+    "packages/generator-superset/node_modules/chalk": {
+      "version": "5.4.1",
+      "license": "MIT",
+      "engines": {
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "packages/generator-superset/node_modules/execa": {
+      "version": "8.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^8.0.1",
+        "human-signals": "^5.0.0",
+        "is-stream": "^3.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^5.1.0",
+        "onetime": "^6.0.0",
+        "signal-exit": "^4.1.0",
+        "strip-final-newline": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=16.17"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "packages/generator-superset/node_modules/fast-content-type-parse": {
+      "version": "2.0.1",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fastify"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fastify"
+        }
+      ],
+      "license": "MIT"
+    },
+    "packages/generator-superset/node_modules/get-stream": {
+      "version": "8.0.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "packages/generator-superset/node_modules/github-username": {
+      "version": "9.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/rest": "^21.1.1"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "packages/generator-superset/node_modules/human-signals": {
+      "version": "5.0.0",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=16.17.0"
+      }
+    },
+    "packages/generator-superset/node_modules/is-plain-obj": {
+      "version": "4.1.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "packages/generator-superset/node_modules/is-stream": {
+      "version": "3.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "packages/generator-superset/node_modules/mimic-fn": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "packages/generator-superset/node_modules/npm-run-path": {
+      "version": "5.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "path-key": "^4.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "packages/generator-superset/node_modules/onetime": {
+      "version": "6.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "mimic-fn": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "packages/generator-superset/node_modules/path-key": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "packages/generator-superset/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "license": "ISC",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "packages/generator-superset/node_modules/sort-keys": {
+      "version": "5.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "is-plain-obj": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "packages/generator-superset/node_modules/strip-final-newline": {
+      "version": "3.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "packages/generator-superset/node_modules/universal-user-agent": {
+      "version": "7.0.3",
+      "license": "ISC"
+    },
+    "packages/generator-superset/node_modules/yeoman-generator": {
       "version": "7.5.1",
-      "resolved": "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-7.5.1.tgz",
-      "integrity": "sha512-MYncRvzSTd71BMwiUMAVhfX00sDD8DZDrmPzRxQkWuWQ0V1Qt4Rd0gS/Nee2QDTWvRjvCa+KBfiAVrtOySq+JA==",
       "license": "BSD-2-Clause",
       "dependencies": {
         "@types/lodash-es": "^4.17.9",
@@ -47305,860 +48527,6 @@
         }
       }
     },
-    "node_modules/yeoman-generator/node_modules/chalk": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.4.1.tgz",
-      "integrity": "sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w==",
-      "license": "MIT",
-      "engines": {
-        "node": "^12.17.0 || ^14.13 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/yeoman-generator/node_modules/execa": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz",
-      "integrity": "sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==",
-      "license": "MIT",
-      "dependencies": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^8.0.1",
-        "human-signals": "^5.0.0",
-        "is-stream": "^3.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^5.1.0",
-        "onetime": "^6.0.0",
-        "signal-exit": "^4.1.0",
-        "strip-final-newline": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=16.17"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
-      }
-    },
-    "node_modules/yeoman-generator/node_modules/get-stream": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-8.0.1.tgz",
-      "integrity": "sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/yeoman-generator/node_modules/human-signals": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-5.0.0.tgz",
-      "integrity": "sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==",
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=16.17.0"
-      }
-    },
-    "node_modules/yeoman-generator/node_modules/is-plain-obj": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz",
-      "integrity": "sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/yeoman-generator/node_modules/is-stream": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz",
-      "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==",
-      "license": "MIT",
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/yeoman-generator/node_modules/mimic-fn": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz",
-      "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/yeoman-generator/node_modules/npm-run-path": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz",
-      "integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==",
-      "license": "MIT",
-      "dependencies": {
-        "path-key": "^4.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/yeoman-generator/node_modules/onetime": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz",
-      "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==",
-      "license": "MIT",
-      "dependencies": {
-        "mimic-fn": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/yeoman-generator/node_modules/path-key": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz",
-      "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/yeoman-generator/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==",
-      "license": "ISC",
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/yeoman-generator/node_modules/sort-keys": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-5.1.0.tgz",
-      "integrity": "sha512-aSbHV0DaBcr7u0PVHXzM6NbZNAtrr9sF6+Qfs9UUVG7Ll3jQ6hHi8F/xqIIcn2rvIVbr0v/2zyjSdwSV47AgLQ==",
-      "license": "MIT",
-      "dependencies": {
-        "is-plain-obj": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/yeoman-generator/node_modules/strip-final-newline": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz",
-      "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/yeoman-test": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/yeoman-test/-/yeoman-test-8.3.0.tgz",
-      "integrity": "sha512-etIrJFTN1RcWBNqqDR6qkIH83cbOq5OkDu/dG0RdC5WYFoVtBlz8Hby4LV+j1bLdAsYsX7YSJCPQzo2mQVJusw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@yeoman/adapter": "^1.4.0",
-        "inquirer": "^9.2.2",
-        "lodash-es": "^4.17.21",
-        "mem-fs-editor": "^10.0.3",
-        "sinon": "^16.0.0",
-        "temp-dir": "^3.0.0",
-        "type-fest": "^4.3.1"
-      },
-      "acceptDependencies": {
-        "mem-fs": "^4.0.0-beta.1",
-        "yeoman-environment": ">=4.0.0-beta.6",
-        "yeoman-generator": ">=6.0.0"
-      },
-      "engines": {
-        "node": "^16.17.0 || >=18.12.0"
-      },
-      "peerDependencies": {
-        "@yeoman/types": "^1.1.0",
-        "mem-fs": "^3.0.0",
-        "yeoman-environment": "^3.18.3",
-        "yeoman-generator": "^5.9.0 || >=6.0.0"
-      },
-      "peerDependenciesMeta": {
-        "yeoman-environment": {
-          "optional": true
-        },
-        "yeoman-generator": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/yeoman-test/node_modules/array-differ": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-4.0.0.tgz",
-      "integrity": "sha512-Q6VPTLMsmXZ47ENG3V+wQyZS1ZxXMxFyYzA+Z/GMrJ6yIutAIEf9wTyroTzmGjNfox9/h3GdGBCVh43GVFx4Uw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/yeoman-test/node_modules/array-union": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-3.0.1.tgz",
-      "integrity": "sha512-1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/yeoman-test/node_modules/binaryextensions": {
-      "version": "4.19.0",
-      "resolved": "https://registry.npmjs.org/binaryextensions/-/binaryextensions-4.19.0.tgz",
-      "integrity": "sha512-DRxnVbOi/1OgA5pA9EDiRT8gvVYeqfuN7TmPfLyt6cyho3KbHCi3EtDQf39TTmGDrR5dZ9CspdXhPkL/j/WGbg==",
-      "dev": true,
-      "license": "Artistic-2.0",
-      "engines": {
-        "node": ">=0.8"
-      },
-      "funding": {
-        "url": "https://bevry.me/fund"
-      }
-    },
-    "node_modules/yeoman-test/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/yeoman-test/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/yeoman-test/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,
-      "license": "ISC",
-      "engines": {
-        "node": ">= 12"
-      }
-    },
-    "node_modules/yeoman-test/node_modules/globby": {
-      "version": "13.2.2",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz",
-      "integrity": "sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.3.0",
-        "ignore": "^5.2.4",
-        "merge2": "^1.4.1",
-        "slash": "^4.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/yeoman-test/node_modules/inquirer": {
-      "version": "9.3.7",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-9.3.7.tgz",
-      "integrity": "sha512-LJKFHCSeIRq9hanN14IlOtPSTe3lNES7TYDTE2xxdAy1LS5rYphajK1qtwvj3YmQXvvk0U2Vbmcni8P9EIQW9w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@inquirer/figures": "^1.0.3",
-        "ansi-escapes": "^4.3.2",
-        "cli-width": "^4.1.0",
-        "external-editor": "^3.1.0",
-        "mute-stream": "1.0.0",
-        "ora": "^5.4.1",
-        "run-async": "^3.0.0",
-        "rxjs": "^7.8.1",
-        "string-width": "^4.2.3",
-        "strip-ansi": "^6.0.1",
-        "wrap-ansi": "^6.2.0",
-        "yoctocolors-cjs": "^2.1.2"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/yeoman-test/node_modules/mem-fs-editor": {
-      "version": "10.0.3",
-      "resolved": "https://registry.npmjs.org/mem-fs-editor/-/mem-fs-editor-10.0.3.tgz",
-      "integrity": "sha512-EfE+MKDgfplq6wtS0mRP/4hKNBLfVqc1dhnNEIJRQS9neTCAI3SkHQDToh9fvp02QtICiyGVR1/jJPFE7AFIpQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/ejs": "^3.1.2",
-        "binaryextensions": "^4.16.0",
-        "commondir": "^1.0.1",
-        "deep-extend": "^0.6.0",
-        "ejs": "^3.1.9",
-        "globby": "^13.1.4",
-        "isbinaryfile": "^5.0.0",
-        "mem-fs": "^3.0.0",
-        "minimatch": "^9.0.0",
-        "multimatch": "^6.0.0",
-        "normalize-path": "^3.0.0",
-        "textextensions": "^5.13.0",
-        "vinyl": "^3.0.0"
-      },
-      "acceptDependencies": {
-        "mem-fs": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=16.13.0"
-      }
-    },
-    "node_modules/yeoman-test/node_modules/minimatch": {
-      "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": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/yeoman-test/node_modules/multimatch": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-6.0.0.tgz",
-      "integrity": "sha512-I7tSVxHGPlmPN/enE3mS1aOSo6bWBfls+3HmuEeCUBCE7gWnm3cBXCBkpurzFjVRwC6Kld8lLaZ1Iv5vOcjvcQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/minimatch": "^3.0.5",
-        "array-differ": "^4.0.0",
-        "array-union": "^3.0.1",
-        "minimatch": "^3.0.4"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/yeoman-test/node_modules/multimatch/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/yeoman-test/node_modules/multimatch/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/yeoman-test/node_modules/mute-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-1.0.0.tgz",
-      "integrity": "sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/yeoman-test/node_modules/nise": {
-      "version": "5.1.9",
-      "resolved": "https://registry.npmjs.org/nise/-/nise-5.1.9.tgz",
-      "integrity": "sha512-qOnoujW4SV6e40dYxJOb3uvuoPHtmLzIk4TFo+j0jPJoC+5Z9xja5qH5JZobEPsa8+YYphMrOSwnrshEhG2qww==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "@sinonjs/commons": "^3.0.0",
-        "@sinonjs/fake-timers": "^11.2.2",
-        "@sinonjs/text-encoding": "^0.7.2",
-        "just-extend": "^6.2.0",
-        "path-to-regexp": "^6.2.1"
-      }
-    },
-    "node_modules/yeoman-test/node_modules/nise/node_modules/@sinonjs/fake-timers": {
-      "version": "11.3.1",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-11.3.1.tgz",
-      "integrity": "sha512-EVJO7nW5M/F5Tur0Rf2z/QoMo+1Ia963RiMtapiQrEWvY0iBUvADo8Beegwjpnle5BHkyHuoxSTW3jF43H1XRA==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "@sinonjs/commons": "^3.0.1"
-      }
-    },
-    "node_modules/yeoman-test/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==",
-      "dev": true,
-      "license": "MIT",
-      "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_modules/yeoman-test/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,
-      "license": "MIT"
-    },
-    "node_modules/yeoman-test/node_modules/run-async": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-3.0.0.tgz",
-      "integrity": "sha512-540WwVDOMxA6dN6We19EcT9sc3hkXPw5mzRNGM3FkdN/vtE9NFvj5lFAPNwUDmJjXidm3v7TC1cTE7t17Ulm1Q==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/yeoman-test/node_modules/sinon": {
-      "version": "16.1.3",
-      "resolved": "https://registry.npmjs.org/sinon/-/sinon-16.1.3.tgz",
-      "integrity": "sha512-mjnWWeyxcAf9nC0bXcPmiDut+oE8HYridTNzBbF98AYVLmWwGRp2ISEpyhYflG1ifILT+eNn3BmKUJPxjXUPlA==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "@sinonjs/commons": "^3.0.0",
-        "@sinonjs/fake-timers": "^10.3.0",
-        "@sinonjs/samsam": "^8.0.0",
-        "diff": "^5.1.0",
-        "nise": "^5.1.4",
-        "supports-color": "^7.2.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/sinon"
-      }
-    },
-    "node_modules/yeoman-test/node_modules/slash": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
-      "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/yeoman-test/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/yeoman-test/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/yeoman-test/node_modules/textextensions": {
-      "version": "5.16.0",
-      "resolved": "https://registry.npmjs.org/textextensions/-/textextensions-5.16.0.tgz",
-      "integrity": "sha512-7D/r3s6uPZyU//MCYrX6I14nzauDwJ5CxazouuRGNuvSCihW87ufN6VLoROLCrHg6FblLuJrT6N2BVaPVzqElw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.8"
-      },
-      "funding": {
-        "url": "https://bevry.me/fund"
-      }
-    },
-    "node_modules/yeoman-test/node_modules/type-fest": {
-      "version": "4.41.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.41.0.tgz",
-      "integrity": "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==",
-      "dev": true,
-      "license": "(MIT OR CC0-1.0)",
-      "engines": {
-        "node": ">=16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/yn": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
-      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
-      "license": "MIT",
-      "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==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/yoctocolors": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/yoctocolors/-/yoctocolors-2.1.1.tgz",
-      "integrity": "sha512-GQHQqAopRhwU8Kt1DDM8NjibDXHC8eoh1erhGAJPEyveY9qqVeXvVikNKrDz69sHowPMorbPUrH/mx8c50eiBQ==",
-      "devOptional": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "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==",
-      "devOptional": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/yosay": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/yosay/-/yosay-3.0.0.tgz",
-      "integrity": "sha512-ydCeqln4hPSPMA1ggS0ZsUnrXxDaatbmtigxF+4R2h/y2USVTaOIIZFPXANeq7tkmHo2bLEK8eal2wmrFMiwYA==",
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "ansi-regex": "^6.0.1",
-        "ansi-styles": "^6.2.1",
-        "chalk": "^5.3.0",
-        "cli-boxes": "^3.0.0",
-        "meow": "^12.1.1",
-        "pad-component": "0.0.1",
-        "string-width": "^6.1.0",
-        "strip-ansi": "^7.1.0",
-        "wrap-ansi": "^8.1.0"
-      },
-      "bin": {
-        "yosay": "cli.js"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/yosay/node_modules/ansi-regex": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
-      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
-      }
-    },
-    "node_modules/yosay/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==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/yosay/node_modules/chalk": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.4.1.tgz",
-      "integrity": "sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w==",
-      "license": "MIT",
-      "engines": {
-        "node": "^12.17.0 || ^14.13 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/yosay/node_modules/cli-boxes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-3.0.0.tgz",
-      "integrity": "sha512-/lzGpEWL/8PfI0BmBOPRwp0c/wFNX1RdUML3jK/RcSBA9T8mZDdQpqYBKtCFTOfQbwPqWEOpjqW+Fnayc0969g==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/yosay/node_modules/emoji-regex": {
-      "version": "10.4.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz",
-      "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==",
-      "license": "MIT"
-    },
-    "node_modules/yosay/node_modules/meow": {
-      "version": "12.1.1",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-12.1.1.tgz",
-      "integrity": "sha512-BhXM0Au22RwUneMPwSCnyhTOizdWoIEPU9sp0Aqa1PnDMR5Wv2FGXYDjuzJEIX+Eo2Rb8xuYe5jrnm5QowQFkw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=16.10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/yosay/node_modules/string-width": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-6.1.0.tgz",
-      "integrity": "sha512-k01swCJAgQmuADB0YIc+7TuatfNvTBVOoaUWJjTB9R4VJzR5vNWzf5t42ESVZFPS8xTySF7CAdV4t/aaIm3UnQ==",
-      "license": "MIT",
-      "dependencies": {
-        "eastasianwidth": "^0.2.0",
-        "emoji-regex": "^10.2.1",
-        "strip-ansi": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/yosay/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==",
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
-      }
-    },
-    "node_modules/yosay/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==",
-      "license": "MIT",
-      "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/yosay/node_modules/wrap-ansi/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==",
-      "license": "MIT"
-    },
-    "node_modules/yosay/node_modules/wrap-ansi/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==",
-      "license": "MIT",
-      "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/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,
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/colinhacks"
-      }
-    },
-    "node_modules/zrender": {
-      "version": "5.6.1",
-      "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.6.1.tgz",
-      "integrity": "sha512-OFXkDJKcrlx5su2XbzJvj/34Q3m6PvyCZkVPHGYpcCJ52ek4U/ymZyfuV1nKE23AyBJ51E/6Yr0mhZ7xGTO4ag==",
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "tslib": "2.3.0"
-      }
-    },
-    "node_modules/zrender/node_modules/tslib": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
-      "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==",
-      "license": "0BSD"
-    },
-    "node_modules/zstddec": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/zstddec/-/zstddec-0.1.0.tgz",
-      "integrity": "sha512-w2NTI8+3l3eeltKAdK8QpiLo/flRAr2p8AGeakfMZOXBxOg9HIu4LVDxBi81sYgVhFhdJjv1OrB5ssI8uFPoLg==",
-      "license": "MIT AND BSD-3-Clause"
-    },
-    "node_modules/zwitch": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-2.0.4.tgz",
-      "integrity": "sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==",
-      "license": "MIT",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "packages/generator-superset": {
-      "name": "@superset-ui/generator-superset",
-      "version": "0.20.3",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "chalk": "^5.4.1",
-        "lodash-es": "^4.17.21",
-        "yeoman-generator": "^7.4.0",
-        "yosay": "^3.0.0"
-      },
-      "devDependencies": {
-        "cross-env": "^7.0.3",
-        "fs-extra": "^11.2.0",
-        "jest": "^29.7.0",
-        "yeoman-test": "^8.3.0"
-      },
-      "engines": {
-        "node": ">= 18.0.0",
-        "npm": ">= 4.0.0"
-      }
-    },
-    "packages/generator-superset/node_modules/chalk": {
-      "version": "5.4.1",
-      "license": "MIT",
-      "engines": {
-        "node": "^12.17.0 || ^14.13 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
     "packages/superset-ui-chart-controls": {
       "name": "@superset-ui/chart-controls",
       "version": "0.20.3",
@@ -48178,7 +48546,6 @@
         "@testing-library/react": "^13.0.0",
         "@testing-library/user-event": "*",
         "ace-builds": "^1.4.14",
-        "antd": "4.10.3",
         "brace": "^0.11.1",
         "memoize-one": "^5.1.1",
         "react": "^18.2.0",
@@ -48191,43 +48558,61 @@
       "version": "0.20.4",
       "license": "Apache-2.0",
       "dependencies": {
+        "@ant-design/icons": "^5.2.6",
         "@babel/runtime": "^7.25.6",
+        "@fontsource/fira-code": "^5.0.18",
+        "@fontsource/inter": "^5.0.20",
         "@types/json-bigint": "^1.0.4",
         "@visx/responsive": "^3.12.0",
+        "ace-builds": "^1.43.1",
+        "brace": "^0.11.1",
+        "classnames": "^2.2.5",
+        "core-js": "^3.38.1",
         "csstype": "^3.1.3",
         "d3-format": "^1.3.2",
         "d3-interpolate": "^3.0.1",
         "d3-scale": "^3.0.0",
         "d3-time": "^3.1.0",
         "d3-time-format": "^4.1.0",
+        "dayjs": "^1.11.13",
+        "dompurify": "^3.2.4",
         "fetch-retry": "^6.0.0",
         "jed": "^1.1.1",
         "lodash": "^4.17.21",
         "math-expression-evaluator": "^2.0.6",
         "pretty-ms": "^9.2.0",
+        "re-resizable": "^6.10.1",
+        "react-ace": "^10.1.0",
+        "react-draggable": "^4.4.6",
         "react-error-boundary": "^5.0.0",
+        "react-js-cron": "^5.2.0",
         "react-markdown": "^8.0.7",
+        "react-resize-detector": "^7.1.2",
+        "react-syntax-highlighter": "^15.4.5",
+        "react-ultimate-pagination": "^1.3.2",
+        "regenerator-runtime": "^0.14.1",
         "rehype-raw": "^7.0.0",
         "rehype-sanitize": "^6.0.0",
-        "remark-gfm": "^3.0.1",
+        "remark-gfm": "^4.0.1",
         "reselect": "^4.0.0",
         "rison": "^0.1.1",
         "seedrandom": "^3.0.5",
-        "whatwg-fetch": "^3.6.20",
         "xss": "^1.0.14"
       },
       "devDependencies": {
-        "@emotion/styled": "^11.3.0",
+        "@emotion/styled": "^11.14.1",
         "@types/d3-format": "^3.0.4",
         "@types/d3-interpolate": "^3.0.4",
         "@types/d3-scale": "^2.1.1",
         "@types/d3-time": "^3.0.4",
         "@types/d3-time-format": "^4.0.3",
-        "@types/fetch-mock": "^7.3.8",
-        "@types/lodash": "^4.17.16",
+        "@types/jquery": "^3.5.8",
+        "@types/lodash": "^4.17.20",
         "@types/math-expression-evaluator": "^1.3.3",
         "@types/node": "^22.10.3",
         "@types/prop-types": "^15.7.2",
+        "@types/react-syntax-highlighter": "^15.5.13",
+        "@types/react-table": "^7.7.20",
         "@types/rison": "0.1.0",
         "@types/seedrandom": "^3.0.8",
         "fetch-mock": "^11.1.4",
@@ -48238,20 +48623,27 @@
       "peerDependencies": {
         "@emotion/cache": "^11.4.0",
         "@emotion/react": "^11.4.1",
-        "@emotion/styled": "^11.3.0",
+        "@emotion/styled": "^11.14.1",
         "@testing-library/dom": "^8.20.1",
         "@testing-library/jest-dom": "*",
         "@testing-library/react": "^13.0.0",
         "@testing-library/user-event": "*",
         "@types/react": "*",
         "@types/react-loadable": "*",
+        "@types/react-window": "^1.8.8",
         "@types/tinycolor2": "*",
+        "antd": "^5.24.6",
         "nanoid": "^5.0.9",
         "react": "^18.2.0",
         "react-loadable": "^5.5.0",
         "tinycolor2": "*"
       }
     },
+    "packages/superset-ui-core/node_modules/@types/lodash": {
+      "version": "4.17.20",
+      "dev": true,
+      "license": "MIT"
+    },
     "packages/superset-ui-core/node_modules/@types/mdast": {
       "version": "3.0.15",
       "license": "MIT",
@@ -48259,24 +48651,9 @@
         "@types/unist": "^2"
       }
     },
-    "packages/superset-ui-core/node_modules/@types/node": {
-      "version": "22.15.30",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.30.tgz",
-      "integrity": "sha512-6Q7lr06bEHdlfplU6YRbgG1SFBdlsfNC4/lX+SkhiTs0cpJkOElmWls8PxDFv4yY/xKb8Y6SO0OmSX4wgqTZbA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "undici-types": "~6.21.0"
-      }
-    },
-    "packages/superset-ui-core/node_modules/d3-array": {
-      "version": "2.12.1",
-      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz",
-      "integrity": "sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==",
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "internmap": "^1.0.0"
-      }
+    "packages/superset-ui-core/node_modules/d3-color": {
+      "version": "2.0.0",
+      "license": "BSD-3-Clause"
     },
     "packages/superset-ui-core/node_modules/d3-scale": {
       "version": "3.3.0",
@@ -48320,32 +48697,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "packages/superset-ui-core/node_modules/fetch-mock": {
-      "version": "11.1.5",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/glob-to-regexp": "^0.4.4",
-        "dequal": "^2.0.3",
-        "glob-to-regexp": "^0.4.1",
-        "is-subset": "^0.1.1",
-        "regexparam": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "node-fetch": {
-          "optional": true
-        }
-      }
-    },
-    "packages/superset-ui-core/node_modules/internmap": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/internmap/-/internmap-1.0.1.tgz",
-      "integrity": "sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw==",
-      "license": "ISC"
-    },
     "packages/superset-ui-core/node_modules/math-expression-evaluator": {
       "version": "2.0.6",
       "license": "MIT"
@@ -49016,6 +49367,15 @@
       ],
       "license": "MIT"
     },
+    "packages/superset-ui-core/node_modules/react-js-cron": {
+      "version": "5.2.0",
+      "license": "MIT",
+      "peerDependencies": {
+        "antd": ">=5.8.0",
+        "react": ">=17.0.0",
+        "react-dom": ">=17.0.0"
+      }
+    },
     "packages/superset-ui-core/node_modules/remark-gfm": {
       "version": "3.0.1",
       "license": "MIT",
@@ -49030,13 +49390,6 @@
         "url": "https://opencollective.com/unified"
       }
     },
-    "packages/superset-ui-core/node_modules/undici-types": {
-      "version": "6.21.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
-      "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
-      "dev": true,
-      "license": "MIT"
-    },
     "packages/superset-ui-core/node_modules/unist-util-is": {
       "version": "5.2.1",
       "license": "MIT",
@@ -49078,16 +49431,15 @@
       "dependencies": {
         "@emotion/cache": "^11.14.0",
         "@emotion/react": "^11.14.0",
-        "@emotion/styled": "^11.14.0",
+        "@emotion/styled": "^11.14.1",
         "@mihkeleidast/storybook-addon-source": "^1.0.1",
         "@react-icons/all-files": "^4.1.0",
-        "@storybook/addon-actions": "8.1.11",
+        "@storybook/addon-actions": "9.0.8",
         "@storybook/addon-controls": "8.1.11",
         "@storybook/addon-links": "8.1.11",
         "@storybook/react": "8.1.11",
         "@storybook/types": "8.4.7",
         "@types/react-loadable": "^5.5.11",
-        "antd": "4.10.3",
         "core-js": "3.40.0",
         "gh-pages": "^6.2.0",
         "jquery": "^3.7.1",
@@ -49104,7 +49456,7 @@
         "@babel/preset-typescript": "^7.23.3",
         "@storybook/react-webpack5": "8.2.9",
         "babel-loader": "^10.0.0",
-        "fork-ts-checker-webpack-plugin": "^9.0.2",
+        "fork-ts-checker-webpack-plugin": "^9.1.0",
         "ts-loader": "^9.5.2",
         "typescript": "^5.7.2"
       },
@@ -49128,6 +49480,14 @@
         "@superset-ui/plugin-chart-word-cloud": "*"
       }
     },
+    "packages/superset-ui-demo/node_modules/@storybook/addon-actions": {
+      "version": "9.0.8",
+      "license": "MIT",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      }
+    },
     "packages/superset-ui-demo/node_modules/@storybook/builder-webpack5": {
       "version": "8.2.9",
       "dev": true,
@@ -49215,7 +49575,9 @@
       }
     },
     "packages/superset-ui-demo/node_modules/@storybook/components": {
-      "version": "8.5.1",
+      "version": "8.6.14",
+      "resolved": "https://registry.npmjs.org/@storybook/components/-/components-8.6.14.tgz",
+      "integrity": "sha512-HNR2mC5I4Z5ek8kTrVZlIY/B8gJGs5b3XdZPBPBopTIN6U/YHXiDyOjY3JlaS4fSG1fVhp/Qp1TpMn1w/9m1pw==",
       "dev": true,
       "license": "MIT",
       "funding": {
@@ -49243,7 +49605,9 @@
       }
     },
     "packages/superset-ui-demo/node_modules/@storybook/manager-api": {
-      "version": "8.5.1",
+      "version": "8.6.14",
+      "resolved": "https://registry.npmjs.org/@storybook/manager-api/-/manager-api-8.6.14.tgz",
+      "integrity": "sha512-ez0Zihuy17udLbfHZQXkGqwtep0mSGgHcNzGN7iZrMP1m+VmNo+7aGCJJdvXi7+iU3yq8weXSQFWg5DqWgLS7g==",
       "dev": true,
       "license": "MIT",
       "funding": {
@@ -49255,7 +49619,9 @@
       }
     },
     "packages/superset-ui-demo/node_modules/@storybook/preview-api": {
-      "version": "8.5.1",
+      "version": "8.6.14",
+      "resolved": "https://registry.npmjs.org/@storybook/preview-api/-/preview-api-8.6.14.tgz",
+      "integrity": "sha512-2GhcCd4dNMrnD7eooEfvbfL4I83qAqEyO0CO7JQAmIO6Rxb9BsOLLI/GD5HkvQB73ArTJ+PT50rfaO820IExOQ==",
       "dev": true,
       "license": "MIT",
       "funding": {
@@ -49297,6 +49663,8 @@
     },
     "packages/superset-ui-demo/node_modules/@storybook/react-webpack5/node_modules/@storybook/preset-react-webpack": {
       "version": "8.2.9",
+      "resolved": "https://registry.npmjs.org/@storybook/preset-react-webpack/-/preset-react-webpack-8.2.9.tgz",
+      "integrity": "sha512-uBLsUfwymWXGmfN/0vB7gLCC0CWDHc778605SWxakqFx7wGF1FZUW4R46qbDFrHTaKh+bundseRdy5/uklksLQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -49334,6 +49702,8 @@
     },
     "packages/superset-ui-demo/node_modules/@storybook/react-webpack5/node_modules/@storybook/react": {
       "version": "8.2.9",
+      "resolved": "https://registry.npmjs.org/@storybook/react/-/react-8.2.9.tgz",
+      "integrity": "sha512-F2xZcTDxxjpbqt7eP8rEHmlksiKmE/qtPusEWEY4N4jK01kN+ncxSl8gkJpUohMEmAnVC5t/1v/sU57xv1DYpg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -49380,6 +49750,8 @@
     },
     "packages/superset-ui-demo/node_modules/@storybook/react-webpack5/node_modules/@storybook/react/node_modules/@storybook/react-dom-shim": {
       "version": "8.2.9",
+      "resolved": "https://registry.npmjs.org/@storybook/react-dom-shim/-/react-dom-shim-8.2.9.tgz",
+      "integrity": "sha512-uCAjSQEsNk8somVn1j/I1G9G/uUax5byHseIIV0Eq3gVXttGd7gaWcP+TDHtqIaenWHx4l+hCSuCesxiLWmx4Q==",
       "dev": true,
       "license": "MIT",
       "funding": {
@@ -49393,7 +49765,9 @@
       }
     },
     "packages/superset-ui-demo/node_modules/@storybook/theming": {
-      "version": "8.5.1",
+      "version": "8.6.14",
+      "resolved": "https://registry.npmjs.org/@storybook/theming/-/theming-8.6.14.tgz",
+      "integrity": "sha512-r4y+LsiB37V5hzpQo+BM10PaCsp7YlZ0YcZzQP1OCkPlYXmUAFy2VvDKaFRpD8IeNPKug2u4iFm/laDEbs03dg==",
       "dev": true,
       "license": "MIT",
       "funding": {
@@ -49415,6 +49789,14 @@
         "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0"
       }
     },
+    "packages/superset-ui-demo/node_modules/@types/node": {
+      "version": "18.19.74",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
     "packages/superset-ui-demo/node_modules/ajv": {
       "version": "6.12.6",
       "dev": true,
@@ -49438,6 +49820,11 @@
         "ajv": "^6.9.1"
       }
     },
+    "packages/superset-ui-demo/node_modules/argparse": {
+      "version": "2.0.1",
+      "dev": true,
+      "license": "Python-2.0"
+    },
     "packages/superset-ui-demo/node_modules/chalk": {
       "version": "4.1.2",
       "dev": true,
@@ -49454,9 +49841,7 @@
       }
     },
     "packages/superset-ui-demo/node_modules/core-js": {
-      "version": "3.40.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.40.0.tgz",
-      "integrity": "sha512-7vsMc/Lty6AGnn7uFpYT56QesI5D2Y/UkgKounk87OP9Z2H9Z8kj6jzcSGAxFmUtDOS0ntK6lbQz+Nsa0Jj6mQ==",
+      "version": "3.39.0",
       "hasInstallScript": true,
       "license": "MIT",
       "funding": {
@@ -49513,11 +49898,112 @@
         }
       }
     },
+    "packages/superset-ui-demo/node_modules/fork-ts-checker-webpack-plugin": {
+      "version": "9.1.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.16.7",
+        "chalk": "^4.1.2",
+        "chokidar": "^4.0.1",
+        "cosmiconfig": "^8.2.0",
+        "deepmerge": "^4.2.2",
+        "fs-extra": "^10.0.0",
+        "memfs": "^3.4.1",
+        "minimatch": "^3.0.4",
+        "node-abort-controller": "^3.0.1",
+        "schema-utils": "^3.1.1",
+        "semver": "^7.3.5",
+        "tapable": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=14.21.3"
+      },
+      "peerDependencies": {
+        "typescript": ">3.6.0",
+        "webpack": "^5.11.0"
+      }
+    },
+    "packages/superset-ui-demo/node_modules/fork-ts-checker-webpack-plugin/node_modules/chokidar": {
+      "version": "4.0.3",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "readdirp": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 14.16.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
+    "packages/superset-ui-demo/node_modules/fork-ts-checker-webpack-plugin/node_modules/cosmiconfig": {
+      "version": "8.3.6",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "import-fresh": "^3.3.0",
+        "js-yaml": "^4.1.0",
+        "parse-json": "^5.2.0",
+        "path-type": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/d-fischer"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.9.5"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "packages/superset-ui-demo/node_modules/fork-ts-checker-webpack-plugin/node_modules/fs-extra": {
+      "version": "10.1.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "packages/superset-ui-demo/node_modules/js-yaml": {
+      "version": "4.1.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
     "packages/superset-ui-demo/node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "dev": true,
       "license": "MIT"
     },
+    "packages/superset-ui-demo/node_modules/readdirp": {
+      "version": "4.1.2",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 14.18.0"
+      },
+      "funding": {
+        "type": "individual",
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
     "packages/superset-ui-demo/node_modules/schema-utils": {
       "version": "3.3.0",
       "dev": true,
@@ -49587,6 +50073,11 @@
         "node": ">=14.17"
       }
     },
+    "packages/superset-ui-demo/node_modules/undici-types": {
+      "version": "5.26.5",
+      "dev": true,
+      "license": "MIT"
+    },
     "packages/superset-ui-demo/node_modules/webpack-virtual-modules": {
       "version": "0.6.2",
       "dev": true,
@@ -49622,15 +50113,6 @@
         "react": "^18.2.0"
       }
     },
-    "plugins/legacy-plugin-chart-calendar/node_modules/d3-array": {
-      "version": "2.12.1",
-      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz",
-      "integrity": "sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==",
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "internmap": "^1.0.0"
-      }
-    },
     "plugins/legacy-plugin-chart-calendar/node_modules/d3-selection": {
       "version": "3.0.0",
       "license": "ISC",
@@ -49638,12 +50120,6 @@
         "node": ">=12"
       }
     },
-    "plugins/legacy-plugin-chart-calendar/node_modules/internmap": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/internmap/-/internmap-1.0.1.tgz",
-      "integrity": "sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw==",
-      "license": "ISC"
-    },
     "plugins/legacy-plugin-chart-chord": {
       "name": "@superset-ui/legacy-plugin-chart-chord",
       "version": "0.20.3",
@@ -49651,13 +50127,20 @@
       "dependencies": {
         "d3": "^3.5.17",
         "prop-types": "^15.8.1",
-        "react": "^18.2.0"
+        "react": "^19.1.0"
       },
       "peerDependencies": {
         "@superset-ui/chart-controls": "*",
         "@superset-ui/core": "*"
       }
     },
+    "plugins/legacy-plugin-chart-chord/node_modules/react": {
+      "version": "19.1.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "plugins/legacy-plugin-chart-country-map": {
       "name": "@superset-ui/legacy-plugin-chart-country-map",
       "version": "0.20.3",
@@ -49673,21 +50156,6 @@
         "react": "^18.2.0"
       }
     },
-    "plugins/legacy-plugin-chart-country-map/node_modules/d3-array": {
-      "version": "2.12.1",
-      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz",
-      "integrity": "sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==",
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "internmap": "^1.0.0"
-      }
-    },
-    "plugins/legacy-plugin-chart-country-map/node_modules/internmap": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/internmap/-/internmap-1.0.1.tgz",
-      "integrity": "sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw==",
-      "license": "ISC"
-    },
     "plugins/legacy-plugin-chart-horizon": {
       "name": "@superset-ui/legacy-plugin-chart-horizon",
       "version": "0.20.3",
@@ -49703,14 +50171,9 @@
         "react": "^18.2.0"
       }
     },
-    "plugins/legacy-plugin-chart-horizon/node_modules/d3-array": {
-      "version": "2.12.1",
-      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz",
-      "integrity": "sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==",
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "internmap": "^1.0.0"
-      }
+    "plugins/legacy-plugin-chart-horizon/node_modules/d3-color": {
+      "version": "2.0.0",
+      "license": "BSD-3-Clause"
     },
     "plugins/legacy-plugin-chart-horizon/node_modules/d3-interpolate": {
       "version": "2.0.1",
@@ -49744,12 +50207,6 @@
         "d3-time": "1 - 2"
       }
     },
-    "plugins/legacy-plugin-chart-horizon/node_modules/internmap": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/internmap/-/internmap-1.0.1.tgz",
-      "integrity": "sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw==",
-      "license": "ISC"
-    },
     "plugins/legacy-plugin-chart-map-box": {
       "name": "@superset-ui/legacy-plugin-chart-map-box",
       "version": "0.20.3",
@@ -49787,7 +50244,7 @@
       "version": "0.20.3",
       "license": "Apache-2.0",
       "dependencies": {
-        "d3": "^3.5.17",
+        "d3v3": "npm:d3@3.5.17",
         "prop-types": "^15.8.1"
       },
       "peerDependencies": {
@@ -49847,34 +50304,19 @@
         "react": "^18.2.0"
       }
     },
-    "plugins/legacy-plugin-chart-world-map/node_modules/d3-array": {
-      "version": "2.12.1",
-      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz",
-      "integrity": "sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==",
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "internmap": "^1.0.0"
-      }
-    },
-    "plugins/legacy-plugin-chart-world-map/node_modules/internmap": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/internmap/-/internmap-1.0.1.tgz",
-      "integrity": "sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw==",
-      "license": "ISC"
-    },
     "plugins/legacy-preset-chart-deckgl": {
       "name": "@superset-ui/legacy-preset-chart-deckgl",
       "version": "0.20.4",
       "license": "Apache-2.0",
       "dependencies": {
-        "@deck.gl/aggregation-layers": "^9.0.38",
+        "@deck.gl/aggregation-layers": "^9.1.12",
         "@deck.gl/core": "^9.0.37",
         "@deck.gl/layers": "^9.0.38",
         "@deck.gl/react": "^9.1.4",
         "@mapbox/geojson-extent": "^1.0.1",
         "@math.gl/web-mercator": "^4.1.0",
         "@types/d3-array": "^2.0.0",
-        "@types/geojson": "^7946.0.15",
+        "@types/geojson": "^7946.0.16",
         "bootstrap-slider": "^11.0.2",
         "d3-array": "^1.2.4",
         "d3-color": "^1.4.1",
@@ -49900,20 +50342,72 @@
         "react-map-gl": "^6.1.19"
       }
     },
-    "plugins/legacy-preset-chart-deckgl/node_modules/@types/d3-array": {
-      "version": "2.12.7",
-      "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-2.12.7.tgz",
-      "integrity": "sha512-SVvxzxRVnIgtJbNTj5ZVJ9CZkVOANCpW0nQbRi7EOU5Q9G+JQQjXD2SCpr1OYCX09b3Yr7o0+CBofZAgU42rbQ==",
+    "plugins/legacy-preset-chart-deckgl/node_modules/@deck.gl/aggregation-layers": {
+      "version": "9.1.12",
+      "license": "MIT",
+      "dependencies": {
+        "@luma.gl/constants": "^9.1.5",
+        "@luma.gl/shadertools": "^9.1.5",
+        "@math.gl/core": "^4.1.0",
+        "@math.gl/web-mercator": "^4.1.0",
+        "d3-hexbin": "^0.2.1"
+      },
+      "peerDependencies": {
+        "@deck.gl/core": "^9.1.0",
+        "@deck.gl/layers": "^9.1.0",
+        "@luma.gl/core": "^9.1.5",
+        "@luma.gl/engine": "^9.1.5"
+      }
+    },
+    "plugins/legacy-preset-chart-deckgl/node_modules/@luma.gl/constants": {
+      "version": "9.1.9",
       "license": "MIT"
     },
+    "plugins/legacy-preset-chart-deckgl/node_modules/@luma.gl/core": {
+      "version": "9.1.9",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@math.gl/types": "^4.1.0",
+        "@probe.gl/env": "^4.0.8",
+        "@probe.gl/log": "^4.0.8",
+        "@probe.gl/stats": "^4.0.8",
+        "@types/offscreencanvas": "^2019.6.4"
+      }
+    },
+    "plugins/legacy-preset-chart-deckgl/node_modules/@luma.gl/engine": {
+      "version": "9.1.9",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@math.gl/core": "^4.1.0",
+        "@math.gl/types": "^4.1.0",
+        "@probe.gl/log": "^4.0.8",
+        "@probe.gl/stats": "^4.0.8"
+      },
+      "peerDependencies": {
+        "@luma.gl/core": "^9.1.0",
+        "@luma.gl/shadertools": "^9.1.0"
+      }
+    },
+    "plugins/legacy-preset-chart-deckgl/node_modules/@luma.gl/shadertools": {
+      "version": "9.1.9",
+      "license": "MIT",
+      "dependencies": {
+        "@math.gl/core": "^4.1.0",
+        "@math.gl/types": "^4.1.0",
+        "wgsl_reflect": "^1.2.0"
+      },
+      "peerDependencies": {
+        "@luma.gl/core": "^9.1.0"
+      }
+    },
     "plugins/legacy-preset-chart-deckgl/node_modules/d3-array": {
       "version": "1.2.4",
       "license": "BSD-3-Clause"
     },
     "plugins/legacy-preset-chart-deckgl/node_modules/d3-color": {
       "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.4.1.tgz",
-      "integrity": "sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q==",
       "license": "BSD-3-Clause"
     },
     "plugins/legacy-preset-chart-deckgl/node_modules/d3-interpolate": {
@@ -49966,6 +50460,10 @@
       "version": "1.0.1",
       "license": "ISC"
     },
+    "plugins/legacy-preset-chart-deckgl/node_modules/wgsl_reflect": {
+      "version": "1.2.1",
+      "license": "MIT"
+    },
     "plugins/legacy-preset-chart-nvd3": {
       "name": "@superset-ui/legacy-preset-chart-nvd3",
       "version": "0.20.3",
@@ -49974,7 +50472,7 @@
         "d3": "^3.5.17",
         "d3-tip": "^0.9.1",
         "dayjs": "^1.11.13",
-        "dompurify": "^3.2.4",
+        "dompurify": "^3.2.6",
         "fast-safe-stringify": "^2.1.1",
         "lodash": "^4.17.21",
         "nvd3-fork": "^2.0.5",
@@ -49988,7 +50486,7 @@
       }
     },
     "plugins/legacy-preset-chart-nvd3/node_modules/dompurify": {
-      "version": "3.2.3",
+      "version": "3.2.6",
       "license": "(MPL-2.0 OR Apache-2.0)",
       "optionalDependencies": {
         "@types/trusted-types": "^2.0.7"
@@ -50007,8 +50505,7 @@
         "@ant-design/icons": "^5.2.6",
         "@superset-ui/chart-controls": "*",
         "@superset-ui/core": "*",
-        "antd": "^4.10.3",
-        "geostyler": "^12.0.0",
+        "geostyler": "^14.1.3",
         "geostyler-data": "^1.0.0",
         "geostyler-openlayers-parser": "^4.0.0",
         "geostyler-style": "^7.2.0",
@@ -50051,9 +50548,9 @@
         "just-handlebars-helpers": "^1.0.19"
       },
       "devDependencies": {
-        "@types/jest": "^29.5.14",
-        "@types/lodash": "^4.17.16",
-        "jest": "^29.7.0"
+        "@types/jest": "^30.0.0",
+        "@types/lodash": "^4.17.20",
+        "jest": "^30.0.4"
       },
       "peerDependencies": {
         "@superset-ui/chart-controls": "*",
@@ -50066,6 +50563,801 @@
         "react-dom": "^18.2.0"
       }
     },
+    "plugins/plugin-chart-handlebars/node_modules/@jest/console": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "chalk": "^4.1.2",
+        "jest-message-util": "30.0.2",
+        "jest-util": "30.0.2",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-handlebars/node_modules/@jest/core": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/console": "30.0.4",
+        "@jest/pattern": "30.0.1",
+        "@jest/reporters": "30.0.4",
+        "@jest/test-result": "30.0.4",
+        "@jest/transform": "30.0.4",
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "ansi-escapes": "^4.3.2",
+        "chalk": "^4.1.2",
+        "ci-info": "^4.2.0",
+        "exit-x": "^0.2.2",
+        "graceful-fs": "^4.2.11",
+        "jest-changed-files": "30.0.2",
+        "jest-config": "30.0.4",
+        "jest-haste-map": "30.0.2",
+        "jest-message-util": "30.0.2",
+        "jest-regex-util": "30.0.1",
+        "jest-resolve": "30.0.2",
+        "jest-resolve-dependencies": "30.0.4",
+        "jest-runner": "30.0.4",
+        "jest-runtime": "30.0.4",
+        "jest-snapshot": "30.0.4",
+        "jest-util": "30.0.2",
+        "jest-validate": "30.0.2",
+        "jest-watcher": "30.0.4",
+        "micromatch": "^4.0.8",
+        "pretty-format": "30.0.2",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
+    },
+    "plugins/plugin-chart-handlebars/node_modules/@jest/environment": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/fake-timers": "30.0.4",
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "jest-mock": "30.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-handlebars/node_modules/@jest/expect": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "expect": "30.0.4",
+        "jest-snapshot": "30.0.4"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-handlebars/node_modules/@jest/expect-utils": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/get-type": "30.0.1"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-handlebars/node_modules/@jest/fake-timers": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "30.0.1",
+        "@sinonjs/fake-timers": "^13.0.0",
+        "@types/node": "*",
+        "jest-message-util": "30.0.2",
+        "jest-mock": "30.0.2",
+        "jest-util": "30.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-handlebars/node_modules/@jest/globals": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/environment": "30.0.4",
+        "@jest/expect": "30.0.4",
+        "@jest/types": "30.0.1",
+        "jest-mock": "30.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-handlebars/node_modules/@jest/reporters": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@bcoe/v8-coverage": "^0.2.3",
+        "@jest/console": "30.0.4",
+        "@jest/test-result": "30.0.4",
+        "@jest/transform": "30.0.4",
+        "@jest/types": "30.0.1",
+        "@jridgewell/trace-mapping": "^0.3.25",
+        "@types/node": "*",
+        "chalk": "^4.1.2",
+        "collect-v8-coverage": "^1.0.2",
+        "exit-x": "^0.2.2",
+        "glob": "^10.3.10",
+        "graceful-fs": "^4.2.11",
+        "istanbul-lib-coverage": "^3.0.0",
+        "istanbul-lib-instrument": "^6.0.0",
+        "istanbul-lib-report": "^3.0.0",
+        "istanbul-lib-source-maps": "^5.0.0",
+        "istanbul-reports": "^3.1.3",
+        "jest-message-util": "30.0.2",
+        "jest-util": "30.0.2",
+        "jest-worker": "30.0.2",
+        "slash": "^3.0.0",
+        "string-length": "^4.0.2",
+        "v8-to-istanbul": "^9.0.1"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
+    },
+    "plugins/plugin-chart-handlebars/node_modules/@jest/schemas": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@sinclair/typebox": "^0.34.0"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-handlebars/node_modules/@jest/snapshot-utils": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "30.0.1",
+        "chalk": "^4.1.2",
+        "graceful-fs": "^4.2.11",
+        "natural-compare": "^1.4.0"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-handlebars/node_modules/@jest/test-result": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/console": "30.0.4",
+        "@jest/types": "30.0.1",
+        "@types/istanbul-lib-coverage": "^2.0.6",
+        "collect-v8-coverage": "^1.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-handlebars/node_modules/@jest/test-sequencer": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/test-result": "30.0.4",
+        "graceful-fs": "^4.2.11",
+        "jest-haste-map": "30.0.2",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-handlebars/node_modules/@jest/transform": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/core": "^7.27.4",
+        "@jest/types": "30.0.1",
+        "@jridgewell/trace-mapping": "^0.3.25",
+        "babel-plugin-istanbul": "^7.0.0",
+        "chalk": "^4.1.2",
+        "convert-source-map": "^2.0.0",
+        "fast-json-stable-stringify": "^2.1.0",
+        "graceful-fs": "^4.2.11",
+        "jest-haste-map": "30.0.2",
+        "jest-regex-util": "30.0.1",
+        "jest-util": "30.0.2",
+        "micromatch": "^4.0.8",
+        "pirates": "^4.0.7",
+        "slash": "^3.0.0",
+        "write-file-atomic": "^5.0.1"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-handlebars/node_modules/@jest/types": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/pattern": "30.0.1",
+        "@jest/schemas": "30.0.1",
+        "@types/istanbul-lib-coverage": "^2.0.6",
+        "@types/istanbul-reports": "^3.0.4",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.33",
+        "chalk": "^4.1.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-handlebars/node_modules/@pkgr/core": {
+      "version": "0.2.7",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/pkgr"
+      }
+    },
+    "plugins/plugin-chart-handlebars/node_modules/@sinclair/typebox": {
+      "version": "0.34.37",
+      "dev": true,
+      "license": "MIT"
+    },
+    "plugins/plugin-chart-handlebars/node_modules/@sinonjs/fake-timers": {
+      "version": "13.0.5",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@sinonjs/commons": "^3.0.1"
+      }
+    },
+    "plugins/plugin-chart-handlebars/node_modules/@types/jest": {
+      "version": "30.0.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "expect": "^30.0.0",
+        "pretty-format": "^30.0.0"
+      }
+    },
+    "plugins/plugin-chart-handlebars/node_modules/@types/lodash": {
+      "version": "4.17.20",
+      "dev": true,
+      "license": "MIT"
+    },
+    "plugins/plugin-chart-handlebars/node_modules/babel-jest": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/transform": "30.0.4",
+        "@types/babel__core": "^7.20.5",
+        "babel-plugin-istanbul": "^7.0.0",
+        "babel-preset-jest": "30.0.1",
+        "chalk": "^4.1.2",
+        "graceful-fs": "^4.2.11",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.11.0"
+      }
+    },
+    "plugins/plugin-chart-handlebars/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "plugins/plugin-chart-handlebars/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"
+      }
+    },
+    "plugins/plugin-chart-handlebars/node_modules/cjs-module-lexer": {
+      "version": "2.1.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "plugins/plugin-chart-handlebars/node_modules/dedent": {
+      "version": "1.6.0",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "babel-plugin-macros": "^3.1.0"
+      },
+      "peerDependenciesMeta": {
+        "babel-plugin-macros": {
+          "optional": true
+        }
+      }
+    },
+    "plugins/plugin-chart-handlebars/node_modules/expect": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/expect-utils": "30.0.4",
+        "@jest/get-type": "30.0.1",
+        "jest-matcher-utils": "30.0.4",
+        "jest-message-util": "30.0.2",
+        "jest-mock": "30.0.2",
+        "jest-util": "30.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-handlebars/node_modules/glob": {
+      "version": "10.4.5",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "plugins/plugin-chart-handlebars/node_modules/istanbul-lib-source-maps": {
+      "version": "5.0.6",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.23",
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "plugins/plugin-chart-handlebars/node_modules/jest": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/core": "30.0.4",
+        "@jest/types": "30.0.1",
+        "import-local": "^3.2.0",
+        "jest-cli": "30.0.4"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
+    },
+    "plugins/plugin-chart-handlebars/node_modules/jest-circus": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/environment": "30.0.4",
+        "@jest/expect": "30.0.4",
+        "@jest/test-result": "30.0.4",
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "chalk": "^4.1.2",
+        "co": "^4.6.0",
+        "dedent": "^1.6.0",
+        "is-generator-fn": "^2.1.0",
+        "jest-each": "30.0.2",
+        "jest-matcher-utils": "30.0.4",
+        "jest-message-util": "30.0.2",
+        "jest-runtime": "30.0.4",
+        "jest-snapshot": "30.0.4",
+        "jest-util": "30.0.2",
+        "p-limit": "^3.1.0",
+        "pretty-format": "30.0.2",
+        "pure-rand": "^7.0.0",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.6"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-handlebars/node_modules/jest-cli": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/core": "30.0.4",
+        "@jest/test-result": "30.0.4",
+        "@jest/types": "30.0.1",
+        "chalk": "^4.1.2",
+        "exit-x": "^0.2.2",
+        "import-local": "^3.2.0",
+        "jest-config": "30.0.4",
+        "jest-util": "30.0.2",
+        "jest-validate": "30.0.2",
+        "yargs": "^17.7.2"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
+    },
+    "plugins/plugin-chart-handlebars/node_modules/jest-config": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/core": "^7.27.4",
+        "@jest/get-type": "30.0.1",
+        "@jest/pattern": "30.0.1",
+        "@jest/test-sequencer": "30.0.4",
+        "@jest/types": "30.0.1",
+        "babel-jest": "30.0.4",
+        "chalk": "^4.1.2",
+        "ci-info": "^4.2.0",
+        "deepmerge": "^4.3.1",
+        "glob": "^10.3.10",
+        "graceful-fs": "^4.2.11",
+        "jest-circus": "30.0.4",
+        "jest-docblock": "30.0.1",
+        "jest-environment-node": "30.0.4",
+        "jest-regex-util": "30.0.1",
+        "jest-resolve": "30.0.2",
+        "jest-runner": "30.0.4",
+        "jest-util": "30.0.2",
+        "jest-validate": "30.0.2",
+        "micromatch": "^4.0.8",
+        "parse-json": "^5.2.0",
+        "pretty-format": "30.0.2",
+        "slash": "^3.0.0",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      },
+      "peerDependencies": {
+        "@types/node": "*",
+        "esbuild-register": ">=3.4.0",
+        "ts-node": ">=9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        },
+        "esbuild-register": {
+          "optional": true
+        },
+        "ts-node": {
+          "optional": true
+        }
+      }
+    },
+    "plugins/plugin-chart-handlebars/node_modules/jest-diff": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/diff-sequences": "30.0.1",
+        "@jest/get-type": "30.0.1",
+        "chalk": "^4.1.2",
+        "pretty-format": "30.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-handlebars/node_modules/jest-environment-node": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/environment": "30.0.4",
+        "@jest/fake-timers": "30.0.4",
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "jest-mock": "30.0.2",
+        "jest-util": "30.0.2",
+        "jest-validate": "30.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-handlebars/node_modules/jest-matcher-utils": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/get-type": "30.0.1",
+        "chalk": "^4.1.2",
+        "jest-diff": "30.0.4",
+        "pretty-format": "30.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-handlebars/node_modules/jest-message-util": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.27.1",
+        "@jest/types": "30.0.1",
+        "@types/stack-utils": "^2.0.3",
+        "chalk": "^4.1.2",
+        "graceful-fs": "^4.2.11",
+        "micromatch": "^4.0.8",
+        "pretty-format": "30.0.2",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.6"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-handlebars/node_modules/jest-mock": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "jest-util": "30.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-handlebars/node_modules/jest-resolve-dependencies": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "jest-regex-util": "30.0.1",
+        "jest-snapshot": "30.0.4"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-handlebars/node_modules/jest-runner": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/console": "30.0.4",
+        "@jest/environment": "30.0.4",
+        "@jest/test-result": "30.0.4",
+        "@jest/transform": "30.0.4",
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "chalk": "^4.1.2",
+        "emittery": "^0.13.1",
+        "exit-x": "^0.2.2",
+        "graceful-fs": "^4.2.11",
+        "jest-docblock": "30.0.1",
+        "jest-environment-node": "30.0.4",
+        "jest-haste-map": "30.0.2",
+        "jest-leak-detector": "30.0.2",
+        "jest-message-util": "30.0.2",
+        "jest-resolve": "30.0.2",
+        "jest-runtime": "30.0.4",
+        "jest-util": "30.0.2",
+        "jest-watcher": "30.0.4",
+        "jest-worker": "30.0.2",
+        "p-limit": "^3.1.0",
+        "source-map-support": "0.5.13"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-handlebars/node_modules/jest-runtime": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/environment": "30.0.4",
+        "@jest/fake-timers": "30.0.4",
+        "@jest/globals": "30.0.4",
+        "@jest/source-map": "30.0.1",
+        "@jest/test-result": "30.0.4",
+        "@jest/transform": "30.0.4",
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "chalk": "^4.1.2",
+        "cjs-module-lexer": "^2.1.0",
+        "collect-v8-coverage": "^1.0.2",
+        "glob": "^10.3.10",
+        "graceful-fs": "^4.2.11",
+        "jest-haste-map": "30.0.2",
+        "jest-message-util": "30.0.2",
+        "jest-mock": "30.0.2",
+        "jest-regex-util": "30.0.1",
+        "jest-resolve": "30.0.2",
+        "jest-snapshot": "30.0.4",
+        "jest-util": "30.0.2",
+        "slash": "^3.0.0",
+        "strip-bom": "^4.0.0"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-handlebars/node_modules/jest-snapshot": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/core": "^7.27.4",
+        "@babel/generator": "^7.27.5",
+        "@babel/plugin-syntax-jsx": "^7.27.1",
+        "@babel/plugin-syntax-typescript": "^7.27.1",
+        "@babel/types": "^7.27.3",
+        "@jest/expect-utils": "30.0.4",
+        "@jest/get-type": "30.0.1",
+        "@jest/snapshot-utils": "30.0.4",
+        "@jest/transform": "30.0.4",
+        "@jest/types": "30.0.1",
+        "babel-preset-current-node-syntax": "^1.1.0",
+        "chalk": "^4.1.2",
+        "expect": "30.0.4",
+        "graceful-fs": "^4.2.11",
+        "jest-diff": "30.0.4",
+        "jest-matcher-utils": "30.0.4",
+        "jest-message-util": "30.0.2",
+        "jest-util": "30.0.2",
+        "pretty-format": "30.0.2",
+        "semver": "^7.7.2",
+        "synckit": "^0.11.8"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-handlebars/node_modules/jest-util": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "chalk": "^4.1.2",
+        "ci-info": "^4.2.0",
+        "graceful-fs": "^4.2.11",
+        "picomatch": "^4.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-handlebars/node_modules/jest-watcher": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/test-result": "30.0.4",
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "ansi-escapes": "^4.3.2",
+        "chalk": "^4.1.2",
+        "emittery": "^0.13.1",
+        "jest-util": "30.0.2",
+        "string-length": "^4.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-handlebars/node_modules/jest-worker": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*",
+        "@ungap/structured-clone": "^1.3.0",
+        "jest-util": "30.0.2",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.1.1"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-handlebars/node_modules/jest-worker/node_modules/supports-color": {
+      "version": "8.1.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
     "plugins/plugin-chart-handlebars/node_modules/just-handlebars-helpers": {
       "version": "1.0.19",
       "license": "MIT",
@@ -50076,19 +51368,118 @@
         "sprintf-js": ">= 1.1.1 < 2"
       }
     },
+    "plugins/plugin-chart-handlebars/node_modules/minimatch": {
+      "version": "9.0.5",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "plugins/plugin-chart-handlebars/node_modules/picomatch": {
+      "version": "4.0.2",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "plugins/plugin-chart-handlebars/node_modules/pretty-format": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/schemas": "30.0.1",
+        "ansi-styles": "^5.2.0",
+        "react-is": "^18.3.1"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-handlebars/node_modules/pretty-format/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "plugins/plugin-chart-handlebars/node_modules/semver": {
+      "version": "7.7.2",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "plugins/plugin-chart-handlebars/node_modules/slash": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "plugins/plugin-chart-handlebars/node_modules/source-map": {
+      "version": "0.6.1",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "plugins/plugin-chart-handlebars/node_modules/source-map-support": {
+      "version": "0.5.13",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
     "plugins/plugin-chart-handlebars/node_modules/sprintf-js": {
       "version": "1.1.3",
       "license": "BSD-3-Clause",
       "peer": true
     },
+    "plugins/plugin-chart-handlebars/node_modules/synckit": {
+      "version": "0.11.8",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@pkgr/core": "^0.2.4"
+      },
+      "engines": {
+        "node": "^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/synckit"
+      }
+    },
     "plugins/plugin-chart-pivot-table": {
       "name": "@superset-ui/plugin-chart-pivot-table",
       "version": "0.20.3",
       "license": "Apache-2.0",
       "devDependencies": {
-        "@babel/types": "^7.26.9",
+        "@babel/types": "^7.28.0",
         "@types/jest": "^29.5.12",
-        "jest": "^29.7.0"
+        "jest": "^30.0.4"
       },
       "peerDependencies": {
         "@ant-design/icons": "^5.2.6",
@@ -50100,6 +51491,898 @@
         "react-dom": "^18.2.0"
       }
     },
+    "plugins/plugin-chart-pivot-table/node_modules/@babel/types": {
+      "version": "7.28.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-string-parser": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/@jest/console": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "chalk": "^4.1.2",
+        "jest-message-util": "30.0.2",
+        "jest-util": "30.0.2",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/@jest/core": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/console": "30.0.4",
+        "@jest/pattern": "30.0.1",
+        "@jest/reporters": "30.0.4",
+        "@jest/test-result": "30.0.4",
+        "@jest/transform": "30.0.4",
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "ansi-escapes": "^4.3.2",
+        "chalk": "^4.1.2",
+        "ci-info": "^4.2.0",
+        "exit-x": "^0.2.2",
+        "graceful-fs": "^4.2.11",
+        "jest-changed-files": "30.0.2",
+        "jest-config": "30.0.4",
+        "jest-haste-map": "30.0.2",
+        "jest-message-util": "30.0.2",
+        "jest-regex-util": "30.0.1",
+        "jest-resolve": "30.0.2",
+        "jest-resolve-dependencies": "30.0.4",
+        "jest-runner": "30.0.4",
+        "jest-runtime": "30.0.4",
+        "jest-snapshot": "30.0.4",
+        "jest-util": "30.0.2",
+        "jest-validate": "30.0.2",
+        "jest-watcher": "30.0.4",
+        "micromatch": "^4.0.8",
+        "pretty-format": "30.0.2",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/@jest/environment": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/fake-timers": "30.0.4",
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "jest-mock": "30.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/@jest/expect": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "expect": "30.0.4",
+        "jest-snapshot": "30.0.4"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/@jest/expect-utils": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/get-type": "30.0.1"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/@jest/fake-timers": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "30.0.1",
+        "@sinonjs/fake-timers": "^13.0.0",
+        "@types/node": "*",
+        "jest-message-util": "30.0.2",
+        "jest-mock": "30.0.2",
+        "jest-util": "30.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/@jest/globals": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/environment": "30.0.4",
+        "@jest/expect": "30.0.4",
+        "@jest/types": "30.0.1",
+        "jest-mock": "30.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/@jest/reporters": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@bcoe/v8-coverage": "^0.2.3",
+        "@jest/console": "30.0.4",
+        "@jest/test-result": "30.0.4",
+        "@jest/transform": "30.0.4",
+        "@jest/types": "30.0.1",
+        "@jridgewell/trace-mapping": "^0.3.25",
+        "@types/node": "*",
+        "chalk": "^4.1.2",
+        "collect-v8-coverage": "^1.0.2",
+        "exit-x": "^0.2.2",
+        "glob": "^10.3.10",
+        "graceful-fs": "^4.2.11",
+        "istanbul-lib-coverage": "^3.0.0",
+        "istanbul-lib-instrument": "^6.0.0",
+        "istanbul-lib-report": "^3.0.0",
+        "istanbul-lib-source-maps": "^5.0.0",
+        "istanbul-reports": "^3.1.3",
+        "jest-message-util": "30.0.2",
+        "jest-util": "30.0.2",
+        "jest-worker": "30.0.2",
+        "slash": "^3.0.0",
+        "string-length": "^4.0.2",
+        "v8-to-istanbul": "^9.0.1"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/@jest/schemas": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@sinclair/typebox": "^0.34.0"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/@jest/snapshot-utils": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "30.0.1",
+        "chalk": "^4.1.2",
+        "graceful-fs": "^4.2.11",
+        "natural-compare": "^1.4.0"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/@jest/test-result": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/console": "30.0.4",
+        "@jest/types": "30.0.1",
+        "@types/istanbul-lib-coverage": "^2.0.6",
+        "collect-v8-coverage": "^1.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/@jest/test-sequencer": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/test-result": "30.0.4",
+        "graceful-fs": "^4.2.11",
+        "jest-haste-map": "30.0.2",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/@jest/transform": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/core": "^7.27.4",
+        "@jest/types": "30.0.1",
+        "@jridgewell/trace-mapping": "^0.3.25",
+        "babel-plugin-istanbul": "^7.0.0",
+        "chalk": "^4.1.2",
+        "convert-source-map": "^2.0.0",
+        "fast-json-stable-stringify": "^2.1.0",
+        "graceful-fs": "^4.2.11",
+        "jest-haste-map": "30.0.2",
+        "jest-regex-util": "30.0.1",
+        "jest-util": "30.0.2",
+        "micromatch": "^4.0.8",
+        "pirates": "^4.0.7",
+        "slash": "^3.0.0",
+        "write-file-atomic": "^5.0.1"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/@jest/types": {
+      "version": "30.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/pattern": "30.0.1",
+        "@jest/schemas": "30.0.1",
+        "@types/istanbul-lib-coverage": "^2.0.6",
+        "@types/istanbul-reports": "^3.0.4",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.33",
+        "chalk": "^4.1.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/@pkgr/core": {
+      "version": "0.2.7",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/pkgr"
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/@sinclair/typebox": {
+      "version": "0.34.37",
+      "dev": true,
+      "license": "MIT"
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/@sinonjs/fake-timers": {
+      "version": "13.0.5",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@sinonjs/commons": "^3.0.1"
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/babel-jest": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/transform": "30.0.4",
+        "@types/babel__core": "^7.20.5",
+        "babel-plugin-istanbul": "^7.0.0",
+        "babel-preset-jest": "30.0.1",
+        "chalk": "^4.1.2",
+        "graceful-fs": "^4.2.11",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.11.0"
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "plugins/plugin-chart-pivot-table/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"
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/cjs-module-lexer": {
+      "version": "2.1.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/dedent": {
+      "version": "1.6.0",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "babel-plugin-macros": "^3.1.0"
+      },
+      "peerDependenciesMeta": {
+        "babel-plugin-macros": {
+          "optional": true
+        }
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/expect": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/expect-utils": "30.0.4",
+        "@jest/get-type": "30.0.1",
+        "jest-matcher-utils": "30.0.4",
+        "jest-message-util": "30.0.2",
+        "jest-mock": "30.0.2",
+        "jest-util": "30.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/glob": {
+      "version": "10.4.5",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/istanbul-lib-source-maps": {
+      "version": "5.0.6",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.23",
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/jest": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/core": "30.0.4",
+        "@jest/types": "30.0.1",
+        "import-local": "^3.2.0",
+        "jest-cli": "30.0.4"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/jest-circus": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/environment": "30.0.4",
+        "@jest/expect": "30.0.4",
+        "@jest/test-result": "30.0.4",
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "chalk": "^4.1.2",
+        "co": "^4.6.0",
+        "dedent": "^1.6.0",
+        "is-generator-fn": "^2.1.0",
+        "jest-each": "30.0.2",
+        "jest-matcher-utils": "30.0.4",
+        "jest-message-util": "30.0.2",
+        "jest-runtime": "30.0.4",
+        "jest-snapshot": "30.0.4",
+        "jest-util": "30.0.2",
+        "p-limit": "^3.1.0",
+        "pretty-format": "30.0.2",
+        "pure-rand": "^7.0.0",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.6"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/jest-cli": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/core": "30.0.4",
+        "@jest/test-result": "30.0.4",
+        "@jest/types": "30.0.1",
+        "chalk": "^4.1.2",
+        "exit-x": "^0.2.2",
+        "import-local": "^3.2.0",
+        "jest-config": "30.0.4",
+        "jest-util": "30.0.2",
+        "jest-validate": "30.0.2",
+        "yargs": "^17.7.2"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/jest-config": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/core": "^7.27.4",
+        "@jest/get-type": "30.0.1",
+        "@jest/pattern": "30.0.1",
+        "@jest/test-sequencer": "30.0.4",
+        "@jest/types": "30.0.1",
+        "babel-jest": "30.0.4",
+        "chalk": "^4.1.2",
+        "ci-info": "^4.2.0",
+        "deepmerge": "^4.3.1",
+        "glob": "^10.3.10",
+        "graceful-fs": "^4.2.11",
+        "jest-circus": "30.0.4",
+        "jest-docblock": "30.0.1",
+        "jest-environment-node": "30.0.4",
+        "jest-regex-util": "30.0.1",
+        "jest-resolve": "30.0.2",
+        "jest-runner": "30.0.4",
+        "jest-util": "30.0.2",
+        "jest-validate": "30.0.2",
+        "micromatch": "^4.0.8",
+        "parse-json": "^5.2.0",
+        "pretty-format": "30.0.2",
+        "slash": "^3.0.0",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      },
+      "peerDependencies": {
+        "@types/node": "*",
+        "esbuild-register": ">=3.4.0",
+        "ts-node": ">=9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        },
+        "esbuild-register": {
+          "optional": true
+        },
+        "ts-node": {
+          "optional": true
+        }
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/jest-diff": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/diff-sequences": "30.0.1",
+        "@jest/get-type": "30.0.1",
+        "chalk": "^4.1.2",
+        "pretty-format": "30.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/jest-environment-node": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/environment": "30.0.4",
+        "@jest/fake-timers": "30.0.4",
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "jest-mock": "30.0.2",
+        "jest-util": "30.0.2",
+        "jest-validate": "30.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/jest-matcher-utils": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/get-type": "30.0.1",
+        "chalk": "^4.1.2",
+        "jest-diff": "30.0.4",
+        "pretty-format": "30.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/jest-message-util": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.27.1",
+        "@jest/types": "30.0.1",
+        "@types/stack-utils": "^2.0.3",
+        "chalk": "^4.1.2",
+        "graceful-fs": "^4.2.11",
+        "micromatch": "^4.0.8",
+        "pretty-format": "30.0.2",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.6"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/jest-mock": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "jest-util": "30.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/jest-resolve-dependencies": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "jest-regex-util": "30.0.1",
+        "jest-snapshot": "30.0.4"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/jest-runner": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/console": "30.0.4",
+        "@jest/environment": "30.0.4",
+        "@jest/test-result": "30.0.4",
+        "@jest/transform": "30.0.4",
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "chalk": "^4.1.2",
+        "emittery": "^0.13.1",
+        "exit-x": "^0.2.2",
+        "graceful-fs": "^4.2.11",
+        "jest-docblock": "30.0.1",
+        "jest-environment-node": "30.0.4",
+        "jest-haste-map": "30.0.2",
+        "jest-leak-detector": "30.0.2",
+        "jest-message-util": "30.0.2",
+        "jest-resolve": "30.0.2",
+        "jest-runtime": "30.0.4",
+        "jest-util": "30.0.2",
+        "jest-watcher": "30.0.4",
+        "jest-worker": "30.0.2",
+        "p-limit": "^3.1.0",
+        "source-map-support": "0.5.13"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/jest-runtime": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/environment": "30.0.4",
+        "@jest/fake-timers": "30.0.4",
+        "@jest/globals": "30.0.4",
+        "@jest/source-map": "30.0.1",
+        "@jest/test-result": "30.0.4",
+        "@jest/transform": "30.0.4",
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "chalk": "^4.1.2",
+        "cjs-module-lexer": "^2.1.0",
+        "collect-v8-coverage": "^1.0.2",
+        "glob": "^10.3.10",
+        "graceful-fs": "^4.2.11",
+        "jest-haste-map": "30.0.2",
+        "jest-message-util": "30.0.2",
+        "jest-mock": "30.0.2",
+        "jest-regex-util": "30.0.1",
+        "jest-resolve": "30.0.2",
+        "jest-snapshot": "30.0.4",
+        "jest-util": "30.0.2",
+        "slash": "^3.0.0",
+        "strip-bom": "^4.0.0"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/jest-snapshot": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/core": "^7.27.4",
+        "@babel/generator": "^7.27.5",
+        "@babel/plugin-syntax-jsx": "^7.27.1",
+        "@babel/plugin-syntax-typescript": "^7.27.1",
+        "@babel/types": "^7.27.3",
+        "@jest/expect-utils": "30.0.4",
+        "@jest/get-type": "30.0.1",
+        "@jest/snapshot-utils": "30.0.4",
+        "@jest/transform": "30.0.4",
+        "@jest/types": "30.0.1",
+        "babel-preset-current-node-syntax": "^1.1.0",
+        "chalk": "^4.1.2",
+        "expect": "30.0.4",
+        "graceful-fs": "^4.2.11",
+        "jest-diff": "30.0.4",
+        "jest-matcher-utils": "30.0.4",
+        "jest-message-util": "30.0.2",
+        "jest-util": "30.0.2",
+        "pretty-format": "30.0.2",
+        "semver": "^7.7.2",
+        "synckit": "^0.11.8"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/jest-util": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "chalk": "^4.1.2",
+        "ci-info": "^4.2.0",
+        "graceful-fs": "^4.2.11",
+        "picomatch": "^4.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/jest-watcher": {
+      "version": "30.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/test-result": "30.0.4",
+        "@jest/types": "30.0.1",
+        "@types/node": "*",
+        "ansi-escapes": "^4.3.2",
+        "chalk": "^4.1.2",
+        "emittery": "^0.13.1",
+        "jest-util": "30.0.2",
+        "string-length": "^4.0.2"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/jest-worker": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*",
+        "@ungap/structured-clone": "^1.3.0",
+        "jest-util": "30.0.2",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.1.1"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/jest-worker/node_modules/supports-color": {
+      "version": "8.1.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/minimatch": {
+      "version": "9.0.5",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/picomatch": {
+      "version": "4.0.2",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/pretty-format": {
+      "version": "30.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/schemas": "30.0.1",
+        "ansi-styles": "^5.2.0",
+        "react-is": "^18.3.1"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/pretty-format/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/semver": {
+      "version": "7.7.2",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/slash": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/source-map": {
+      "version": "0.6.1",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/source-map-support": {
+      "version": "0.5.13",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "plugins/plugin-chart-pivot-table/node_modules/synckit": {
+      "version": "0.11.8",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@pkgr/core": "^0.2.4"
+      },
+      "engines": {
+        "node": "^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/synckit"
+      }
+    },
     "plugins/plugin-chart-table": {
       "name": "@superset-ui/plugin-chart-table",
       "version": "0.20.3",
@@ -50131,33 +52414,12 @@
         "react-dom": "^18.2.0"
       }
     },
-    "plugins/plugin-chart-table/node_modules/@types/d3-array": {
-      "version": "2.12.7",
-      "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-2.12.7.tgz",
-      "integrity": "sha512-SVvxzxRVnIgtJbNTj5ZVJ9CZkVOANCpW0nQbRi7EOU5Q9G+JQQjXD2SCpr1OYCX09b3Yr7o0+CBofZAgU42rbQ==",
-      "license": "MIT"
-    },
-    "plugins/plugin-chart-table/node_modules/d3-array": {
-      "version": "2.12.1",
-      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz",
-      "integrity": "sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==",
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "internmap": "^1.0.0"
-      }
-    },
-    "plugins/plugin-chart-table/node_modules/internmap": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/internmap/-/internmap-1.0.1.tgz",
-      "integrity": "sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw==",
-      "license": "ISC"
-    },
     "plugins/plugin-chart-word-cloud": {
       "name": "@superset-ui/plugin-chart-word-cloud",
       "version": "0.20.4",
       "license": "Apache-2.0",
       "dependencies": {
-        "@types/d3-scale": "^4.0.8",
+        "@types/d3-scale": "^4.0.9",
         "d3-cloud": "^1.2.7",
         "d3-scale": "^3.0.1",
         "encodable": "^0.7.8"
@@ -50174,20 +52436,15 @@
       }
     },
     "plugins/plugin-chart-word-cloud/node_modules/@types/d3-scale": {
-      "version": "4.0.8",
+      "version": "4.0.9",
       "license": "MIT",
       "dependencies": {
         "@types/d3-time": "*"
       }
     },
-    "plugins/plugin-chart-word-cloud/node_modules/d3-array": {
-      "version": "2.12.1",
-      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz",
-      "integrity": "sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==",
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "internmap": "^1.0.0"
-      }
+    "plugins/plugin-chart-word-cloud/node_modules/d3-color": {
+      "version": "2.0.0",
+      "license": "BSD-3-Clause"
     },
     "plugins/plugin-chart-word-cloud/node_modules/d3-interpolate": {
       "version": "2.0.1",
@@ -50220,12 +52477,6 @@
       "dependencies": {
         "d3-time": "1 - 2"
       }
-    },
-    "plugins/plugin-chart-word-cloud/node_modules/internmap": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/internmap/-/internmap-1.0.1.tgz",
-      "integrity": "sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw==",
-      "license": "ISC"
     }
   }
 }
diff --git a/superset-frontend/package.json b/superset-frontend/package.json
index 422bc9dccac..afdc78884dc 100644
--- a/superset-frontend/package.json
+++ b/superset-frontend/package.json
@@ -37,7 +37,7 @@
     "src/setup/*"
   ],
   "scripts": {
-    "_prettier": "prettier './({src,spec,cypress-base,plugins,packages,.storybook}/**/*{.js,.jsx,.ts,.tsx,.css,.less,.scss,.sass}|package.json)'",
+    "_prettier": "prettier './({src,spec,cypress-base,plugins,packages,.storybook}/**/*{.js,.jsx,.ts,.tsx,.css,.scss,.sass}|package.json)'",
     "build": "cross-env NODE_OPTIONS=--max_old_space_size=8192 NODE_ENV=production BABEL_ENV=\"${BABEL_ENV:=production}\" webpack --color --mode production",
     "build-dev": "cross-env NODE_OPTIONS=--max_old_space_size=8192 NODE_ENV=development webpack --mode=development --color",
     "build-instrumented": "cross-env NODE_ENV=production BABEL_ENV=instrumented webpack --mode=production --color",
@@ -70,6 +70,7 @@
     "storybook": "cross-env NODE_ENV=development BABEL_ENV=development storybook dev -p 6006",
     "tdd": "cross-env NODE_ENV=test NODE_OPTIONS=\"--max-old-space-size=8192\" jest --watch",
     "test": "cross-env NODE_ENV=test NODE_OPTIONS=\"--max-old-space-size=8192\" jest --max-workers=80% --silent",
+    "test-loud": "cross-env NODE_ENV=test NODE_OPTIONS=\"--max-old-space-size=8192\" jest --max-workers=80%",
     "type": "tsc --noEmit",
     "update-maps": "jupyter nbconvert --to notebook --execute --inplace 'plugins/legacy-plugin-chart-country-map/scripts/Country Map GeoJSON Generator.ipynb' -Xfrozen_modules=off",
     "validate-release": "../RELEASING/validate_this_release.sh"
@@ -81,12 +82,9 @@
     "last 3 edge versions"
   ],
   "dependencies": {
-    "@ant-design/icons": "^5.2.6",
     "@emotion/cache": "^11.4.0",
-    "@emotion/react": "^11.13.3",
-    "@emotion/styled": "^11.3.0",
-    "@fontsource/fira-code": "^5.0.18",
-    "@fontsource/inter": "^5.0.20",
+    "@emotion/react": "^11.14.0",
+    "@emotion/styled": "^11.14.1",
     "@reduxjs/toolkit": "^1.9.3",
     "@rjsf/core": "^5.21.1",
     "@rjsf/utils": "^5.24.3",
@@ -115,20 +113,16 @@
     "@superset-ui/switchboard": "file:./packages/superset-ui-switchboard",
     "@types/d3-format": "^3.0.1",
     "@types/d3-time-format": "^4.0.3",
+    "@types/react-google-recaptcha": "^2.1.9",
     "@visx/axis": "^3.8.0",
     "@visx/grid": "^3.5.0",
     "@visx/responsive": "^3.0.0",
     "@visx/scale": "^3.5.0",
     "@visx/tooltip": "^3.0.0",
     "@visx/xychart": "^3.5.1",
-    "abortcontroller-polyfill": "^1.7.8",
-    "ace-builds": "^1.41.0",
     "ag-grid-community": "33.1.1",
     "ag-grid-react": "33.1.1",
-    "antd": "4.10.3",
-    "antd-v5": "npm:antd@^5.18.0",
-    "bootstrap": "^3.4.1",
-    "brace": "^0.11.1",
+    "antd": "^5.24.6",
     "chrono-node": "^2.7.8",
     "classnames": "^2.2.5",
     "core-js": "^3.38.1",
@@ -138,7 +132,6 @@
     "dayjs": "^1.11.13",
     "dom-to-image-more": "^3.2.0",
     "dom-to-pdf": "^0.3.2",
-    "dompurify": "^3.2.4",
     "echarts": "^5.6.0",
     "emotion-rgba": "0.0.12",
     "eslint-plugin-i18n-strings": "file:eslint-rules/eslint-plugin-i18n-strings",
@@ -146,12 +139,14 @@
     "fs-extra": "^11.2.0",
     "fuse.js": "^7.0.0",
     "geolib": "^2.0.24",
-    "geostyler": "^12.0.2",
+    "geostyler": "^14.1.3",
     "geostyler-data": "^1.0.0",
     "geostyler-openlayers-parser": "^4.3.0",
-    "geostyler-style": "^7.5.0",
+    "geostyler-qgis-parser": "2.0.1",
+    "geostyler-style": "7.5.0",
     "geostyler-wfs-parser": "^2.0.3",
     "googleapis": "^130.0.0",
+    "html-webpack-plugin": "^5.6.3",
     "immer": "^10.1.1",
     "interweave": "^13.1.0",
     "jquery": "^3.7.1",
@@ -161,7 +156,7 @@
     "json-stringify-pretty-compact": "^2.0.0",
     "lodash": "^4.17.21",
     "luxon": "^3.5.0",
-    "mapbox-gl": "^2.10.0",
+    "mapbox-gl": "^3.13.0",
     "markdown-to-jsx": "^7.7.4",
     "match-sorter": "^6.3.4",
     "memoize-one": "^5.2.1",
@@ -171,8 +166,6 @@
     "ol": "^7.5.2",
     "polished": "^4.3.1",
     "prop-types": "^15.8.1",
-    "query-string": "^6.13.7",
-    "rc-trigger": "^5.3.4",
     "re-resizable": "^6.10.1",
     "react": "^18.2.0",
     "react-ace": "^10.1.0",
@@ -183,8 +176,8 @@
     "react-dnd-html5-backend": "^11.1.3",
     "react-dom": "^18.2.0",
     "react-draggable": "^4.4.6",
+    "react-google-recaptcha": "^3.1.0",
     "react-intersection-observer": "^9.16.0",
-    "react-js-cron": "^2.1.2",
     "react-json-tree": "^0.17.0",
     "react-lines-ellipsis": "^0.15.4",
     "react-loadable": "^5.5.0",
@@ -195,21 +188,18 @@
     "react-search-input": "^0.11.3",
     "react-sortable-hoc": "^2.0.0",
     "react-split": "^2.0.9",
-    "react-syntax-highlighter": "^15.4.5",
     "react-table": "^7.8.0",
     "react-transition-group": "^4.4.5",
-    "react-ultimate-pagination": "^1.3.2",
     "react-virtualized-auto-sizer": "^1.0.25",
     "react-window": "^1.8.10",
     "redux": "^4.2.1",
     "redux-localstorage": "^0.4.1",
     "redux-thunk": "^2.1.0",
     "redux-undo": "^1.0.0-beta9-9-7",
-    "regenerator-runtime": "^0.14.1",
-    "rimraf": "^6.0.1",
     "rison": "^0.1.1",
     "scroll-into-view-if-needed": "^3.1.0",
     "simple-zstd": "^1.4.2",
+    "stream-browserify": "^3.0.0",
     "tinycolor2": "^1.4.2",
     "urijs": "^1.19.8",
     "use-event-callback": "^0.1.0",
@@ -218,8 +208,8 @@
     "yargs": "^17.7.2"
   },
   "devDependencies": {
-    "@applitools/eyes-storybook": "^3.50.9",
-    "@babel/cli": "^7.22.6",
+    "@applitools/eyes-storybook": "^3.55.6",
+    "@babel/cli": "^7.27.2",
     "@babel/compat-data": "^7.26.8",
     "@babel/core": "^7.26.0",
     "@babel/eslint-parser": "^7.25.9",
@@ -258,9 +248,7 @@
     "@testing-library/user-event": "^12.8.3",
     "@types/classnames": "^2.2.10",
     "@types/dom-to-image": "^2.6.7",
-    "@types/fetch-mock": "^7.3.2",
-    "@types/jest": "^29.5.12",
-    "@types/jquery": "^3.5.8",
+    "@types/jest": "^29.5.14",
     "@types/js-levenshtein": "^1.1.3",
     "@types/json-bigint": "^1.0.4",
     "@types/math-expression-evaluator": "^1.3.3",
@@ -268,13 +256,12 @@
     "@types/react": "^18.2.0",
     "@types/react-dom": "^18.2.0",
     "@types/react-gravatar": "^2.6.14",
+    "@types/node": "^22.12.0",
     "@types/react-json-tree": "^0.6.11",
     "@types/react-loadable": "^5.5.11",
     "@types/react-redux": "^7.1.10",
     "@types/react-resizable": "^3.0.8",
     "@types/react-router-dom": "^5.3.3",
-    "@types/react-syntax-highlighter": "^15.5.13",
-    "@types/react-table": "^7.7.20",
     "@types/react-transition-group": "^4.4.12",
     "@types/react-ultimate-pagination": "^1.2.4",
     "@types/react-virtualized-auto-sizer": "^1.0.4",
@@ -283,24 +270,25 @@
     "@types/redux-mock-store": "^1.0.6",
     "@types/rison": "0.1.0",
     "@types/sinon": "^17.0.3",
+    "@types/testing-library__jest-dom": "^5.14.9",
     "@types/tinycolor2": "^1.4.3",
-    "@types/yargs": "12 - 18",
-    "@typescript-eslint/eslint-plugin": "^5.62.0",
-    "@typescript-eslint/parser": "^5.62.0",
-    "babel-jest": "^29.7.0",
+    "@typescript-eslint/eslint-plugin": "^7.18.0",
+    "@typescript-eslint/parser": "^7.18.0",
+    "babel-jest": "^30.0.2",
     "babel-loader": "^10.0.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-jsx-remove-data-test-id": "^3.0.0",
     "babel-plugin-lodash": "^3.3.4",
     "babel-plugin-typescript-to-proptypes": "^2.0.0",
-    "cheerio": "1.0.0-rc.10",
-    "copy-webpack-plugin": "^12.0.2",
+    "cheerio": "1.1.0",
+    "copy-webpack-plugin": "^13.0.0",
     "cross-env": "^7.0.3",
     "css-loader": "^7.1.2",
     "css-minimizer-webpack-plugin": "^7.0.2",
     "eslint": "^8.56.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-prettier": "^7.2.0",
+    "eslint-import-resolver-alias": "^1.1.2",
     "eslint-import-resolver-typescript": "^3.7.0",
     "eslint-plugin-cypress": "^3.6.0",
     "eslint-plugin-file-progress": "^1.5.0",
@@ -318,19 +306,17 @@
     "eslint-plugin-storybook": "^0.8.0",
     "eslint-plugin-testing-library": "^6.4.0",
     "eslint-plugin-theme-colors": "file:eslint-rules/eslint-plugin-theme-colors",
-    "fetch-mock": "^9.1.0",
+    "fetch-mock": "^11.1.5",
     "fork-ts-checker-webpack-plugin": "^9.0.2",
     "history": "^5.3.0",
     "html-webpack-plugin": "^5.6.3",
     "imports-loader": "^5.0.0",
-    "jest": "^29.7.0",
+    "jest": "^30.0.2",
     "jest-environment-jsdom": "^29.7.0",
-    "jest-html-reporter": "^3.10.2",
+    "jest-html-reporter": "^4.3.0",
     "jest-websocket-mock": "^2.5.0",
     "jsdom": "^26.0.0",
     "lerna": "^8.2.1",
-    "less": "^4.2.0",
-    "less-loader": "^12.2.0",
     "mini-css-extract-plugin": "^2.9.0",
     "open-cli": "^8.0.0",
     "po2json": "^0.4.5",
@@ -346,18 +332,25 @@
     "storybook": "8.1.11",
     "style-loader": "^4.0.0",
     "thread-loader": "^4.0.4",
-    "ts-jest": "^29.2.5",
+    "ts-jest": "^29.4.0",
     "ts-loader": "^9.5.1",
     "tscw-config": "^1.1.2",
-    "typescript": "5.1.6",
+    "tsx": "^4.19.2",
+    "typescript": "5.4.5",
     "vm-browserify": "^1.1.2",
     "webpack": "^5.98.0",
     "webpack-bundle-analyzer": "^4.10.1",
     "webpack-cli": "^4.10.0",
-    "webpack-dev-server": "^4.15.1",
+    "webpack-dev-server": "^5.2.2",
     "webpack-manifest-plugin": "^5.0.0",
     "webpack-sources": "^3.2.3",
-    "webpack-visualizer-plugin2": "^1.1.0"
+    "webpack-visualizer-plugin2": "^1.2.0"
+  },
+  "peerDependencies": {
+    "ace-builds": "^1.41.0",
+    "core-js": "^3.38.1",
+    "react-ace": "^10.1.0",
+    "regenerator-runtime": "^0.14.1"
   },
   "engines": {
     "node": "^20.16.0",
@@ -372,7 +365,8 @@
     "d3-color": "^3.1.0",
     "puppeteer": "^22.4.1",
     "underscore": "^1.13.7",
-    "jspdf": "^3.0.1"
+    "jspdf": "^3.0.1",
+    "nwsapi": "^2.2.13"
   },
   "readme": "ERROR: No README data found!",
   "scarfSettings": {
diff --git a/superset-frontend/packages/generator-superset/generators/plugin-chart/templates/package-lock.erb b/superset-frontend/packages/generator-superset/generators/plugin-chart/templates/package-lock.erb
index 2a36b32b840..56df41714ad 100644
--- a/superset-frontend/packages/generator-superset/generators/plugin-chart/templates/package-lock.erb
+++ b/superset-frontend/packages/generator-superset/generators/plugin-chart/templates/package-lock.erb
@@ -4194,7 +4194,7 @@
       "peerDependencies": {
         "@emotion/react": "^11.4.1",
         "@types/react": "*",
-        "antd": "^4.9.4",
+        "antd": "^5.24.6",
         "react": "^16.13.1",
         "react-dom": "^16.13.1"
       }
diff --git a/superset-frontend/packages/generator-superset/generators/plugin-chart/templates/src/MyChart.erb b/superset-frontend/packages/generator-superset/generators/plugin-chart/templates/src/MyChart.erb
index c5b8583de13..562a17cf915 100644
--- a/superset-frontend/packages/generator-superset/generators/plugin-chart/templates/src/MyChart.erb
+++ b/superset-frontend/packages/generator-superset/generators/plugin-chart/templates/src/MyChart.erb
@@ -25,29 +25,14 @@ import { <%= packageLabel %>Props, <%= packageLabel %>StylesProps } from './type
 
 // Theming variables are provided for your use via a ThemeProvider
 // imported from @superset-ui/core. For variables available, please visit
-// https://github.com/apache-superset/superset-ui/blob/master/packages/superset-ui-core/src/style/index.ts
+// https://github.com/apache-superset/superset-ui/blob/master/packages/superset-ui-core/src/theme/index.ts
 
 const Styles = styled.div<<%= packageLabel %>StylesProps>`
-  background-color: ${({ theme }) => theme.colors.secondary.light2};
-  padding: ${({ theme }) => theme.gridUnit * 4}px;
-  border-radius: ${({ theme }) => theme.gridUnit * 2}px;
+  background-color: ${({ theme }) => theme.colorPrimaryBg};
+  padding: ${({ theme }) => theme.sizeUnit * 4}px;
+  border-radius: ${({ theme }) => theme.borderRadius}px;
   height: ${({ height }) => height}px;
   width: ${({ width }) => width}px;
-
-  h3 {
-    /* You can use your props to control CSS! */
-    margin-top: 0;
-    margin-bottom: ${({ theme }) => theme.gridUnit * 3}px;
-    font-size: ${({ theme, headerFontSize }) =>
-      theme.typography.sizes[headerFontSize]}px;
-    font-weight: ${({ theme, boldText }) =>
-      theme.typography.weights[boldText ? 'bold' : 'normal']};
-  }
-
-  pre {
-    height: ${({ theme, headerFontSize, height }) =>
-      height - theme.gridUnit * 12 - theme.typography.sizes[headerFontSize]}px;
-  }
 `;
 
 /**
diff --git a/superset-frontend/packages/generator-superset/package.json b/superset-frontend/packages/generator-superset/package.json
index 23af42bfd24..7c83c0a0f58 100644
--- a/superset-frontend/packages/generator-superset/package.json
+++ b/superset-frontend/packages/generator-superset/package.json
@@ -30,14 +30,14 @@
   "dependencies": {
     "chalk": "^5.4.1",
     "lodash-es": "^4.17.21",
-    "yeoman-generator": "^7.4.0",
+    "yeoman-generator": "^7.5.1",
     "yosay": "^3.0.0"
   },
   "devDependencies": {
     "cross-env": "^7.0.3",
-    "fs-extra": "^11.2.0",
-    "jest": "^29.7.0",
-    "yeoman-test": "^8.3.0"
+    "fs-extra": "^11.3.0",
+    "jest": "^30.0.2",
+    "yeoman-test": "^10.1.1"
   },
   "engines": {
     "npm": ">= 4.0.0",
diff --git a/superset-frontend/packages/superset-ui-chart-controls/package.json b/superset-frontend/packages/superset-ui-chart-controls/package.json
index 4f0df5d4614..bd3441698ec 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/package.json
+++ b/superset-frontend/packages/superset-ui-chart-controls/package.json
@@ -38,7 +38,6 @@
     "@testing-library/react": "^13.0.0",
     "@testing-library/user-event": "*",
     "ace-builds": "^1.4.14",
-    "antd": "4.10.3",
     "brace": "^0.11.1",
     "memoize-one": "^5.1.1",
     "react": "^18.2.0",
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/components/CertifiedIconWithTooltip.tsx b/superset-frontend/packages/superset-ui-chart-controls/src/components/CertifiedIconWithTooltip.tsx
index 5468d66139c..18cedfbca9a 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/src/components/CertifiedIconWithTooltip.tsx
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/components/CertifiedIconWithTooltip.tsx
@@ -18,7 +18,7 @@
  */
 import { kebabCase } from 'lodash';
 import { t, useTheme, styled } from '@superset-ui/core';
-import Tooltip from './Tooltip';
+import { Tooltip } from '@superset-ui/core/components';
 
 interface CertifiedIconWithTooltipProps {
   certifiedBy?: string | null;
@@ -27,7 +27,7 @@ interface CertifiedIconWithTooltipProps {
 }
 
 const StyledDiv = styled.div`
-  margin-bottom: ${({ theme }) => theme.gridUnit * 2}px;
+  margin-bottom: ${({ theme }) => theme.sizeUnit * 2}px;
 `;
 
 function CertifiedIconWithTooltip({
@@ -58,7 +58,7 @@ function CertifiedIconWithTooltip({
       >
         <g>
           <path
-            fill={theme.colors.primary.base}
+            fill={theme.colorPrimary}
             d="M23,12l-2.44-2.79l0.34-3.69l-3.61-0.82L15.4,1.5L12,2.96L8.6,1.5L6.71,4.69L3.1,5.5L3.44,9.2L1,12l2.44,2.79l-0.34,3.7 l3.61,0.82L8.6,22.5l3.4-1.47l3.4,1.46l1.89-3.19l3.61-0.82l-0.34-3.69L23,12z M9.38,16.01L7,13.61c-0.39-0.39-0.39-1.02,0-1.41 l0.07-0.07c0.39-0.39,1.03-0.39,1.42,0l1.61,1.62l5.15-5.16c0.39-0.39,1.03-0.39,1.42,0l0.07,0.07c0.39,0.39,0.39,1.02,0,1.41 l-5.92,5.94C10.41,16.4,9.78,16.4,9.38,16.01z"
           />
         </g>
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/components/ColumnOption.tsx b/superset-frontend/packages/superset-ui-chart-controls/src/components/ColumnOption.tsx
index db449b3450e..763bf0a7d11 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/src/components/ColumnOption.tsx
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/components/ColumnOption.tsx
@@ -17,8 +17,12 @@
  * under the License.
  */
 import { useState, ReactNode, useLayoutEffect, RefObject } from 'react';
-import { css, SafeMarkdown, styled, SupersetTheme } from '@superset-ui/core';
-import { Tooltip } from './Tooltip';
+import { css, styled, SupersetTheme } from '@superset-ui/core';
+import {
+  SafeMarkdown,
+  Tooltip,
+  InfoTooltip,
+} from '@superset-ui/core/components';
 import { ColumnTypeLabel } from './ColumnTypeLabel/ColumnTypeLabel';
 import CertifiedIconWithTooltip from './CertifiedIconWithTooltip';
 import { ColumnMeta } from '../types';
@@ -28,7 +32,6 @@ import {
   getColumnTypeTooltipNode,
 } from './labelUtils';
 import { SQLPopover } from './SQLPopover';
-import InfoTooltipWithTrigger from './InfoTooltipWithTrigger';
 
 export type ColumnOptionProps = {
   column: ColumnMeta;
@@ -40,7 +43,7 @@ const StyleOverrides = styled.span`
   display: flex;
   align-items: center;
   svg {
-    margin-right: ${({ theme }) => theme.gridUnit}px;
+    margin-right: ${({ theme }) => theme.sizeUnit}px;
   }
 `;
 
@@ -82,7 +85,7 @@ export function ColumnOption({
         <span
           className="option-label column-option-label"
           css={(theme: SupersetTheme) => css`
-            margin-right: ${theme.gridUnit}px;
+            margin-right: ${theme.sizeUnit}px;
           `}
           ref={labelRef}
         >
@@ -98,15 +101,13 @@ export function ColumnOption({
         />
       )}
       {warningMarkdown && (
-        <InfoTooltipWithTrigger
-          className="text-warning"
-          icon="warning"
+        <InfoTooltip
+          type="warning"
           tooltip={<SafeMarkdown source={warningMarkdown} />}
           label={`warn-${column.column_name}`}
-          iconsStyle={{ marginLeft: 0 }}
+          iconStyle={{ marginLeft: 0 }}
           {...(column.error_text && {
-            className: 'text-danger',
-            icon: 'exclamation-circle',
+            type: 'error',
           })}
         />
       )}
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/components/ColumnTypeLabel/ColumnTypeLabel.tsx b/superset-frontend/packages/superset-ui-chart-controls/src/components/ColumnTypeLabel/ColumnTypeLabel.tsx
index 129449912a8..e9879a4f276 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/src/components/ColumnTypeLabel/ColumnTypeLabel.tsx
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/components/ColumnTypeLabel/ColumnTypeLabel.tsx
@@ -39,9 +39,9 @@ const TypeIconWrapper = styled.div`
     display: flex;
     justify-content: center;
     align-items: center;
-    width: ${theme.gridUnit * 6}px;
-    height: ${theme.gridUnit * 6}px;
-    margin-right: ${theme.gridUnit}px;
+    width: ${theme.sizeUnit * 6}px;
+    height: ${theme.sizeUnit * 6}px;
+    margin-right: ${theme.sizeUnit}px;
 
     && svg {
       margin-right: 0;
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/components/ControlHeader.tsx b/superset-frontend/packages/superset-ui-chart-controls/src/components/ControlHeader.tsx
index 44e47d55e99..f4311530674 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/src/components/ControlHeader.tsx
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/components/ControlHeader.tsx
@@ -17,9 +17,9 @@
  * under the License.
  */
 import { ReactNode } from 'react';
-import { t } from '@superset-ui/core';
-import { InfoTooltipWithTrigger } from './InfoTooltipWithTrigger';
-import { Tooltip } from './Tooltip';
+import { t, css } from '@superset-ui/core';
+import { InfoCircleOutlined } from '@ant-design/icons';
+import { InfoTooltip, Tooltip } from '@superset-ui/core/components';
 
 type ValidationError = string;
 
@@ -60,7 +60,7 @@ export function ControlHeader({
         <span>
           {description && (
             <span>
-              <InfoTooltipWithTrigger
+              <InfoTooltip
                 label={t('description')}
                 tooltip={description}
                 placement="top"
@@ -70,11 +70,11 @@ export function ControlHeader({
           )}
           {renderTrigger && (
             <span>
-              <InfoTooltipWithTrigger
+              <InfoTooltip
                 label={t('bolt')}
                 tooltip={t('Changing this control takes effect instantly')}
                 placement="top"
-                icon="bolt"
+                type="notice"
               />{' '}
             </span>
           )}
@@ -88,35 +88,40 @@ export function ControlHeader({
     return null;
   }
   const labelClass = validationErrors.length > 0 ? 'text-danger' : '';
+
   return (
     <div className="ControlHeader" data-test={`${name}-header`}>
       <div className="pull-left">
         <label className="control-label" htmlFor={name}>
           {leftNode && <span>{leftNode}</span>}
           <span
-            role="button"
-            tabIndex={0}
-            onClick={onClick}
+            role={onClick ? 'button' : undefined}
+            {...(onClick ? { onClick, tabIndex: 0 } : {})}
             className={labelClass}
-            style={{ cursor: onClick ? 'pointer' : '' }}
           >
             {label}
           </span>{' '}
           {warning && (
             <span>
               <Tooltip id="error-tooltip" placement="top" title={warning}>
-                {/* TODO: Remove fa-icon */}
-                {/* eslint-disable-next-line icons/no-fa-icons-usage */}
-                <i className="fa fa-exclamation-circle text-warning" />
+                <InfoCircleOutlined
+                  css={theme => css`
+                    font-size: ${theme.sizeUnit * 3}px;
+                    color: ${theme.colorError};
+                  `}
+                />
               </Tooltip>{' '}
             </span>
           )}
           {danger && (
             <span>
               <Tooltip id="error-tooltip" placement="top" title={danger}>
-                {/* TODO: Remove fa-icon */}
-                {/* eslint-disable-next-line icons/no-fa-icons-usage */}
-                <i className="fa fa-exclamation-circle text-danger" />
+                <InfoCircleOutlined
+                  css={theme => css`
+                    font-size: ${theme.sizeUnit * 3}px;
+                    color: ${theme.colorError};
+                  `}
+                />{' '}
               </Tooltip>{' '}
             </span>
           )}
@@ -127,18 +132,17 @@ export function ControlHeader({
                 placement="top"
                 title={validationErrors.join(' ')}
               >
-                {/* TODO: Remove fa-icon */}
-                {/* eslint-disable-next-line icons/no-fa-icons-usage */}
-                <i className="fa fa-exclamation-circle text-danger" />
+                <InfoCircleOutlined
+                  css={theme => css`
+                    font-size: ${theme.sizeUnit * 3}px;
+                    color: ${theme.colorError};
+                  `}
+                />{' '}
               </Tooltip>{' '}
             </span>
           )}
           {renderOptionalIcons()}
-          {required && (
-            <span className="text-danger m-l-4">
-              <strong>*</strong>
-            </span>
-          )}
+          {required && <strong> *</strong>}
         </label>
       </div>
       {rightNode && <div className="pull-right">{rightNode}</div>}
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/components/ControlSubSectionHeader.tsx b/superset-frontend/packages/superset-ui-chart-controls/src/components/ControlSubSectionHeader.tsx
index 676028b4530..39d6a3b6a5d 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/src/components/ControlSubSectionHeader.tsx
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/components/ControlSubSectionHeader.tsx
@@ -20,9 +20,8 @@ import { styled, css } from '@superset-ui/core';
 
 export const ControlSubSectionHeader = styled.div`
   ${({ theme }) => css`
-    font-weight: ${theme.typography.weights.bold};
-    font-size: ${theme.typography.sizes.s};
-    margin-bottom: ${theme.gridUnit}px;
+    font-weight: ${theme.fontWeightStrong};
+    margin-bottom: ${theme.sizeUnit}px;
+    font-size: ${theme.fontSizeSM}px;
   `}
 `;
-export default ControlSubSectionHeader;
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/components/Dropdown.tsx b/superset-frontend/packages/superset-ui-chart-controls/src/components/Dropdown.tsx
index 032365ebd5d..4e82e62cc03 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/src/components/Dropdown.tsx
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/components/Dropdown.tsx
@@ -17,5 +17,4 @@
  * under the License.
  */
 
-export { Dropdown } from 'antd';
-export type { DropDownProps } from 'antd/lib/dropdown';
+export { Dropdown, type DropdownProps } from '@superset-ui/core/components';
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/components/InfoTooltipWithTrigger.tsx b/superset-frontend/packages/superset-ui-chart-controls/src/components/InfoTooltipWithTrigger.tsx
deleted file mode 100644
index 5551e94a809..00000000000
--- a/superset-frontend/packages/superset-ui-chart-controls/src/components/InfoTooltipWithTrigger.tsx
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 { CSSProperties } from 'react';
-import { kebabCase } from 'lodash';
-import { t } from '@superset-ui/core';
-import { Tooltip, TooltipProps, TooltipPlacement } from './Tooltip';
-
-export interface InfoTooltipWithTriggerProps {
-  label?: string;
-  tooltip?: TooltipProps['title'];
-  icon?: string;
-  onClick?: () => void;
-  placement?: TooltipPlacement;
-  bsStyle?: string;
-  className?: string;
-  iconsStyle?: CSSProperties;
-}
-
-export function InfoTooltipWithTrigger({
-  label,
-  tooltip,
-  bsStyle,
-  onClick,
-  icon = 'info-circle',
-  className = 'text-muted',
-  placement = 'right',
-  iconsStyle = {},
-}: InfoTooltipWithTriggerProps) {
-  const iconClass = `fa fa-${icon} ${className} ${
-    bsStyle ? `text-${bsStyle}` : ''
-  }`;
-  const iconEl = (
-    <i
-      role="button"
-      aria-label={t('Show info tooltip')}
-      tabIndex={0}
-      className={iconClass}
-      style={{ cursor: onClick ? 'pointer' : undefined, ...iconsStyle }}
-      onClick={onClick}
-      onKeyPress={
-        onClick &&
-        (event => {
-          if (event.key === 'Enter' || event.key === ' ') {
-            onClick();
-          }
-        })
-      }
-    />
-  );
-  if (!tooltip) {
-    return iconEl;
-  }
-  return (
-    <Tooltip
-      id={`${kebabCase(label)}-tooltip`}
-      title={tooltip}
-      placement={placement}
-    >
-      {iconEl}
-    </Tooltip>
-  );
-}
-
-export default InfoTooltipWithTrigger;
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/components/Menu.tsx b/superset-frontend/packages/superset-ui-chart-controls/src/components/Menu.tsx
index 89a7405cde5..d19f596de18 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/src/components/Menu.tsx
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/components/Menu.tsx
@@ -17,5 +17,4 @@
  * under the License.
  */
 
-export { Menu } from 'antd';
-export type { MenuProps } from 'antd/lib/menu';
+export { Menu, type MenuProps } from '@superset-ui/core/components';
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/components/MetricOption.tsx b/superset-frontend/packages/superset-ui-chart-controls/src/components/MetricOption.tsx
index 59beeee4c56..e33c3b73e0e 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/src/components/MetricOption.tsx
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/components/MetricOption.tsx
@@ -18,17 +18,16 @@
  */
 import { useState, ReactNode, useLayoutEffect, RefObject } from 'react';
 
+import { css, styled, Metric, SupersetTheme } from '@superset-ui/core';
 import {
-  css,
-  styled,
-  Metric,
   SafeMarkdown,
-  SupersetTheme,
-} from '@superset-ui/core';
-import InfoTooltipWithTrigger from './InfoTooltipWithTrigger';
+  Typography,
+  // TODO: somehow doesn't work with our main Tooltip (?)
+  RawAntdTooltip as Tooltip,
+  InfoTooltip,
+} from '@superset-ui/core/components';
 import { ColumnTypeLabel } from './ColumnTypeLabel/ColumnTypeLabel';
 import CertifiedIconWithTooltip from './CertifiedIconWithTooltip';
-import Tooltip from './Tooltip';
 import { getMetricTooltipNode } from './labelUtils';
 import { SQLPopover } from './SQLPopover';
 
@@ -37,7 +36,7 @@ const FlexRowContainer = styled.div`
   display: flex;
 
   > svg {
-    margin-right: ${({ theme }) => theme.gridUnit}px;
+    margin-right: ${({ theme }) => theme.sizeUnit}px;
   }
 `;
 
@@ -61,23 +60,26 @@ export function MetricOption({
   url = '',
 }: MetricOptionProps) {
   const verbose = metric.verbose_name || metric.metric_name || metric.label;
-  const link = url ? (
-    <a href={url} target={openInNewWindow ? '_blank' : ''} rel="noreferrer">
-      {verbose}
-    </a>
-  ) : (
-    verbose
-  );
 
   const label = (
     <span
       className="option-label metric-option-label"
       css={(theme: SupersetTheme) => css`
-        margin-right: ${theme.gridUnit}px;
+        margin-right: ${theme.sizeUnit}px;
       `}
       ref={labelRef}
     >
-      {link}
+      {url ? (
+        <Typography.Link
+          href={url}
+          target={openInNewWindow ? '_blank' : ''}
+          rel="noreferrer"
+        >
+          {verbose}
+        </Typography.Link>
+      ) : (
+        verbose
+      )}
     </span>
   );
 
@@ -111,15 +113,13 @@ export function MetricOption({
         />
       )}
       {warningMarkdown && (
-        <InfoTooltipWithTrigger
-          className="text-warning"
-          icon="warning"
+        <InfoTooltip
+          type="warning"
           tooltip={<SafeMarkdown source={warningMarkdown} />}
           label={`warn-${metric.metric_name}`}
-          iconsStyle={{ marginLeft: 0 }}
+          iconStyle={{ marginLeft: 0 }}
           {...(metric.error_text && {
-            className: 'text-danger',
-            icon: 'exclamation-circle',
+            type: 'error',
           })}
         />
       )}
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/components/SQLPopover.tsx b/superset-frontend/packages/superset-ui-chart-controls/src/components/SQLPopover.tsx
index 3a29c4885cf..af0ff77db9e 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/src/components/SQLPopover.tsx
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/components/SQLPopover.tsx
@@ -17,19 +17,18 @@
  * under the License.
  */
 import { useEffect, useState } from 'react';
-import { Popover } from 'antd-v5';
+import { Popover, type PopoverProps } from '@superset-ui/core/components';
 import type ReactAce from 'react-ace';
-import type { PopoverProps } from 'antd-v5/lib/popover';
 import { CalculatorOutlined } from '@ant-design/icons';
 import { css, styled, useTheme, t } from '@superset-ui/core';
 
 const StyledCalculatorIcon = styled(CalculatorOutlined)`
   ${({ theme }) => css`
     color: ${theme.colors.grayscale.base};
-    font-size: ${theme.typography.sizes.s}px;
+    font-size: ${theme.fontSizeSM}px;
     & svg {
-      margin-left: ${theme.gridUnit}px;
-      margin-right: ${theme.gridUnit}px;
+      margin-left: ${theme.sizeUnit}px;
+      margin-right: ${theme.sizeUnit}px;
     }
   `}
 `;
@@ -65,9 +64,9 @@ export const SQLPopover = (props: PopoverProps & { sqlExpression: string }) => {
           readOnly
           wrapEnabled
           style={{
-            border: `1px solid ${theme.colors.grayscale.light2}`,
-            background: theme.colors.secondary.light5,
-            maxWidth: theme.gridUnit * 100,
+            border: `1px solid ${theme.colorBorder}`,
+            background: theme.colorPrimaryBg,
+            maxWidth: theme.sizeUnit * 100,
           }}
         />
       }
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/components/Select.tsx b/superset-frontend/packages/superset-ui-chart-controls/src/components/Select.tsx
index 01fb74d2e8e..4831dcba107 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/src/components/Select.tsx
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/components/Select.tsx
@@ -17,7 +17,10 @@
  * under the License.
  */
 import { useState, ReactNode } from 'react';
-import AntdSelect, { SelectProps as AntdSelectProps } from 'antd/lib/select';
+import {
+  RawAntdSelect as AntdSelect,
+  type RawAntdSelectProps as AntdSelectProps,
+} from '@superset-ui/core/components';
 
 export const { Option }: any = AntdSelect;
 
@@ -35,7 +38,7 @@ export type SelectProps<VT> = Omit<AntdSelectProps<VT>, 'options'> & {
 export default function Select<VT extends string | number>({
   creatable,
   onSearch,
-  dropdownMatchSelectWidth = false,
+  popupMatchSelectWidth = false,
   minWidth = '100%',
   showSearch: showSearch_ = true,
   onChange,
@@ -73,7 +76,7 @@ export default function Select<VT extends string | number>({
 
   return (
     <AntdSelect<VT>
-      dropdownMatchSelectWidth={dropdownMatchSelectWidth}
+      popupMatchSelectWidth={popupMatchSelectWidth}
       showSearch={showSearch}
       onSearch={handleSearch}
       onChange={handleChange}
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/components/Tooltip.tsx b/superset-frontend/packages/superset-ui-chart-controls/src/components/Tooltip.tsx
deleted file mode 100644
index 1fc482211b6..00000000000
--- a/superset-frontend/packages/superset-ui-chart-controls/src/components/Tooltip.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 { useTheme } from '@superset-ui/core';
-import { Tooltip as BaseTooltip } from 'antd-v5';
-import {
-  TooltipProps as BaseTooltipProps,
-  TooltipPlacement as BaseTooltipPlacement,
-} from 'antd-v5/lib/tooltip';
-
-export type TooltipProps = BaseTooltipProps;
-export type TooltipPlacement = BaseTooltipPlacement;
-
-export const Tooltip = ({
-  overlayStyle = {},
-  color,
-  ...props
-}: BaseTooltipProps) => {
-  const theme = useTheme();
-  const defaultColor = `${theme.colors.grayscale.dark2}e6`;
-  return (
-    <BaseTooltip
-      styles={{
-        root: {
-          fontSize: theme.typography.sizes.s,
-          lineHeight: '1.6',
-          maxWidth: theme.gridUnit * 62,
-          minWidth: theme.gridUnit * 30,
-          ...overlayStyle,
-        },
-      }}
-      // make the tooltip display closer to the label
-      align={{ offset: [0, 1] }}
-      color={defaultColor || color}
-      trigger="hover"
-      placement="bottom"
-      // don't allow hovering over the tooltip
-      mouseLeaveDelay={0}
-      {...props}
-    />
-  );
-};
-
-export default Tooltip;
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/components/labelUtils.tsx b/superset-frontend/packages/superset-ui-chart-controls/src/components/labelUtils.tsx
index 4102fb2b9f3..6d371afcc4e 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/src/components/labelUtils.tsx
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/components/labelUtils.tsx
@@ -29,18 +29,18 @@ const TooltipSectionWrapper = styled.div`
     overflow: hidden;
     text-overflow: ellipsis;
 
-    font-size: ${theme.typography.sizes.s}px;
+    font-size: ${theme.fontSizeSM}px;
     line-height: 1.2;
 
     &:not(:last-of-type) {
-      margin-bottom: ${theme.gridUnit * 2}px;
+      margin-bottom: ${theme.sizeUnit * 2}px;
     }
   `}
 `;
 
 const TooltipSectionLabel = styled.span`
   ${({ theme }) => css`
-    font-weight: ${theme.typography.weights.bold};
+    font-weight: ${theme.fontWeightStrong};
   `}
 `;
 
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/index.ts b/superset-frontend/packages/superset-ui-chart-controls/src/index.ts
index e58bc940385..2a598267fb8 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/src/index.ts
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/index.ts
@@ -25,14 +25,12 @@ export * from './operators';
 // can't do `export * as sections from './sections'`, babel-transformer will fail
 export const sections = sectionsModule;
 
-export * from './components/InfoTooltipWithTrigger';
 export * from './components/ColumnOption';
 export * from './components/ColumnTypeLabel/ColumnTypeLabel';
 export * from './components/ControlSubSectionHeader';
 export * from './components/Dropdown';
 export * from './components/Menu';
 export * from './components/MetricOption';
-export * from './components/Tooltip';
 export * from './components/ControlHeader';
 
 export * from './shared-controls';
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/operators/sortOperator.ts b/superset-frontend/packages/superset-ui-chart-controls/src/operators/sortOperator.ts
index 74807b5d483..ee4238a857c 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/src/operators/sortOperator.ts
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/operators/sortOperator.ts
@@ -27,10 +27,9 @@ import {
 import { PostProcessingFactory } from './types';
 import { extractExtraMetrics } from './utils';
 
-export const sortOperator: PostProcessingFactory<PostProcessingSort> = (
-  formData,
-  queryObject,
-) => {
+export const sortOperator: PostProcessingFactory<
+  PostProcessingSort
+> = formData => {
   // the sortOperator only used in the barchart v2
   const sortableLabels = [
     getXAxisLabel(formData),
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/sections/chartTitle.tsx b/superset-frontend/packages/superset-ui-chart-controls/src/sections/chartTitle.tsx
index 43ad46ba7f7..1cbca5a8649 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/src/sections/chartTitle.tsx
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/sections/chartTitle.tsx
@@ -29,6 +29,7 @@ export const TITLE_POSITION_OPTIONS: [string, string][] = [
   ['Left', t('Left')],
   ['Top', t('Top')],
 ];
+
 export const titleControls: ControlPanelSectionConfig = {
   label: t('Chart Title'),
   tabOverride: 'customize',
@@ -43,7 +44,6 @@ export const titleControls: ControlPanelSectionConfig = {
           label: t('X Axis Title'),
           renderTrigger: true,
           default: '',
-          description: t('Changing this control takes effect instantly'),
         },
       },
     ],
@@ -58,7 +58,6 @@ export const titleControls: ControlPanelSectionConfig = {
           renderTrigger: true,
           default: TITLE_MARGIN_OPTIONS[0],
           choices: formatSelectOptions(TITLE_MARGIN_OPTIONS),
-          description: t('Changing this control takes effect instantly'),
         },
       },
     ],
@@ -71,7 +70,6 @@ export const titleControls: ControlPanelSectionConfig = {
           label: t('Y Axis Title'),
           renderTrigger: true,
           default: '',
-          description: t('Changing this control takes effect instantly'),
         },
       },
     ],
@@ -86,7 +84,6 @@ export const titleControls: ControlPanelSectionConfig = {
           renderTrigger: true,
           default: TITLE_MARGIN_OPTIONS[1],
           choices: formatSelectOptions(TITLE_MARGIN_OPTIONS),
-          description: t('Changing this control takes effect instantly'),
         },
       },
     ],
@@ -101,7 +98,6 @@ export const titleControls: ControlPanelSectionConfig = {
           renderTrigger: true,
           default: TITLE_POSITION_OPTIONS[0][0],
           choices: TITLE_POSITION_OPTIONS,
-          description: t('Changing this control takes effect instantly'),
         },
       },
     ],
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/components/RadioButtonControl.tsx b/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/components/RadioButtonControl.tsx
index 3af514f171b..dadc5285233 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/components/RadioButtonControl.tsx
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/components/RadioButtonControl.tsx
@@ -17,7 +17,8 @@
  * under the License.
  */
 import { ReactNode } from 'react';
-import { JsonValue, useTheme } from '@superset-ui/core';
+import { JsonValue, t } from '@superset-ui/core';
+import { Radio } from '@superset-ui/core/components';
 import { ControlHeader } from '../../components/ControlHeader';
 
 // [value, label]
@@ -42,51 +43,56 @@ export default function RadioButtonControl({
   ...props
 }: RadioButtonControlProps) {
   const currentValue = initialValue || options[0][0];
-  const theme = useTheme();
   return (
-    <div
-      css={{
-        '.btn svg': {
-          position: 'relative',
-          top: '0.2em',
-        },
-        '.btn:focus': {
-          outline: 'none',
-        },
-        '.control-label': {
-          color: theme.colors.grayscale.base,
-          marginBottom: theme.gridUnit,
-        },
-        '.control-label + .btn-group': {
-          marginTop: '1px',
-        },
-        '.btn-group .btn-default': {
-          color: theme.colors.grayscale.dark1,
-        },
-        '.btn-group .btn.active': {
-          background: theme.colors.grayscale.light4,
-          fontWeight: theme.typography.weights.bold,
-          boxShadow: 'none',
-        },
-      }}
-    >
-      <ControlHeader {...props} />
-      <div className="btn-group btn-group-sm">
-        {options.map(([val, label]) => (
-          <button
-            key={JSON.stringify(val)}
-            type="button"
-            className={`btn btn-default ${
-              val === currentValue ? 'active' : ''
-            }`}
-            onClick={() => {
-              onChange(val);
-            }}
-          >
-            {label}
-          </button>
-        ))}
+    <div>
+      <div
+        role="tablist"
+        aria-label={typeof props.label === 'string' ? props.label : undefined}
+      >
+        <ControlHeader {...props} />
+        <Radio.Group
+          value={currentValue}
+          onChange={e => onChange(e.target.value)}
+        >
+          {options.map(([val, label]) => (
+            <Radio.Button
+              // role="tab"
+              key={JSON.stringify(val)}
+              value={val}
+              aria-label={typeof label === 'string' ? label : undefined}
+              id={`tab-${val}`}
+              type="button"
+              aria-selected={val === currentValue}
+              className={`btn btn-default ${
+                val === currentValue ? 'active' : ''
+              }`}
+              onClick={e => {
+                e.currentTarget?.focus();
+                onChange(val);
+              }}
+            >
+              {label}
+            </Radio.Button>
+          ))}
+        </Radio.Group>
       </div>
+      {/* accessibility begin */}
+      <div
+        aria-live="polite"
+        style={{
+          position: 'absolute',
+          left: '-9999px',
+          height: '1px',
+          width: '1px',
+          overflow: 'hidden',
+        }}
+      >
+        {t(
+          '%s tab selected',
+          options.find(([val]) => val === currentValue)?.[1],
+        )}
+      </div>
+      {/* accessibility end */}
     </div>
   );
 }
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx b/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx
index 130478893ef..fc079e98e71 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx
@@ -17,7 +17,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { QueryColumn, t, validateNonEmpty } from '@superset-ui/core';
+import {
+  GenericDataType,
+  QueryColumn,
+  t,
+  validateNonEmpty,
+} from '@superset-ui/core';
 import {
   ExtraControlProps,
   SharedControlConfig,
@@ -52,6 +57,19 @@ type Control = {
  * feature flags are set and when they're checked.
  */
 
+function filterOptions(
+  options: (ColumnMeta | QueryColumn)[],
+  allowedDataTypes?: GenericDataType[],
+) {
+  if (!allowedDataTypes) {
+    return options;
+  }
+  return options.filter(
+    o =>
+      o.type_generic !== undefined && allowedDataTypes.includes(o.type_generic),
+  );
+}
+
 export const dndGroupByControl: SharedControlConfig<
   'DndColumnSelect' | 'SelectControl',
   ColumnMeta
@@ -81,14 +99,20 @@ export const dndGroupByControl: SharedControlConfig<
     const newState: ExtraControlProps = {};
     const { datasource } = state;
     if (datasource?.columns[0]?.hasOwnProperty('groupby')) {
-      const options = (datasource as Dataset).columns.filter(c => c.groupby);
+      const options = filterOptions(
+        (datasource as Dataset).columns.filter(c => c.groupby),
+        controlState?.allowedDataTypes,
+      );
       if (controlState?.includeTime) {
         options.unshift(DATASET_TIME_COLUMN_OPTION);
       }
       newState.options = options;
       newState.savedMetrics = (datasource as Dataset).metrics || [];
     } else {
-      const options = (datasource?.columns as QueryColumn[]) || [];
+      const options = filterOptions(
+        (datasource?.columns as QueryColumn[]) || [],
+        controlState?.allowedDataTypes,
+      );
       if (controlState?.includeTime) {
         options.unshift(QUERY_TIME_COLUMN_OPTION);
       }
@@ -177,6 +201,19 @@ export const dndAdhocMetricControl: typeof dndAdhocMetricsControl = {
   ),
 };
 
+export const dndTooltipColumnsControl: typeof dndColumnsControl = {
+  ...dndColumnsControl,
+  label: t('Tooltip (columns)'),
+  description: t('Columns to show in the tooltip.'),
+};
+
+export const dndTooltipMetricsControl: typeof dndAdhocMetricsControl = {
+  ...dndAdhocMetricsControl,
+  label: t('Tooltip (metrics)'),
+  description: t('Metrics to show in the tooltip.'),
+  validators: [],
+};
+
 export const dndAdhocMetricControl2: typeof dndAdhocMetricControl = {
   ...dndAdhocMetricControl,
   label: t('Right Axis Metric'),
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/sharedControls.tsx b/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/sharedControls.tsx
index 5baa8c688c9..6ceff6a444d 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/sharedControls.tsx
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/sharedControls.tsx
@@ -45,6 +45,7 @@ import {
   isDefined,
   NO_TIME_RANGE,
   validateMaxValue,
+  getColumnLabel,
 } from '@superset-ui/core';
 
 import {
@@ -82,6 +83,8 @@ import {
   dndSeriesControl,
   dndAdhocMetricControl2,
   dndXAxisControl,
+  dndTooltipColumnsControl,
+  dndTooltipMetricsControl,
 } from './dndControls';
 
 const categoricalSchemeRegistry = getCategoricalSchemeRegistry();
@@ -373,6 +376,14 @@ const temporal_columns_lookup: SharedControlConfig<'HiddenControl'> = {
     ),
 };
 
+const zoomable: SharedControlConfig<'CheckboxControl'> = {
+  type: 'CheckboxControl',
+  label: t('Data Zoom'),
+  default: false,
+  renderTrigger: true,
+  description: t('Enable data zooming controls'),
+};
+
 const sort_by_metric: SharedControlConfig<'CheckboxControl'> = {
   type: 'CheckboxControl',
   label: t('Sort by metric'),
@@ -381,6 +392,26 @@ const sort_by_metric: SharedControlConfig<'CheckboxControl'> = {
   ),
 };
 
+const order_by_cols: SharedControlConfig<'SelectControl'> = {
+  type: 'SelectControl',
+  label: t('Ordering'),
+  description: t('Order results by selected columns'),
+  multi: true,
+  default: [],
+  shouldMapStateToProps: () => true,
+  mapStateToProps: ({ datasource }) => ({
+    choices: (datasource?.columns || [])
+      .map(col =>
+        [true, false].map(asc => [
+          JSON.stringify([col.column_name, asc]),
+          `${getColumnLabel(col.column_name)} [${asc ? 'asc' : 'desc'}]`,
+        ]),
+      )
+      .flat(),
+  }),
+  resetOnHide: false,
+};
+
 export default {
   metrics: dndAdhocMetricsControl,
   metric: dndAdhocMetricControl,
@@ -392,6 +423,8 @@ export default {
   secondary_metric: dndSecondaryMetricControl,
   groupby: dndGroupByControl,
   columns: dndColumnsControl,
+  tooltip_columns: dndTooltipColumnsControl,
+  tooltip_metrics: dndTooltipMetricsControl,
   granularity,
   granularity_sqla: dndGranularitySqlaControl,
   time_grain_sqla,
@@ -417,8 +450,10 @@ export default {
   legacy_order_by: dndSortByControl,
   truncate_metric,
   x_axis: dndXAxisControl,
+  zoomable,
   show_empty_columns,
   temporal_columns_lookup,
   currency_format,
   sort_by_metric,
+  order_by_cols,
 };
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/types.ts b/superset-frontend/packages/superset-ui-chart-controls/src/types.ts
index 71517884daa..8f6ed74d216 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/src/types.ts
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/types.ts
@@ -69,6 +69,7 @@ export interface Dataset {
   columns: ColumnMeta[];
   metrics: Metric[];
   column_formats: Record<string, string>;
+  currency_formats?: Record<string, Currency>;
   verbose_map: Record<string, string>;
   main_dttm_col: string;
   // eg. ['["ds", true]', 'ds [asc]']
@@ -300,7 +301,7 @@ export interface FilterOption<T extends SelectOption> {
   data: T;
 }
 
-// Ref: superset-frontend/src/components/Select/SupersetStyledSelect.tsx
+// Ref: superset-frontend/@superset-ui/core/components/Select/SupersetStyledSelect.tsx
 export interface SelectControlConfig<
   O extends SelectOption = SelectOption,
   T extends SelectControlType = SelectControlType,
diff --git a/superset-frontend/packages/superset-ui-chart-controls/test/components/ColumnOption.test.tsx b/superset-frontend/packages/superset-ui-chart-controls/test/components/ColumnOption.test.tsx
index c5b369aa2db..33d2a35cffd 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/test/components/ColumnOption.test.tsx
+++ b/superset-frontend/packages/superset-ui-chart-controls/test/components/ColumnOption.test.tsx
@@ -17,26 +17,26 @@
  * under the License.
  */
 import '@testing-library/jest-dom';
-import { render } from '@testing-library/react';
-import {
-  ThemeProvider,
-  supersetTheme,
-  GenericDataType,
-} from '@superset-ui/core';
+import { render } from '@superset-ui/core/spec';
+import { GenericDataType } from '@superset-ui/core';
 
 import { ColumnOption, ColumnOptionProps } from '../../src';
 
-jest.mock('../../src/components/SQLPopover', () => ({
+jest.mock('@superset-ui/chart-controls/components/SQLPopover', () => ({
   SQLPopover: () => <div data-test="mock-sql-popover" />,
 }));
-jest.mock('../../src/components/ColumnTypeLabel/ColumnTypeLabel', () => ({
-  ColumnTypeLabel: ({ type }: { type: string }) => (
-    <div data-test="mock-column-type-label">{type}</div>
-  ),
+jest.mock(
+  '@superset-ui/chart-controls/components/ColumnTypeLabel/ColumnTypeLabel',
+  () => ({
+    ColumnTypeLabel: ({ type }: { type: string }) => (
+      <div data-test="mock-column-type-label">{type}</div>
+    ),
+  }),
+);
+
+jest.mock('@superset-ui/core/components/InfoTooltip', () => ({
+  InfoTooltip: () => <div data-test="mock-tooltip" />,
 }));
-jest.mock('../../src/components/InfoTooltipWithTrigger', () => () => (
-  <div data-test="mock-info-tooltip-with-trigger" />
-));
 
 const defaultProps: ColumnOptionProps = {
   column: {
@@ -49,11 +49,7 @@ const defaultProps: ColumnOptionProps = {
 };
 
 const setup = (props: Partial<ColumnOptionProps> = {}) =>
-  render(
-    <ThemeProvider theme={supersetTheme}>
-      <ColumnOption {...defaultProps} {...props} />
-    </ThemeProvider>,
-  );
+  render(<ColumnOption {...defaultProps} {...props} />);
 test('shows a label with verbose_name', () => {
   const { container } = setup();
   const lbl = container.getElementsByClassName('option-label');
@@ -114,11 +110,11 @@ test('dttm column has correct column label if showType is true', () => {
     String(GenericDataType.Temporal),
   );
 });
-test('doesnt show InfoTooltipWithTrigger when no warning', () => {
+test('doesnt show InfoTooltip when no warning', () => {
   const { queryByText } = setup();
-  expect(queryByText('mock-info-tooltip-with-trigger')).not.toBeInTheDocument();
+  expect(queryByText('mock-tooltip')).not.toBeInTheDocument();
 });
-test('shows a warning with InfoTooltipWithTrigger when it contains warning', () => {
+test('shows a warning with InfoTooltip when it contains warning', () => {
   const { getByTestId } = setup({
     ...defaultProps,
     column: {
@@ -126,5 +122,5 @@ test('shows a warning with InfoTooltipWithTrigger when it contains warning', ()
       warning_text: 'This is a warning',
     },
   });
-  expect(getByTestId('mock-info-tooltip-with-trigger')).toBeInTheDocument();
+  expect(getByTestId('mock-tooltip')).toBeInTheDocument();
 });
diff --git a/superset-frontend/packages/superset-ui-chart-controls/test/components/ColumnTypeLabel.test.tsx b/superset-frontend/packages/superset-ui-chart-controls/test/components/ColumnTypeLabel.test.tsx
index 603ac9172eb..350820207eb 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/test/components/ColumnTypeLabel.test.tsx
+++ b/superset-frontend/packages/superset-ui-chart-controls/test/components/ColumnTypeLabel.test.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { isValidElement } from 'react';
-import { render, screen } from '@testing-library/react';
+import { render, screen } from '@superset-ui/core/spec';
 import '@testing-library/jest-dom';
 import { GenericDataType } from '@superset-ui/core';
 
diff --git a/superset-frontend/packages/superset-ui-chart-controls/test/components/InfoTooltipWithTrigger.test.tsx b/superset-frontend/packages/superset-ui-chart-controls/test/components/InfoTooltipWithTrigger.test.tsx
index 0011f862b29..f9f78af8ab1 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/test/components/InfoTooltipWithTrigger.test.tsx
+++ b/superset-frontend/packages/superset-ui-chart-controls/test/components/InfoTooltipWithTrigger.test.tsx
@@ -17,11 +17,10 @@
  * under the License.
  */
 import '@testing-library/jest-dom';
-import { fireEvent, render } from '@testing-library/react';
-import { ThemeProvider, supersetTheme } from '@superset-ui/core';
-import { InfoTooltipWithTrigger, InfoTooltipWithTriggerProps } from '../../src';
+import { fireEvent, render } from '@superset-ui/core/spec';
+import { InfoTooltip, InfoTooltipProps } from '@superset-ui/core/components';
 
-jest.mock('../../src/components/Tooltip', () => ({
+jest.mock('@superset-ui/core/components/Tooltip', () => ({
   Tooltip: ({ children }: { children: React.ReactNode }) => (
     <div data-test="mock-tooltip">{children}</div>
   ),
@@ -29,12 +28,8 @@ jest.mock('../../src/components/Tooltip', () => ({
 
 const defaultProps = {};
 
-const setup = (props: Partial<InfoTooltipWithTriggerProps> = {}) =>
-  render(
-    <ThemeProvider theme={supersetTheme}>
-      <InfoTooltipWithTrigger {...defaultProps} {...props} />
-    </ThemeProvider>,
-  );
+const setup = (props: Partial<InfoTooltipProps> = {}) =>
+  render(<InfoTooltip {...defaultProps} {...props} />);
 
 test('renders a tooltip', () => {
   const { getAllByTestId } = setup({
@@ -44,31 +39,29 @@ test('renders a tooltip', () => {
   expect(getAllByTestId('mock-tooltip').length).toEqual(1);
 });
 
-test('renders an info icon', () => {
-  const { container } = setup();
-  expect(container.getElementsByClassName('fa-info-circle')).toHaveLength(1);
-});
-
-test('responds to keypresses', () => {
+test('responds to keydown events', () => {
   const clickHandler = jest.fn();
   const { getByRole } = setup({
     label: 'test',
     tooltip: 'this is a test',
     onClick: clickHandler,
   });
-  fireEvent.keyPress(getByRole('button'), {
+
+  fireEvent.keyDown(getByRole('button'), {
     key: 'Tab',
     code: 9,
     charCode: 9,
   });
   expect(clickHandler).toHaveBeenCalledTimes(0);
-  fireEvent.keyPress(getByRole('button'), {
+
+  fireEvent.keyDown(getByRole('button'), {
     key: 'Enter',
     code: 13,
     charCode: 13,
   });
   expect(clickHandler).toHaveBeenCalledTimes(1);
-  fireEvent.keyPress(getByRole('button'), {
+
+  fireEvent.keyDown(getByRole('button'), {
     key: ' ',
     code: 32,
     charCode: 32,
@@ -76,9 +69,47 @@ test('responds to keypresses', () => {
   expect(clickHandler).toHaveBeenCalledTimes(2);
 });
 
-test('has a bsStyle', () => {
+test('finds the info circle icon inside info variant', () => {
   const { container } = setup({
-    bsStyle: 'something',
+    type: 'info',
   });
-  expect(container.getElementsByClassName('text-something')).toHaveLength(1);
+
+  const iconSpan = container.querySelector('svg[data-icon="info-circle"]');
+  expect(iconSpan).toBeInTheDocument();
+});
+
+test('finds the warning icon inside warning variant', () => {
+  const { container } = setup({
+    type: 'warning',
+  });
+
+  const iconSpan = container.querySelector('svg[data-icon="warning"]');
+  expect(iconSpan).toBeInTheDocument();
+});
+
+test('finds the close circle icon inside error variant', () => {
+  const { container } = setup({
+    type: 'error',
+  });
+
+  const iconSpan = container.querySelector('svg[data-icon="close-circle"]');
+  expect(iconSpan).toBeInTheDocument();
+});
+
+test('finds the question circle icon inside question variant', () => {
+  const { container } = setup({
+    type: 'question',
+  });
+
+  const iconSpan = container.querySelector('svg[data-icon="question-circle"]');
+  expect(iconSpan).toBeInTheDocument();
+});
+
+test('finds the thunderbolt icon inside notice variant', () => {
+  const { container } = setup({
+    type: 'notice',
+  });
+
+  const iconSpan = container.querySelector('svg[data-icon="thunderbolt"]');
+  expect(iconSpan).toBeInTheDocument();
 });
diff --git a/superset-frontend/packages/superset-ui-chart-controls/test/components/MetricOption.test.tsx b/superset-frontend/packages/superset-ui-chart-controls/test/components/MetricOption.test.tsx
index 49b78159f37..254a8401c82 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/test/components/MetricOption.test.tsx
+++ b/superset-frontend/packages/superset-ui-chart-controls/test/components/MetricOption.test.tsx
@@ -17,24 +17,30 @@
  * under the License.
  */
 import '@testing-library/jest-dom';
-import { render } from '@testing-library/react';
-import { ThemeProvider, supersetTheme } from '@superset-ui/core';
-import { MetricOption, MetricOptionProps } from '../../src';
+import { render } from '@superset-ui/core/spec';
+import {
+  MetricOption,
+  MetricOptionProps,
+} from '../../src/components/MetricOption';
 
-jest.mock('../../src/components/InfoTooltipWithTrigger', () => () => (
-  <div data-test="mock-info-tooltip-with-trigger" />
-));
-jest.mock('../../src/components/ColumnTypeLabel/ColumnTypeLabel', () => ({
-  ColumnTypeLabel: () => <div data-test="mock-column-type-label" />,
+jest.mock('@superset-ui/core/components/InfoTooltip', () => ({
+  InfoTooltip: () => <div data-test="mock-tooltip" />,
 }));
+
 jest.mock(
-  '../../src/components/Tooltip',
+  '@superset-ui/chart-controls/components/ColumnTypeLabel/ColumnTypeLabel',
+  () => ({
+    ColumnTypeLabel: () => <div data-test="mock-column-type-label" />,
+  }),
+);
+jest.mock(
+  '@superset-ui/core/components/Tooltip',
   () =>
     ({ children }: { children: React.ReactNode }) => (
       <div data-test="mock-tooltip">{children}</div>
     ),
 );
-jest.mock('../../src/components/SQLPopover', () => ({
+jest.mock('@superset-ui/chart-controls/components/SQLPopover', () => ({
   SQLPopover: () => <div data-test="mock-sql-popover" />,
 }));
 
@@ -54,20 +60,16 @@ const defaultProps = {
 };
 
 const setup = (props: Partial<MetricOptionProps> = {}) =>
-  render(
-    <ThemeProvider theme={supersetTheme}>
-      <MetricOption {...defaultProps} {...props} />
-    </ThemeProvider>,
-  );
+  render(<MetricOption {...defaultProps} {...props} />);
 test('shows a label with verbose_name', () => {
   const { container } = setup();
   const lbl = container.getElementsByClassName('option-label');
   expect(lbl).toHaveLength(1);
   expect(`${lbl[0].textContent}`).toEqual(defaultProps.metric.verbose_name);
 });
-test('shows a InfoTooltipWithTrigger', () => {
+test('shows a InfoTooltip', () => {
   const { getByTestId } = setup();
-  expect(getByTestId('mock-info-tooltip-with-trigger')).toBeInTheDocument();
+  expect(getByTestId('mock-tooltip')).toBeInTheDocument();
 });
 test('shows SQL Popover trigger', () => {
   const { getByTestId } = setup();
@@ -82,14 +84,14 @@ test('shows a label with metric_name when no verbose_name', () => {
   });
   expect(getByText(defaultProps.metric.metric_name)).toBeInTheDocument();
 });
-test('doesnt show InfoTooltipWithTrigger when no warning', () => {
+test('doesnt show InfoTooltip when no warning', () => {
   const { queryByText } = setup({
     metric: {
       ...defaultProps.metric,
       warning_text: '',
     },
   });
-  expect(queryByText('mock-info-tooltip-with-trigger')).not.toBeInTheDocument();
+  expect(queryByText('mock-tooltip')).not.toBeInTheDocument();
 });
 test('sets target="_blank" when openInNewWindow is true', () => {
   const { getByRole } = setup({
diff --git a/superset-frontend/packages/superset-ui-chart-controls/test/components/labelUtils.test.tsx b/superset-frontend/packages/superset-ui-chart-controls/test/components/labelUtils.test.tsx
index 9b5b760f791..64e75887abd 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/test/components/labelUtils.test.tsx
+++ b/superset-frontend/packages/superset-ui-chart-controls/test/components/labelUtils.test.tsx
@@ -16,10 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { ReactElement } from 'react';
-import { render, screen } from '@testing-library/react';
+import { render, screen } from '@superset-ui/core/spec';
 import '@testing-library/jest-dom';
-import { ThemeProvider, supersetTheme } from '@superset-ui/core';
 import {
   getColumnLabelText,
   getColumnTooltipNode,
@@ -27,9 +25,6 @@ import {
   getColumnTypeTooltipNode,
 } from '../../src/components/labelUtils';
 
-const renderWithTheme = (ui: ReactElement) =>
-  render(<ThemeProvider theme={supersetTheme}>{ui}</ThemeProvider>);
-
 test("should get column name when column doesn't have verbose_name", () => {
   expect(
     getColumnLabelText({
@@ -78,7 +73,7 @@ test('should get null for column datatype tooltip when type is blank', () => {
 });
 
 test('should get column datatype rendered as tooltip when column has a type', () => {
-  renderWithTheme(
+  render(
     <>
       {getColumnTypeTooltipNode({
         id: 123,
@@ -96,7 +91,7 @@ test('should get column datatype rendered as tooltip when column has a type', ()
 
 test('should get column name, verbose name and description when it has a verbose name', () => {
   const ref = { current: { scrollWidth: 100, clientWidth: 100 } };
-  renderWithTheme(
+  render(
     <>
       {getColumnTooltipNode(
         {
@@ -120,7 +115,7 @@ test('should get column name, verbose name and description when it has a verbose
 
 test('should get column name as tooltip if it overflowed', () => {
   const ref = { current: { scrollWidth: 200, clientWidth: 100 } };
-  renderWithTheme(
+  render(
     <>
       {getColumnTooltipNode(
         {
@@ -141,7 +136,7 @@ test('should get column name as tooltip if it overflowed', () => {
 
 test('should get column name, verbose name and description as tooltip if it overflowed', () => {
   const ref = { current: { scrollWidth: 200, clientWidth: 100 } };
-  renderWithTheme(
+  render(
     <>
       {getColumnTooltipNode(
         {
@@ -180,7 +175,7 @@ test('should get null as tooltip in metric', () => {
 
 test('should get metric name, verbose name and description as tooltip in metric', () => {
   const ref = { current: { scrollWidth: 100, clientWidth: 100 } };
-  renderWithTheme(
+  render(
     <>
       {getMetricTooltipNode(
         {
@@ -203,7 +198,7 @@ test('should get metric name, verbose name and description as tooltip in metric'
 
 test('should get metric name as tooltip if it overflowed', () => {
   const ref = { current: { scrollWidth: 200, clientWidth: 100 } };
-  renderWithTheme(
+  render(
     <>
       {getMetricTooltipNode(
         {
@@ -224,7 +219,7 @@ test('should get metric name as tooltip if it overflowed', () => {
 
 test('should get metric name, verbose name and description in tooltip if it overflowed', () => {
   const ref = { current: { scrollWidth: 200, clientWidth: 100 } };
-  renderWithTheme(
+  render(
     <>
       {getMetricTooltipNode(
         {
diff --git a/superset-frontend/packages/superset-ui-core/.eslintrc b/superset-frontend/packages/superset-ui-core/.eslintrc
new file mode 100644
index 00000000000..e0ff7c67bb8
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/.eslintrc
@@ -0,0 +1,68 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+{
+  "plugins": ["jest", "jest-dom", "no-only-tests", "testing-library"],
+  "env": {
+    "jest/globals": true
+  },
+  "settings": {
+    "jest": {
+      "version": "detect"
+    }
+  },
+  "extends": [
+    "plugin:jest/recommended",
+    "plugin:jest-dom/recommended",
+    "plugin:testing-library/react"
+  ],
+  "overrides": [
+	{
+  	  "files": [
+        "**/*.stories.*",
+        "**/*.overview.*",
+        "**/fixtures.*"
+      ],
+  	  "rules": {
+        "import/no-extraneous-dependencies": "off"
+      }
+	}
+  ],
+  "rules": {
+    "import/no-extraneous-dependencies": ["error", { "devDependencies": true }],
+    "jest/consistent-test-it": "error",
+    "no-only-tests/no-only-tests": "error",
+    "prefer-promise-reject-errors": 0,
+
+    "testing-library/no-node-access": "off",
+    "testing-library/prefer-screen-queries": "off",
+    "testing-library/no-container": "off",
+    "testing-library/await-async-queries": "off",
+    "testing-library/await-async-utils": "off",
+    "testing-library/no-await-sync-events": "off",
+    "testing-library/no-render-in-lifecycle": "off",
+    "testing-library/no-unnecessary-act": "off",
+    "testing-library/no-wait-for-multiple-assertions": "off",
+    "testing-library/await-async-events": "off",
+    "testing-library/no-wait-for-side-effects": "off",
+    "testing-library/prefer-presence-queries": "off",
+    "testing-library/render-result-naming-convention": "off",
+    "testing-library/prefer-find-by": "off",
+    "testing-library/no-manual-cleanup": "off"
+  }
+}
diff --git a/superset-frontend/packages/superset-ui-core/__mocks__/mockExportObject.js b/superset-frontend/packages/superset-ui-core/__mocks__/mockExportObject.js
new file mode 100644
index 00000000000..ab22d88b5b2
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/__mocks__/mockExportObject.js
@@ -0,0 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+module.exports = {};
diff --git a/superset-frontend/packages/superset-ui-core/__mocks__/mockExportString.js b/superset-frontend/packages/superset-ui-core/__mocks__/mockExportString.js
new file mode 100644
index 00000000000..5b7f1d6da96
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/__mocks__/mockExportString.js
@@ -0,0 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+module.exports = 'test-file-stub';
diff --git a/superset-frontend/src/components/Tags/Tag.stories.tsx b/superset-frontend/packages/superset-ui-core/__mocks__/svgrMock.tsx
similarity index 75%
rename from superset-frontend/src/components/Tags/Tag.stories.tsx
rename to superset-frontend/packages/superset-ui-core/__mocks__/svgrMock.tsx
index b6d82bff930..4f1178bee8d 100644
--- a/superset-frontend/src/components/Tags/Tag.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/__mocks__/svgrMock.tsx
@@ -16,16 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import TagType from 'src/types/TagType';
-import { Tag } from '.';
 
-export default {
-  title: 'Tags',
-  component: Tag,
-};
-export const InteractiveTag = (args: TagType) => <Tag {...args} />;
+import { SVGProps, forwardRef } from 'react';
 
-InteractiveTag.args = {
-  editable: false,
-  name: 'Tag',
-};
+const SvgrMock = forwardRef<SVGSVGElement, SVGProps<SVGSVGElement>>(
+  (props, ref) => <svg ref={ref} {...props} />,
+);
+
+SvgrMock.displayName = 'SvgrMock';
+
+export const ReactComponent = SvgrMock;
+export default SvgrMock;
diff --git a/superset-frontend/packages/superset-ui-core/package.json b/superset-frontend/packages/superset-ui-core/package.json
index 0327818b6ac..8da32a5a994 100644
--- a/superset-frontend/packages/superset-ui-core/package.json
+++ b/superset-frontend/packages/superset-ui-core/package.json
@@ -24,40 +24,58 @@
     "lib"
   ],
   "dependencies": {
+    "@ant-design/icons": "^5.2.6",
     "@babel/runtime": "^7.25.6",
+    "@fontsource/fira-code": "^5.0.18",
+    "@fontsource/inter": "^5.0.20",
     "@types/json-bigint": "^1.0.4",
+    "ace-builds": "^1.43.1",
+    "brace": "^0.11.1",
+    "classnames": "^2.2.5",
     "csstype": "^3.1.3",
+    "core-js": "^3.38.1",
     "d3-format": "^1.3.2",
+    "dayjs": "^1.11.13",
     "d3-interpolate": "^3.0.1",
     "d3-scale": "^3.0.0",
     "d3-time": "^3.1.0",
     "d3-time-format": "^4.1.0",
+    "dompurify": "^3.2.4",
     "fetch-retry": "^6.0.0",
     "jed": "^1.1.1",
     "lodash": "^4.17.21",
     "math-expression-evaluator": "^2.0.6",
     "pretty-ms": "^9.2.0",
+    "re-resizable": "^6.10.1",
+    "react-ace": "^10.1.0",
+    "react-js-cron": "^5.2.0",
+    "react-draggable": "^4.4.6",
+    "react-resize-detector": "^7.1.2",
+    "react-syntax-highlighter": "^15.4.5",
+    "react-ultimate-pagination": "^1.3.2",
     "react-error-boundary": "^5.0.0",
     "react-markdown": "^8.0.7",
+    "regenerator-runtime": "^0.14.1",
     "rehype-raw": "^7.0.0",
     "rehype-sanitize": "^6.0.0",
-    "remark-gfm": "^3.0.1",
+    "remark-gfm": "^4.0.1",
     "reselect": "^4.0.0",
     "rison": "^0.1.1",
     "seedrandom": "^3.0.5",
     "@visx/responsive": "^3.12.0",
-    "whatwg-fetch": "^3.6.20",
     "xss": "^1.0.14"
   },
   "devDependencies": {
-    "@emotion/styled": "^11.3.0",
+    "@emotion/styled": "^11.14.1",
     "@types/d3-format": "^3.0.4",
     "@types/d3-interpolate": "^3.0.4",
     "@types/d3-scale": "^2.1.1",
     "@types/d3-time": "^3.0.4",
     "@types/d3-time-format": "^4.0.3",
-    "@types/fetch-mock": "^7.3.8",
-    "@types/lodash": "^4.17.16",
+    "@types/react-table": "^7.7.20",
+    "@types/react-syntax-highlighter": "^15.5.13",
+    "@types/jquery": "^3.5.8",
+    "@types/lodash": "^4.17.20",
     "@types/math-expression-evaluator": "^1.3.3",
     "@types/node": "^22.10.3",
     "@types/prop-types": "^15.7.2",
@@ -69,15 +87,17 @@
     "timezone-mock": "1.3.6"
   },
   "peerDependencies": {
+    "antd": "^5.24.6",
     "@emotion/cache": "^11.4.0",
     "@emotion/react": "^11.4.1",
-    "@emotion/styled": "^11.3.0",
+    "@emotion/styled": "^11.14.1",
     "@testing-library/dom": "^8.20.1",
     "@testing-library/jest-dom": "*",
     "@testing-library/react": "^13.0.0",
     "@testing-library/user-event": "*",
     "@types/react": "*",
     "@types/react-loadable": "*",
+    "@types/react-window": "^1.8.8",
     "@types/tinycolor2": "*",
     "nanoid": "^5.0.9",
     "react": "^18.2.0",
@@ -86,5 +106,27 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "exports": {
+    ".": {
+      "import": "./esm/index.js",
+      "require": "./lib/index.js",
+      "types": "./lib/index.d.ts"
+    },
+    "./components/*": {
+      "import": "./esm/components/*/index.js",
+      "require": "./lib/components/*/index.js",
+      "types": "./lib/components/*/index.d.ts"
+    },
+    "./components": {
+      "import": "./esm/components/index.js",
+      "require": "./lib/components/index.js",
+      "types": "./lib/components/index.d.ts"
+    },
+    "./utils/*": {
+      "import": "./esm/utils/*.js",
+      "require": "./lib/utils/*.js",
+      "types": "./lib/utils/*.d.ts"
+    }
   }
 }
diff --git a/superset-frontend/packages/superset-ui-core/src/chart-composition/tooltip/TooltipTable.tsx b/superset-frontend/packages/superset-ui-core/src/chart-composition/tooltip/TooltipTable.tsx
index 4952d821f1a..6e17d8134c2 100644
--- a/superset-frontend/packages/superset-ui-core/src/chart-composition/tooltip/TooltipTable.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/chart-composition/tooltip/TooltipTable.tsx
@@ -16,8 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
-import { CSSProperties, PureComponent, ReactNode } from 'react';
+import { CSSProperties, ReactNode } from 'react';
+import { Table, type TableColumnsType } from 'antd';
 
 interface TooltipRowData {
   key: string | number;
@@ -27,43 +27,52 @@ interface TooltipRowData {
   valueStyle?: CSSProperties;
 }
 
-const defaultProps = {
-  className: '',
-  data: [] as TooltipRowData[],
-};
-
-type Props = {
+interface TooltipTableProps {
   className?: string;
   data: TooltipRowData[];
-} & Readonly<typeof defaultProps>;
+}
 
 const VALUE_CELL_STYLE: CSSProperties = { paddingLeft: 8, textAlign: 'right' };
 
-export default class TooltipTable extends PureComponent<Props, {}> {
-  static defaultProps = defaultProps;
+const TooltipTable = ({ className = '', data }: TooltipTableProps) => {
+  const columns: TableColumnsType<TooltipRowData> = [
+    {
+      title: '',
+      dataIndex: 'keyColumn',
+      key: 'keyColumn',
+      render: (text, record) => (
+        <div style={record.keyStyle}>{record.keyColumn ?? record.key}</div>
+      ),
+    },
+    {
+      title: '',
+      dataIndex: 'valueColumn',
+      key: 'valueColumn',
+      align: 'right',
+      render: (text, record) => (
+        <div
+          style={
+            record.valueStyle
+              ? { ...VALUE_CELL_STYLE, ...record.valueStyle }
+              : VALUE_CELL_STYLE
+          }
+        >
+          {record.valueColumn}
+        </div>
+      ),
+    },
+  ];
 
-  render() {
-    const { className, data } = this.props;
+  return (
+    <Table
+      className={className}
+      columns={columns}
+      dataSource={data}
+      pagination={false}
+      showHeader={false}
+      bordered={false}
+    />
+  );
+};
 
-    return (
-      <table className={className}>
-        <tbody>
-          {data.map(({ key, keyColumn, keyStyle, valueColumn, valueStyle }) => (
-            <tr key={key}>
-              <td style={keyStyle}>{keyColumn ?? key}</td>
-              <td
-                style={
-                  valueStyle
-                    ? { ...VALUE_CELL_STYLE, ...valueStyle }
-                    : VALUE_CELL_STYLE
-                }
-              >
-                {valueColumn}
-              </td>
-            </tr>
-          ))}
-        </tbody>
-      </table>
-    );
-  }
-}
+export default TooltipTable;
diff --git a/superset-frontend/packages/superset-ui-core/src/chart/components/FallbackComponent.tsx b/superset-frontend/packages/superset-ui-core/src/chart/components/FallbackComponent.tsx
index 4d34fc88e8d..d5ff70c954c 100644
--- a/superset-frontend/packages/superset-ui-core/src/chart/components/FallbackComponent.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/chart/components/FallbackComponent.tsx
@@ -18,7 +18,7 @@
  */
 
 import { t } from '@superset-ui/core';
-import { SupersetTheme } from '../../style';
+import { SupersetTheme } from '../..';
 import { FallbackPropsWithDimension } from './SuperChart';
 
 export type Props = FallbackPropsWithDimension;
diff --git a/superset-frontend/packages/superset-ui-core/src/chart/components/NoResultsComponent.tsx b/superset-frontend/packages/superset-ui-core/src/chart/components/NoResultsComponent.tsx
index 73e8df62584..3bcb3e3a89a 100644
--- a/superset-frontend/packages/superset-ui-core/src/chart/components/NoResultsComponent.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/chart/components/NoResultsComponent.tsx
@@ -18,7 +18,7 @@
  */
 
 import { CSSProperties } from 'react';
-import { css, styled } from '../../style';
+import { css, styled } from '../../theme';
 import { t } from '../../translation';
 
 const MESSAGE_STYLES: CSSProperties = { maxWidth: 800 };
@@ -36,16 +36,16 @@ const Container = styled.div<{
     text-align: center;
     height: ${height}px;
     width: ${width}px;
-    padding: ${theme.gridUnit * 4}px;
+    padding: ${theme.sizeUnit * 4}px;
 
     & .no-results-title {
-      font-size: ${theme.typography.sizes.l}px;
-      font-weight: ${theme.typography.weights.bold};
-      padding-bottom: ${theme.gridUnit * 2};
+      font-size: ${theme.fontSizeLG}px;
+      font-weight: ${theme.fontWeightStrong};
+      padding-bottom: ${theme.sizeUnit * 2};
     }
 
     & .no-results-body {
-      font-size: ${theme.typography.sizes.m}px;
+      font-size: ${theme.fontSize}px;
     }
   `}
 `;
diff --git a/superset-frontend/packages/superset-ui-core/src/chart/components/reactify.tsx b/superset-frontend/packages/superset-ui-core/src/chart/components/reactify.tsx
index 0a1bee16c54..c52f13d0de0 100644
--- a/superset-frontend/packages/superset-ui-core/src/chart/components/reactify.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/chart/components/reactify.tsx
@@ -18,7 +18,7 @@
  */
 
 // eslint-disable-next-line no-restricted-syntax -- whole React import is required for `reactify.test.tsx` Jest test passing.
-import React, { Component, ComponentClass, WeakValidationMap } from 'react';
+import { Component, ComponentClass, WeakValidationMap } from 'react';
 
 // TODO: Note that id and className can collide between Props and ReactifyProps
 // leading to (likely) unexpected behaviors. We should either require Props to not
diff --git a/superset-frontend/packages/superset-ui-core/src/chart/models/ChartProps.ts b/superset-frontend/packages/superset-ui-core/src/chart/models/ChartProps.ts
index 829440133a3..a886dacdb9e 100644
--- a/superset-frontend/packages/superset-ui-core/src/chart/models/ChartProps.ts
+++ b/superset-frontend/packages/superset-ui-core/src/chart/models/ChartProps.ts
@@ -37,7 +37,7 @@ import {
   SetDataMaskHook,
 } from '../types/Base';
 import { QueryData, DataRecordFilters } from '..';
-import { SupersetTheme } from '../../style';
+import { SupersetTheme } from '../../theme';
 
 // TODO: more specific typing for these fields of ChartProps
 type AnnotationData = PlainObject;
@@ -67,6 +67,8 @@ type Hooks = {
   setDataMask?: SetDataMaskHook;
   /** handle tooltip */
   setTooltip?: HandlerFunction;
+  /* handle legend scroll changes */
+  onLegendScroll?: HandlerFunction;
 } & PlainObject;
 
 /**
@@ -105,6 +107,8 @@ export interface ChartPropsConfig {
   inputRef?: RefObject<any>;
   /** Theme object */
   theme: SupersetTheme;
+  /* legend index */
+  legendIndex?: number;
 }
 
 const DEFAULT_WIDTH = 800;
@@ -135,6 +139,8 @@ export default class ChartProps<FormData extends RawFormData = RawFormData> {
 
   legendState?: LegendState;
 
+  legendIndex?: number;
+
   queriesData: QueryData[];
 
   width: number;
@@ -164,6 +170,7 @@ export default class ChartProps<FormData extends RawFormData = RawFormData> {
       ownState = {},
       filterState = {},
       legendState,
+      legendIndex,
       initialValues = {},
       queriesData = [],
       behaviors = [],
@@ -190,6 +197,7 @@ export default class ChartProps<FormData extends RawFormData = RawFormData> {
     this.ownState = ownState;
     this.filterState = filterState;
     this.legendState = legendState;
+    this.legendIndex = legendIndex;
     this.behaviors = behaviors;
     this.displaySettings = displaySettings;
     this.appSection = appSection;
@@ -215,6 +223,7 @@ ChartProps.createSelector = function create(): ChartPropsSelector {
     input => input.ownState,
     input => input.filterState,
     input => input.legendState,
+    input => input.legendIndex,
     input => input.behaviors,
     input => input.displaySettings,
     input => input.appSection,
@@ -235,6 +244,7 @@ ChartProps.createSelector = function create(): ChartPropsSelector {
       ownState,
       filterState,
       legendState,
+      legendIndex,
       behaviors,
       displaySettings,
       appSection,
@@ -255,6 +265,7 @@ ChartProps.createSelector = function create(): ChartPropsSelector {
         ownState,
         filterState,
         legendState,
+        legendIndex,
         width,
         behaviors,
         displaySettings,
diff --git a/superset-frontend/packages/superset-ui-core/src/chart/types/VizType.ts b/superset-frontend/packages/superset-ui-core/src/chart/types/VizType.ts
index 110d44f8fa2..3d341af70fa 100644
--- a/superset-frontend/packages/superset-ui-core/src/chart/types/VizType.ts
+++ b/superset-frontend/packages/superset-ui-core/src/chart/types/VizType.ts
@@ -31,6 +31,7 @@ export enum VizType {
   Compare = 'compare',
   CountryMap = 'country_map',
   Funnel = 'funnel',
+  Gantt = 'gantt_chart',
   Gauge = 'gauge_chart',
   Graph = 'graph_chart',
   Handlebars = 'handlebars',
diff --git a/superset-frontend/packages/superset-ui-core/src/color/CategoricalColorScale.ts b/superset-frontend/packages/superset-ui-core/src/color/CategoricalColorScale.ts
index 53a5b855bf8..d5128f03986 100644
--- a/superset-frontend/packages/superset-ui-core/src/color/CategoricalColorScale.ts
+++ b/superset-frontend/packages/superset-ui-core/src/color/CategoricalColorScale.ts
@@ -27,6 +27,8 @@ import getLabelsColorMap, {
 import { getAnalogousColors } from './utils';
 import { FeatureFlag, isFeatureEnabled } from '../utils';
 
+/* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */
+
 // Use type augmentation to correct the fact that
 // an instance of CategoricalScale is also a function
 interface CategoricalColorScale {
diff --git a/superset-frontend/src/components/Alert/Alert.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/Alert/Alert.stories.tsx
similarity index 96%
rename from superset-frontend/src/components/Alert/Alert.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Alert/Alert.stories.tsx
index 649abaa16a9..97241e10580 100644
--- a/superset-frontend/src/components/Alert/Alert.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Alert/Alert.stories.tsx
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import Alert, { AlertProps } from './index';
+import { Alert } from '.';
+import type { AlertProps } from './types';
 
 type AlertType = Required<Pick<AlertProps, 'type'>>;
 type AlertTypeValue = AlertType['type'];
@@ -30,7 +31,7 @@ const bigText =
   'purus convallis placerat in at nunc. Nulla nec viverra augue.';
 
 export default {
-  title: 'Alert',
+  title: 'Components/Alert',
   component: Alert,
 };
 
diff --git a/superset-frontend/src/components/Alert/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Alert/index.tsx
similarity index 79%
rename from superset-frontend/src/components/Alert/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Alert/index.tsx
index b8fb872b6a2..512f83b22d6 100644
--- a/superset-frontend/src/components/Alert/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Alert/index.tsx
@@ -16,15 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { PropsWithChildren } from 'react';
-import { Alert as AntdAlert } from 'antd-v5';
-import { AlertProps as AntdAlertProps } from 'antd-v5/lib/alert';
+import { Alert as AntdAlert } from 'antd';
+import type { AlertProps } from './types';
 
-export type AlertProps = PropsWithChildren<
-  Omit<AntdAlertProps, 'children'> & { roomBelow?: boolean }
->;
-
-export default function Alert(props: AlertProps) {
+export const Alert = (props: AlertProps) => {
   const {
     type = 'info',
     description,
@@ -46,4 +41,6 @@ export default function Alert(props: AlertProps) {
       {...rest}
     />
   );
-}
+};
+
+export type { AlertProps };
diff --git a/superset-frontend/src/components/Divider/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Alert/types.ts
similarity index 78%
rename from superset-frontend/src/components/Divider/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Alert/types.ts
index 1e0110c8233..37bf8751be1 100644
--- a/superset-frontend/src/components/Divider/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Alert/types.ts
@@ -16,12 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import type { PropsWithChildren } from 'react';
+import type { AlertProps as AntdAlertProps } from 'antd/es/alert';
 
-import { Divider as AntdDivider } from 'antd-v5';
-import type { DividerProps } from 'antd-v5/es/divider';
-
-export function Divider(props: DividerProps) {
-  return <AntdDivider {...props} />;
-}
-
-export { DividerProps };
+export type AlertProps = PropsWithChildren<
+  Omit<AntdAlertProps, 'children'> & { roomBelow?: boolean }
+>;
diff --git a/superset-frontend/src/components/Switch/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/AntdThemeProvider/index.tsx
similarity index 79%
rename from superset-frontend/src/components/Switch/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/AntdThemeProvider/index.tsx
index b4d89e85057..6bb9ffc0b2c 100644
--- a/superset-frontend/src/components/Switch/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/AntdThemeProvider/index.tsx
@@ -16,8 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { SwitchProps } from 'antd-v5/lib/switch';
-import { Switch as AntdSwitch } from 'antd-v5';
 
-export const Switch = (props: SwitchProps) => <AntdSwitch {...props} />;
-export type { SwitchProps };
+import { ConfigProvider, type ConfigProviderProps } from 'antd';
+
+export const AntdThemeProvider = ({
+  children,
+  ...rest
+}: ConfigProviderProps) => (
+  <ConfigProvider {...rest}>{children}</ConfigProvider>
+);
diff --git a/superset-frontend/src/components/AsyncAceEditor/AsyncAceEditor.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/AsyncAceEditor/AsyncAceEditor.stories.tsx
similarity index 96%
rename from superset-frontend/src/components/AsyncAceEditor/AsyncAceEditor.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/AsyncAceEditor/AsyncAceEditor.stories.tsx
index c537e409851..5f6b7679f11 100644
--- a/superset-frontend/src/components/AsyncAceEditor/AsyncAceEditor.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/AsyncAceEditor/AsyncAceEditor.stories.tsx
@@ -24,9 +24,10 @@ import {
   CssEditor,
   JsonEditor,
   ConfigEditor,
-  AsyncAceEditorOptions,
 } from '.';
 
+import type { AsyncAceEditorOptions } from './types';
+
 type EditorType =
   | 'sql'
   | 'full-sql'
@@ -47,7 +48,7 @@ const editorTypes: EditorType[] = [
 ];
 
 export default {
-  title: 'AsyncAceEditor',
+  title: 'Components/AsyncAceEditor',
 };
 
 const parseEditorType = (editorType: EditorType) => {
diff --git a/superset-frontend/src/components/AsyncAceEditor/AsyncAceEditor.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/AsyncAceEditor/AsyncAceEditor.test.tsx
similarity index 93%
rename from superset-frontend/src/components/AsyncAceEditor/AsyncAceEditor.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/AsyncAceEditor/AsyncAceEditor.test.tsx
index 6e377f889fd..151b1db1a93 100644
--- a/superset-frontend/src/components/AsyncAceEditor/AsyncAceEditor.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/AsyncAceEditor/AsyncAceEditor.test.tsx
@@ -16,8 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { render, screen, waitFor } from 'spec/helpers/testing-library';
-import AsyncAceEditor, {
+import { render, screen, waitFor } from '@superset-ui/core/spec';
+import {
+  AsyncAceEditor,
   SQLEditor,
   FullSQLEditor,
   MarkdownEditor,
@@ -25,9 +26,9 @@ import AsyncAceEditor, {
   CssEditor,
   JsonEditor,
   ConfigEditor,
-  AceModule,
-  AsyncAceEditorOptions,
-} from 'src/components/AsyncAceEditor';
+} from '.';
+
+import type { AceModule, AsyncAceEditorOptions } from './types';
 
 const selector = '[id="ace-editor"]';
 
diff --git a/superset-frontend/src/components/AsyncAceEditor/Tooltip.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/AsyncAceEditor/Tooltip.test.tsx
similarity index 100%
rename from superset-frontend/src/components/AsyncAceEditor/Tooltip.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/AsyncAceEditor/Tooltip.test.tsx
diff --git a/superset-frontend/src/components/AsyncAceEditor/Tooltip.tsx b/superset-frontend/packages/superset-ui-core/src/components/AsyncAceEditor/Tooltip.tsx
similarity index 99%
rename from superset-frontend/src/components/AsyncAceEditor/Tooltip.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/AsyncAceEditor/Tooltip.tsx
index a495928d61a..ef8158c9899 100644
--- a/superset-frontend/src/components/AsyncAceEditor/Tooltip.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/AsyncAceEditor/Tooltip.tsx
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 import DOMPurify from 'dompurify';
 
 type Props = {
diff --git a/superset-frontend/src/components/AsyncAceEditor/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/AsyncAceEditor/index.tsx
similarity index 58%
rename from superset-frontend/src/components/AsyncAceEditor/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/AsyncAceEditor/index.tsx
index 13b569c54e2..45b7468b10d 100644
--- a/superset-frontend/src/components/AsyncAceEditor/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/AsyncAceEditor/index.tsx
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { forwardRef, useEffect, ComponentType } from 'react';
+import { forwardRef, useEffect, useCallback, ComponentType } from 'react';
 
 import type {
   Editor as OrigEditor,
@@ -27,10 +27,10 @@ import type {
 import type AceEditor from 'react-ace';
 import type { IAceEditorProps } from 'react-ace';
 
-import AsyncEsmComponent, {
+import {
+  AsyncEsmComponent,
   PlaceholderProps,
-} from 'src/components/AsyncEsmComponent';
-import useEffectEvent from 'src/hooks/useEffectEvent';
+} from '@superset-ui/core/components/AsyncEsmComponent';
 import { useTheme, css } from '@superset-ui/core';
 import { Global } from '@emotion/react';
 
@@ -67,7 +67,7 @@ export interface AceCompleterKeyword extends AceCompleterKeywordData {
  * Async loaders to import brace modules. Must manually create call `import(...)`
  * promises because webpack can only analyze async imports statically.
  */
-const aceModuleLoaders = {
+export const aceModuleLoaders = {
   'mode/sql': () => import('brace/mode/sql'),
   'mode/markdown': () => import('brace/mode/markdown'),
   'mode/css': () => import('brace/mode/css'),
@@ -102,7 +102,7 @@ export type AsyncAceEditorOptions = {
 /**
  * Get an async AceEditor with automatical loading of specified ace modules.
  */
-export default function AsyncAceEditor(
+export function AsyncAceEditor(
   aceModules: AceModule[],
   {
     defaultMode,
@@ -155,9 +155,10 @@ export default function AsyncAceEditor(
         },
         ref,
       ) {
-        const supersetTheme = useTheme();
+        const token = useTheme();
         const langTools = acequire('ace/ext/language_tools');
-        const setCompleters = useEffectEvent(
+
+        const setCompleters = useCallback(
           (keywords: AceCompleterKeyword[]) => {
             const completer = {
               getCompletions: (
@@ -180,7 +181,9 @@ export default function AsyncAceEditor(
             };
             langTools.setCompleters([completer]);
           },
+          [langTools, mode],
         );
+
         useEffect(() => {
           if (keywords) {
             setCompleters(keywords);
@@ -192,36 +195,150 @@ export default function AsyncAceEditor(
             <Global
               key="ace-tooltip-global"
               styles={css`
+                .ace_editor {
+                  border: 1px solid ${token.colorBorder} !important;
+                  background-color: ${token.colorBgContainer} !important;
+                }
+
+                /* Basic editor styles with dark mode support */
+                .ace_editor.ace-github,
+                .ace_editor.ace-textmate {
+                  background-color: ${token.colorBgContainer} !important;
+                  color: ${token.colorText} !important;
+                }
+
+                /* Adjust gutter colors */
+                .ace_editor .ace_gutter {
+                  background-color: ${token.colorBgElevated} !important;
+                  color: ${token.colorTextSecondary} !important;
+                }
+                .ace_editor.ace_editor .ace_gutter .ace_gutter-active-line {
+                  background-color: ${token.colorBorderSecondary};
+                }
+                /* Adjust selection color */
+                .ace_editor .ace_selection {
+                  background-color: ${token.colorPrimaryBgHover} !important;
+                }
+
+                /* Improve active line highlighting */
+                .ace_editor .ace_active-line {
+                  background-color: ${token.colorPrimaryBg} !important;
+                }
+
+                /* Fix indent guides and print margin (80 chars line) */
+                .ace_editor .ace_indent-guide,
+                .ace_editor .ace_print-margin {
+                  background-color: ${token.colorSplit} !important;
+                  opacity: 0.5;
+                }
+
+                /* Adjust cursor color */
+                .ace_editor .ace_cursor {
+                  color: ${token.colorPrimaryText} !important;
+                }
+
+                /* Syntax highlighting using semantic color tokens */
+                .ace_editor .ace_keyword {
+                  color: ${token.colorPrimaryText} !important;
+                }
+
+                .ace_editor .ace_string {
+                  color: ${token.colorSuccessText} !important;
+                }
+
+                .ace_editor .ace_constant {
+                  color: ${token.colorWarningActive} !important;
+                }
+
+                .ace_editor .ace_function {
+                  color: ${token.colorInfoText} !important;
+                }
+
+                .ace_editor .ace_comment {
+                  color: ${token.colorTextTertiary} !important;
+                }
+
+                .ace_editor .ace_variable {
+                  color: ${token.colorTextSecondary} !important;
+                }
+
+                /* Adjust tooltip styles */
                 .ace_tooltip {
-                  all: unset;
-                  position: fixed;
-                  z-index: 9999;
-                  background: ${supersetTheme.colors.grayscale.light5};
-                  border: 1px solid ${supersetTheme.colors.grayscale.light1};
-                  padding: ${supersetTheme.gridUnit}px
-                    ${supersetTheme.gridUnit * 2}px;
-                  line-height: 1.4;
-                  max-width: 400px;
-                  min-width: 200px;
-                  pointer-events: auto;
-                  font-size: ${supersetTheme.typography.sizes.m}px;
+                  margin-left: ${token.margin}px;
+                  padding: 0px;
+                  background-color: ${token.colorBgElevated} !important;
+                  color: ${token.colorText} !important;
+                  border: 1px solid ${token.colorBorderSecondary};
+                  box-shadow: ${token.boxShadow};
+                  border-radius: ${token.borderRadius}px;
                 }
 
                 & .tooltip-detail {
+                  background-color: ${token.colorBgContainer};
+                  white-space: pre-wrap;
+                  word-break: break-all;
+                  min-width: ${token.sizeXXL * 5}px;
+                  max-width: ${token.sizeXXL * 10}px;
+
+                  & .tooltip-detail-head {
+                    background-color: ${token.colorBgElevated};
+                    color: ${token.colorText};
+                    display: flex;
+                    column-gap: ${token.padding}px;
+                    align-items: baseline;
+                    justify-content: space-between;
+                  }
+
                   & .tooltip-detail-title {
-                    font-weight: bold;
-                    font-size: ${supersetTheme.typography.sizes.m}px;
+                    display: flex;
+                    column-gap: ${token.padding}px;
                   }
+
                   & .tooltip-detail-body {
-                    font-size: ${supersetTheme.typography.sizes.s}px;
-                    padding: ${supersetTheme.gridUnit}px;
+                    word-break: break-word;
+                    color: ${token.colorTextSecondary};
                   }
+
                   & .tooltip-detail-head,
                   & .tooltip-detail-body {
+                    padding: ${token.padding}px ${token.paddingLG}px;
                   }
+
                   & .tooltip-detail-footer {
-                    font-size: ${supersetTheme.typography.sizes.s}px;
+                    border-top: 1px ${token.colorSplit} solid;
+                    padding: 0 ${token.paddingLG}px;
+                    color: ${token.colorTextTertiary};
+                    font-size: ${token.fontSizeSM}px;
                   }
+
+                  & .tooltip-detail-meta {
+                    & > .ant-tag {
+                      margin-right: 0px;
+                    }
+                  }
+                }
+
+                /* Adjust the searchbox to match theme */
+                .ace_search {
+                  background-color: ${token.colorBgContainer} !important;
+                  color: ${token.colorText} !important;
+                  border: 1px solid ${token.colorBorder} !important;
+                }
+
+                .ace_search_field {
+                  background-color: ${token.colorBgContainer} !important;
+                  color: ${token.colorText} !important;
+                  border: 1px solid ${token.colorBorder} !important;
+                }
+
+                .ace_button {
+                  background-color: ${token.colorBgElevated} !important;
+                  color: ${token.colorText} !important;
+                  border: 1px solid ${token.colorBorder} !important;
+                }
+
+                .ace_button:hover {
+                  background-color: ${token.colorPrimaryBg} !important;
                 }
               `}
             />
diff --git a/superset-frontend/packages/superset-ui-core/src/components/AsyncAceEditor/types.ts b/superset-frontend/packages/superset-ui-core/src/components/AsyncAceEditor/types.ts
new file mode 100644
index 00000000000..17a4210b2ba
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/AsyncAceEditor/types.ts
@@ -0,0 +1,68 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 type { Editor as OrigEditor, TextMode as OrigTextMode } from 'brace';
+import type { ComponentType } from 'react';
+import type { IAceEditorProps } from 'react-ace';
+import type { PlaceholderProps } from '../AsyncEsmComponent/types';
+import { aceModuleLoaders } from '.';
+
+export interface AceCompleterKeywordData {
+  name: string;
+  value: string;
+  score: number;
+  meta: string;
+  docText?: string;
+  docHTML?: string;
+}
+
+export type TextMode = OrigTextMode & { $id: string };
+
+export interface AceCompleter {
+  insertMatch: (
+    data?: Editor | { value: string } | string,
+    options?: AceCompleterKeywordData,
+  ) => void;
+}
+
+export type Editor = OrigEditor & {
+  completer: AceCompleter;
+  completers: AceCompleter[];
+};
+
+export interface AceCompleterKeyword extends AceCompleterKeywordData {
+  completer?: AceCompleter;
+}
+
+export type AceModule = keyof typeof aceModuleLoaders;
+
+export type AsyncAceEditorProps = IAceEditorProps & {
+  keywords?: AceCompleterKeyword[];
+};
+
+export type AceEditorMode = 'sql';
+export type AceEditorTheme = 'textmate' | 'github';
+export type AsyncAceEditorOptions = {
+  defaultMode?: AceEditorMode;
+  defaultTheme?: AceEditorTheme;
+  defaultTabSize?: number;
+  fontFamily?: string;
+  placeholder?: ComponentType<
+    PlaceholderProps & Partial<IAceEditorProps>
+  > | null;
+};
diff --git a/superset-frontend/src/components/AsyncEsmComponent/AsyncEsmComponent.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/AsyncEsmComponent/AsyncEsmComponent.stories.tsx
similarity index 91%
rename from superset-frontend/src/components/AsyncEsmComponent/AsyncEsmComponent.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/AsyncEsmComponent/AsyncEsmComponent.stories.tsx
index 0a9125fe05e..0c786141e06 100644
--- a/superset-frontend/src/components/AsyncEsmComponent/AsyncEsmComponent.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/AsyncEsmComponent/AsyncEsmComponent.stories.tsx
@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import AsyncEsmComponent, { PlaceholderProps } from '.';
+import { AsyncEsmComponent } from '.';
+import type { PlaceholderProps } from './types';
 
 export default {
-  title: 'AsyncEsmComponent',
+  title: 'Components/AsyncEsmComponent',
 };
 
 const Placeholder = () => <span>Loading...</span>;
diff --git a/superset-frontend/src/components/AsyncEsmComponent/AsyncEsmComponent.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/AsyncEsmComponent/AsyncEsmComponent.test.tsx
similarity index 94%
rename from superset-frontend/src/components/AsyncEsmComponent/AsyncEsmComponent.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/AsyncEsmComponent/AsyncEsmComponent.test.tsx
index 9e23acf5d64..82a88a322f9 100644
--- a/superset-frontend/src/components/AsyncEsmComponent/AsyncEsmComponent.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/AsyncEsmComponent/AsyncEsmComponent.test.tsx
@@ -16,8 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { render, screen } from 'spec/helpers/testing-library';
-import AsyncEsmComponent from 'src/components/AsyncEsmComponent';
+import { render, screen } from '@superset-ui/core/spec';
+import { AsyncEsmComponent } from '.';
 
 const Placeholder = () => <span>Loading...</span>;
 
diff --git a/superset-frontend/src/components/AsyncEsmComponent/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/AsyncEsmComponent/index.tsx
similarity index 92%
rename from superset-frontend/src/components/AsyncEsmComponent/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/AsyncEsmComponent/index.tsx
index 06ac5ef10ff..dd643a8e1a6 100644
--- a/superset-frontend/src/components/AsyncEsmComponent/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/AsyncEsmComponent/index.tsx
@@ -17,7 +17,6 @@
  * under the License.
  */
 import {
-  CSSProperties,
   useEffect,
   useState,
   RefObject,
@@ -28,16 +27,8 @@ import {
   RefAttributes,
 } from 'react';
 
-import Loading from '../Loading';
-
-export type PlaceholderProps = {
-  showLoadingForImport?: boolean;
-  width?: string | number;
-  height?: string | number;
-  placeholderStyle?: CSSProperties;
-} & {
-  [key: string]: any;
-};
+import { Loading } from '../Loading';
+import type { PlaceholderProps } from './types';
 
 function DefaultPlaceholder({
   width,
@@ -62,7 +53,7 @@ function DefaultPlaceholder({
  * Asynchronously import an ES module as a React component, render a placeholder
  * first (if provided) and re-render once import is complete.
  */
-export default function AsyncEsmComponent<
+export function AsyncEsmComponent<
   P = PlaceholderProps,
   M = ComponentType<P> | { default: ComponentType<P> },
 >(
@@ -128,6 +119,7 @@ export default function AsyncEsmComponent<
     const Component = component || placeholder;
     return Component ? (
       // placeholder does not get the ref
+      // @ts-ignore: Suppress TypeScript error for ref assignment
       <Component ref={Component === component ? ref : null} {...props} />
     ) : null;
   });
@@ -138,3 +130,5 @@ export default function AsyncEsmComponent<
     preload: typeof waitForPromise;
   };
 }
+
+export type { PlaceholderProps };
diff --git a/superset-frontend/packages/superset-ui-core/src/components/AsyncEsmComponent/types.ts b/superset-frontend/packages/superset-ui-core/src/components/AsyncEsmComponent/types.ts
new file mode 100644
index 00000000000..d00bdaa7c5e
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/AsyncEsmComponent/types.ts
@@ -0,0 +1,28 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 type { CSSProperties } from 'react';
+
+export type PlaceholderProps = {
+  showLoadingForImport?: boolean;
+  width?: string | number;
+  height?: string | number;
+  placeholderStyle?: CSSProperties;
+} & {
+  [key: string]: any;
+};
diff --git a/superset-frontend/packages/superset-ui-core/src/components/AutoComplete/AutoComplete.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/AutoComplete/AutoComplete.stories.tsx
new file mode 100644
index 00000000000..1b465ff1527
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/AutoComplete/AutoComplete.stories.tsx
@@ -0,0 +1,267 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { useState } from 'react';
+import type { Meta, StoryObj } from '@storybook/react';
+import { AutoComplete } from '.';
+import type { AutoCompleteProps } from './types';
+
+export default {
+  title: 'Components/AutoComplete',
+  component: AutoComplete,
+  argTypes: {
+    style: {
+      control: 'object',
+      description: 'Custom styles for AutoComplete',
+    },
+    placeholder: {
+      control: 'text',
+      description: 'Placeholder text for AutoComplete',
+    },
+    value: {
+      control: 'text',
+      description: 'Selected option',
+      table: {
+        type: { summary: 'string' },
+      },
+    },
+    disabled: {
+      control: 'boolean',
+      description: 'Disable the AutoComplete',
+      defaultValue: false,
+      table: {
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'false' },
+      },
+    },
+    popupMatchSelectWidth: {
+      control: 'number',
+      description: 'Width of the dropdown',
+      defaultValue: 252,
+    },
+    allowClear: {
+      control: 'boolean',
+      description: 'Show clear button',
+      defaultValue: false,
+      table: {
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'false' },
+      },
+    },
+    autoFocus: {
+      control: 'boolean',
+      description: 'If get focus when component mounted',
+      defaultValue: false,
+      table: {
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'false' },
+      },
+    },
+    backfill: {
+      control: 'boolean',
+      description: 'If backfill selected item the input when using keyboard',
+      defaultValue: false,
+      table: {
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'false' },
+      },
+    },
+    popupClassName: {
+      control: 'text',
+      description: 'The className of dropdown menu',
+    },
+    filterOption: {
+      control: 'boolean',
+      description:
+        'If true, filters options by input. If a function, filters options using `inputValue` and `option`. Returns true to include the option, false to exclude it.',
+      defaultValue: true,
+      table: {
+        type: { summary: 'boolean | function(inputValue, option)' },
+        defaultValue: { summary: 'true' },
+      },
+    },
+    notFoundContent: {
+      control: 'text',
+      description: 'Specify content to show when no result matches.',
+      defaultValue: undefined,
+      table: {
+        type: { summary: 'ReactNode' },
+        defaultValue: { summary: '-' },
+      },
+    },
+    open: {
+      control: 'boolean',
+      description: 'Controlled open state of dropdown',
+      defaultValue: undefined,
+      table: {
+        type: { summary: 'boolean' },
+      },
+    },
+    status: {
+      control: 'select',
+      options: [undefined, 'error', 'warning'],
+      description: 'Set validation status',
+      defaultValue: undefined,
+    },
+    size: {
+      control: 'select',
+      options: [undefined, 'large', 'middle', 'small'],
+      description: 'The size of the input box',
+      defaultValue: undefined,
+    },
+    variant: {
+      control: 'select',
+      options: ['outlined', 'borderless', 'filled'],
+      description: 'Variants of input',
+      defaultValue: 'outlined',
+    },
+    virtual: {
+      control: 'boolean',
+      description: 'Disable virtual scroll when set to false',
+      defaultValue: true,
+      table: {
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'true' },
+      },
+    },
+    // reference of additional props
+    defaultValue: {
+      control: false,
+      description: 'Initial selected option from the `options` array.',
+      table: {
+        type: { summary: 'string' },
+      },
+    },
+    defaultOpen: {
+      control: false,
+      description: 'Initial open state of dropdown',
+      defaultValue: undefined,
+      table: {
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'false' },
+      },
+    },
+    defaultActiveFirstOption: {
+      control: false,
+      description: 'Whether active first option by default',
+      defaultValue: undefined,
+      table: {
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'false' },
+      },
+    },
+    popupRender: {
+      control: false,
+      description:
+        'Custom render function for dropdown content. `(menus: ReactNode) => ReactNode`',
+      table: {
+        type: { summary: '(menus: ReactNode) => ReactNode' },
+        defaultValue: { summary: '-' },
+      },
+    },
+    options: {
+      control: false,
+      description:
+        'Select options. Will get better performance than using JSX elements.',
+      table: {
+        type: { summary: '{ label: string, value: string }[]' },
+        defaultValue: { summary: '-' },
+      },
+    },
+    children: {
+      control: false,
+      description:
+        'Can be used in two ways:\n' +
+        '1. Customize input element (e.g., `<Input />`, `<TextArea />`).\n' +
+        '2. Provide data source for auto-complete (`React.ReactElement<OptionProps>` or an array of such elements).',
+      table: {
+        type: {
+          summary:
+            'React.ReactElement<InputProps> | React.ReactElement<OptionProps> | React.ReactElement<OptionProps>[]',
+        },
+        defaultValue: { summary: '-' },
+      },
+    },
+    getPopupContainer: {
+      control: false,
+      description:
+        'Parent node of the dropdown. Defaults to `body`. If you encounter positioning issues during scrolling, try setting it to the scrollable area and positioning it relative to that.',
+      defaultValue: () => document.body,
+      table: {
+        type: { summary: '(triggerNode) => HTMLElement' },
+        defaultValue: { summary: '() => document.body' },
+      },
+    },
+  },
+  parameters: {
+    docs: {
+      description: {
+        component: 'AutoComplete component for search functionality.',
+      },
+    },
+  },
+} as Meta<typeof AutoComplete>;
+
+const getRandomInt = (max: number, min = 0) =>
+  Math.floor(Math.random() * (max - min + 1)) + min;
+
+const searchResult = (query: string) =>
+  Array.from({ length: getRandomInt(5) }).map((_, idx) => {
+    const category = `${query}${idx}`;
+    return {
+      value: category,
+      label: (
+        <div style={{ display: 'flex', justifyContent: 'space-between' }}>
+          <span>
+            Found {query} on{' '}
+            <a
+              href={`https://github.com/apache/superset?q=${query}`}
+              target="_blank"
+              rel="noopener noreferrer"
+            >
+              {category}
+            </a>
+          </span>
+          <span>{getRandomInt(200, 100)} results</span>
+        </div>
+      ),
+    };
+  });
+
+const AutoCompleteWithOptions = (args: AutoCompleteProps) => {
+  const [options, setOptions] = useState<AutoCompleteProps['options']>([]);
+
+  const handleSearch = (value: string) => {
+    setOptions(value ? searchResult(value) : []);
+  };
+
+  return <AutoComplete {...args} options={options} onSearch={handleSearch} />;
+};
+type Story = StoryObj<typeof AutoComplete>;
+
+export const AutoCompleteStory: Story = {
+  args: {
+    style: { width: 300 },
+    placeholder: 'Type to search...',
+  },
+  render: (args: AutoCompleteProps) => (
+    <div style={{ margin: '20px' }}>
+      <AutoCompleteWithOptions {...args} />
+    </div>
+  ),
+};
diff --git a/superset-frontend/packages/superset-ui-core/src/components/AutoComplete/AutoComplete.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/AutoComplete/AutoComplete.test.tsx
new file mode 100644
index 00000000000..a69e2924cf2
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/AutoComplete/AutoComplete.test.tsx
@@ -0,0 +1,78 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { useState } from 'react';
+import { render, screen, userEvent, waitFor } from '@superset-ui/core/spec';
+import { Input } from '../Input';
+import { AutoComplete } from '.';
+
+const searchResult = (query: string): Array<{ value: string; label: string }> =>
+  Array.from({ length: 3 }).map((_, idx) => ({
+    value: `${query}${idx}`,
+    label: `${query} result ${idx}`,
+  }));
+
+const AutoCompleteTest = () => {
+  const [options, setOptions] = useState<{ value: string; label: string }[]>(
+    [],
+  );
+
+  const handleSearch = (value: string) => {
+    setOptions(value ? searchResult(value) : []);
+  };
+
+  return (
+    <AutoComplete options={options} onSearch={handleSearch}>
+      <Input placeholder="Type to search..." />
+    </AutoComplete>
+  );
+};
+
+describe('AutoComplete Component', () => {
+  it('renders input field', () => {
+    render(<AutoCompleteTest />);
+    expect(
+      screen.getByPlaceholderText('Type to search...'),
+    ).toBeInTheDocument();
+  });
+
+  it('shows options when user types', async () => {
+    render(<AutoCompleteTest />);
+    const input = screen.getByPlaceholderText('Type to search...');
+    await userEvent.type(input, 'test');
+
+    await waitFor(() => {
+      expect(screen.getByText('test result 0')).toBeInTheDocument();
+      expect(screen.getByText('test result 1')).toBeInTheDocument();
+      expect(screen.getByText('test result 2')).toBeInTheDocument();
+    });
+  });
+
+  it('selecting an option updates input value', async () => {
+    render(<AutoCompleteTest />);
+    const input = screen.getByPlaceholderText('Type to search...');
+    await userEvent.type(input, 'test');
+
+    await waitFor(() => {
+      expect(screen.getByText('test result 0')).toBeInTheDocument();
+    });
+
+    await userEvent.click(screen.getByText('test result 0'));
+    expect(input).toHaveValue('test0');
+  });
+});
diff --git a/superset-frontend/packages/superset-ui-core/src/components/AutoComplete/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/AutoComplete/index.tsx
new file mode 100644
index 00000000000..779ba25d3a7
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/AutoComplete/index.tsx
@@ -0,0 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+export { AutoComplete } from 'antd';
+export type { AutoCompleteProps } from './types';
diff --git a/superset-frontend/packages/superset-ui-core/src/components/AutoComplete/types.ts b/superset-frontend/packages/superset-ui-core/src/components/AutoComplete/types.ts
new file mode 100644
index 00000000000..ae914b7ea96
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/AutoComplete/types.ts
@@ -0,0 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+export type { AutoCompleteProps } from 'antd/es/auto-complete';
diff --git a/superset-frontend/src/components/Avatar/Avatar.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/Avatar/Avatar.stories.tsx
similarity index 91%
rename from superset-frontend/src/components/Avatar/Avatar.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Avatar/Avatar.stories.tsx
index d9b6a5bcce5..5122cd8b51a 100644
--- a/superset-frontend/src/components/Avatar/Avatar.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Avatar/Avatar.stories.tsx
@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { Avatar, AvatarProps } from '.';
+import { Avatar } from '.';
+import type { AvatarProps } from './types';
 
 export default {
-  title: 'Avatar',
+  title: 'Components/Avatar',
   component: Avatar,
 };
 
diff --git a/superset-frontend/src/components/Avatar/Avatar.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Avatar/Avatar.test.tsx
similarity index 90%
rename from superset-frontend/src/components/Avatar/Avatar.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Avatar/Avatar.test.tsx
index 91cf1ef5e79..41b3d494925 100644
--- a/superset-frontend/src/components/Avatar/Avatar.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Avatar/Avatar.test.tsx
@@ -16,8 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { render } from 'spec/helpers/testing-library';
-import { Avatar } from 'src/components/Avatar';
+import { render } from '@superset-ui/core/spec';
+import { Avatar } from '.';
 
 test('renders with default props', async () => {
   const { container } = render(<Avatar />);
diff --git a/superset-frontend/src/components/Avatar/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Avatar/index.tsx
similarity index 80%
rename from superset-frontend/src/components/Avatar/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Avatar/index.tsx
index 910c3eeada6..6627e42de1f 100644
--- a/superset-frontend/src/components/Avatar/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Avatar/index.tsx
@@ -17,15 +17,15 @@
  * under the License.
  */
 
-import { Avatar as AntdAvatar } from 'antd-v5';
-import { AvatarProps, GroupProps } from 'antd-v5/lib/avatar';
+import { Avatar as AntdAvatar } from 'antd';
+import type { AvatarProps, GroupProps as AvatarGroupProps } from './types';
 
 export function Avatar(props: AvatarProps) {
   return <AntdAvatar {...props} />;
 }
 
-export function AvatarGroup(props: GroupProps) {
+export function AvatarGroup(props: AvatarGroupProps) {
   return <AntdAvatar.Group {...props} />;
 }
 
-export type { AvatarProps, GroupProps };
+export type { AvatarProps, AvatarGroupProps };
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Avatar/types.ts b/superset-frontend/packages/superset-ui-core/src/components/Avatar/types.ts
new file mode 100644
index 00000000000..374bb41f34d
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Avatar/types.ts
@@ -0,0 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 type { AvatarProps, GroupProps } from 'antd/es/avatar';
+
+export type { AvatarProps, GroupProps };
diff --git a/superset-frontend/src/components/Badge/Badge.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/Badge/Badge.stories.tsx
similarity index 96%
rename from superset-frontend/src/components/Badge/Badge.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Badge/Badge.stories.tsx
index 505c51ab384..9a5ff53d737 100644
--- a/superset-frontend/src/components/Badge/Badge.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Badge/Badge.stories.tsx
@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import Badge, { BadgeProps } from '.';
+import { Badge } from '.';
+import type { BadgeProps } from './types';
 
 export default {
-  title: 'Badge',
+  title: 'Components/Badge',
   component: Badge,
 };
 
diff --git a/superset-frontend/src/components/Badge/Badge.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Badge/Badge.test.tsx
similarity index 93%
rename from superset-frontend/src/components/Badge/Badge.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Badge/Badge.test.tsx
index cbf9bcf80eb..98fa396bfb6 100644
--- a/superset-frontend/src/components/Badge/Badge.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Badge/Badge.test.tsx
@@ -16,8 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { render, screen } from 'spec/helpers/testing-library';
-import Badge from '.';
+import { render, screen } from '@superset-ui/core/spec';
+import { Badge } from '.';
 
 const mockedProps = {
   count: 9,
diff --git a/superset-frontend/src/components/Badge/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Badge/index.tsx
similarity index 70%
rename from superset-frontend/src/components/Badge/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Badge/index.tsx
index 463884e5075..16350bfbd91 100644
--- a/superset-frontend/src/components/Badge/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Badge/index.tsx
@@ -17,22 +17,18 @@
  * under the License.
  */
 import { styled } from '@superset-ui/core';
-import { Badge as AntdBadge } from 'antd-v5';
-import { BadgeProps as AntdBadgeProps } from 'antd-v5/lib/badge';
+import { Badge as AntdBadge } from 'antd';
+import type { BadgeProps } from './types';
 
-export type { AntdBadgeProps as BadgeProps };
-
-const Badge = styled((props: AntdBadgeProps) => <AntdBadge {...props} />)`
+export const Badge = styled((props: BadgeProps) => <AntdBadge {...props} />)`
   ${({ theme, color, count }) => `
     & > sup,
-    & > sup.antd5-badge-count {
+    & > sup.ant-badge-count {
       ${
-        count !== undefined
-          ? `background: ${color || theme.colors.primary.base};`
-          : ''
+        count !== undefined ? `background: ${color || theme.colorPrimary};` : ''
       }
     }
   `}
 `;
 
-export default Badge;
+export type { BadgeProps };
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Badge/types.ts b/superset-frontend/packages/superset-ui-core/src/components/Badge/types.ts
new file mode 100644
index 00000000000..9b9a2765f62
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Badge/types.ts
@@ -0,0 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 type { BadgeProps } from 'antd/es/badge';
+
+export type { BadgeProps };
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Breadcrumb/Breadcrumb.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/Breadcrumb/Breadcrumb.stories.tsx
new file mode 100644
index 00000000000..3cd070d34ca
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Breadcrumb/Breadcrumb.stories.tsx
@@ -0,0 +1,62 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 type { Meta, StoryObj } from '@storybook/react';
+import { Breadcrumb } from '.';
+
+export default {
+  title: 'Components/Breadcrumb',
+  component: Breadcrumb,
+  argTypes: {
+    separator: {
+      control: 'text',
+      description: 'Custom separator between items',
+      table: {
+        type: { summary: 'string' },
+        defaultValue: { summary: '/' },
+      },
+    },
+    items: {
+      control: false,
+      description: 'List of breadcrumb items',
+      table: {
+        type: { summary: 'object' },
+      },
+    },
+  },
+  parameters: {
+    docs: {
+      description: {
+        component: 'Breadcrumb component for displaying navigation paths',
+      },
+    },
+  },
+} as Meta<typeof Breadcrumb>;
+
+type Story = StoryObj<typeof Breadcrumb>;
+
+export const Default: Story = {
+  args: {
+    items: [
+      { title: 'Home', href: '/' },
+      { title: 'Library', href: '/library' },
+      { title: 'Data' },
+    ],
+  },
+  render: args => <Breadcrumb {...args} />,
+};
diff --git a/superset-frontend/src/components/Form/Form.tsx b/superset-frontend/packages/superset-ui-core/src/components/Breadcrumb/Breadcrumb.test.tsx
similarity index 54%
rename from superset-frontend/src/components/Form/Form.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Breadcrumb/Breadcrumb.test.tsx
index d827dd5871a..bd45b713059 100644
--- a/superset-frontend/src/components/Form/Form.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Breadcrumb/Breadcrumb.test.tsx
@@ -16,29 +16,25 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-// eslint-disable-next-line no-restricted-imports
-import AntdForm, { FormProps } from 'antd/lib/form'; // TODO: Remove antd
-import { styled } from '@superset-ui/core';
+import { render, screen } from '@superset-ui/core/spec';
+import '@testing-library/jest-dom';
+import { Breadcrumb } from '.';
 
-const StyledForm = styled(AntdForm)`
-  &.ant-form label {
-    font-size: ${({ theme }) => theme.typography.sizes.s}px;
-  }
-  .ant-form-item {
-    margin-bottom: ${({ theme }) => theme.gridUnit * 4}px;
-  }
-`;
+describe('Breadcrumb Component', () => {
+  it('renders breadcrumb items correctly', () => {
+    render(
+      <Breadcrumb>
+        <Breadcrumb.Item>Home</Breadcrumb.Item>
+        <Breadcrumb.Item>Library</Breadcrumb.Item>
+        <Breadcrumb.Item>Data</Breadcrumb.Item>
+      </Breadcrumb>,
+    );
 
-function Form(props: FormProps) {
-  return <StyledForm {...props} />;
-}
+    expect(screen.getByText('Home')).toBeInTheDocument();
+    expect(screen.getByText('Library')).toBeInTheDocument();
+    expect(screen.getByText('Data')).toBeInTheDocument();
 
-export default Object.assign(Form, {
-  useForm: AntdForm.useForm,
-  Item: AntdForm.Item,
-  List: AntdForm.List,
-  ErrorList: AntdForm.ErrorList,
-  Provider: AntdForm.Provider,
+    const separators = screen.getAllByText('/');
+    expect(separators.length).toBe(2);
+  });
 });
-
-export type { FormProps };
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Breadcrumb/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Breadcrumb/index.tsx
new file mode 100644
index 00000000000..b67bdad2f19
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Breadcrumb/index.tsx
@@ -0,0 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+export { Breadcrumb } from 'antd';
+export type { BreadcrumbProps } from './types';
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Breadcrumb/types.ts b/superset-frontend/packages/superset-ui-core/src/components/Breadcrumb/types.ts
new file mode 100644
index 00000000000..a494698815d
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Breadcrumb/types.ts
@@ -0,0 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+export type { BreadcrumbProps } from 'antd/es/breadcrumb';
diff --git a/superset-frontend/src/components/Button/Button.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/Button/Button.stories.tsx
similarity index 96%
rename from superset-frontend/src/components/Button/Button.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Button/Button.stories.tsx
index 800d5af104d..4f3b7275cca 100644
--- a/superset-frontend/src/components/Button/Button.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Button/Button.stories.tsx
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import Button, { ButtonProps } from './index';
+import { Button } from '.';
+import type { ButtonProps } from './types';
 
 type ButtonStyle = Pick<ButtonProps, 'buttonStyle'>;
 type ButtonStyleValue = ButtonStyle[keyof ButtonStyle];
@@ -24,7 +25,7 @@ type ButtonSize = Pick<ButtonProps, 'buttonSize'>;
 type ButtonSizeValue = ButtonSize[keyof ButtonSize];
 
 export default {
-  title: 'Button',
+  title: 'Components/Button',
   component: Button,
   includeStories: ['ButtonGallery', 'InteractiveButton'],
 };
@@ -32,13 +33,9 @@ export default {
 const buttonStyles: ButtonStyleValue[] = [
   'primary',
   'secondary',
-  'tertiary',
   'dashed',
   'danger',
-  'warning',
-  'success',
   'link',
-  'default',
 ];
 
 const buttonSizes: ButtonSizeValue[] = ['xsmall', 'small', 'default'];
diff --git a/superset-frontend/src/components/Button/Button.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Button/Button.test.tsx
similarity index 95%
rename from superset-frontend/src/components/Button/Button.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Button/Button.test.tsx
index bbb72e5d454..2f2c16db27b 100644
--- a/superset-frontend/src/components/Button/Button.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Button/Button.test.tsx
@@ -16,8 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { fireEvent, render } from 'spec/helpers/testing-library';
-import Button from '.';
+import { fireEvent, render } from '@superset-ui/core/spec';
+import { Button } from '.';
 import {
   ButtonGallery,
   SIZES as buttonSizes,
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Button/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Button/index.tsx
new file mode 100644
index 00000000000..93a630129ae
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Button/index.tsx
@@ -0,0 +1,171 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { Children, ReactElement, Fragment } from 'react';
+
+import cx from 'classnames';
+import { Button as AntdButton } from 'antd';
+import { useTheme } from '@superset-ui/core';
+import { Tooltip } from '../Tooltip';
+import type {
+  ButtonColorType,
+  ButtonProps,
+  ButtonStyle,
+  ButtonType,
+  ButtonVariantType,
+  OnClickHandler,
+} from './types';
+
+export function Button(props: ButtonProps) {
+  const {
+    tooltip,
+    placement,
+    disabled = false,
+    buttonSize,
+    buttonStyle,
+    className,
+    cta,
+    children,
+    href,
+    showMarginRight = true,
+    icon,
+    ...restProps
+  } = props;
+
+  const theme = useTheme();
+  const { fontSizeSM, fontWeightStrong } = theme;
+
+  let height = 32;
+  let padding = 18;
+  if (buttonSize === 'xsmall') {
+    height = 22;
+    padding = 5;
+  } else if (buttonSize === 'small') {
+    height = 30;
+    padding = 10;
+  }
+  if (buttonStyle === 'link') {
+    padding = 4;
+  }
+
+  let antdType: ButtonType = 'default';
+  let variant: ButtonVariantType = 'solid';
+  let color: ButtonColorType = 'primary';
+
+  if (!buttonStyle || buttonStyle === 'primary') {
+    variant = 'solid';
+    antdType = 'primary';
+    color = 'primary';
+  } else if (buttonStyle === 'secondary') {
+    variant = 'filled';
+    color = 'primary';
+  } else if (buttonStyle === 'tertiary') {
+    variant = 'outlined';
+    color = 'default';
+  } else if (buttonStyle === 'dashed') {
+    color = 'primary';
+    variant = 'dashed';
+    antdType = 'dashed';
+  } else if (buttonStyle === 'danger') {
+    color = 'danger';
+  } else if (buttonStyle === 'link') {
+    variant = 'link';
+  }
+
+  const element = children as ReactElement;
+
+  let renderedChildren = [];
+  if (element && element.type === Fragment) {
+    renderedChildren = Children.toArray(element.props.children);
+  } else {
+    renderedChildren = Children.toArray(children);
+  }
+  const firstChildMargin =
+    showMarginRight && renderedChildren.length > 1 ? theme.sizeUnit * 2 : 0;
+
+  const effectiveButtonStyle: ButtonStyle = buttonStyle ?? 'primary';
+
+  const button = (
+    <AntdButton
+      href={disabled ? undefined : href}
+      disabled={disabled}
+      type={antdType}
+      variant={variant}
+      danger={effectiveButtonStyle === 'danger'}
+      color={color}
+      className={cx(
+        className,
+        'superset-button',
+        // A static class name containing the button style is available to
+        // support customizing button styles in embedded dashboards.
+        `superset-button-${buttonStyle}`,
+        { cta: !!cta },
+      )}
+      css={{
+        display: 'inline-flex',
+        alignItems: 'center',
+        justifyContent: 'center',
+        lineHeight: 1.5715,
+        fontSize: fontSizeSM,
+        fontWeight: fontWeightStrong,
+        height,
+        padding: `0px ${padding}px`,
+        minWidth: cta ? theme.sizeUnit * 36 : undefined,
+        minHeight: cta ? theme.sizeUnit * 8 : undefined,
+        marginLeft: 0,
+        '& + .superset-button': {
+          marginLeft: theme.sizeUnit * 2,
+        },
+        '& > span > :first-of-type': {
+          marginRight: firstChildMargin,
+        },
+      }}
+      icon={icon}
+      {...restProps}
+    >
+      {children}
+    </AntdButton>
+  );
+
+  if (tooltip) {
+    return (
+      <Tooltip placement={placement} title={tooltip}>
+        {/* wrap the button in a span so that the tooltip shows up
+        when the button is disabled. */}
+        {disabled ? (
+          <span
+            css={{
+              cursor: 'not-allowed',
+              '& > .superset-button': {
+                marginLeft: theme.sizeUnit * 2,
+              },
+            }}
+          >
+            {button}
+          </span>
+        ) : (
+          button
+        )}
+      </Tooltip>
+    );
+  }
+
+  return button;
+}
+
+export type { ButtonProps, OnClickHandler };
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Button/types.ts b/superset-frontend/packages/superset-ui-core/src/components/Button/types.ts
new file mode 100644
index 00000000000..92e29eaeed3
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Button/types.ts
@@ -0,0 +1,53 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 type { MouseEventHandler, ReactNode } from 'react';
+import type {
+  ButtonProps as AntdButtonProps,
+  ButtonType,
+  ButtonVariantType,
+  ButtonColorType,
+} from 'antd/es/button';
+import { IconType } from '@superset-ui/core/components/Icons/types';
+import type { TooltipPlacement } from '../Tooltip/types';
+
+export type { AntdButtonProps, ButtonType, ButtonVariantType, ButtonColorType };
+
+export type OnClickHandler = MouseEventHandler<HTMLElement>;
+
+export type ButtonStyle =
+  | 'primary'
+  | 'secondary'
+  | 'tertiary'
+  | 'danger'
+  | 'link'
+  | 'dashed';
+
+export type ButtonSize = 'default' | 'small' | 'xsmall';
+
+export type ButtonProps = Omit<AntdButtonProps, 'css'> & {
+  placement?: TooltipPlacement;
+  tooltip?: ReactNode;
+  className?: string;
+  buttonSize?: ButtonSize;
+  buttonStyle?: ButtonStyle;
+  cta?: boolean;
+  showMarginRight?: boolean;
+  icon?: IconType;
+};
diff --git a/superset-frontend/src/components/ButtonGroup/ButtonGroup.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/ButtonGroup/ButtonGroup.stories.tsx
similarity index 89%
rename from superset-frontend/src/components/ButtonGroup/ButtonGroup.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/ButtonGroup/ButtonGroup.stories.tsx
index bb1bfc1929f..bdd3f07b6b3 100644
--- a/superset-frontend/src/components/ButtonGroup/ButtonGroup.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/ButtonGroup/ButtonGroup.stories.tsx
@@ -16,12 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import Button, { ButtonProps } from 'src/components/Button';
-import { STYLES, SIZES } from 'src/components/Button/Button.stories';
-import ButtonGroup from './index';
+import { Button } from '../Button';
+import type { ButtonProps } from '../Button/types';
+import { STYLES, SIZES } from '../Button/Button.stories';
+import { ButtonGroup } from '.';
 
 export default {
-  title: 'ButtonGroup',
+  title: 'Components/ButtonGroup',
   component: ButtonGroup,
 };
 
diff --git a/superset-frontend/src/components/ButtonGroup/ButtonGroup.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/ButtonGroup/ButtonGroup.test.tsx
similarity index 91%
rename from superset-frontend/src/components/ButtonGroup/ButtonGroup.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/ButtonGroup/ButtonGroup.test.tsx
index b99b9907a78..986027a9628 100644
--- a/superset-frontend/src/components/ButtonGroup/ButtonGroup.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/ButtonGroup/ButtonGroup.test.tsx
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-import { render, screen } from 'spec/helpers/testing-library';
-import Button from 'src/components/Button';
-import ButtonGroup from '.';
+import { render, screen } from '@superset-ui/core/spec';
+import { Button } from '../Button';
+import { ButtonGroup } from '.';
 
 test('renders 1 button', () => {
   render(
diff --git a/superset-frontend/src/components/ButtonGroup/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/ButtonGroup/index.tsx
similarity index 89%
rename from superset-frontend/src/components/ButtonGroup/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/ButtonGroup/index.tsx
index a4db7f34c18..89c373c1e2b 100644
--- a/superset-frontend/src/components/ButtonGroup/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/ButtonGroup/index.tsx
@@ -16,15 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { ReactNode } from 'react';
+import type { ButtonGroupProps } from './types';
 
-export interface ButtonGroupProps {
-  className?: string;
-  children: ReactNode;
-  expand?: boolean;
-}
-
-export default function ButtonGroup(props: ButtonGroupProps) {
+export function ButtonGroup(props: ButtonGroupProps) {
   const { className, children } = props;
   return (
     <div
@@ -59,3 +53,5 @@ export default function ButtonGroup(props: ButtonGroupProps) {
     </div>
   );
 }
+
+export type { ButtonGroupProps };
diff --git a/superset-frontend/packages/superset-ui-core/src/components/ButtonGroup/types.ts b/superset-frontend/packages/superset-ui-core/src/components/ButtonGroup/types.ts
new file mode 100644
index 00000000000..e5fe9e64204
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/ButtonGroup/types.ts
@@ -0,0 +1,26 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 type { ReactNode } from 'react';
+
+export interface ButtonGroupProps {
+  className?: string;
+  children: ReactNode;
+  expand?: boolean;
+}
diff --git a/superset-frontend/src/components/CachedLabel/CachedLabel.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/CachedLabel/CachedLabel.test.tsx
similarity index 90%
rename from superset-frontend/src/components/CachedLabel/CachedLabel.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/CachedLabel/CachedLabel.test.tsx
index d42bb0257f3..59d9d63088c 100644
--- a/superset-frontend/src/components/CachedLabel/CachedLabel.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/CachedLabel/CachedLabel.test.tsx
@@ -18,8 +18,9 @@
  */
 
 import { isValidElement } from 'react';
-import { render, screen } from 'spec/helpers/testing-library';
-import CachedLabel, { CacheLabelProps } from '.';
+import { render, screen } from '@superset-ui/core/spec';
+import { CachedLabel } from '.';
+import type { CacheLabelProps } from './types';
 
 const defaultProps = {
   onClick: () => {},
diff --git a/superset-frontend/src/components/CachedLabel/TooltipContent.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/CachedLabel/TooltipContent.test.tsx
similarity index 92%
rename from superset-frontend/src/components/CachedLabel/TooltipContent.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/CachedLabel/TooltipContent.test.tsx
index a9ba7babc04..72629c868b2 100644
--- a/superset-frontend/src/components/CachedLabel/TooltipContent.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/CachedLabel/TooltipContent.test.tsx
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { render, screen } from 'spec/helpers/testing-library';
-import { extendedDayjs } from 'src/utils/dates';
+import { render, screen } from '@superset-ui/core/spec';
+import { extendedDayjs } from '../../utils/dates';
 import { TooltipContent } from './TooltipContent';
 
 test('Rendering TooltipContent correctly - no timestep', () => {
diff --git a/superset-frontend/src/components/CachedLabel/TooltipContent.tsx b/superset-frontend/packages/superset-ui-core/src/components/CachedLabel/TooltipContent.tsx
similarity index 96%
rename from superset-frontend/src/components/CachedLabel/TooltipContent.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/CachedLabel/TooltipContent.tsx
index fc0b5914f6b..470e2aa4a50 100644
--- a/superset-frontend/src/components/CachedLabel/TooltipContent.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/CachedLabel/TooltipContent.tsx
@@ -18,8 +18,8 @@
  */
 
 import { FC } from 'react';
-import { extendedDayjs } from 'src/utils/dates';
 import { t } from '@superset-ui/core';
+import { extendedDayjs } from '../../utils/dates';
 
 interface Props {
   cachedTimestamp?: string;
diff --git a/superset-frontend/src/components/CachedLabel/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/CachedLabel/index.tsx
similarity index 70%
rename from superset-frontend/src/components/CachedLabel/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/CachedLabel/index.tsx
index 9fd35b41543..f55a0dfc0d9 100644
--- a/superset-frontend/src/components/CachedLabel/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/CachedLabel/index.tsx
@@ -16,27 +16,23 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { useState, MouseEventHandler, FC } from 'react';
+import { useState, FC } from 'react';
 
 import { t } from '@superset-ui/core';
-import Label from 'src/components/Label';
-import { Tooltip } from 'src/components/Tooltip';
+import { Icons } from '@superset-ui/core/components/Icons';
+import { Label } from '../Label';
+import { Tooltip } from '../Tooltip';
 import { TooltipContent } from './TooltipContent';
+import type { CacheLabelProps } from './types';
 
-export interface CacheLabelProps {
-  onClick?: MouseEventHandler<HTMLElement>;
-  cachedTimestamp?: string;
-  className?: string;
-}
-
-const CacheLabel: FC<CacheLabelProps> = ({
+export const CachedLabel: FC<CacheLabelProps> = ({
   className,
   onClick,
   cachedTimestamp,
 }) => {
   const [hovered, setHovered] = useState(false);
 
-  const labelType = hovered ? 'primary' : 'default';
+  const labelType = hovered ? 'info' : 'default';
   return (
     <Tooltip
       title={<TooltipContent cachedTimestamp={cachedTimestamp} />}
@@ -48,13 +44,12 @@ const CacheLabel: FC<CacheLabelProps> = ({
         onClick={onClick}
         onMouseOver={() => setHovered(true)}
         onMouseOut={() => setHovered(false)}
+        icon={<Icons.SyncOutlined iconSize="m" />}
       >
-        {/* TODO: Remove fa-icon */}
-        {/* eslint-disable-next-line icons/no-fa-icons-usage */}
-        {t('Cached')} <i className="fa fa-refresh" />
+        {t('Cached')}
       </Label>
     </Tooltip>
   );
 };
 
-export default CacheLabel;
+export type { CacheLabelProps };
diff --git a/superset-frontend/packages/superset-ui-core/src/components/CachedLabel/types.ts b/superset-frontend/packages/superset-ui-core/src/components/CachedLabel/types.ts
new file mode 100644
index 00000000000..5a8b3567405
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/CachedLabel/types.ts
@@ -0,0 +1,26 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 type { MouseEventHandler } from 'react';
+
+export interface CacheLabelProps {
+  onClick?: MouseEventHandler<HTMLElement>;
+  cachedTimestamp?: string;
+  className?: string;
+}
diff --git a/superset-frontend/src/components/Card/Card.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/Card/Card.stories.tsx
similarity index 90%
rename from superset-frontend/src/components/Card/Card.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Card/Card.stories.tsx
index dad91382628..3009da49b92 100644
--- a/superset-frontend/src/components/Card/Card.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Card/Card.stories.tsx
@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import Card, { CardProps } from '.';
+import { Card } from '.';
+import type { CardProps } from './types';
 
 export default {
-  title: 'Card',
+  title: 'Components/Card',
   component: Card,
 };
 
@@ -27,7 +28,7 @@ export const InteractiveCard = (args: CardProps) => <Card {...args} />;
 
 InteractiveCard.args = {
   padded: true,
-  title: 'Card title',
+  title: 'Components/Card',
   children: 'Card content',
   bordered: true,
   loading: false,
diff --git a/superset-frontend/src/components/Card/Card.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Card/Card.test.tsx
similarity index 92%
rename from superset-frontend/src/components/Card/Card.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Card/Card.test.tsx
index 2c353d0924c..5f4028cda2f 100644
--- a/superset-frontend/src/components/Card/Card.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Card/Card.test.tsx
@@ -16,8 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { render, waitFor } from 'spec/helpers/testing-library';
-import Card from '.';
+import { render, waitFor } from '@superset-ui/core/spec';
+import { Card } from '.';
 
 afterEach(async () => {
   // Wait for any pending effects to complete
diff --git a/superset-frontend/src/components/Card/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Card/index.tsx
similarity index 67%
rename from superset-frontend/src/components/Card/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Card/index.tsx
index 855f50c273f..cc2242ca530 100644
--- a/superset-frontend/src/components/Card/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Card/index.tsx
@@ -17,26 +17,20 @@
  * under the License.
  */
 import { SupersetTheme } from '@superset-ui/core';
-import { Card as AntdCard } from 'antd-v5';
-import { CardProps as AntdCardProps } from 'antd-v5/lib/card';
+import { Card as AntdCard } from 'antd';
+import type { CardProps } from './types';
 
-export interface CardProps extends AntdCardProps {
-  padded?: boolean;
-}
-
-const Card = ({ padded, ...props }: CardProps) => (
+const CustomCard = ({ padded, ...props }: CardProps) => (
   <AntdCard
     {...props}
     css={(theme: SupersetTheme) => ({
-      // 'border-radius': `${theme.gridUnit}px`,
-      border: `1px solid ${theme.colors.grayscale.light2}`,
-      '.antd5-card-body': {
-        padding: padded ? theme.gridUnit * 4 : theme.gridUnit,
+      '.ant-card-body': {
+        padding: padded ? theme.sizeUnit * 4 : theme.sizeUnit,
       },
     })}
   />
 );
 
-export default Object.assign(Card, {
+export const Card = Object.assign(CustomCard, {
   Meta: AntdCard.Meta,
 });
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Card/types.ts b/superset-frontend/packages/superset-ui-core/src/components/Card/types.ts
new file mode 100644
index 00000000000..ae97878c9fc
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Card/types.ts
@@ -0,0 +1,23 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 type { CardProps as AntdCardProps } from 'antd/es/card';
+
+export interface CardProps extends AntdCardProps {
+  padded?: boolean;
+}
diff --git a/superset-frontend/src/components/CertifiedBadge/CertifiedBadge.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/CertifiedBadge/CertifiedBadge.stories.tsx
similarity index 89%
rename from superset-frontend/src/components/CertifiedBadge/CertifiedBadge.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/CertifiedBadge/CertifiedBadge.stories.tsx
index a248e7b0d1c..92df41a4690 100644
--- a/superset-frontend/src/components/CertifiedBadge/CertifiedBadge.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/CertifiedBadge/CertifiedBadge.stories.tsx
@@ -17,12 +17,13 @@
  * under the License.
  */
 import { configure as configureTranslation } from '@superset-ui/core';
-import CertifiedBadge, { CertifiedBadgeProps } from '.';
+import { CertifiedBadge } from '.';
+import type { CertifiedBadgeProps } from './types';
 
 configureTranslation();
 
 export default {
-  title: 'CertifiedBadgeWithTooltip',
+  title: 'Components/CertifiedBadgeWithTooltip',
 };
 
 export const InteractiveIcon = (args: CertifiedBadgeProps) => (
diff --git a/superset-frontend/src/components/CertifiedBadge/CertifiedBadge.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/CertifiedBadge/CertifiedBadge.test.tsx
similarity index 83%
rename from superset-frontend/src/components/CertifiedBadge/CertifiedBadge.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/CertifiedBadge/CertifiedBadge.test.tsx
index 39612e66760..000f04ac666 100644
--- a/superset-frontend/src/components/CertifiedBadge/CertifiedBadge.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/CertifiedBadge/CertifiedBadge.test.tsx
@@ -16,15 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import {
-  render,
-  screen,
-  userEvent,
-  waitFor,
-} from 'spec/helpers/testing-library';
-import CertifiedBadge, {
-  CertifiedBadgeProps,
-} from 'src/components/CertifiedBadge';
+import { render, screen, userEvent, waitFor } from '@superset-ui/core/spec';
+import { CertifiedBadge } from '.';
+import type { CertifiedBadgeProps } from './types';
 
 const asyncRender = (props?: CertifiedBadgeProps) =>
   waitFor(() => render(<CertifiedBadge {...props} />));
@@ -36,20 +30,20 @@ test('renders with default props', async () => {
 
 test('renders a tooltip when hovered', async () => {
   await asyncRender();
-  userEvent.hover(screen.getByRole('img'));
+  await userEvent.hover(screen.getByRole('img'));
   expect(await screen.findByRole('tooltip')).toBeInTheDocument();
 });
 
 test('renders with certified by', async () => {
   const certifiedBy = 'Trusted Authority';
   await asyncRender({ certifiedBy });
-  userEvent.hover(screen.getByRole('img'));
+  await userEvent.hover(screen.getByRole('img'));
   expect(await screen.findByRole('tooltip')).toHaveTextContent(certifiedBy);
 });
 
 test('renders with details', async () => {
   const details = 'All requirements have been met.';
   await asyncRender({ details });
-  userEvent.hover(screen.getByRole('img'));
+  await userEvent.hover(screen.getByRole('img'));
   expect(await screen.findByRole('tooltip')).toHaveTextContent(details);
 });
diff --git a/superset-frontend/src/components/CertifiedBadge/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/CertifiedBadge/index.tsx
similarity index 77%
rename from superset-frontend/src/components/CertifiedBadge/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/CertifiedBadge/index.tsx
index 2af0f864d58..4eff6bf4d50 100644
--- a/superset-frontend/src/components/CertifiedBadge/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/CertifiedBadge/index.tsx
@@ -17,16 +17,11 @@
  * under the License.
  */
 import { t, useTheme } from '@superset-ui/core';
-import { Icons, IconType } from 'src/components/Icons';
-import { Tooltip } from 'src/components/Tooltip';
+import { Icons } from '@superset-ui/core/components/Icons';
+import { Tooltip } from '../Tooltip';
+import type { CertifiedBadgeProps } from './types';
 
-export interface CertifiedBadgeProps {
-  certifiedBy?: string;
-  details?: string;
-  size?: IconType['iconSize'];
-}
-
-function CertifiedBadge({
+export function CertifiedBadge({
   certifiedBy,
   details,
   size = 'l',
@@ -47,9 +42,7 @@ function CertifiedBadge({
         </>
       }
     >
-      <Icons.Certified iconColor={theme.colors.primary.base} iconSize={size} />
+      <Icons.Certified iconColor={theme.colorPrimary} iconSize={size} />
     </Tooltip>
   );
 }
-
-export default CertifiedBadge;
diff --git a/superset-frontend/packages/superset-ui-core/src/components/CertifiedBadge/types.ts b/superset-frontend/packages/superset-ui-core/src/components/CertifiedBadge/types.ts
new file mode 100644
index 00000000000..71f8b4c909f
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/CertifiedBadge/types.ts
@@ -0,0 +1,25 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 type { IconType } from '@superset-ui/core/components/Icons/types';
+
+export interface CertifiedBadgeProps {
+  certifiedBy?: string;
+  details?: string;
+  size?: IconType['iconSize'];
+}
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Checkbox/Checkbox.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/Checkbox/Checkbox.stories.tsx
new file mode 100644
index 00000000000..afa3c211555
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Checkbox/Checkbox.stories.tsx
@@ -0,0 +1,198 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { useArgs } from '@storybook/preview-api';
+import { useState } from 'react';
+import { Checkbox } from '.';
+import type { CheckboxProps, CheckboxChangeEvent } from './types';
+
+export default {
+  title: 'Components/Checkbox',
+  component: Checkbox,
+  parameters: {
+    docs: {
+      description: {
+        component:
+          'Checkbox component that supports both regular and indeterminate states, built on top of Ant Design v5 Checkbox.',
+      },
+    },
+  },
+};
+
+export const InteractiveCheckbox = ({
+  checked,
+  indeterminate,
+}: CheckboxProps) => {
+  const [, updateArgs] = useArgs();
+
+  const handleChange = () => {
+    // Cycle through states: unchecked -> checked -> indeterminate -> unchecked
+    if (!checked && !indeterminate) {
+      updateArgs({ checked: true, indeterminate: false });
+    } else if (checked && !indeterminate) {
+      updateArgs({ checked: false, indeterminate: true });
+    } else if (!checked && indeterminate) {
+      updateArgs({ checked: false, indeterminate: false });
+    }
+  };
+
+  return (
+    <Checkbox
+      onChange={handleChange}
+      checked={checked}
+      indeterminate={indeterminate}
+    >
+      I'm an interactive checkbox (click to cycle through states)
+    </Checkbox>
+  );
+};
+
+InteractiveCheckbox.args = {
+  checked: false,
+  indeterminate: false,
+};
+
+// All checkbox states including indeterminate
+const STATES = [
+  {
+    id: 'unchecked',
+    checked: false,
+    indeterminate: false,
+    labelText: 'Unchecked checkbox',
+  },
+  {
+    id: 'checked',
+    checked: true,
+    indeterminate: false,
+    labelText: 'Checked checkbox',
+  },
+  {
+    id: 'indeterminate',
+    checked: false,
+    indeterminate: true,
+    labelText: 'Indeterminate checkbox',
+  },
+];
+
+export const AllCheckboxStates = () =>
+  STATES.map(({ id, checked, indeterminate, labelText }) => (
+    <div style={{ marginBottom: '16px' }} key={id}>
+      <Checkbox
+        id={id}
+        checked={checked}
+        indeterminate={indeterminate}
+        onChange={() => {}}
+      >
+        {labelText}
+      </Checkbox>
+    </div>
+  ));
+
+export const InteractiveIndeterminate = () => {
+  const [selectedOptions, setSelectedOptions] = useState<string[]>([]);
+  const options = ['Option 1', 'Option 2', 'Option 3'];
+
+  const handleParentChange = (e: CheckboxChangeEvent) => {
+    setSelectedOptions(e.target.checked ? [...options] : []);
+  };
+
+  const handleChildChange = (option: string) => {
+    setSelectedOptions(prev =>
+      prev.includes(option)
+        ? prev.filter(item => item !== option)
+        : [...prev, option],
+    );
+  };
+
+  const isIndeterminate =
+    selectedOptions.length > 0 && selectedOptions.length < options.length;
+  const isAllSelected = selectedOptions.length === options.length;
+
+  return (
+    <div>
+      <div style={{ marginBottom: '16px' }}>
+        <Checkbox
+          id="parent-checkbox"
+          checked={isAllSelected}
+          indeterminate={isIndeterminate}
+          onChange={handleParentChange}
+        >
+          Select All
+        </Checkbox>
+      </div>
+      {options.map(option => (
+        <div style={{ marginLeft: '24px', marginBottom: '8px' }} key={option}>
+          <Checkbox
+            id={`checkbox-${option}`}
+            checked={selectedOptions.includes(option)}
+            onChange={() => handleChildChange(option)}
+          >
+            {option}
+          </Checkbox>
+        </div>
+      ))}
+      <div style={{ marginTop: '16px', fontSize: '14px', color: '#666' }}>
+        Selected options:{' '}
+        {selectedOptions.length ? selectedOptions.join(', ') : 'None'}
+        <br />
+        Checkbox state:{' '}
+        {isAllSelected
+          ? 'All selected'
+          : isIndeterminate
+            ? 'Indeterminate'
+            : 'None selected'}
+      </div>
+    </div>
+  );
+};
+
+const DISABLED_STATES = [
+  {
+    id: 'disabled-unchecked',
+    checked: false,
+    indeterminate: false,
+    labelText: 'Disabled unchecked',
+  },
+  {
+    id: 'disabled-checked',
+    checked: true,
+    indeterminate: false,
+    labelText: 'Disabled checked',
+  },
+  {
+    id: 'disabled-indeterminate',
+    checked: false,
+    indeterminate: true,
+    labelText: 'Disabled indeterminate',
+  },
+];
+
+export const DisabledCheckboxes = () =>
+  DISABLED_STATES.map(({ id, checked, indeterminate, labelText }) => (
+    <div style={{ marginBottom: '16px' }} key={id}>
+      <Checkbox
+        id={id}
+        checked={checked}
+        indeterminate={indeterminate}
+        disabled
+        onChange={() => {}}
+      >
+        {labelText}
+      </Checkbox>
+    </div>
+  ));
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Checkbox/Checkbox.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Checkbox/Checkbox.test.tsx
new file mode 100644
index 00000000000..0b88e0297ab
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Checkbox/Checkbox.test.tsx
@@ -0,0 +1,119 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { render, screen, userEvent, waitFor } from '@superset-ui/core/spec';
+import { Checkbox } from '.';
+import type { CheckboxProps } from './types';
+
+const mockedProps: CheckboxProps = {
+  checked: false,
+  id: 'checkbox-id',
+  onChange: jest.fn(),
+  disabled: false,
+  title: 'Checkbox title',
+  indeterminate: false,
+  children: 'Checkbox Label',
+};
+
+describe('Checkbox Component', () => {
+  const asyncRender = (props = mockedProps) =>
+    waitFor(() => render(<Checkbox {...props} />));
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('Rendering', () => {
+    it('should render correctly', async () => {
+      const { container } = await asyncRender();
+      expect(container).toBeInTheDocument();
+    });
+
+    it('should render the label', async () => {
+      await asyncRender();
+      expect(screen.getByText('Checkbox Label')).toBeInTheDocument();
+    });
+
+    it('should render the checkbox', async () => {
+      await asyncRender();
+      expect(screen.getByRole('checkbox')).toBeInTheDocument();
+    });
+  });
+
+  describe('States', () => {
+    it('should render as unchecked when checked is false', async () => {
+      await asyncRender();
+      const checkbox = screen.getByRole('checkbox');
+      expect(checkbox).not.toBeChecked();
+    });
+
+    it('should render as checked when checked is true', async () => {
+      const checkedProps = { ...mockedProps, checked: true };
+      await asyncRender(checkedProps);
+      const checkbox = screen.getByRole('checkbox');
+      expect(checkbox).toBeChecked();
+    });
+
+    it('should render as indeterminate when indeterminate is true', async () => {
+      const indeterminateProps = { ...mockedProps, indeterminate: true };
+      await asyncRender(indeterminateProps);
+      const checkbox = screen.getByRole('checkbox');
+      expect(checkbox).toBeInTheDocument();
+      expect((checkbox as HTMLInputElement).indeterminate).toBe(true);
+    });
+
+    it('should render as disabled when disabled prop is true', async () => {
+      const disabledProps = { ...mockedProps, disabled: true };
+      await asyncRender(disabledProps);
+      expect(screen.getByRole('checkbox')).toBeDisabled();
+    });
+  });
+
+  describe('Interactions', () => {
+    it('should call the onChange handler when clicked', async () => {
+      await asyncRender();
+      const checkbox = screen.getByRole('checkbox');
+      await userEvent.click(checkbox);
+      expect(mockedProps.onChange).toHaveBeenCalledTimes(1);
+    });
+
+    it('should not call the onChange handler when disabled and clicked', async () => {
+      const mockOnChange = jest.fn();
+      const disabledProps = {
+        ...mockedProps,
+        disabled: true,
+        onChange: mockOnChange,
+      };
+
+      await asyncRender(disabledProps);
+      const checkbox = screen.getByRole('checkbox');
+
+      await userEvent.click(checkbox);
+
+      expect(mockOnChange).not.toHaveBeenCalled();
+    });
+
+    it('calls onChange handler successfully', async () => {
+      const mockAction = jest.fn();
+      render(<Checkbox checked={false} onChange={mockAction} />);
+      const checkboxInput = screen.getByRole('checkbox');
+      await userEvent.click(checkboxInput);
+      expect(mockAction).toHaveBeenCalled();
+    });
+  });
+});
diff --git a/superset-frontend/src/components/Checkbox/CheckboxIcons.tsx b/superset-frontend/packages/superset-ui-core/src/components/Checkbox/CheckboxIcons.tsx
similarity index 98%
rename from superset-frontend/src/components/Checkbox/CheckboxIcons.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Checkbox/CheckboxIcons.tsx
index 2ad2d0f8d83..9eb1bc5d5ea 100644
--- a/superset-frontend/src/components/Checkbox/CheckboxIcons.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Checkbox/CheckboxIcons.tsx
@@ -30,7 +30,7 @@ export const CheckboxChecked = () => {
     >
       <path
         d="M16 0H2C0.89 0 0 0.9 0 2V16C0 17.1 0.89 18 2 18H16C17.11 18 18 17.1 18 16V2C18 0.9 17.11 0 16 0Z"
-        fill={theme.colors.primary.base}
+        fill={theme.colorPrimary}
       />
       <path
         d="M7 14L2 9L3.41 7.59L7 11.17L14.59 3.58L16 5L7 14Z"
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Checkbox/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Checkbox/index.tsx
new file mode 100644
index 00000000000..b5f9c3f6415
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Checkbox/index.tsx
@@ -0,0 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+export { Checkbox } from 'antd';
+export type { CheckboxProps, CheckboxChangeEvent } from './types';
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Checkbox/types.ts b/superset-frontend/packages/superset-ui-core/src/components/Checkbox/types.ts
new file mode 100644
index 00000000000..a5f496fb98d
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Checkbox/types.ts
@@ -0,0 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+export type { CheckboxProps, CheckboxChangeEvent } from 'antd/es/checkbox';
diff --git a/superset-frontend/packages/superset-ui-core/src/components/CodeSyntaxHighlighter/CodeSyntaxHighlighter.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/CodeSyntaxHighlighter/CodeSyntaxHighlighter.stories.tsx
new file mode 100644
index 00000000000..e3308e0c485
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/CodeSyntaxHighlighter/CodeSyntaxHighlighter.stories.tsx
@@ -0,0 +1,320 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { Typography, Flex, Space } from '@superset-ui/core/components';
+import CodeSyntaxHighlighter from '.';
+import type { CodeSyntaxHighlighterProps, SupportedLanguage } from '.';
+
+const { Title, Text, Paragraph } = Typography;
+
+const languages: SupportedLanguage[] = ['sql', 'json', 'htmlbars', 'markdown'];
+
+// Sample code for each language
+const sampleCode = {
+  sql: `-- Complex SQL Query Example
+SELECT
+  u.id,
+  u.username,
+  u.email,
+  COUNT(o.id) as total_orders,
+  SUM(o.amount) as total_spent,
+  AVG(o.amount) as avg_order_value
+FROM users u
+LEFT JOIN orders o ON u.id = o.user_id
+WHERE u.created_at >= '2023-01-01'
+  AND u.status = 'active'
+GROUP BY u.id, u.username, u.email
+HAVING COUNT(o.id) > 0
+ORDER BY total_spent DESC, total_orders DESC
+LIMIT 50;`,
+
+  json: `{
+  "user": {
+    "id": 12345,
+    "username": "john_doe",
+    "email": "john@example.com",
+    "profile": {
+      "firstName": "John",
+      "lastName": "Doe",
+      "age": 30,
+      "preferences": {
+        "theme": "dark",
+        "language": "en",
+        "notifications": true
+      }
+    },
+    "orders": [
+      {
+        "id": "order_001",
+        "amount": 99.99,
+        "status": "completed",
+        "items": ["laptop", "mouse"]
+      },
+      {
+        "id": "order_002",
+        "amount": 49.99,
+        "status": "pending",
+        "items": ["keyboard"]
+      }
+    ]
+  }
+}`,
+
+  htmlbars: `{{!-- Handlebars Template Example --}}
+<div class="user-profile">
+  <h1>Welcome, {{user.firstName}} {{user.lastName}}!</h1>
+
+  {{#if user.orders}}
+    <div class="orders-section">
+      <h2>Your Orders ({{user.orders.length}})</h2>
+
+      {{#each user.orders}}
+        <div class="order-card {{status}}">
+          <h3>Order #{{id}}</h3>
+          <p class="amount">\${{amount}}</p>
+          <p class="status">Status: {{capitalize status}}</p>
+
+          {{#if items}}
+            <ul class="items">
+              {{#each items}}
+                <li>{{this}}</li>
+              {{/each}}
+            </ul>
+          {{/if}}
+        </div>
+      {{/each}}
+    </div>
+  {{else}}
+    <p class="no-orders">No orders found.</p>
+  {{/if}}
+</div>`,
+
+  markdown: `# CodeSyntaxHighlighter Component
+
+A **themed syntax highlighter** for Superset that supports multiple languages and automatic theme switching.
+
+## Features
+
+- 🎨 **Automatic theming** - Adapts to light/dark modes
+- ⚡ **Lazy loading** - Languages load on-demand for better performance
+- 🔧 **TypeScript support** - Full type safety
+- 📱 **Responsive** - Works on all screen sizes
+
+## Supported Languages
+
+| Language | Extension | Use Case |
+|----------|-----------|----------|
+| SQL | \`.sql\` | Database queries |
+| JSON | \`.json\` | Data interchange |
+| HTML/Handlebars | \`.hbs\` | Templates |
+| Markdown | \`.md\` | Documentation |
+
+## Usage
+
+\`\`\`typescript
+import CodeSyntaxHighlighter from '@superset-ui/core/components/CodeSyntaxHighlighter';
+
+<CodeSyntaxHighlighter language="sql">
+  SELECT * FROM users WHERE active = true;
+</CodeSyntaxHighlighter>
+\`\`\`
+
+> **Note**: Languages are loaded lazily for optimal performance!`,
+};
+
+export default {
+  title: 'Components/CodeSyntaxHighlighter',
+  component: CodeSyntaxHighlighter,
+  parameters: {
+    docs: {
+      description: {
+        component:
+          "A themed syntax highlighter component that automatically adapts to Superset's light/dark themes and supports lazy loading of languages.",
+      },
+    },
+  },
+};
+
+// Gallery showing all supported languages
+export const LanguageGallery = () => (
+  <Space direction="vertical" size="large" style={{ width: '100%' }}>
+    {languages.map(language => (
+      <div key={language}>
+        <Title
+          level={3}
+          style={{ textTransform: 'capitalize', marginBottom: 16 }}
+        >
+          {language.toUpperCase()} Example
+        </Title>
+        <CodeSyntaxHighlighter language={language}>
+          {sampleCode[language]}
+        </CodeSyntaxHighlighter>
+      </div>
+    ))}
+  </Space>
+);
+
+// Interactive playground
+export const InteractivePlayground = (args: CodeSyntaxHighlighterProps) => (
+  <CodeSyntaxHighlighter {...args}>
+    {args.children || sampleCode[args.language || 'sql']}
+  </CodeSyntaxHighlighter>
+);
+
+InteractivePlayground.args = {
+  language: 'sql',
+  showLineNumbers: false,
+  wrapLines: true,
+  children: sampleCode.sql,
+};
+
+InteractivePlayground.argTypes = {
+  language: {
+    control: { type: 'select' },
+    options: languages,
+    description: 'Programming language for syntax highlighting',
+  },
+  showLineNumbers: {
+    control: { type: 'boolean' },
+    description: 'Display line numbers alongside the code',
+  },
+  wrapLines: {
+    control: { type: 'boolean' },
+    description: 'Wrap long lines instead of showing horizontal scroll',
+  },
+  children: {
+    control: { type: 'text' },
+    description: 'Code content to highlight',
+  },
+  customStyle: {
+    control: { type: 'object' },
+    description: 'Custom CSS styles to apply to the syntax highlighter',
+  },
+};
+
+// Showcase different styling options
+export const StylingExamples = () => (
+  <Space direction="vertical" size="large" style={{ width: '100%' }}>
+    {/* Default styling */}
+    <div>
+      <Title level={3}>Default Styling</Title>
+      <CodeSyntaxHighlighter language="sql">
+        SELECT id, name FROM users WHERE active = true;
+      </CodeSyntaxHighlighter>
+    </div>
+
+    {/* With line numbers */}
+    <div>
+      <Title level={3}>With Line Numbers</Title>
+      <CodeSyntaxHighlighter language="sql" showLineNumbers>
+        {sampleCode.sql}
+      </CodeSyntaxHighlighter>
+    </div>
+
+    {/* Custom styling */}
+    <div>
+      <Title level={3}>Custom Styling (Compact)</Title>
+      <CodeSyntaxHighlighter
+        language="json"
+        customStyle={{
+          fontSize: '12px',
+          padding: '12px',
+          maxHeight: '200px',
+          overflow: 'auto',
+        }}
+      >
+        {sampleCode.json}
+      </CodeSyntaxHighlighter>
+    </div>
+
+    {/* No line wrapping */}
+    <div>
+      <Title level={3}>No Line Wrapping</Title>
+      <CodeSyntaxHighlighter
+        language="sql"
+        wrapLines={false}
+        customStyle={{ maxWidth: '400px' }}
+      >
+        {`SELECT very_long_column_name, another_very_long_column_name, yet_another_extremely_long_column_name FROM very_long_table_name WHERE condition = 'this is a very long condition';`}
+      </CodeSyntaxHighlighter>
+    </div>
+  </Space>
+);
+
+// Performance and edge cases
+export const EdgeCases = () => (
+  <Space direction="vertical" size="large" style={{ width: '100%' }}>
+    {/* Very long single line */}
+    <div>
+      <Title level={3}>Very Long Single Line</Title>
+      <CodeSyntaxHighlighter language="sql">
+        {`SELECT ${'very_long_column_name, '.repeat(20)}id FROM users;`}
+      </CodeSyntaxHighlighter>
+    </div>
+
+    {/* Special characters */}
+    <div>
+      <Title level={3}>Special Characters & Escaping</Title>
+      <CodeSyntaxHighlighter language="sql">
+        {`SELECT * FROM "table-name" WHERE field = 'O\\'Brien' AND data = '{"key": "value"}';`}
+      </CodeSyntaxHighlighter>
+    </div>
+
+    {/* Multiple languages showcase */}
+    <div>
+      <Title level={3}>Quick Language Comparison</Title>
+      <Flex gap="middle">
+        <div style={{ flex: 1 }}>
+          <Title level={4}>SQL</Title>
+          <CodeSyntaxHighlighter language="sql">
+            SELECT id, name FROM users;
+          </CodeSyntaxHighlighter>
+        </div>
+        <div style={{ flex: 1 }}>
+          <Title level={4}>JSON</Title>
+          <CodeSyntaxHighlighter language="json">
+            {`{"users": [{"id": 1, "name": "John"}]}`}
+          </CodeSyntaxHighlighter>
+        </div>
+      </Flex>
+    </div>
+  </Space>
+);
+
+// Theme testing helper
+export const ThemeShowcase = () => (
+  <Space direction="vertical" size="middle" style={{ width: '100%' }}>
+    <Paragraph>
+      <Text strong>Theme Testing:</Text> Switch between light and dark themes in
+      Storybook to see automatic adaptation.
+    </Paragraph>
+
+    <Space direction="vertical" size="large" style={{ width: '100%' }}>
+      {languages.map(language => (
+        <div key={language}>
+          <Title level={4} style={{ textTransform: 'uppercase' }}>
+            {language}
+          </Title>
+          <CodeSyntaxHighlighter language={language}>
+            {sampleCode[language].split('\n').slice(0, 5).join('\n')}
+          </CodeSyntaxHighlighter>
+        </div>
+      ))}
+    </Space>
+  </Space>
+);
diff --git a/superset-frontend/packages/superset-ui-core/src/components/CodeSyntaxHighlighter/index.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/CodeSyntaxHighlighter/index.test.tsx
new file mode 100644
index 00000000000..f4c04a90069
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/CodeSyntaxHighlighter/index.test.tsx
@@ -0,0 +1,156 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { render, screen } from '../../spec';
+import CodeSyntaxHighlighter from './index';
+
+// Simple mock that just returns the content
+jest.mock(
+  'react-syntax-highlighter/dist/cjs/light',
+  () =>
+    function MockSyntaxHighlighter({ children, ...props }: any) {
+      return (
+        <pre data-testid="syntax-highlighter" data-language={props.language}>
+          {children}
+        </pre>
+      );
+    },
+);
+
+// Mock the language modules
+jest.mock(
+  'react-syntax-highlighter/dist/cjs/languages/hljs/sql',
+  () => 'sql-mock',
+);
+jest.mock(
+  'react-syntax-highlighter/dist/cjs/languages/hljs/json',
+  () => 'json-mock',
+);
+jest.mock(
+  'react-syntax-highlighter/dist/cjs/languages/hljs/htmlbars',
+  () => 'html-mock',
+);
+jest.mock(
+  'react-syntax-highlighter/dist/cjs/languages/hljs/markdown',
+  () => 'md-mock',
+);
+
+// Mock the styles
+jest.mock('react-syntax-highlighter/dist/cjs/styles/hljs/github', () => ({}));
+jest.mock(
+  'react-syntax-highlighter/dist/cjs/styles/hljs/atom-one-dark',
+  () => ({}),
+);
+
+describe('CodeSyntaxHighlighter', () => {
+  it('renders code content', () => {
+    render(<CodeSyntaxHighlighter>SELECT * FROM users;</CodeSyntaxHighlighter>);
+
+    expect(screen.getByText('SELECT * FROM users;')).toBeInTheDocument();
+  });
+
+  it('renders with default SQL language', () => {
+    render(<CodeSyntaxHighlighter>SELECT * FROM users;</CodeSyntaxHighlighter>);
+
+    // Should show content (the important thing is content is visible)
+    expect(screen.getByText('SELECT * FROM users;')).toBeInTheDocument();
+  });
+
+  it('renders with specified language', () => {
+    render(
+      <CodeSyntaxHighlighter language="json">
+        {`{ "key": "value" }`}
+      </CodeSyntaxHighlighter>,
+    );
+
+    // Should show content regardless of which element renders it
+    expect(screen.getByText('{ "key": "value" }')).toBeInTheDocument();
+  });
+
+  it('supports all expected languages', () => {
+    const languages = ['sql', 'json', 'htmlbars', 'markdown'] as const;
+
+    languages.forEach(language => {
+      const { unmount } = render(
+        <CodeSyntaxHighlighter language={language}>
+          {`Test content for ${language}`}
+        </CodeSyntaxHighlighter>,
+      );
+
+      // Should render the content (either in fallback or syntax highlighter)
+      expect(
+        screen.getByText(`Test content for ${language}`),
+      ).toBeInTheDocument();
+
+      unmount();
+    });
+  });
+
+  it('renders fallback pre element initially', () => {
+    render(
+      <CodeSyntaxHighlighter language="sql">
+        SELECT COUNT(*) FROM table;
+      </CodeSyntaxHighlighter>,
+    );
+
+    // Should render the content in some form
+    expect(screen.getByText('SELECT COUNT(*) FROM table;')).toBeInTheDocument();
+  });
+
+  it('handles special characters', () => {
+    const specialContent = "SELECT * FROM `users` WHERE name = 'O\\'Brien';";
+
+    render(
+      <CodeSyntaxHighlighter language="sql">
+        {specialContent}
+      </CodeSyntaxHighlighter>,
+    );
+
+    expect(screen.getByText(specialContent)).toBeInTheDocument();
+  });
+
+  it('accepts custom styles', () => {
+    render(
+      <CodeSyntaxHighlighter language="sql" customStyle={{ fontSize: '16px' }}>
+        SELECT * FROM users;
+      </CodeSyntaxHighlighter>,
+    );
+
+    expect(screen.getByText('SELECT * FROM users;')).toBeInTheDocument();
+  });
+
+  it('accepts showLineNumbers prop', () => {
+    render(
+      <CodeSyntaxHighlighter language="sql" showLineNumbers>
+        SELECT * FROM users;
+      </CodeSyntaxHighlighter>,
+    );
+
+    expect(screen.getByText('SELECT * FROM users;')).toBeInTheDocument();
+  });
+
+  it('accepts wrapLines prop', () => {
+    render(
+      <CodeSyntaxHighlighter language="sql" wrapLines={false}>
+        SELECT * FROM users;
+      </CodeSyntaxHighlighter>,
+    );
+
+    expect(screen.getByText('SELECT * FROM users;')).toBeInTheDocument();
+  });
+});
diff --git a/superset-frontend/packages/superset-ui-core/src/components/CodeSyntaxHighlighter/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/CodeSyntaxHighlighter/index.tsx
new file mode 100644
index 00000000000..b52ba362543
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/CodeSyntaxHighlighter/index.tsx
@@ -0,0 +1,149 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { useEffect, useState } from 'react';
+import SyntaxHighlighterBase from 'react-syntax-highlighter/dist/cjs/light';
+import github from 'react-syntax-highlighter/dist/cjs/styles/hljs/github';
+import tomorrow from 'react-syntax-highlighter/dist/cjs/styles/hljs/tomorrow-night';
+import { themeObject } from '@superset-ui/core';
+
+export type SupportedLanguage = 'sql' | 'htmlbars' | 'markdown' | 'json';
+
+export interface CodeSyntaxHighlighterProps {
+  children: string;
+  language?: SupportedLanguage;
+  customStyle?: React.CSSProperties;
+  showLineNumbers?: boolean;
+  wrapLines?: boolean;
+  style?: any; // Override theme style if needed
+}
+
+// Track which languages have been registered to avoid duplicate registrations
+const registeredLanguages = new Set<SupportedLanguage>();
+
+// Language import functions - these will be called lazily
+const languageImporters = {
+  sql: () => import('react-syntax-highlighter/dist/cjs/languages/hljs/sql'),
+  htmlbars: () =>
+    import('react-syntax-highlighter/dist/cjs/languages/hljs/htmlbars'),
+  markdown: () =>
+    import('react-syntax-highlighter/dist/cjs/languages/hljs/markdown'),
+  json: () => import('react-syntax-highlighter/dist/cjs/languages/hljs/json'),
+};
+
+/**
+ * Lazily register a language for syntax highlighting
+ */
+const registerLanguage = async (language: SupportedLanguage): Promise<void> => {
+  if (registeredLanguages.has(language)) {
+    return; // Already registered
+  }
+
+  try {
+    const languageModule = await languageImporters[language]();
+    SyntaxHighlighterBase.registerLanguage(language, languageModule.default);
+    registeredLanguages.add(language);
+  } catch (error) {
+    console.warn(`Failed to load language ${language}:`, error);
+  }
+};
+
+/**
+ * A themed syntax highlighter component that automatically adapts to Superset's current theme.
+ * Supports light/dark mode switching and provides consistent styling across the application.
+ * Languages are loaded lazily to improve initial page load performance.
+ * Uses ultra-neutral themes for professional, consistent appearance.
+ */
+export const CodeSyntaxHighlighter: React.FC<CodeSyntaxHighlighterProps> = ({
+  children,
+  language = 'sql',
+  customStyle = {},
+  showLineNumbers = false,
+  wrapLines = true,
+  style: overrideStyle,
+}) => {
+  const [isLanguageReady, setIsLanguageReady] = useState(
+    registeredLanguages.has(language),
+  );
+
+  useEffect(() => {
+    const loadLanguage = async () => {
+      if (!registeredLanguages.has(language)) {
+        await registerLanguage(language);
+        setIsLanguageReady(true);
+      }
+    };
+
+    loadLanguage();
+  }, [language]);
+
+  const isDark = themeObject.isThemeDark();
+  const themeStyle = overrideStyle || (isDark ? tomorrow : github);
+
+  const defaultCustomStyle: React.CSSProperties = {
+    background: themeObject.theme.colorBgElevated,
+    padding: themeObject.theme.sizeUnit * 4,
+    border: 0,
+    borderRadius: themeObject.theme.borderRadius,
+    ...customStyle,
+  };
+
+  // Show a simple pre-formatted text while language is loading
+  if (!isLanguageReady) {
+    return (
+      <pre
+        style={{
+          ...defaultCustomStyle,
+          fontFamily: 'monospace',
+          whiteSpace: 'pre-wrap',
+          margin: 0,
+        }}
+      >
+        {children}
+      </pre>
+    );
+  }
+
+  return (
+    <SyntaxHighlighterBase
+      language={language}
+      style={themeStyle}
+      customStyle={defaultCustomStyle}
+      showLineNumbers={showLineNumbers}
+      wrapLines={wrapLines}
+    >
+      {children}
+    </SyntaxHighlighterBase>
+  );
+};
+
+/**
+ * Utility function to preload specific languages if needed
+ * This can be called strategically in components that know they'll need certain languages
+ */
+export const preloadLanguages = async (
+  languages: SupportedLanguage[],
+): Promise<void> => {
+  const promises = languages
+    .filter(lang => !registeredLanguages.has(lang))
+    .map(registerLanguage);
+
+  await Promise.all(promises);
+};
+
+export default CodeSyntaxHighlighter;
diff --git a/superset-frontend/src/components/Collapse/Collapse.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/Collapse/Collapse.stories.tsx
similarity index 65%
rename from superset-frontend/src/components/Collapse/Collapse.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Collapse/Collapse.stories.tsx
index f20c0349dc7..a75646ad6b9 100644
--- a/superset-frontend/src/components/Collapse/Collapse.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Collapse/Collapse.stories.tsx
@@ -16,38 +16,39 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { useTheme } from '@superset-ui/core';
-import Collapse, { CollapseProps } from '.';
+import { Collapse } from '.';
+import type { CollapseProps } from './types';
 
 export default {
-  title: 'Collapse',
+  title: 'Components/Collapse',
   component: Collapse,
 };
 
-export const InteractiveCollapse = (args: CollapseProps) => {
-  const theme = useTheme();
-  return (
-    <Collapse
-      defaultActiveKey={['1']}
-      style={
-        args.light ? { background: theme.colors.grayscale.light2 } : undefined
-      }
-      {...args}
-    >
-      <Collapse.Panel header="Header 1" key="1">
-        Content 1
-      </Collapse.Panel>
-      <Collapse.Panel header="Header 2" key="2">
-        Content 2
-      </Collapse.Panel>
-    </Collapse>
-  );
-};
+export const InteractiveCollapse = (args: CollapseProps) => (
+  <Collapse
+    defaultActiveKey={['1']}
+    {...args}
+    items={[
+      {
+        key: '1',
+        label: 'Header 1',
+        children: 'Content 1',
+      },
+      {
+        key: '2',
+        label: 'Header 2',
+        children: 'Content 2',
+      },
+    ]}
+  />
+);
 
 InteractiveCollapse.args = {
   ghost: false,
   bordered: true,
   accordion: false,
+  animateArrows: false,
+  modalMode: false,
 };
 
 InteractiveCollapse.argTypes = {
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Collapse/Collapse.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Collapse/Collapse.test.tsx
new file mode 100644
index 00000000000..664215d88ad
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Collapse/Collapse.test.tsx
@@ -0,0 +1,89 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { render, screen, userEvent } from '@superset-ui/core/spec';
+import { Collapse } from '.';
+import type { CollapseProps } from './types';
+
+function renderCollapse(props?: CollapseProps) {
+  return render(
+    <Collapse
+      {...props}
+      items={[
+        {
+          key: '1',
+          label: 'Header 1',
+          children: 'Content 1',
+        },
+        {
+          key: '2',
+          label: 'Header 2',
+          children: 'Content 2',
+        },
+      ]}
+    />,
+  );
+}
+
+test('renders collapsed with default props', () => {
+  renderCollapse();
+
+  const headers = screen.getAllByRole('button');
+
+  expect(headers[0]).toHaveTextContent('Header 1');
+  expect(headers[1]).toHaveTextContent('Header 2');
+  expect(screen.queryByText('Content 1')).not.toBeInTheDocument();
+  expect(screen.queryByText('Content 2')).not.toBeInTheDocument();
+});
+
+test('renders with one item expanded by default', () => {
+  renderCollapse({ defaultActiveKey: ['1'] });
+
+  const headers = screen.getAllByRole('button');
+
+  expect(headers[0]).toHaveTextContent('Header 1');
+  expect(headers[1]).toHaveTextContent('Header 2');
+  expect(screen.getByText('Content 1')).toBeInTheDocument();
+  expect(screen.queryByText('Content 2')).not.toBeInTheDocument();
+});
+
+test('expands on click', async () => {
+  renderCollapse();
+
+  expect(screen.queryByText('Content 1')).not.toBeInTheDocument();
+  expect(screen.queryByText('Content 2')).not.toBeInTheDocument();
+
+  await userEvent.click(screen.getAllByRole('button')[0]);
+
+  expect(screen.getByText('Content 1')).toBeInTheDocument();
+  expect(screen.queryByText('Content 2')).not.toBeInTheDocument();
+});
+
+test('collapses on click', async () => {
+  renderCollapse({ defaultActiveKey: ['1'] });
+
+  expect(screen.getByText('Content 1')).toBeInTheDocument();
+  expect(screen.queryByText('Content 2')).not.toBeInTheDocument();
+
+  await userEvent.click(screen.getAllByRole('button')[0]);
+
+  expect(screen.getByText('Content 1').parentNode).toHaveClass(
+    'ant-collapse-content-hidden',
+  );
+  expect(screen.queryByText('Content 2')).not.toBeInTheDocument();
+});
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Collapse/Collapse.tsx b/superset-frontend/packages/superset-ui-core/src/components/Collapse/Collapse.tsx
new file mode 100644
index 00000000000..9d823707880
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Collapse/Collapse.tsx
@@ -0,0 +1,93 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file * to you 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 { styled } from '@superset-ui/core';
+import { Collapse as AntdCollapse } from 'antd';
+import type { CollapseProps } from './types';
+
+const StyledCollapse = styled((props: CollapseProps) => (
+  <AntdCollapse {...props} />
+))`
+  ${({ modalMode }) =>
+    modalMode &&
+    `
+      border-radius: 0;
+      border-left: 0;
+      border-right: 0;
+    `}
+  .ant-collapse-item {
+    .ant-collapse-header {
+      .ant-collapse-arrow svg {
+        transition: ${({ animateArrows }) =>
+          animateArrows ? 'transform 0.24s' : 'none'};
+      }
+
+      ${({ expandIconPosition }) =>
+        expandIconPosition &&
+        expandIconPosition === 'end' &&
+        `
+            .anticon.anticon-right.ant-collapse-arrow > svg {
+              transform: rotate(90deg) !important;
+            }
+          `}
+    }
+
+    ${({ ghost, bordered, theme }) =>
+      ghost &&
+      bordered &&
+      `
+        border-bottom: 1px solid ${theme.colorBorderSecondary};
+      `}
+    .ant-collapse-content {
+      color: ${({ theme }) => theme.colorText};
+
+      .ant-collapse-content-box {
+        .loading.inline {
+          margin: ${({ theme }) => theme.sizeUnit * 12}px auto;
+          display: block;
+        }
+      }
+    }
+  }
+
+  .hidden-collapse-header .ant-collapse-header {
+    display: none;
+  }
+
+  .ant-collapse-item-active {
+    .ant-collapse-header {
+      ${({ expandIconPosition }) =>
+        expandIconPosition &&
+        expandIconPosition === 'end' &&
+        `
+            .anticon.anticon-right.ant-collapse-arrow > svg {
+              transform: rotate(-90deg) !important;
+            }
+          `}
+    }
+  }
+`;
+
+// Type-safe extension to preserve Collapse.Panel
+type CollapseWithPanel = typeof StyledCollapse & {
+  Panel: typeof AntdCollapse.Panel;
+};
+
+export const Collapse = StyledCollapse as CollapseWithPanel;
+Collapse.Panel = AntdCollapse.Panel;
+
+export type { CollapseProps };
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Collapse/CollapseLabelInModal.tsx b/superset-frontend/packages/superset-ui-core/src/components/Collapse/CollapseLabelInModal.tsx
new file mode 100644
index 00000000000..611ad304623
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Collapse/CollapseLabelInModal.tsx
@@ -0,0 +1,77 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file * to you 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 { useTheme } from '@superset-ui/core';
+import { Typography } from '@superset-ui/core/components/Typography';
+import { Icons } from '@superset-ui/core/components';
+
+interface CollapseLabelInModalProps {
+  title: React.ReactNode;
+  subtitle: React.ReactNode;
+  validateCheckStatus?: boolean;
+  testId?: string;
+}
+
+export const CollapseLabelInModal: React.FC<CollapseLabelInModalProps> = ({
+  title,
+  subtitle,
+  validateCheckStatus = false,
+  testId,
+}) => {
+  const theme = useTheme();
+
+  return (
+    <div data-test={testId}>
+      <Typography.Title
+        style={{
+          marginTop: 0,
+          marginBottom: theme.sizeUnit / 2,
+          fontSize: theme.fontSizeLG,
+        }}
+      >
+        {title}{' '}
+        {validateCheckStatus ? (
+          <Icons.CheckCircleOutlined
+            style={{ color: theme.colorSuccess }}
+            aria-label="check-circle"
+            role="img"
+          />
+        ) : (
+          <span
+            style={{
+              color: theme.colorErrorText,
+              fontSize: theme.fontSizeLG,
+            }}
+          >
+            *
+          </span>
+        )}
+      </Typography.Title>
+      <Typography.Paragraph
+        style={{
+          margin: 0,
+          fontSize: theme.fontSizeSM,
+          color: theme.colorTextDescription,
+        }}
+      >
+        {subtitle}
+      </Typography.Paragraph>
+    </div>
+  );
+};
+
+export type { CollapseLabelInModalProps };
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Collapse/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Collapse/index.tsx
new file mode 100644
index 00000000000..6bba675f2fc
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Collapse/index.tsx
@@ -0,0 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file * to you 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.
+ */
+export type { CollapseProps } from './types';
+export type { CollapseLabelInModalProps } from './CollapseLabelInModal';
+export { CollapseLabelInModal } from './CollapseLabelInModal';
+export { Collapse } from './Collapse';
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Collapse/types.ts b/superset-frontend/packages/superset-ui-core/src/components/Collapse/types.ts
new file mode 100644
index 00000000000..f9d1c1a61fd
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Collapse/types.ts
@@ -0,0 +1,24 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 type { CollapseProps as AntdCollapseProps } from 'antd';
+
+export interface CollapseProps extends AntdCollapseProps {
+  animateArrows?: boolean;
+  modalMode?: boolean;
+}
diff --git a/superset-frontend/src/components/ConfirmStatusChange/ConfirmStatusChange.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/ConfirmStatusChange/ConfirmStatusChange.stories.tsx
similarity index 86%
rename from superset-frontend/src/components/ConfirmStatusChange/ConfirmStatusChange.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/ConfirmStatusChange/ConfirmStatusChange.stories.tsx
index ff52fc068c8..e61157329dc 100644
--- a/superset-frontend/src/components/ConfirmStatusChange/ConfirmStatusChange.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/ConfirmStatusChange/ConfirmStatusChange.stories.tsx
@@ -16,11 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import Button from 'src/components/Button';
-import ConfirmStatusChange, { ConfirmStatusChangeProps, Callback } from '.';
+import { Button } from '@superset-ui/core/components';
+import { ConfirmStatusChange } from '.';
+import type { ConfirmStatusChangeProps, Callback } from './types';
 
 export default {
-  title: 'ConfirmStatusChange',
+  title: 'Components/ConfirmStatusChange',
 };
 
 export const InteractiveConfirmStatusChange = (
diff --git a/superset-frontend/src/components/ConfirmStatusChange/ConfirmStatusChange.test.jsx b/superset-frontend/packages/superset-ui-core/src/components/ConfirmStatusChange/ConfirmStatusChange.test.jsx
similarity index 91%
rename from superset-frontend/src/components/ConfirmStatusChange/ConfirmStatusChange.test.jsx
rename to superset-frontend/packages/superset-ui-core/src/components/ConfirmStatusChange/ConfirmStatusChange.test.jsx
index bb8da13af16..bd84ca1a285 100644
--- a/superset-frontend/src/components/ConfirmStatusChange/ConfirmStatusChange.test.jsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/ConfirmStatusChange/ConfirmStatusChange.test.jsx
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { fireEvent, render, waitFor } from 'spec/helpers/testing-library';
-import Button from 'src/components/Button';
-import ConfirmStatusChange from 'src/components/ConfirmStatusChange';
+import { fireEvent, render, waitFor } from '@superset-ui/core/spec';
+import { Button } from '../Button';
+import { ConfirmStatusChange } from '.';
 
 const mockedProps = {
   title: 'please confirm',
diff --git a/superset-frontend/src/components/ConfirmStatusChange/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/ConfirmStatusChange/index.tsx
similarity index 84%
rename from superset-frontend/src/components/ConfirmStatusChange/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/ConfirmStatusChange/index.tsx
index fe795065c70..ff2ba0cf63d 100644
--- a/superset-frontend/src/components/ConfirmStatusChange/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/ConfirmStatusChange/index.tsx
@@ -16,20 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { useState, ReactNode } from 'react';
+import { useState } from 'react';
 
-import DeleteModal from 'src/components/DeleteModal';
+import { DeleteModal } from '../DeleteModal';
+import type { ConfirmStatusChangeProps } from './types';
 
-export type Callback = (...args: any[]) => void;
-
-export interface ConfirmStatusChangeProps {
-  title: ReactNode;
-  description: ReactNode;
-  onConfirm: Callback;
-  children: (showConfirm: Callback) => ReactNode;
-}
-
-export default function ConfirmStatusChange({
+export function ConfirmStatusChange({
   title,
   description,
   onConfirm,
@@ -81,3 +73,5 @@ export default function ConfirmStatusChange({
     </>
   );
 }
+
+export type { ConfirmStatusChangeProps };
diff --git a/superset-frontend/packages/superset-ui-core/src/api/types/core.ts b/superset-frontend/packages/superset-ui-core/src/components/ConfirmStatusChange/types.ts
similarity index 76%
rename from superset-frontend/packages/superset-ui-core/src/api/types/core.ts
rename to superset-frontend/packages/superset-ui-core/src/components/ConfirmStatusChange/types.ts
index 9aeba85accc..cd80743220d 100644
--- a/superset-frontend/packages/superset-ui-core/src/api/types/core.ts
+++ b/superset-frontend/packages/superset-ui-core/src/components/ConfirmStatusChange/types.ts
@@ -16,16 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import type { ReactNode } from 'react';
 
-// /superset/sqllab_viz
-interface SqlLabPostRequest {
-  data: {
-    schema: string;
-    sql: string;
-    dbId: number;
-    templateParams?: string | undefined;
-    datasourceName: string;
-    metrics?: string[];
-    columns?: string[];
-  };
+export type Callback = (...args: any[]) => void;
+
+export interface ConfirmStatusChangeProps {
+  title: ReactNode;
+  description: ReactNode;
+  onConfirm: Callback;
+  children: (showConfirm: Callback) => ReactNode;
 }
diff --git a/superset-frontend/src/components/CronPicker/CronPicker.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/CronPicker/CronPicker.stories.tsx
similarity index 91%
rename from superset-frontend/src/components/CronPicker/CronPicker.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/CronPicker/CronPicker.stories.tsx
index 262246b8447..1bc2748f939 100644
--- a/superset-frontend/src/components/CronPicker/CronPicker.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/CronPicker/CronPicker.stories.tsx
@@ -17,12 +17,13 @@
  * under the License.
  */
 import { useState, useRef, useCallback } from 'react';
-import { Divider } from 'src/components/Divider';
-import { Input } from 'src/components/Input';
-import { CronPicker, CronError, CronProps } from '.';
+import { Divider } from '../Divider';
+import { Input } from '../Input';
+import { CronPicker } from '.';
+import type { CronError, CronProps } from './types';
 
 export default {
-  title: 'CronPicker',
+  title: 'Components/CronPicker',
   component: CronPicker,
 };
 
diff --git a/superset-frontend/src/components/CronPicker/CronPicker.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/CronPicker/CronPicker.test.tsx
similarity index 92%
rename from superset-frontend/src/components/CronPicker/CronPicker.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/CronPicker/CronPicker.test.tsx
index 48203a2dc88..3a95f27e556 100644
--- a/superset-frontend/src/components/CronPicker/CronPicker.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/CronPicker/CronPicker.test.tsx
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-import { render } from 'spec/helpers/testing-library';
+import { render } from '@superset-ui/core/spec';
 import * as ReactCronPicker from 'react-js-cron';
-import { CronPicker } from './CronPicker';
+import { CronPicker } from '.';
 
 const spy = jest.spyOn(ReactCronPicker, 'default');
 
diff --git a/superset-frontend/src/components/CronPicker/CronPicker.tsx b/superset-frontend/packages/superset-ui-core/src/components/CronPicker/index.tsx
similarity index 87%
rename from superset-frontend/src/components/CronPicker/CronPicker.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/CronPicker/index.tsx
index 3e0e93d65da..71f4545eba8 100644
--- a/superset-frontend/src/components/CronPicker/CronPicker.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/CronPicker/index.tsx
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-// eslint-disable-next-line no-restricted-imports
-import { ConfigProvider } from 'antd'; // TODO: Remove antd
 import { styled, t } from '@superset-ui/core';
-import ReactCronPicker, { Locale, CronProps } from 'react-js-cron';
+import ReactCronPicker from 'react-js-cron';
+import type { Locale, CronProps } from './types';
 
-export * from 'react-js-cron';
+// Styles for the crontab-related lib
+import 'react-js-cron/dist/styles.css';
 
 export const LOCALE: Locale = {
   everyText: t('every'),
@@ -104,11 +104,7 @@ export const LOCALE: Locale = {
 };
 
 export const CronPicker = styled((props: CronProps) => (
-  <ConfigProvider
-    getPopupContainer={trigger => trigger.parentElement as HTMLElement}
-  >
-    <ReactCronPicker locale={LOCALE} {...props} />
-  </ConfigProvider>
+  <ReactCronPicker locale={LOCALE} {...props} />
 ))`
   ${({ theme }) => `
 
@@ -119,8 +115,8 @@ export const CronPicker = styled((props: CronProps) => (
     :has(.react-js-cron-months) {
       display: grid !important;
       grid-template-columns: repeat(2, 50%);
-      column-gap: ${theme.gridUnit}px;
-      row-gap: ${theme.gridUnit * 2}px;
+      column-gap: ${theme.sizeUnit}px;
+      row-gap: ${theme.sizeUnit * 2}px;
       div:has(.react-js-cron-hours) {
         grid-column: span 2;
         display: flex;
@@ -136,8 +132,8 @@ export const CronPicker = styled((props: CronProps) => (
     :not(:has(.react-js-cron-months)) {
       display: grid;
       grid-template-columns: repeat(2, 50%);
-      column-gap: ${theme.gridUnit}px;
-      row-gap: ${theme.gridUnit * 2}px;
+      column-gap: ${theme.sizeUnit}px;
+      row-gap: ${theme.sizeUnit * 2}px;
       .react-js-cron-period {
         grid-column: span 2;
       }
@@ -171,7 +167,7 @@ export const CronPicker = styled((props: CronProps) => (
     }
 
     .react-js-cron-minutes > span {
-      padding-left: ${theme.gridUnit}px;
+      padding-left: ${theme.sizeUnit}px;
     }
 
     /* Sizing of select container */
@@ -193,7 +189,7 @@ export const CronPicker = styled((props: CronProps) => (
 
     .react-js-cron-custom-select .ant-select-selection-placeholder {
       flex: auto;
-      border-radius: ${theme.gridUnit}px;
+      border-radius: ${theme.borderRadius}px;
     }
 
     .react-js-cron-custom-select .ant-select-selection-overflow-item {
@@ -202,7 +198,9 @@ export const CronPicker = styled((props: CronProps) => (
 
     .react-js-cron-select > div:first-of-type,
     .react-js-cron-custom-select {
-      border-radius: ${theme.gridUnit}px;
+      border-radius: ${theme.borderRadius}px;
     }
   `}
 `;
+
+export type { CronError } from './types';
diff --git a/superset-frontend/packages/superset-ui-core/src/components/CronPicker/types.ts b/superset-frontend/packages/superset-ui-core/src/components/CronPicker/types.ts
new file mode 100644
index 00000000000..ca2dba02624
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/CronPicker/types.ts
@@ -0,0 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+
+export type { Locale, CronError, CronProps } from 'react-js-cron';
diff --git a/superset-frontend/src/components/DatePicker/DatePicker.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/DatePicker/DatePicker.stories.tsx
similarity index 90%
rename from superset-frontend/src/components/DatePicker/DatePicker.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/DatePicker/DatePicker.stories.tsx
index aff0eed4606..6043effffb5 100644
--- a/superset-frontend/src/components/DatePicker/DatePicker.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/DatePicker/DatePicker.stories.tsx
@@ -16,12 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { DatePickerProps } from 'antd-v5';
-import { RangePickerProps } from 'antd-v5/es/date-picker';
+import type { DatePickerProps, RangePickerProps } from './types';
 import { DatePicker, RangePicker } from '.';
 
 export default {
-  title: 'DatePicker',
+  title: 'Components/DatePicker',
   component: DatePicker,
 };
 
@@ -87,9 +86,11 @@ InteractiveDatePicker.args = {
 
 InteractiveDatePicker.argTypes = interactiveTypes;
 
-export const InteractiveRangePicker: any = (args: RangePickerProps) => (
-  <RangePicker {...args} />
-);
+export const InteractiveRangePicker = (
+  args: Omit<RangePickerProps, 'picker'> & {
+    picker?: 'date';
+  },
+) => <RangePicker {...args} />;
 
 InteractiveRangePicker.args = {
   ...commonArgs,
diff --git a/superset-frontend/src/components/DatePicker/DatePicker.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/DatePicker/DatePicker.test.tsx
similarity index 95%
rename from superset-frontend/src/components/DatePicker/DatePicker.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/DatePicker/DatePicker.test.tsx
index 463c3ace578..eac06ac80cf 100644
--- a/superset-frontend/src/components/DatePicker/DatePicker.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/DatePicker/DatePicker.test.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { render } from 'spec/helpers/testing-library';
+import { render } from '@superset-ui/core/spec';
 import { DatePicker, RangePicker } from '.';
 
 test('should render date picker', () => {
diff --git a/superset-frontend/src/components/DatePicker/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/DatePicker/index.tsx
similarity index 87%
rename from superset-frontend/src/components/DatePicker/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/DatePicker/index.tsx
index a9b1f465f43..efcdad155c1 100644
--- a/superset-frontend/src/components/DatePicker/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/DatePicker/index.tsx
@@ -16,8 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { DatePicker as AntdDatePicker, DatePickerProps } from 'antd-v5';
+import { DatePicker as AntdDatePicker } from 'antd';
 import { css } from '@superset-ui/core';
+import type { DatePickerProps, RangePickerProps } from './types';
 
 export const DatePicker = (props: DatePickerProps) => (
   <AntdDatePicker
@@ -32,3 +33,5 @@ export const DatePicker = (props: DatePickerProps) => (
 // eslint-disable-next-line prefer-destructuring
 export const RangePicker: typeof AntdDatePicker.RangePicker =
   AntdDatePicker.RangePicker;
+
+export type { DatePickerProps, RangePickerProps };
diff --git a/superset-frontend/packages/superset-ui-core/src/components/DatePicker/types.ts b/superset-frontend/packages/superset-ui-core/src/components/DatePicker/types.ts
new file mode 100644
index 00000000000..289f98eb690
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/DatePicker/types.ts
@@ -0,0 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+export type { RangePickerProps } from 'antd/es/date-picker';
+export type { DatePickerProps } from 'antd';
diff --git a/superset-frontend/src/components/DeleteModal/DeleteModal.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/DeleteModal/DeleteModal.test.tsx
similarity index 74%
rename from superset-frontend/src/components/DeleteModal/DeleteModal.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/DeleteModal/DeleteModal.test.tsx
index 86e9ff21e8a..be2868afe99 100644
--- a/superset-frontend/src/components/DeleteModal/DeleteModal.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/DeleteModal/DeleteModal.test.tsx
@@ -16,8 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { render, screen, userEvent } from 'spec/helpers/testing-library';
-import DeleteModal from '.';
+import { render, screen, userEvent, waitFor } from '@superset-ui/core/spec';
+import { DeleteModal } from '.';
 
 test('Must display title and content', () => {
   const props = {
@@ -29,12 +29,26 @@ test('Must display title and content', () => {
   };
   render(<DeleteModal {...props} />);
   expect(screen.getByTestId('test-title')).toBeInTheDocument();
-  expect(screen.getByTestId('test-title')).toBeInTheDocument();
-  expect(screen.getByTestId('test-description')).toBeInTheDocument();
   expect(screen.getByTestId('test-description')).toBeInTheDocument();
 });
 
-test('Calling "onHide"', () => {
+test('Input should autofocus when modal opens', async () => {
+  const props = {
+    title: <div data-test="test-title">Title</div>,
+    description: <div data-test="test-description">Description</div>,
+    onConfirm: jest.fn(),
+    onHide: jest.fn(),
+    open: true,
+  };
+  render(<DeleteModal {...props} />);
+  const input = screen.getByTestId('delete-modal-input');
+  // waitFor because focus may happen after render due to useEffect
+  await waitFor(() => {
+    expect(input).toHaveFocus();
+  });
+});
+
+test('Calling "onHide"', async () => {
   const props = {
     title: <div data-test="test-title">Title</div>,
     description: <div data-test="test-description">Description</div>,
@@ -48,12 +62,12 @@ test('Calling "onHide"', () => {
   expect(props.onConfirm).toHaveBeenCalledTimes(0);
 
   // type "del" in the input
-  userEvent.type(screen.getByTestId('delete-modal-input'), 'del');
+  await userEvent.type(screen.getByTestId('delete-modal-input'), 'del');
   expect(screen.getByTestId('delete-modal-input')).toHaveValue('del');
 
   // close the modal
   expect(screen.getByText('×')).toBeInTheDocument();
-  userEvent.click(screen.getByText('×'));
+  await userEvent.click(screen.getByText('×'));
   expect(props.onHide).toHaveBeenCalledTimes(1);
   expect(props.onConfirm).toHaveBeenCalledTimes(0);
 
@@ -61,7 +75,7 @@ test('Calling "onHide"', () => {
   expect(screen.getByTestId('delete-modal-input')).toHaveValue('');
 });
 
-test('Calling "onConfirm" only after typing "delete" in the input', () => {
+test('Calling "onConfirm" only after typing "delete" in the input', async () => {
   const props = {
     title: <div data-test="test-title">Title</div>,
     description: <div data-test="test-description">Description</div>,
@@ -76,12 +90,12 @@ test('Calling "onConfirm" only after typing "delete" in the input', () => {
   expect(props.onConfirm).toHaveBeenCalledTimes(0);
 
   // do not execute "onConfirm" if you have not typed "delete"
-  userEvent.click(screen.getByText('Delete'));
+  await userEvent.click(screen.getByText('Delete'));
   expect(props.onConfirm).toHaveBeenCalledTimes(0);
 
   // execute "onConfirm" if you have typed "delete"
-  userEvent.type(screen.getByTestId('delete-modal-input'), 'delete');
-  userEvent.click(screen.getByText('Delete'));
+  await userEvent.type(screen.getByTestId('delete-modal-input'), 'delete');
+  await userEvent.click(screen.getByText('Delete'));
   expect(props.onConfirm).toHaveBeenCalledTimes(1);
 
   // confirm input has been cleared
diff --git a/superset-frontend/src/components/DeleteModal/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/DeleteModal/index.tsx
similarity index 82%
rename from superset-frontend/src/components/DeleteModal/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/DeleteModal/index.tsx
index 11991854deb..66ff8289a3d 100644
--- a/superset-frontend/src/components/DeleteModal/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/DeleteModal/index.tsx
@@ -17,10 +17,11 @@
  * under the License.
  */
 import { t, styled } from '@superset-ui/core';
-import { useState, ReactNode, ChangeEvent } from 'react';
-import { Input } from 'src/components/Input';
-import Modal from 'src/components/Modal';
-import { FormLabel } from 'src/components/Form';
+import { useState, useRef, useEffect, ChangeEvent } from 'react';
+import { FormLabel } from '../Form';
+import { Input, InputRef } from '../Input';
+import { Modal } from '../Modal';
+import type { DeleteModalProps } from './types';
 
 const StyledDiv = styled.div`
   padding-top: 8px;
@@ -31,19 +32,11 @@ const StyledDiv = styled.div`
 `;
 
 const DescriptionContainer = styled.div`
-  line-height: ${({ theme }) => theme.gridUnit * 4}px;
+  line-height: ${({ theme }) => theme.sizeUnit * 4}px;
   padding-top: 16px;
 `;
 
-interface DeleteModalProps {
-  description: ReactNode;
-  onConfirm: () => void;
-  onHide: () => void;
-  open: boolean;
-  title: ReactNode;
-}
-
-export default function DeleteModal({
+export function DeleteModal({
   description,
   onConfirm,
   onHide,
@@ -52,6 +45,13 @@ export default function DeleteModal({
 }: DeleteModalProps) {
   const [disableChange, setDisableChange] = useState(true);
   const [confirmation, setConfirmation] = useState<string>('');
+  const inputRef = useRef<InputRef>(null);
+
+  useEffect(() => {
+    if (open && inputRef.current) {
+      inputRef.current.focus();
+    }
+  }, [open]);
 
   const hide = () => {
     setConfirmation('');
@@ -99,8 +99,11 @@ export default function DeleteModal({
           value={confirmation}
           onChange={onChange}
           onPressEnter={onPressEnter}
+          ref={inputRef}
         />
       </StyledDiv>
     </Modal>
   );
 }
+
+export type { DeleteModalProps };
diff --git a/superset-frontend/packages/superset-ui-core/src/components/DeleteModal/types.ts b/superset-frontend/packages/superset-ui-core/src/components/DeleteModal/types.ts
new file mode 100644
index 00000000000..f0ba7ff188b
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/DeleteModal/types.ts
@@ -0,0 +1,28 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 type { ReactNode } from 'react';
+
+export interface DeleteModalProps {
+  description: ReactNode;
+  onConfirm: () => void;
+  onHide: () => void;
+  open: boolean;
+  title: ReactNode;
+}
diff --git a/superset-frontend/src/components/DesignSystem.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/DesignSystem.stories.tsx
similarity index 100%
rename from superset-frontend/src/components/DesignSystem.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/DesignSystem.stories.tsx
diff --git a/superset-frontend/src/components/Divider/Divider.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/Divider/Divider.stories.tsx
similarity index 93%
rename from superset-frontend/src/components/Divider/Divider.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Divider/Divider.stories.tsx
index c60789849ef..903fa3b238b 100644
--- a/superset-frontend/src/components/Divider/Divider.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Divider/Divider.stories.tsx
@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { Divider, DividerProps } from 'src/components/Divider';
+import { Divider } from '.';
+import type { DividerProps } from './types';
 
 export default {
-  title: 'Divider',
+  title: 'Components/Divider',
   component: Divider,
 };
 
diff --git a/superset-frontend/src/components/Divider/Divider.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Divider/Divider.test.tsx
similarity index 94%
rename from superset-frontend/src/components/Divider/Divider.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Divider/Divider.test.tsx
index 8148754c0e0..8767adde014 100644
--- a/superset-frontend/src/components/Divider/Divider.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Divider/Divider.test.tsx
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { render } from 'spec/helpers/testing-library';
+import { render } from '@superset-ui/core/spec';
 import { Divider } from '.';
 
 test('should render', () => {
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Divider/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Divider/index.tsx
new file mode 100644
index 00000000000..74b5b85f737
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Divider/index.tsx
@@ -0,0 +1,33 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { css } from '@superset-ui/core';
+import { Divider as AntdDivider } from 'antd';
+import type { DividerProps } from './types';
+
+export function Divider(props: DividerProps) {
+  return (
+    <AntdDivider
+      css={theme => css`
+        margin: ${theme.margin}px 0;
+      `}
+      {...props}
+    />
+  );
+}
+export type { DividerProps };
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Divider/types.ts b/superset-frontend/packages/superset-ui-core/src/components/Divider/types.ts
new file mode 100644
index 00000000000..ea628cc68e6
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Divider/types.ts
@@ -0,0 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 type { DividerProps } from 'antd/es/divider';
+
+export { DividerProps };
diff --git a/superset-frontend/src/components/Dropdown/Dropdown.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/Dropdown/Dropdown.stories.tsx
similarity index 81%
rename from superset-frontend/src/components/Dropdown/Dropdown.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Dropdown/Dropdown.stories.tsx
index e30a69a38af..b65f4e854a2 100644
--- a/superset-frontend/src/components/Dropdown/Dropdown.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Dropdown/Dropdown.stories.tsx
@@ -16,19 +16,22 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { Menu } from 'src/components/Menu';
-import { MenuDotsDropdown, MenuDotsDropdownProps } from '.';
+import { Menu } from '@superset-ui/core/components/Menu';
+import { MenuDotsDropdown } from '.';
+import type { MenuDotsDropdownProps } from './types';
 
 export default {
-  title: 'Dropdown',
+  title: 'Components/Dropdown',
 };
 
 const menu = (
-  <Menu>
-    <Menu.Item>1st menu item</Menu.Item>
-    <Menu.Item>2nd menu item</Menu.Item>
-    <Menu.Item>3rd menu item</Menu.Item>
-  </Menu>
+  <Menu
+    items={[
+      { label: 'Menu Item 1', key: '1' },
+      { label: 'Menu Item 2', key: '2' },
+      { label: 'Menu Item 3', key: '3' },
+    ]}
+  />
 );
 
 const customOverlay = (
diff --git a/superset-frontend/src/components/Dropdown/Dropdown.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Dropdown/Dropdown.test.tsx
similarity index 92%
rename from superset-frontend/src/components/Dropdown/Dropdown.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Dropdown/Dropdown.test.tsx
index 192a2fdea94..9baaef9adbf 100644
--- a/superset-frontend/src/components/Dropdown/Dropdown.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Dropdown/Dropdown.test.tsx
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { render, fireEvent, screen } from 'spec/helpers/testing-library';
-import { NoAnimationDropdown } from './index'; // adjust the import path as needed
+import { render, fireEvent, screen } from '@superset-ui/core/spec';
+import { NoAnimationDropdown } from '.';
 
 const props = {
   overlay: <div>Test Overlay</div>,
diff --git a/superset-frontend/src/components/Dropdown/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Dropdown/index.tsx
similarity index 63%
rename from superset-frontend/src/components/Dropdown/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Dropdown/index.tsx
index 99079e87adc..ae2135b1845 100644
--- a/superset-frontend/src/components/Dropdown/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Dropdown/index.tsx
@@ -16,37 +16,33 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import {
-  ReactElement,
-  ReactNode,
-  FocusEvent,
-  KeyboardEvent,
-  cloneElement,
-} from 'react';
+import { ReactElement, cloneElement } from 'react';
 
-import {
-  Dropdown as AntdDropdown,
-  DropdownProps as AntdDropdownProps,
-} from 'antd-v5';
+import { Dropdown as AntdDropdown, DropdownProps } from 'antd';
 import { styled } from '@superset-ui/core';
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
+import {
+  IconOrientation,
+  type NoAnimationDropdownProps,
+  type MenuDotsDropdownProps,
+} from './types';
 
 const MenuDots = styled.div`
-  width: ${({ theme }) => theme.gridUnit * 0.75}px;
-  height: ${({ theme }) => theme.gridUnit * 0.75}px;
+  width: ${({ theme }) => theme.sizeUnit * 0.75}px;
+  height: ${({ theme }) => theme.sizeUnit * 0.75}px;
   border-radius: 50%;
   background-color: ${({ theme }) => theme.colors.grayscale.light1};
 
-  font-weight: ${({ theme }) => theme.typography.weights.normal};
+  font-weight: ${({ theme }) => theme.fontWeightNormal};
   display: inline-flex;
   position: relative;
 
   &:hover {
-    background-color: ${({ theme }) => theme.colors.primary.base};
+    background-color: ${({ theme }) => theme.colorPrimary};
 
     &::before,
     &::after {
-      background-color: ${({ theme }) => theme.colors.primary.base};
+      background-color: ${({ theme }) => theme.colorPrimary};
     }
   }
 
@@ -54,38 +50,28 @@ const MenuDots = styled.div`
   &::after {
     position: absolute;
     content: ' ';
-    width: ${({ theme }) => theme.gridUnit * 0.75}px;
-    height: ${({ theme }) => theme.gridUnit * 0.75}px;
+    width: ${({ theme }) => theme.sizeUnit * 0.75}px;
+    height: ${({ theme }) => theme.sizeUnit * 0.75}px;
     border-radius: 50%;
     background-color: ${({ theme }) => theme.colors.grayscale.light1};
   }
 
   &::before {
-    top: ${({ theme }) => theme.gridUnit}px;
+    top: ${({ theme }) => theme.sizeUnit}px;
   }
 
   &::after {
-    bottom: ${({ theme }) => theme.gridUnit}px;
+    bottom: ${({ theme }) => theme.sizeUnit}px;
   }
 `;
 
 const MenuDotsWrapper = styled.div`
   display: flex;
   align-items: center;
-  padding: ${({ theme }) => theme.gridUnit * 2}px;
-  padding-left: ${({ theme }) => theme.gridUnit}px;
+  padding: ${({ theme }) => theme.sizeUnit * 2}px;
+  padding-left: ${({ theme }) => theme.sizeUnit}px;
 `;
 
-export enum IconOrientation {
-  Vertical = 'vertical',
-  Horizontal = 'horizontal',
-}
-
-export interface MenuDotsDropdownProps extends AntdDropdownProps {
-  overlay: ReactElement;
-  iconOrientation?: IconOrientation;
-}
-
 const RenderIcon = (
   iconOrientation: IconOrientation = IconOrientation.Vertical,
 ) => {
@@ -103,19 +89,13 @@ export const MenuDotsDropdown = ({
   iconOrientation = IconOrientation.Vertical,
   ...rest
 }: MenuDotsDropdownProps) => (
-  <AntdDropdown dropdownRender={() => overlay} {...rest}>
+  <AntdDropdown popupRender={() => overlay} {...rest}>
     <MenuDotsWrapper data-test="dropdown-trigger">
       {RenderIcon(iconOrientation)}
     </MenuDotsWrapper>
   </AntdDropdown>
 );
 
-export interface NoAnimationDropdownProps extends AntdDropdownProps {
-  children: ReactNode;
-  onBlur?: (e: FocusEvent<HTMLDivElement>) => void;
-  onKeyDown?: (e: KeyboardEvent<HTMLDivElement>) => void;
-}
-
 export const NoAnimationDropdown = (props: NoAnimationDropdownProps) => {
   const { children, onBlur, onKeyDown, ...rest } = props;
   const childrenWithProps = cloneElement(children as ReactElement, {
@@ -130,7 +110,8 @@ export const NoAnimationDropdown = (props: NoAnimationDropdownProps) => {
   );
 };
 
-export type DropdownProps = AntdDropdownProps;
 export const Dropdown = (props: DropdownProps) => (
   <AntdDropdown autoFocus {...props} />
 );
+
+export type { DropdownProps, NoAnimationDropdownProps, MenuDotsDropdownProps };
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Dropdown/types.ts b/superset-frontend/packages/superset-ui-core/src/components/Dropdown/types.ts
new file mode 100644
index 00000000000..705022a10ed
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Dropdown/types.ts
@@ -0,0 +1,38 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 type { DropdownProps as AntdDropdownProps } from 'antd';
+import type { ReactElement, ReactNode, FocusEvent, KeyboardEvent } from 'react';
+
+export enum IconOrientation {
+  Vertical = 'vertical',
+  Horizontal = 'horizontal',
+}
+
+export interface MenuDotsDropdownProps extends AntdDropdownProps {
+  overlay?: ReactElement;
+  iconOrientation?: IconOrientation;
+}
+
+export interface NoAnimationDropdownProps extends AntdDropdownProps {
+  children: ReactNode;
+  onBlur?: (e: FocusEvent<HTMLDivElement>) => void;
+  onKeyDown?: (e: KeyboardEvent<HTMLDivElement>) => void;
+}
+
+export type DropdownProps = AntdDropdownProps;
diff --git a/superset-frontend/src/components/DropdownButton/DropdownButton.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/DropdownButton/DropdownButton.stories.tsx
similarity index 81%
rename from superset-frontend/src/components/DropdownButton/DropdownButton.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/DropdownButton/DropdownButton.stories.tsx
index 57b5e3e0c21..2ebb77f948f 100644
--- a/superset-frontend/src/components/DropdownButton/DropdownButton.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/DropdownButton/DropdownButton.stories.tsx
@@ -16,19 +16,22 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { Menu } from 'src/components/Menu';
-import { DropdownButton, DropdownButtonProps } from '.';
+import { Menu } from '@superset-ui/core/components/Menu';
+import { DropdownButton } from '.';
+import type { DropdownButtonProps } from './types';
 
 export default {
-  title: 'DropdownButton',
+  title: 'Components/DropdownButton',
 };
 
 const menu = (
-  <Menu>
-    <Menu.Item>1st menu item</Menu.Item>
-    <Menu.Item>2nd menu item</Menu.Item>
-    <Menu.Item>3rd menu item</Menu.Item>
-  </Menu>
+  <Menu
+    items={[
+      { label: '1st menu item', key: '1' },
+      { label: '2nd menu item', key: '2' },
+      { label: '3rd menu item', key: '3' },
+    ]}
+  />
 );
 
 const PLACEMENTS = [
diff --git a/superset-frontend/src/components/DropdownButton/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/DropdownButton/index.tsx
similarity index 77%
rename from superset-frontend/src/components/DropdownButton/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/DropdownButton/index.tsx
index 7f9f184dbde..7ad8d3867c4 100644
--- a/superset-frontend/src/components/DropdownButton/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/DropdownButton/index.tsx
@@ -16,20 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { type ComponentProps } from 'react';
-
-import { Dropdown } from 'antd-v5';
-import { Tooltip, TooltipPlacement } from 'src/components/Tooltip';
+import { Dropdown } from 'antd';
 import { kebabCase } from 'lodash';
 import { css, useTheme } from '@superset-ui/core';
-
-export type DropdownButtonProps = ComponentProps<typeof Dropdown.Button> & {
-  tooltip?: string;
-  tooltipPlacement?: TooltipPlacement;
-};
+import { Tooltip } from '../Tooltip';
+import type { DropdownButtonProps } from './types';
 
 export const DropdownButton = ({
-  dropdownRender,
+  popupRender,
   tooltip,
   tooltipPlacement,
   children,
@@ -40,7 +34,7 @@ export const DropdownButton = ({
   // divider implementation for default (non-primary) buttons
   const defaultBtnCss = css`
     ${(!buttonType || buttonType === 'default') &&
-    `.antd5-dropdown-trigger {
+    `.ant-dropdown-trigger {
       position: relative;
       &:before {
         content: '';
@@ -49,7 +43,6 @@ export const DropdownButton = ({
         top: 0;
         width: 1px;
         height: 100%;
-        background-color: ${theme.colors.grayscale.light2};
       }
       .anticon {
         vertical-align: middle;
@@ -58,16 +51,16 @@ export const DropdownButton = ({
   `;
   const button = (
     <Dropdown.Button
-      dropdownRender={dropdownRender}
+      popupRender={popupRender}
       {...rest}
       css={[
         defaultBtnCss,
         css`
-          .antd5-btn {
+          .ant-btn {
             height: 30px;
             box-shadow: none;
-            font-size: ${theme.typography.sizes.s}px;
-            font-weight: ${theme.typography.weights.bold};
+            font-size: ${theme.fontSizeSM}px;
+            font-weight: ${theme.fontWeightStrong};
           }
         `,
       ]}
@@ -88,3 +81,5 @@ export const DropdownButton = ({
   }
   return button;
 };
+
+export type { DropdownButtonProps };
diff --git a/superset-frontend/packages/superset-ui-core/src/components/DropdownButton/types.ts b/superset-frontend/packages/superset-ui-core/src/components/DropdownButton/types.ts
new file mode 100644
index 00000000000..3789d677336
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/DropdownButton/types.ts
@@ -0,0 +1,27 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { type ComponentProps } from 'react';
+
+import { Dropdown } from 'antd';
+import type { TooltipPlacement } from '../Tooltip/types';
+
+export type DropdownButtonProps = ComponentProps<typeof Dropdown.Button> & {
+  tooltip?: string;
+  tooltipPlacement?: TooltipPlacement;
+};
diff --git a/superset-frontend/src/components/DropdownContainer/DropdownContainer.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/DropdownContainer/DropdownContainer.stories.tsx
similarity index 93%
rename from superset-frontend/src/components/DropdownContainer/DropdownContainer.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/DropdownContainer/DropdownContainer.stories.tsx
index ed37b488b66..ad99b6b00f7 100644
--- a/superset-frontend/src/components/DropdownContainer/DropdownContainer.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/DropdownContainer/DropdownContainer.stories.tsx
@@ -19,9 +19,10 @@
 import { useRef, useCallback, useState } from 'react';
 import { isEqual } from 'lodash';
 import { css } from '@superset-ui/core';
-import Select from '../Select/Select';
-import Button from '../Button';
-import DropdownContainer, { DropdownContainerProps, Ref } from '.';
+import { Button } from '../Button';
+import { Select } from '../Select';
+import type { DropdownContainerProps, DropdownRef } from './types';
+import { DropdownContainer } from '.';
 
 export default {
   title: 'Design System/Components/DropdownContainer',
@@ -62,7 +63,7 @@ const generateItems = (overflowingState?: OverflowingState) =>
 export const Component = (props: DropdownContainerProps) => {
   const [items, setItems] = useState<ItemsType>([]);
   const [overflowingState, setOverflowingState] = useState<OverflowingState>();
-  const containerRef = useRef<Ref>(null);
+  const containerRef = useRef<DropdownRef>(null);
   const onOverflowingStateChange = useCallback(
     value => {
       if (!isEqual(overflowingState, value)) {
diff --git a/superset-frontend/packages/superset-ui-core/src/components/DropdownContainer/DropdownContainer.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/DropdownContainer/DropdownContainer.test.tsx
new file mode 100644
index 00000000000..f46b151c7a3
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/DropdownContainer/DropdownContainer.test.tsx
@@ -0,0 +1,180 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { screen, render } from '@superset-ui/core/spec';
+import { Button, DropdownContainer, Icons } from '..';
+
+const generateItems = (n: number) =>
+  Array.from({ length: n }).map((_, i) => ({
+    id: `el-${i + 1}`,
+    element: <Button>{`Element ${i + 1}`}</Button>,
+  }));
+
+const ITEMS = generateItems(10);
+
+beforeEach(() => {
+  // Reset any mocks
+  jest.restoreAllMocks();
+
+  // Mock ResizeObserver globally
+  global.ResizeObserver = jest.fn().mockImplementation(() => ({
+    observe: jest.fn(),
+    unobserve: jest.fn(),
+    disconnect: jest.fn(),
+  }));
+});
+
+test('renders children', () => {
+  render(<DropdownContainer items={generateItems(3)} />);
+  expect(screen.getByText('Element 1')).toBeInTheDocument();
+  expect(screen.getByText('Element 2')).toBeInTheDocument();
+  expect(screen.getByText('Element 3')).toBeInTheDocument();
+});
+
+test('renders children with custom horizontal spacing', () => {
+  render(<DropdownContainer items={ITEMS} style={{ gap: 20 }} />);
+  expect(screen.getByTestId('container')).toHaveStyle('gap: 20px');
+});
+
+test('does not render a dropdown button when not overflowing', () => {
+  render(<DropdownContainer items={generateItems(3)} />);
+  expect(screen.queryByText('More')).not.toBeInTheDocument();
+});
+
+test('renders component with dropdown trigger icon prop without error', () => {
+  render(
+    <DropdownContainer
+      items={generateItems(5)}
+      dropdownTriggerIcon={<Icons.LinkOutlined />}
+    />,
+  );
+  // Component should render without error
+  expect(screen.getByText('Element 1')).toBeInTheDocument();
+});
+
+test('renders component with dropdown trigger text prop without error', () => {
+  const customText = 'Custom text';
+  render(
+    <DropdownContainer
+      items={generateItems(5)}
+      dropdownTriggerText={customText}
+    />,
+  );
+  // Component should render without error
+  expect(screen.getByText('Element 1')).toBeInTheDocument();
+});
+
+test('renders component with dropdown trigger count prop without error', () => {
+  const customCount = 99;
+  render(
+    <DropdownContainer
+      items={generateItems(5)}
+      dropdownTriggerCount={customCount}
+    />,
+  );
+  // Component should render without error
+  expect(screen.getByText('Element 1')).toBeInTheDocument();
+});
+
+test('renders component with dropdown style prop without error', () => {
+  render(
+    <DropdownContainer items={generateItems(5)} dropdownStyle={{ gap: 20 }} />,
+  );
+  // Component should render without error
+  expect(screen.getByText('Element 1')).toBeInTheDocument();
+});
+
+test('renders component with onOverflowingStateChange prop without error', () => {
+  const onOverflowingStateChange = jest.fn();
+  render(
+    <DropdownContainer
+      items={generateItems(5)}
+      onOverflowingStateChange={onOverflowingStateChange}
+    />,
+  );
+  // Component should render without error
+  expect(screen.getByText('Element 1')).toBeInTheDocument();
+});
+
+test('renders component with custom dropdown content prop without error', () => {
+  const customDropdownContent = <div>Custom content</div>;
+  render(
+    <DropdownContainer
+      items={generateItems(5)}
+      dropdownContent={() => customDropdownContent}
+    />,
+  );
+  // Component should render without error
+  expect(screen.getByText('Element 1')).toBeInTheDocument();
+});
+
+test('renders component with dropdown trigger tooltip prop without error', () => {
+  render(
+    <DropdownContainer
+      items={generateItems(5)}
+      dropdownTriggerTooltip="Test tooltip"
+    />,
+  );
+  // Component should render without error
+  expect(screen.getByText('Element 1')).toBeInTheDocument();
+});
+
+// Tests that can work without complex overflow mocking
+test('container has correct test id', () => {
+  render(<DropdownContainer items={generateItems(3)} />);
+  expect(screen.getByTestId('container')).toBeInTheDocument();
+});
+
+test('renders all provided items when not overflowing', () => {
+  const items = generateItems(3);
+  render(<DropdownContainer items={items} />);
+
+  items.forEach((item, index) => {
+    expect(screen.getByText(`Element ${index + 1}`)).toBeInTheDocument();
+  });
+});
+
+test('accepts custom style props', () => {
+  const customStyle = { backgroundColor: 'red', padding: '10px' };
+  render(<DropdownContainer items={generateItems(2)} style={customStyle} />);
+
+  const container = screen.getByTestId('container');
+  expect(container).toHaveStyle('background-color: red');
+  expect(container).toHaveStyle('padding: 10px');
+});
+
+// Integration test that doesn't rely on specific overflow behavior
+test('component renders and functions without throwing errors', () => {
+  const onOverflowingStateChange = jest.fn();
+
+  expect(() => {
+    render(
+      <DropdownContainer
+        items={generateItems(10)}
+        onOverflowingStateChange={onOverflowingStateChange}
+        dropdownTriggerText="More items"
+        dropdownTriggerTooltip="Click to see more"
+        style={{ gap: 10 }}
+        dropdownStyle={{ gap: 5 }}
+      />,
+    );
+  }).not.toThrow();
+
+  // Basic functionality test
+  expect(screen.getByText('Element 1')).toBeInTheDocument();
+});
diff --git a/superset-frontend/src/components/DropdownContainer/Overview.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/DropdownContainer/Overview.stories.tsx
similarity index 100%
rename from superset-frontend/src/components/DropdownContainer/Overview.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/DropdownContainer/Overview.stories.tsx
diff --git a/superset-frontend/src/components/DropdownContainer/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/DropdownContainer/index.tsx
similarity index 85%
rename from superset-frontend/src/components/DropdownContainer/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/DropdownContainer/index.tsx
index 908e79ed8de..7fab3e498cc 100644
--- a/superset-frontend/src/components/DropdownContainer/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/DropdownContainer/index.tsx
@@ -29,23 +29,17 @@ import {
   useState,
   useRef,
   ReactNode,
+  useCallback,
 } from 'react';
 
 import { Global } from '@emotion/react';
 import { css, t, useTheme, usePrevious } from '@superset-ui/core';
 import { useResizeDetector } from 'react-resize-detector';
-import Badge from '../Badge';
-import { Icons } from '../Icons';
-import Button from '../Button';
-import Popover from '../Popover';
-import { Tooltip } from '../Tooltip';
-
-const MAX_HEIGHT = 500;
-
+import { Badge, Icons, Button, Tooltip, Popover } from '..';
 /**
  * Container item.
  */
-export interface Item {
+export interface DropdownItem {
   /**
    * String that uniquely identifies the item.
    */
@@ -65,7 +59,7 @@ export interface DropdownContainerProps {
    * Array of items. The id property is used to uniquely identify
    * the elements when rendering or dealing with event handlers.
    */
-  items: Item[];
+  items: DropdownItem[];
   /**
    * Event handler called every time an element moves between
    * main container and dropdown.
@@ -77,7 +71,7 @@ export interface DropdownContainerProps {
   /**
    * Option to customize the content of the dropdown.
    */
-  dropdownContent?: (overflowedItems: Item[]) => ReactElement;
+  dropdownContent?: (overflowedItems: DropdownItem[]) => ReactElement;
   /**
    * Dropdown ref.
    */
@@ -112,9 +106,11 @@ export interface DropdownContainerProps {
   forceRender?: boolean;
 }
 
-export type Ref = HTMLDivElement & { open: () => void };
+export type DropdownRef = HTMLDivElement & { open: () => void };
 
-const DropdownContainer = forwardRef(
+const MAX_HEIGHT = 500;
+
+export const DropdownContainer = forwardRef(
   (
     {
       items,
@@ -129,7 +125,7 @@ const DropdownContainer = forwardRef(
       forceRender,
       style,
     }: DropdownContainerProps,
-    outerRef: RefObject<Ref>,
+    outerRef: RefObject<DropdownRef>,
   ) => {
     const theme = useTheme();
     const { ref, width = 0 } = useResizeDetector<HTMLDivElement>();
@@ -147,7 +143,38 @@ const DropdownContainer = forwardRef(
 
     const [showOverflow, setShowOverflow] = useState(false);
 
-    const reduceItems = (items: Item[]): [Item[], string[]] =>
+    // callback to update item widths so that the useLayoutEffect runs whenever
+    // width of any of the child changes
+    const recalculateItemWidths = useCallback(() => {
+      const mainItemsContainerNode = current?.children.item(0);
+      if (mainItemsContainerNode) {
+        const visibleChildrenElements = Array.from(
+          mainItemsContainerNode.children,
+        );
+        setItemsWidth(prevGlobalWidths => {
+          if (prevGlobalWidths.length !== items.length) {
+            return prevGlobalWidths;
+          }
+
+          const newGlobalWidths = [...prevGlobalWidths];
+          let changed = false;
+          visibleChildrenElements.forEach((child, indexInVisible) => {
+            const originalItemIndex = indexInVisible;
+            if (originalItemIndex < newGlobalWidths.length) {
+              const newWidth = child.getBoundingClientRect().width;
+              if (newGlobalWidths[originalItemIndex] !== newWidth) {
+                newGlobalWidths[originalItemIndex] = newWidth;
+                changed = true;
+              }
+            }
+          });
+
+          return changed ? newGlobalWidths : prevGlobalWidths;
+        });
+      }
+    }, [current?.children, items.length]);
+
+    const reduceItems = (items: DropdownItem[]): [DropdownItem[], string[]] =>
       items.reduce(
         ([items, ids], item) => {
           items.push({
@@ -157,7 +184,7 @@ const DropdownContainer = forwardRef(
           ids.push(item.id);
           return [items, ids];
         },
-        [[], []] as [Item[], string[]],
+        [[], []] as [DropdownItem[], string[]],
       );
 
     const [notOverflowedItems, notOverflowedIds] = useMemo(
@@ -196,24 +223,7 @@ const DropdownContainer = forwardRef(
         childrenArray.map(child => resizeObserver.unobserve(child));
         resizeObserver.disconnect();
       };
-    }, [items.length]);
-
-    // callback to update item widths so that the useLayoutEffect runs whenever
-    // width of any of the child changes
-    const recalculateItemWidths = () => {
-      const container = current?.children.item(0);
-      if (container) {
-        const { children } = container;
-        const childrenArray = Array.from(children);
-
-        const currentWidths = childrenArray.map(
-          child => child.getBoundingClientRect().width,
-        );
-
-        // Update state with new widths
-        setItemsWidth(currentWidths);
-      }
-    };
+    }, [items.length, current, recalculateItemWidths]);
 
     useLayoutEffect(() => {
       if (popoverVisible) {
@@ -280,6 +290,7 @@ const DropdownContainer = forwardRef(
       overflowedItems.length,
       previousWidth,
       width,
+      popoverVisible,
     ]);
 
     useEffect(() => {
@@ -301,7 +312,7 @@ const DropdownContainer = forwardRef(
             css={css`
               display: flex;
               flex-direction: column;
-              gap: ${theme.gridUnit * 4}px;
+              gap: ${theme.sizeUnit * 4}px;
             `}
             data-test="dropdown-content"
             style={dropdownStyle}
@@ -315,7 +326,7 @@ const DropdownContainer = forwardRef(
       [
         dropdownContent,
         overflowingCount,
-        theme.gridUnit,
+        theme.sizeUnit,
         dropdownStyle,
         overflowedItems,
       ],
@@ -365,8 +376,8 @@ const DropdownContainer = forwardRef(
           css={css`
             display: flex;
             align-items: center;
-            gap: ${theme.gridUnit * 4}px;
-            margin-right: ${theme.gridUnit * 4}px;
+            gap: ${theme.sizeUnit * 4}px;
+            margin-right: ${theme.sizeUnit * 4}px;
             min-width: 0px;
           `}
           data-test="container"
@@ -378,7 +389,7 @@ const DropdownContainer = forwardRef(
           <>
             <Global
               styles={css`
-                .antd5-popover-inner {
+                .ant-popover-inner {
                   // Some OS versions only show the scroll when hovering.
                   // These settings will make the scroll always visible.
                   ::-webkit-scrollbar {
@@ -400,9 +411,11 @@ const DropdownContainer = forwardRef(
             />
 
             <Popover
-              overlayInnerStyle={{
-                maxHeight: `${MAX_HEIGHT}px`,
-                overflow: showOverflow ? 'auto' : 'visible',
+              styles={{
+                body: {
+                  maxHeight: `${MAX_HEIGHT}px`,
+                  overflow: showOverflow ? 'auto' : 'visible',
+                },
               }}
               content={popoverContent}
               trigger="click"
@@ -422,12 +435,12 @@ const DropdownContainer = forwardRef(
                     count={dropdownTriggerCount ?? overflowingCount}
                     color={
                       (dropdownTriggerCount ?? overflowingCount) > 0
-                        ? theme.colors.primary.base
+                        ? theme.colorPrimary
                         : theme.colors.grayscale.light1
                     }
                     showZero
                     css={css`
-                      margin-left: ${theme.gridUnit * 2}px;
+                      margin-left: ${theme.sizeUnit * 2}px;
                     `}
                   />
                   <Icons.DownOutlined
@@ -448,5 +461,3 @@ const DropdownContainer = forwardRef(
     );
   },
 );
-
-export default DropdownContainer;
diff --git a/superset-frontend/packages/superset-ui-core/src/components/DropdownContainer/types.ts b/superset-frontend/packages/superset-ui-core/src/components/DropdownContainer/types.ts
new file mode 100644
index 00000000000..ea2c33050ea
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/DropdownContainer/types.ts
@@ -0,0 +1,91 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 type { CSSProperties, ReactElement, RefObject, ReactNode } from 'react';
+
+/**
+ * Container item.
+ */
+export interface DropdownItem {
+  /**
+   * String that uniquely identifies the item.
+   */
+  id: string;
+  /**
+   * The element to be rendered.
+   */
+  element: ReactElement;
+}
+
+/**
+ * Horizontal container that displays overflowed items in a dropdown.
+ * It shows an indicator of how many items are currently overflowing.
+ */
+export interface DropdownContainerProps {
+  /**
+   * Array of items. The id property is used to uniquely identify
+   * the elements when rendering or dealing with event handlers.
+   */
+  items: DropdownItem[];
+  /**
+   * Event handler called every time an element moves between
+   * main container and dropdown.
+   */
+  onOverflowingStateChange?: (overflowingState: {
+    notOverflowed: string[];
+    overflowed: string[];
+  }) => void;
+  /**
+   * Option to customize the content of the dropdown.
+   */
+  dropdownContent?: (overflowedItems: DropdownItem[]) => ReactElement;
+  /**
+   * Dropdown ref.
+   */
+  dropdownRef?: RefObject<HTMLDivElement>;
+  /**
+   * Dropdown additional style properties.
+   */
+  dropdownStyle?: CSSProperties;
+  /**
+   * Displayed count in the dropdown trigger.
+   */
+  dropdownTriggerCount?: number;
+  /**
+   * Icon of the dropdown trigger.
+   */
+  dropdownTriggerIcon?: ReactElement;
+  /**
+   * Text of the dropdown trigger.
+   */
+  dropdownTriggerText?: string;
+  /**
+   * Text of the dropdown trigger tooltip
+   */
+  dropdownTriggerTooltip?: ReactNode | null;
+  /**
+   * Main container additional style properties.
+   */
+  style?: CSSProperties;
+  /**
+   * Force render popover content before it's first opened
+   */
+  forceRender?: boolean;
+}
+
+export type DropdownRef = HTMLDivElement & { open: () => void };
diff --git a/superset-frontend/src/components/DynamicEditableTitle/DynamicEditableTitle.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/DynamicEditableTitle/DynamicEditableTitle.test.tsx
similarity index 79%
rename from superset-frontend/src/components/DynamicEditableTitle/DynamicEditableTitle.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/DynamicEditableTitle/DynamicEditableTitle.test.tsx
index f70859cfb06..c8e0ba13314 100644
--- a/superset-frontend/src/components/DynamicEditableTitle/DynamicEditableTitle.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/DynamicEditableTitle/DynamicEditableTitle.test.tsx
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { render, screen, userEvent } from 'spec/helpers/testing-library';
+import { render, screen, userEvent } from '@superset-ui/core/spec';
 import { DynamicEditableTitle } from '.';
 
 const createProps = (overrides: Record<string, any> = {}) => ({
@@ -43,25 +43,26 @@ describe('Chart editable title', () => {
     expect(screen.getByText('Add the name of the chart')).toBeVisible();
   });
 
-  it('click, edit and save title', () => {
+  it('click, edit and save title', async () => {
     const props = createProps();
     render(<DynamicEditableTitle {...props} />);
     const textboxElement = screen.getByRole('textbox');
-    userEvent.click(textboxElement);
-    userEvent.type(textboxElement, ' edited');
+    await userEvent.click(textboxElement);
+    await userEvent.type(textboxElement, ' edited');
     expect(screen.getByText('Chart title edited')).toBeVisible();
-    userEvent.type(textboxElement, '{enter}');
+    await userEvent.type(textboxElement, '{enter}');
     expect(props.onSave).toHaveBeenCalled();
   });
 
-  it('renders in non-editable mode', () => {
+  it('renders in non-editable mode', async () => {
     const props = createProps({ canEdit: false });
     render(<DynamicEditableTitle {...props} />);
     const titleElement = screen.getByLabelText('Chart title');
-    expect(screen.queryByRole('textbox')).not.toBeInTheDocument();
+    const inputElement = screen.getByRole('textbox');
+    expect(inputElement).toBeDisabled();
     expect(titleElement).toBeVisible();
-    userEvent.click(titleElement);
-    userEvent.type(titleElement, ' edited{enter}');
+    await userEvent.click(titleElement);
+    await userEvent.type(titleElement, ' edited{enter}');
     expect(props.onSave).not.toHaveBeenCalled();
   });
 });
diff --git a/superset-frontend/src/components/DynamicEditableTitle/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/DynamicEditableTitle/index.tsx
similarity index 64%
rename from superset-frontend/src/components/DynamicEditableTitle/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/DynamicEditableTitle/index.tsx
index dd439194383..dff597f3fa1 100644
--- a/superset-frontend/src/components/DynamicEditableTitle/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/DynamicEditableTitle/index.tsx
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 import {
   ChangeEvent,
   KeyboardEvent,
@@ -24,48 +23,34 @@ import {
   useCallback,
   useEffect,
   useLayoutEffect,
-  useRef,
   useState,
 } from 'react';
-import { css, SupersetTheme, t } from '@superset-ui/core';
-import { Tooltip } from 'src/components/Tooltip';
+import { css, SupersetTheme, t, useTheme } from '@superset-ui/core';
 import { useResizeDetector } from 'react-resize-detector';
-
-export type DynamicEditableTitleProps = {
-  title: string;
-  placeholder: string;
-  onSave: (title: string) => void;
-  canEdit: boolean;
-  label: string | undefined;
-};
+import { Tooltip } from '../Tooltip';
+import { Input } from '../Input';
+import type { DynamicEditableTitleProps } from './types';
 
 const titleStyles = (theme: SupersetTheme) => css`
   display: flex;
-  font-size: ${theme.typography.sizes.xl}px;
-  font-weight: ${theme.typography.weights.bold};
+  font-size: ${theme.fontSizeXL}px;
+  font-weight: ${theme.fontWeightStrong};
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
 
-  & .dynamic-title,
   & .dynamic-title-input {
     display: inline-block;
     max-width: 100%;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
-  }
-
-  & .dynamic-title {
-    cursor: default;
-  }
-  & .dynamic-title-input {
-    border: none;
     padding: 0;
-    outline: none;
+    color: ${theme.colorText};
+    background-color: ${theme.colorBgContainer};
 
     &::placeholder {
-      color: ${theme.colors.grayscale.light1};
+      color: ${theme.colorTextTertiary};
     }
   }
 
@@ -85,10 +70,10 @@ export const DynamicEditableTitle = memo(
     canEdit,
     label,
   }: DynamicEditableTitleProps) => {
+    const theme = useTheme();
     const [isEditing, setIsEditing] = useState(false);
-    const [currentTitle, setCurrentTitle] = useState(title || '');
-    const contentRef = useRef<HTMLInputElement>(null);
     const [showTooltip, setShowTooltip] = useState(false);
+    const [currentTitle, setCurrentTitle] = useState(title || '');
 
     const { width: inputWidth, ref: sizerRef } = useResizeDetector();
     const { width: containerWidth, ref: containerRef } = useResizeDetector({
@@ -98,15 +83,13 @@ export const DynamicEditableTitle = memo(
     useEffect(() => {
       setCurrentTitle(title);
     }, [title]);
-
     useEffect(() => {
-      if (isEditing && contentRef?.current) {
-        contentRef.current.focus();
+      if (isEditing && sizerRef?.current) {
         // move cursor and scroll to the end
-        if (contentRef.current.setSelectionRange) {
-          const { length } = contentRef.current.value;
-          contentRef.current.setSelectionRange(length, length);
-          contentRef.current.scrollLeft = contentRef.current.scrollWidth;
+        if (sizerRef.current.setSelectionRange) {
+          const { length } = sizerRef.current.value;
+          sizerRef.current.setSelectionRange(length, length);
+          sizerRef.current.scrollLeft = sizerRef.current.scrollWidth;
         }
       }
     }, [isEditing]);
@@ -121,13 +104,14 @@ export const DynamicEditableTitle = memo(
     }, [currentTitle, placeholder, sizerRef]);
 
     useEffect(() => {
-      if (
-        contentRef.current &&
-        contentRef.current.scrollWidth > contentRef.current.clientWidth
-      ) {
-        setShowTooltip(true);
-      } else {
-        setShowTooltip(false);
+      const inputElement = sizerRef.current?.input;
+
+      if (inputElement) {
+        if (inputElement.scrollWidth > inputElement.clientWidth) {
+          setShowTooltip(true);
+        } else {
+          setShowTooltip(false);
+        }
       }
     }, [inputWidth, containerWidth]);
 
@@ -165,9 +149,10 @@ export const DynamicEditableTitle = memo(
         if (!canEdit) {
           return;
         }
-        if (ev.key === 'Enter') {
-          ev.preventDefault();
-          contentRef.current?.blur();
+        ev.preventDefault();
+        const { activeElement } = document;
+        if (activeElement && activeElement instanceof HTMLElement) {
+          activeElement.blur();
         }
       },
       [canEdit],
@@ -181,38 +166,33 @@ export const DynamicEditableTitle = memo(
             showTooltip && currentTitle && !isEditing ? currentTitle : null
           }
         >
-          {canEdit ? (
-            <input
-              data-test="editable-title-input"
-              className="dynamic-title-input"
-              aria-label={label ?? t('Title')}
-              ref={contentRef}
-              onChange={handleChange}
-              onBlur={handleBlur}
-              onClick={handleClick}
-              onKeyPress={handleKeyPress}
-              placeholder={placeholder}
-              value={currentTitle}
-              css={css`
-                cursor: ${isEditing ? 'text' : 'pointer'};
-
-                ${inputWidth &&
-                inputWidth > 0 &&
-                css`
-                  width: ${inputWidth + 1}px;
-                `}
+          <Input
+            data-test="editable-title-input"
+            variant="borderless"
+            aria-label={label ?? t('Title')}
+            className="dynamic-title-input"
+            value={currentTitle}
+            onChange={handleChange}
+            onBlur={handleBlur}
+            onClick={handleClick}
+            onPressEnter={handleKeyPress}
+            placeholder={placeholder}
+            css={css`
+              ${!canEdit &&
+              `&[disabled] {
+                  cursor: default;
+                }
               `}
-            />
-          ) : (
-            <span
-              className="dynamic-title"
-              aria-label={label ?? t('Title')}
-              ref={contentRef}
-              data-test="editable-title"
-            >
-              {currentTitle}
-            </span>
-          )}
+              font-size: ${theme.fontSizeXL}px;
+              transition: auto;
+              ${inputWidth &&
+              inputWidth > 0 &&
+              css`
+                width: ${inputWidth}px;
+              `}
+            `}
+            disabled={!canEdit}
+          />
         </Tooltip>
         <span
           ref={sizerRef}
@@ -224,3 +204,4 @@ export const DynamicEditableTitle = memo(
     );
   },
 );
+export type { DynamicEditableTitleProps } from './types';
diff --git a/superset-frontend/packages/superset-ui-core/src/components/DynamicEditableTitle/types.ts b/superset-frontend/packages/superset-ui-core/src/components/DynamicEditableTitle/types.ts
new file mode 100644
index 00000000000..c52801388ae
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/DynamicEditableTitle/types.ts
@@ -0,0 +1,25 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+export type DynamicEditableTitleProps = {
+  title: string;
+  placeholder: string;
+  onSave: (title: string) => void;
+  canEdit: boolean;
+  label: string | undefined;
+};
diff --git a/superset-frontend/src/components/EditableTitle/EditableTitle.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/EditableTitle/EditableTitle.stories.tsx
similarity index 89%
rename from superset-frontend/src/components/EditableTitle/EditableTitle.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/EditableTitle/EditableTitle.stories.tsx
index 6438d49f126..e778e71ed4e 100644
--- a/superset-frontend/src/components/EditableTitle/EditableTitle.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/EditableTitle/EditableTitle.stories.tsx
@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import EditableTitle, { EditableTitleProps } from '.';
+import { EditableTitle } from '.';
+import type { EditableTitleProps } from './types';
 
 export default {
-  title: 'EditableTitle',
+  title: 'Components/EditableTitle',
   component: EditableTitle,
 };
 
@@ -31,12 +32,13 @@ InteractiveEditableTitle.args = {
   canEdit: true,
   editing: false,
   emptyText: 'Empty text',
-  multiLine: true,
   noPermitTooltip: 'Not permitted',
   showTooltip: true,
   title: 'Title',
   defaultTitle: 'Default title',
   placeholder: 'Placeholder',
+  maxWidth: 100,
+  autoSize: true,
 };
 
 InteractiveEditableTitle.argTypes = {
diff --git a/superset-frontend/packages/superset-ui-core/src/components/EditableTitle/EditableTitle.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/EditableTitle/EditableTitle.test.tsx
new file mode 100644
index 00000000000..4440c116e24
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/EditableTitle/EditableTitle.test.tsx
@@ -0,0 +1,103 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { fireEvent, render } from '@superset-ui/core/spec';
+import { EditableTitle } from '.';
+
+const mockEvent = {
+  target: {
+    value: 'new title',
+  },
+};
+const mockProps = {
+  title: 'my title',
+  canEdit: true,
+  onSaveTitle: jest.fn(),
+};
+
+test('should render title', () => {
+  const { getByTestId } = render(<EditableTitle {...mockProps} />);
+  const textArea = getByTestId('textarea-editable-title-input');
+
+  expect(textArea).toBeInTheDocument();
+  expect(textArea).toHaveValue(mockProps.title);
+});
+
+test('should not render an input if it is not editable', () => {
+  const { queryByTestId } = render(
+    <EditableTitle title="my title" onSaveTitle={jest.fn()} />,
+  );
+  expect(
+    queryByTestId('textarea-editable-title-input'),
+  ).not.toBeInTheDocument();
+});
+
+describe('should handle click', () => {
+  it('should enable editing mode on click', () => {
+    const { getByTestId, container } = render(<EditableTitle {...mockProps} />);
+
+    fireEvent.click(getByTestId('textarea-editable-title-input'));
+    expect(container.querySelector('textarea')).toHaveClass(
+      'ant-input-outlined',
+    );
+  });
+});
+
+describe('should handle change', () => {
+  it('should change title', () => {
+    const { getByTestId } = render(<EditableTitle {...mockProps} editing />);
+    const textarea = getByTestId('textarea-editable-title-input');
+    fireEvent.change(textarea, mockEvent);
+    expect(textarea).toHaveValue('new title');
+  });
+});
+
+describe('should handle blur', () => {
+  const setup = (overrides: Partial<typeof mockProps> = {}) => {
+    const selectors = render(<EditableTitle {...mockProps} {...overrides} />);
+    fireEvent.click(selectors.getByTestId('textarea-editable-title-input'));
+    return selectors;
+  };
+
+  it('should trigger callback', () => {
+    const callback = jest.fn();
+    const { getByTestId } = setup({ onSaveTitle: callback });
+    fireEvent.change(getByTestId('textarea-editable-title-input'), mockEvent);
+    fireEvent.blur(getByTestId('textarea-editable-title-input'));
+    expect(callback).toHaveBeenCalledTimes(1);
+    expect(callback).toHaveBeenCalledWith('new title');
+  });
+
+  it('should not trigger callback', () => {
+    const callback = jest.fn();
+    const { getByTestId } = setup({ onSaveTitle: callback });
+    fireEvent.blur(getByTestId('textarea-editable-title-input'));
+    // no change
+    expect(callback).not.toHaveBeenCalled();
+  });
+
+  it('should not save empty title', () => {
+    const callback = jest.fn();
+    const { getByTestId } = setup({ onSaveTitle: callback });
+    const textarea = getByTestId('textarea-editable-title-input');
+    fireEvent.blur(textarea);
+
+    expect(textarea).toHaveValue(mockProps.title);
+    expect(callback).not.toHaveBeenCalled();
+  });
+});
diff --git a/superset-frontend/packages/superset-ui-core/src/components/EditableTitle/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/EditableTitle/index.tsx
new file mode 100644
index 00000000000..3be6fd3f29e
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/EditableTitle/index.tsx
@@ -0,0 +1,280 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { css, styled, t } from '@superset-ui/core';
+import { useEffect, useState, useRef } from 'react';
+import cx from 'classnames';
+import { Tooltip } from '../Tooltip';
+import { CertifiedBadge } from '../CertifiedBadge';
+import { Input, TextAreaRef } from '../Input';
+import type { EditableTitleProps } from './types';
+
+const StyledCertifiedBadge = styled(CertifiedBadge)`
+  vertical-align: middle;
+`;
+
+const StyledEditableTitle = styled.span<{
+  editing: boolean;
+  canEdit: boolean;
+}>`
+  &.editable-title {
+    display: inline-block;
+    width: 100%;
+
+    input,
+    textarea {
+      outline: none;
+      background: transparent;
+      box-shadow: none;
+      cursor: initial;
+      font-feature-settings:
+        'liga' 0,
+        'calt' 0;
+      font-variant-ligatures: none;
+      font-weight: bold;
+    }
+
+    input[type='text'],
+    textarea {
+      border: 1px solid ${({ theme }) => theme.colorSplit};
+      color: ${({ theme }) => theme.colorTextTertiary};
+      border-radius: ${({ theme }) => theme.sizeUnit}px;
+      font-size: ${({ theme }) => theme.fontSizeLG}px;
+      padding: ${({ theme }) => theme.sizeUnit / 2}px;
+      min-height: 100px;
+      width: 95%;
+    }
+
+    &.datasource-sql-expression {
+      min-width: 315px;
+      width: 100%;
+    }
+  }
+`;
+
+export function EditableTitle({
+  canEdit = false,
+  editing = false,
+  extraClasses,
+  noPermitTooltip,
+  onSaveTitle,
+  showTooltip = true,
+  style,
+  title = '',
+  defaultTitle = '',
+  placeholder = '',
+  certifiedBy,
+  certificationDetails,
+  renderLink,
+  maxWidth,
+  autoSize = true,
+  ...rest
+}: EditableTitleProps) {
+  const [isEditing, setIsEditing] = useState(editing);
+  const [currentTitle, setCurrentTitle] = useState(title);
+  const [lastTitle, setLastTitle] = useState(title);
+  const [inputWidth, setInputWidth] = useState<number>(0);
+  const contentRef = useRef<TextAreaRef>(null);
+
+  function measureTextWidth(text: string, font = '14px Arial') {
+    const canvas = document.createElement('canvas');
+    const context = canvas.getContext('2d');
+    if (context) {
+      context.font = font;
+      return context.measureText(text).width;
+    }
+    return 0;
+  }
+
+  useEffect(() => {
+    const { font } = window.getComputedStyle(
+      contentRef.current?.resizableTextArea?.textArea || document.body,
+    );
+    const textWidth = measureTextWidth(currentTitle || '', font);
+    const padding = 20;
+    const maxAllowedWidth = typeof maxWidth === 'number' ? maxWidth : Infinity;
+    setInputWidth(Math.min(textWidth + padding, maxAllowedWidth));
+  }, [currentTitle]);
+
+  useEffect(() => {
+    if (title !== currentTitle) {
+      setLastTitle(currentTitle);
+      setCurrentTitle(title);
+    }
+  }, [title]);
+
+  useEffect(() => {
+    if (isEditing && contentRef.current) {
+      const textArea = contentRef.current.resizableTextArea?.textArea;
+      if (textArea) {
+        textArea.focus();
+        const { length } = textArea.value;
+        textArea.setSelectionRange(length, length);
+        textArea.scrollTop = textArea.scrollHeight;
+      }
+    }
+  }, [isEditing]);
+
+  function handleClick() {
+    if (!canEdit || isEditing) return;
+    const textArea = contentRef.current?.resizableTextArea?.textArea;
+    if (textArea) {
+      textArea.focus();
+      const { length } = textArea.value;
+      textArea.setSelectionRange(length, length);
+    }
+    setIsEditing(true);
+  }
+
+  function handleBlur() {
+    const formattedTitle = currentTitle.trim();
+
+    if (!canEdit) return;
+    setIsEditing(false);
+
+    if (!formattedTitle.length) {
+      setCurrentTitle(lastTitle);
+      return;
+    }
+
+    if (lastTitle !== formattedTitle) {
+      setLastTitle(formattedTitle);
+    }
+
+    if (title !== formattedTitle) {
+      onSaveTitle(formattedTitle);
+    }
+  }
+
+  function handleKeyDown(event: any) {
+    const stopPropagationKeys = [
+      'Backspace',
+      'Delete',
+      ' ',
+      'ArrowLeft',
+      'ArrowRight',
+      'ArrowUp',
+      'ArrowDown',
+    ];
+
+    if (stopPropagationKeys.includes(event.key)) {
+      event.stopPropagation();
+    }
+
+    if (event.key === 'Enter') {
+      event.preventDefault();
+      handleBlur();
+    }
+  }
+
+  function handleChange(event: any) {
+    if (!canEdit) return;
+    setCurrentTitle(event.target.value);
+  }
+
+  function handleKeyPress(event: React.KeyboardEvent) {
+    event.preventDefault();
+    handleBlur();
+  }
+
+  let value: string | undefined = currentTitle;
+  if (!isEditing && !currentTitle) {
+    value = defaultTitle || title;
+  }
+
+  let titleComponent: React.ReactNode = (
+    <Input.TextArea
+      size="small"
+      data-test="textarea-editable-title-input"
+      ref={contentRef}
+      value={value}
+      className={!title ? 'text-muted' : undefined}
+      onChange={handleChange}
+      onBlur={handleBlur}
+      onClick={handleClick}
+      onKeyDown={handleKeyDown}
+      onPressEnter={handleKeyPress}
+      placeholder={placeholder}
+      variant={isEditing ? 'outlined' : 'borderless'}
+      autoSize={autoSize ? { minRows: 1, maxRows: 3 } : false}
+      css={theme => css`
+        && {
+          width: ${inputWidth}px;
+          min-width: ${theme.sizeUnit * 10}px;
+          transition: auto;
+        }
+      `}
+    />
+  );
+
+  if (showTooltip && !isEditing) {
+    titleComponent = (
+      <Tooltip
+        id="title-tooltip"
+        placement="topLeft"
+        title={
+          canEdit
+            ? t('Click to edit')
+            : noPermitTooltip ||
+              t("You don't have the rights to alter this title.")
+        }
+      >
+        {titleComponent}
+      </Tooltip>
+    );
+  }
+
+  if (!canEdit) {
+    if (renderLink) {
+      // New approach: let caller provide the link component
+      titleComponent = renderLink(value || '');
+    } else {
+      titleComponent = <span data-test="span-title">{value}</span>;
+    }
+  }
+
+  return (
+    <StyledEditableTitle
+      data-test="editable-title"
+      className={cx(
+        'editable-title',
+        extraClasses,
+        canEdit && 'editable-title--editable',
+        isEditing && 'editable-title--editing',
+      )}
+      style={style}
+      editing={isEditing}
+      canEdit={canEdit}
+      {...rest}
+    >
+      {certifiedBy && (
+        <>
+          <StyledCertifiedBadge
+            certifiedBy={certifiedBy}
+            details={certificationDetails}
+            size="xl"
+          />{' '}
+        </>
+      )}
+      {titleComponent}
+    </StyledEditableTitle>
+  );
+}
+
+export type { EditableTitleProps };
diff --git a/superset-frontend/packages/superset-ui-core/src/components/EditableTitle/types.ts b/superset-frontend/packages/superset-ui-core/src/components/EditableTitle/types.ts
new file mode 100644
index 00000000000..dc615dac644
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/EditableTitle/types.ts
@@ -0,0 +1,36 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+export interface EditableTitleProps {
+  canEdit?: boolean;
+  editing?: boolean;
+  emptyText?: string;
+  extraClasses?: Array<string> | string;
+  noPermitTooltip?: string;
+  onSaveTitle: (arg0: string) => void;
+  showTooltip?: boolean;
+  style?: object;
+  title?: string;
+  defaultTitle?: string;
+  placeholder?: string;
+  certifiedBy?: string;
+  certificationDetails?: string;
+  renderLink?: (title: string) => React.ReactNode;
+  maxWidth?: number;
+  autoSize?: boolean;
+}
diff --git a/superset-frontend/src/components/EmptyState/Empty.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/EmptyState/Empty.test.tsx
similarity index 94%
rename from superset-frontend/src/components/EmptyState/Empty.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/EmptyState/Empty.test.tsx
index 7c9ace0fc81..da5dad601e0 100644
--- a/superset-frontend/src/components/EmptyState/Empty.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/EmptyState/Empty.test.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { render } from 'spec/helpers/testing-library';
+import { render } from '@superset-ui/core/spec';
 import { Empty } from './Empty';
 
 test('should render', () => {
diff --git a/superset-frontend/src/components/EmptyState/Empty.tsx b/superset-frontend/packages/superset-ui-core/src/components/EmptyState/Empty.tsx
similarity index 89%
rename from superset-frontend/src/components/EmptyState/Empty.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/EmptyState/Empty.tsx
index b507027c64d..5ea351d5c12 100644
--- a/superset-frontend/src/components/EmptyState/Empty.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/EmptyState/Empty.tsx
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { Empty as AntdEmpty } from 'antd-v5';
-import { EmptyProps } from 'antd-v5/es/empty';
+import { Empty as AntdEmpty } from 'antd';
+import { EmptyProps } from 'antd/es/empty';
 
 export const Empty = Object.assign(
   (props: EmptyProps) => <AntdEmpty {...props} />,
@@ -27,3 +27,5 @@ export const Empty = Object.assign(
     PRESENTED_IMAGE_DEFAULT: AntdEmpty.PRESENTED_IMAGE_DEFAULT,
   },
 );
+
+export type { EmptyProps };
diff --git a/superset-frontend/src/components/EmptyState/EmptyState.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/EmptyState/EmptyState.stories.tsx
similarity index 95%
rename from superset-frontend/src/components/EmptyState/EmptyState.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/EmptyState/EmptyState.stories.tsx
index dbc3a0af9cc..2c58d7ca459 100644
--- a/superset-frontend/src/components/EmptyState/EmptyState.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/EmptyState/EmptyState.stories.tsx
@@ -18,7 +18,7 @@
  * under the License.
  */
 import { Meta, StoryFn } from '@storybook/react';
-import { Row, Col } from 'antd';
+import { Row, Col } from '@superset-ui/core/components';
 import { EmptyState, imageMap } from '.';
 
 const emptyStates = [
@@ -31,7 +31,7 @@ const emptyStates = [
 ];
 
 export default {
-  title: 'Empty State Gallery',
+  title: 'Components/EmptyState',
   component: EmptyState,
   argTypes: {
     size: {
diff --git a/superset-frontend/src/components/EmptyState/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/EmptyState/index.tsx
similarity index 62%
rename from superset-frontend/src/components/EmptyState/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/EmptyState/index.tsx
index 0dc9e876c19..570119ff2fc 100644
--- a/superset-frontend/src/components/EmptyState/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/EmptyState/index.tsx
@@ -18,25 +18,24 @@
  */
 import { ReactNode, SyntheticEvent } from 'react';
 import { styled, css, SupersetTheme, t } from '@superset-ui/core';
-import Button from 'src/components/Button';
 
 // Importing svg images
-import FilterResultsImage from 'src/assets/images/filter-results.svg';
-import ChartImage from 'src/assets/images/chart.svg';
-import FilterImage from 'src/assets/images/filter.svg';
-import EmptyChartsImage from 'src/assets/images/empty-charts.svg';
-import EmptyDashboardImage from 'src/assets/images/empty-dashboard.svg';
-import UnionImage from 'src/assets/images/union.svg';
-import EmptyQueriesImage from 'src/assets/images/empty-queries.svg';
-import StarCircleImage from 'src/assets/images/star-circle.svg';
-import VectorImage from 'src/assets/images/vector.svg';
-import DocumentImage from 'src/assets/images/document.svg';
-import DatasetImage from 'src/assets/images/empty-dataset.svg';
-import EmptySqlChartImage from 'src/assets/images/empty_sql_chart.svg';
-import EmptyQueryImage from 'src/assets/images/empty-query.svg';
-import EmptyTableImage from 'src/assets/images/empty-table.svg';
-import EmptyImage from 'src/assets/images/empty.svg';
-import { Empty } from './Empty';
+import FilterResultsImage from './svgs/filter-results.svg';
+import ChartImage from '../assets/svgs/chart.svg';
+import FilterImage from './svgs/filter.svg';
+import EmptyChartsImage from './svgs/empty-charts.svg';
+import EmptyDashboardImage from './svgs/empty-dashboard.svg';
+import UnionImage from './svgs/union.svg';
+import StarCircleImage from './svgs/star-circle.svg';
+import VectorImage from './svgs/vector.svg';
+import DocumentImage from './svgs/document.svg';
+import DatasetImage from './svgs/empty-dataset.svg';
+import EmptySqlChartImage from './svgs/empty_sql_chart.svg';
+import EmptyQueryImage from './svgs/empty-query.svg';
+import EmptyTableImage from './svgs/empty-table.svg';
+import EmptyImage from './svgs/empty.svg';
+import { Button, Empty } from '..';
+import type { EmptyStateProps, EmptyStateSize } from './types';
 
 export const imageMap = {
   'chart.svg': <ChartImage />,
@@ -44,7 +43,6 @@ export const imageMap = {
   'empty-charts.svg': <EmptyChartsImage />,
   'empty-dashboard.svg': <EmptyDashboardImage />,
   'empty-dataset.svg': <DatasetImage />,
-  'empty-queries.svg': <EmptyQueriesImage />,
   'empty-query.svg': <EmptyQueryImage />,
   'empty-table.svg': <EmptyTableImage />,
   'empty.svg': <EmptyImage />,
@@ -56,31 +54,19 @@ export const imageMap = {
   'vector.svg': <VectorImage />,
 };
 
-type EmptyStateSize = 'small' | 'medium' | 'large';
-
-export type EmptyStateProps = {
-  title?: ReactNode;
-  description?: ReactNode;
-  image?: ReactNode | string;
-  buttonText?: ReactNode;
-  buttonAction?: (event: SyntheticEvent) => void;
-  size?: EmptyStateSize;
-  children?: ReactNode;
-};
-
 const EmptyStateContainer = styled.div`
   ${({ theme }) => css`
     display: flex;
     flex-direction: column;
     width: 100%;
     height: 100%;
-    color: ${theme.colors.grayscale.light2};
+    color: ${theme.colorTextQuaternary};
     align-items: center;
     justify-content: center;
-    padding: ${theme.gridUnit * 4}px;
+    padding: ${theme.sizeUnit * 4}px;
     text-align: center;
 
-    & .antd5-empty-image svg {
+    & .ant-empty-image svg {
       width: auto;
     }
 
@@ -89,7 +75,7 @@ const EmptyStateContainer = styled.div`
       color: inherit;
       text-decoration: underline;
       &:hover {
-        color: ${theme.colors.grayscale.base};
+        color: ${theme.colorText};
       }
     }
   `}
@@ -97,29 +83,18 @@ const EmptyStateContainer = styled.div`
 
 const Title = styled.p<{ size: EmptyStateSize }>`
   ${({ theme, size }) => css`
-    font-size: ${size === 'large'
-      ? theme.typography.sizes.l
-      : theme.typography.sizes.m}px;
-    color: ${theme.colors.grayscale.light1};
-    margin-top: ${size === 'large' ? theme.gridUnit * 4 : theme.gridUnit * 2}px;
-    font-weight: ${theme.typography.weights.bold};
+    font-size: ${size === 'large' ? theme.fontSizeLG : theme.fontSize}px;
+    color: ${theme.colorTextQuaternary};
+    margin-top: ${size === 'large' ? theme.sizeUnit * 4 : theme.sizeUnit * 2}px;
+    font-weight: ${theme.fontWeightStrong};
   `}
 `;
 
 const Description = styled.p<{ size: EmptyStateSize }>`
   ${({ theme, size }) => css`
-    font-size: ${size === 'large'
-      ? theme.typography.sizes.m
-      : theme.typography.sizes.s}px;
-    color: ${theme.colors.grayscale.light1};
-    margin-top: ${theme.gridUnit * 2}px;
-  `}
-`;
-
-const ActionButton = styled(Button)`
-  ${({ theme }) => css`
-    margin-top: ${theme.gridUnit * 4}px;
-    z-index: 1;
+    font-size: ${size === 'large' ? theme.fontSize : theme.fontSizeSM}px;
+    color: ${theme.colorTextQuaternary};
+    margin-top: ${theme.sizeUnit * 2}px;
   `}
 `;
 
@@ -178,8 +153,8 @@ export const EmptyState: React.FC<EmptyStateProps> = ({
     <div
       css={(theme: SupersetTheme) => css`
         max-width: ${size === 'large'
-          ? theme.gridUnit * 150
-          : theme.gridUnit * 100}px;
+          ? theme.sizeUnit * 150
+          : theme.sizeUnit * 100}px;
       `}
     >
       {title && <Title size={size}>{title}</Title>}
@@ -189,15 +164,22 @@ export const EmptyState: React.FC<EmptyStateProps> = ({
         </Description>
       )}
       {buttonText && buttonAction && (
-        <ActionButton
+        <Button
           buttonStyle="primary"
           onClick={buttonAction}
           onMouseDown={handleMouseDown}
+          css={(theme: SupersetTheme) => css`
+            margin-top: ${theme.sizeUnit * 4}px;
+            z-index: 1;
+            box-shadow: none;
+          `}
         >
           {buttonText}
-        </ActionButton>
+        </Button>
       )}
       {children}
     </div>
   </EmptyStateContainer>
 );
+
+export type { EmptyStateProps };
diff --git a/superset-frontend/src/assets/images/document.svg b/superset-frontend/packages/superset-ui-core/src/components/EmptyState/svgs/document.svg
similarity index 88%
rename from superset-frontend/src/assets/images/document.svg
rename to superset-frontend/packages/superset-ui-core/src/components/EmptyState/svgs/document.svg
index 552fc8d220b..eec096274fa 100644
--- a/superset-frontend/src/assets/images/document.svg
+++ b/superset-frontend/packages/superset-ui-core/src/components/EmptyState/svgs/document.svg
@@ -16,7 +16,7 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-<svg width="64" height="80" viewBox="0 0 64 80" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M53.2326 10.7391L53.2336 10.7402L63.5 21.7963V79.5H0.5V0.5H43.7811L53.2326 10.7391Z" fill="currentColor" stroke="currentColor" fill-opacity="0.5"/>
+<svg viewBox="0 0 64 80" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M53.2326 10.7391L53.2336 10.7402L63.5 21.7963V79.5H0.5V0.5H43.7811L53.2326 10.7391Z" fill="currentColor" stroke="currentColor" fill-opacity="0.25"/>
 <path d="M44 0V22.4H64" stroke="currentColor"/>
 </svg>
diff --git a/superset-frontend/src/assets/images/empty-charts.svg b/superset-frontend/packages/superset-ui-core/src/components/EmptyState/svgs/empty-charts.svg
similarity index 96%
rename from superset-frontend/src/assets/images/empty-charts.svg
rename to superset-frontend/packages/superset-ui-core/src/components/EmptyState/svgs/empty-charts.svg
index 8c7b205d2a9..a56851af197 100644
--- a/superset-frontend/src/assets/images/empty-charts.svg
+++ b/superset-frontend/packages/superset-ui-core/src/components/EmptyState/svgs/empty-charts.svg
@@ -26,5 +26,5 @@ under the License.
 
   <path
     d="M58 10.6416C58 9.53706 57.1014 8.63294 56.0006 8.72373C43.6813 9.73974 34 20.0601 34 32.6416C34 45.8965 44.7452 56.6416 58 56.6416C70.5815 56.6416 80.9019 46.9604 81.9179 34.641C82.0087 33.5402 81.1046 32.6416 80 32.6416L60 32.6416C58.8954 32.6416 58 31.7462 58 30.6416V10.6416Z"
-    fill="currentColor" fill-opacity="0.5" />
+    fill="currentColor" fill-opacity="0.25" />
 </svg>
diff --git a/superset-frontend/src/assets/images/empty-dashboard.svg b/superset-frontend/packages/superset-ui-core/src/components/EmptyState/svgs/empty-dashboard.svg
similarity index 100%
rename from superset-frontend/src/assets/images/empty-dashboard.svg
rename to superset-frontend/packages/superset-ui-core/src/components/EmptyState/svgs/empty-dashboard.svg
diff --git a/superset-frontend/src/assets/images/empty-dataset.svg b/superset-frontend/packages/superset-ui-core/src/components/EmptyState/svgs/empty-dataset.svg
similarity index 50%
rename from superset-frontend/src/assets/images/empty-dataset.svg
rename to superset-frontend/packages/superset-ui-core/src/components/EmptyState/svgs/empty-dataset.svg
index 9a0299d3b42..7f1913a4d48 100644
--- a/superset-frontend/src/assets/images/empty-dataset.svg
+++ b/superset-frontend/packages/superset-ui-core/src/components/EmptyState/svgs/empty-dataset.svg
@@ -17,23 +17,14 @@ specific language governing permissions and limitations
 under the License.
 -->
 <svg viewBox="0 0 152 152" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M44.5 1C45.0523 1 45.5 1.44772 45.5 2V45C45.5 45.5523 45.0523 46 44.5 46H1.5C0.947716 46 0.5 45.5523 0.5 45V2C0.5 1.44772 0.947716 1 1.5 1L44.5 1Z" fill="currentColor"/>
-<path d="M97.5 1C98.0523 1 98.5 1.44772 98.5 2V45C98.5 45.5523 98.0523 46 97.5 46H54.5C53.9477 46 53.5 45.5523 53.5 45V2C53.5 1.44772 53.9477 1 54.5 1L97.5 1Z" fill="currentColor"/>
-<path d="M150.5 1C151.052 1 151.5 1.44772 151.5 2V45C151.5 45.5523 151.052 46 150.5 46H107.5C106.948 46 106.5 45.5523 106.5 45V2C106.5 1.44772 106.948 1 107.5 1L150.5 1Z" fill="currentColor"/>
-<path d="M44.5 54C45.0523 54 45.5 54.4477 45.5 55V98C45.5 98.5523 45.0523 99 44.5 99H1.5C0.947716 99 0.5 98.5523 0.5 98V55C0.5 54.4477 0.947716 54 1.5 54H44.5Z" fill="currentColor"/>
-<path d="M97.5 54C98.0523 54 98.5 54.4477 98.5 55V98C98.5 98.5523 98.0523 99 97.5 99H54.5C53.9477 99 53.5 98.5523 53.5 98V55C53.5 54.4477 53.9477 54 54.5 54H97.5Z" fill="currentColor"/>
-<path d="M150.5 54C151.052 54 151.5 54.4477 151.5 55V98C151.5 98.5523 151.052 99 150.5 99H107.5C106.948 99 106.5 98.5523 106.5 98V55C106.5 54.4477 106.948 54 107.5 54H150.5Z" fill="currentColor"/>
-<path d="M44.5 106C45.0523 106 45.5 106.448 45.5 107V150C45.5 150.552 45.0523 151 44.5 151H1.5C0.947716 151 0.5 150.552 0.5 150V107C0.5 106.448 0.947716 106 1.5 106H44.5Z" fill="currentColor"/>
-<path d="M97.5 106C98.0523 106 98.5 106.448 98.5 107V150C98.5 150.552 98.0523 151 97.5 151H54.5C53.9477 151 53.5 150.552 53.5 150V107C53.5 106.448 53.9477 106 54.5 106H97.5Z" fill="currentColor"/>
-<path d="M150.5 106C151.052 106 151.5 106.448 151.5 107V150C151.5 150.552 151.052 151 150.5 151H107.5C106.948 151 106.5 150.552 106.5 150V107C106.5 106.448 106.948 106 107.5 106H150.5Z" fill="currentColor"/>
+<path d="M44.5 1C45.0523 1 45.5 1.44772 45.5 2V45C45.5 45.5523 45.0523 46 44.5 46H1.5C0.947716 46 0.5 45.5523 0.5 45V2C0.5 1.44772 0.947716 1 1.5 1L44.5 1Z" fill="currentColor" stroke="currentColor" fill-opacity="0.25"/>
+<path d="M97.5 1C98.0523 1 98.5 1.44772 98.5 2V45C98.5 45.5523 98.0523 46 97.5 46H54.5C53.9477 46 53.5 45.5523 53.5 45V2C53.5 1.44772 53.9477 1 54.5 1L97.5 1Z" fill="currentColor"  stroke="currentColor" fill-opacity="0.25"/>
+<path d="M150.5 1C151.052 1 151.5 1.44772 151.5 2V45C151.5 45.5523 151.052 46 150.5 46H107.5C106.948 46 106.5 45.5523 106.5 45V2C106.5 1.44772 106.948 1 107.5 1L150.5 1Z" fill="currentColor"  stroke="currentColor" fill-opacity="0.25"/>
+<path d="M44.5 54C45.0523 54 45.5 54.4477 45.5 55V98C45.5 98.5523 45.0523 99 44.5 99H1.5C0.947716 99 0.5 98.5523 0.5 98V55C0.5 54.4477 0.947716 54 1.5 54H44.5Z" fill="currentColor"  stroke="currentColor" fill-opacity="0.25"/>
+<path d="M97.5 54C98.0523 54 98.5 54.4477 98.5 55V98C98.5 98.5523 98.0523 99 97.5 99H54.5C53.9477 99 53.5 98.5523 53.5 98V55C53.5 54.4477 53.9477 54 54.5 54H97.5Z" fill="currentColor" stroke="currentColor" fill-opacity="0.25" />
+<path d="M150.5 54C151.052 54 151.5 54.4477 151.5 55V98C151.5 98.5523 151.052 99 150.5 99H107.5C106.948 99 106.5 98.5523 106.5 98V55C106.5 54.4477 106.948 54 107.5 54H150.5Z" fill="currentColor"  stroke="currentColor" fill-opacity="0.25"/>
+<path d="M44.5 106C45.0523 106 45.5 106.448 45.5 107V150C45.5 150.552 45.0523 151 44.5 151H1.5C0.947716 151 0.5 150.552 0.5 150V107C0.5 106.448 0.947716 106 1.5 106H44.5Z" fill="currentColor"  stroke="currentColor" fill-opacity="0.25"/>
+<path d="M97.5 106C98.0523 106 98.5 106.448 98.5 107V150C98.5 150.552 98.0523 151 97.5 151H54.5C53.9477 151 53.5 150.552 53.5 150V107C53.5 106.448 53.9477 106 54.5 106H97.5Z" fill="currentColor"  stroke="currentColor" fill-opacity="0.25"/>
+<path d="M150.5 106C151.052 106 151.5 106.448 151.5 107V150C151.5 150.552 151.052 151 150.5 151H107.5C106.948 151 106.5 150.552 106.5 150V107C106.5 106.448 106.948 106 107.5 106H150.5Z" fill="currentColor" stroke="currentColor" fill-opacity="0.25"/>
 
-<path d="M44.5 1C45.0523 1 45.5 1.44772 45.5 2V45C45.5 45.5523 45.0523 46 44.5 46H1.5C0.947716 46 0.5 45.5523 0.5 45V2C0.5 1.44772 0.947716 1 1.5 1L44.5 1Z" stroke="currentColor"/>
-<path d="M97.5 1C98.0523 1 98.5 1.44772 98.5 2V45C98.5 45.5523 98.0523 46 97.5 46H54.5C53.9477 46 53.5 45.5523 53.5 45V2C53.5 1.44772 53.9477 1 54.5 1L97.5 1Z" stroke="currentColor"/>
-<path d="M150.5 1C151.052 1 151.5 1.44772 151.5 2V45C151.5 45.5523 151.052 46 150.5 46H107.5C106.948 46 106.5 45.5523 106.5 45V2C106.5 1.44772 106.948 1 107.5 1L150.5 1Z" stroke="currentColor"/>
-<path d="M44.5 54C45.0523 54 45.5 54.4477 45.5 55V98C45.5 98.5523 45.0523 99 44.5 99H1.5C0.947716 99 0.5 98.5523 0.5 98V55C0.5 54.4477 0.947716 54 1.5 54H44.5Z" stroke="currentColor"/>
-<path d="M97.5 54C98.0523 54 98.5 54.4477 98.5 55V98C98.5 98.5523 98.0523 99 97.5 99H54.5C53.9477 99 53.5 98.5523 53.5 98V55C53.5 54.4477 53.9477 54 54.5 54H97.5Z" stroke="currentColor"/>
-<path d="M150.5 54C151.052 54 151.5 54.4477 151.5 55V98C151.5 98.5523 151.052 99 150.5 99H107.5C106.948 99 106.5 98.5523 106.5 98V55C106.5 54.4477 106.948 54 107.5 54H150.5Z" stroke="currentColor"/>
-<path d="M44.5 106C45.0523 106 45.5 106.448 45.5 107V150C45.5 150.552 45.0523 151 44.5 151H1.5C0.947716 151 0.5 150.552 0.5 150V107C0.5 106.448 0.947716 106 1.5 106H44.5Z" stroke="currentColor"/>
-<path d="M97.5 106C98.0523 106 98.5 106.448 98.5 107V150C98.5 150.552 98.0523 151 97.5 151H54.5C53.9477 151 53.5 150.552 53.5 150V107C53.5 106.448 53.9477 106 54.5 106H97.5Z" stroke="currentColor"/>
-<path d="M150.5 106C151.052 106 151.5 106.448 151.5 107V150C151.5 150.552 151.052 151 150.5 151H107.5C106.948 151 106.5 150.552 106.5 150V107C106.5 106.448 106.948 106 107.5 106H150.5Z" stroke="currentColor"/>
 </svg>
diff --git a/superset-frontend/src/assets/images/empty-query.svg b/superset-frontend/packages/superset-ui-core/src/components/EmptyState/svgs/empty-query.svg
similarity index 77%
rename from superset-frontend/src/assets/images/empty-query.svg
rename to superset-frontend/packages/superset-ui-core/src/components/EmptyState/svgs/empty-query.svg
index a19fc73eebf..68074bb78f4 100644
--- a/superset-frontend/src/assets/images/empty-query.svg
+++ b/superset-frontend/packages/superset-ui-core/src/components/EmptyState/svgs/empty-query.svg
@@ -17,9 +17,9 @@ specific language governing permissions and limitations
 under the License.
 -->
 <svg viewBox="0 0 300 146" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M17 21C17 18.7909 18.7909 17 21 17H125C127.209 17 129 18.7909 129 21V29C129 31.2091 127.209 33 125 33H21C18.7909 33 17 31.2091 17 29V21Z" fill="currentColor"/>
-<path d="M17 45C17 42.7909 18.7909 41 21 41H223C225.209 41 227 42.7909 227 45V53C227 55.2091 225.209 57 223 57H21C18.7909 57 17 55.2091 17 53V45Z" fill="currentColor"/>
-<path d="M21 65C18.7909 65 17 66.7909 17 69V77C17 79.2091 18.7909 81 21 81H172C174.209 81 176 79.2091 176 77V69C176 66.7909 174.209 65 172 65H21Z" fill="currentColor"/>
-<path d="M17 93C17 90.7909 18.7909 89 21 89H286C288.209 89 290 90.7909 290 93V101C290 103.209 288.209 105 286 105H21C18.7909 105 17 103.209 17 101V93Z" fill="currentColor"/>
-<path d="M21 113C18.7909 113 17 114.791 17 117V125C17 127.209 18.7909 129 21 129H73C75.2091 129 77 127.209 77 125V117C77 114.791 75.2091 113 73 113H21Z" fill="currentColor"/>
+<path d="M17 21C17 18.7909 18.7909 17 21 17H125C127.209 17 129 18.7909 129 21V29C129 31.2091 127.209 33 125 33H21C18.7909 33 17 31.2091 17 29V21Z" fill="currentColor" stroke="currentColor" fill-opacity="0.25"/>
+<path d="M17 45C17 42.7909 18.7909 41 21 41H223C225.209 41 227 42.7909 227 45V53C227 55.2091 225.209 57 223 57H21C18.7909 57 17 55.2091 17 53V45Z" fill="currentColor" stroke="currentColor" fill-opacity="0.25"/>
+<path d="M21 65C18.7909 65 17 66.7909 17 69V77C17 79.2091 18.7909 81 21 81H172C174.209 81 176 79.2091 176 77V69C176 66.7909 174.209 65 172 65H21Z" fill="currentColor" stroke="currentColor" fill-opacity="0.25"/>
+<path d="M17 93C17 90.7909 18.7909 89 21 89H286C288.209 89 290 90.7909 290 93V101C290 103.209 288.209 105 286 105H21C18.7909 105 17 103.209 17 101V93Z" fill="currentColor" stroke="currentColor" fill-opacity="0.25"/>
+<path d="M21 113C18.7909 113 17 114.791 17 117V125C17 127.209 18.7909 129 21 129H73C75.2091 129 77 127.209 77 125V117C77 114.791 75.2091 113 73 113H21Z" fill="currentColor" stroke="currentColor" fill-opacity="0.25"/>
 </svg>
diff --git a/superset-frontend/src/assets/images/empty-table.svg b/superset-frontend/packages/superset-ui-core/src/components/EmptyState/svgs/empty-table.svg
similarity index 95%
rename from superset-frontend/src/assets/images/empty-table.svg
rename to superset-frontend/packages/superset-ui-core/src/components/EmptyState/svgs/empty-table.svg
index 9079b07114c..12a71ae097c 100644
--- a/superset-frontend/src/assets/images/empty-table.svg
+++ b/superset-frontend/packages/superset-ui-core/src/components/EmptyState/svgs/empty-table.svg
@@ -17,6 +17,6 @@ specific language governing permissions and limitations
 under the License.
 -->
 <svg viewBox="0 0 81 82" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M76.5 1H4.5C2.29086 1 0.5 2.79086 0.5 5V77C0.5 79.2091 2.29086 81 4.5 81H76.5C78.7091 81 80.5 79.2091 80.5 77V5C80.5 2.79086 78.7091 1 76.5 1ZM36.5 73H8.5V57H36.5V73ZM36.5 49H8.5V33H36.5V49ZM72.5 73H44.5V57H72.5V73ZM72.5 49H44.5V33H72.5V49ZM72.5 25H8.5V9H72.5V25Z" fill="currentColor"/>
-<path d="M36.5 73V73.5H37V73H36.5ZM8.5 73H8V73.5H8.5V73ZM8.5 57V56.5H8V57H8.5ZM36.5 57H37V56.5H36.5V57ZM36.5 49V49.5H37V49H36.5ZM8.5 49H8V49.5H8.5V49ZM8.5 33V32.5H8V33H8.5ZM36.5 33H37V32.5H36.5V33ZM72.5 73V73.5H73V73H72.5ZM44.5 73H44V73.5H44.5V73ZM44.5 57V56.5H44V57H44.5ZM72.5 57H73V56.5H72.5V57ZM72.5 49V49.5H73V49H72.5ZM44.5 49H44V49.5H44.5V49ZM44.5 33V32.5H44V33H44.5ZM72.5 33H73V32.5H72.5V33ZM72.5 25V25.5H73V25H72.5ZM8.5 25H8V25.5H8.5V25ZM8.5 9V8.5H8V9H8.5ZM72.5 9H73V8.5H72.5V9ZM76.5 0.5H4.5V1.5H76.5V0.5ZM4.5 0.5C2.01472 0.5 0 2.51472 0 5H1C1 3.067 2.567 1.5 4.5 1.5V0.5ZM0 5V77H1V5H0ZM0 77C0 79.4853 2.01472 81.5 4.5 81.5V80.5C2.567 80.5 1 78.933 1 77H0ZM4.5 81.5H76.5V80.5H4.5V81.5ZM76.5 81.5C78.9853 81.5 81 79.4853 81 77H80C80 78.933 78.433 80.5 76.5 80.5V81.5ZM81 77V5H80V77H81ZM81 5C81 2.51472 78.9853 0.5 76.5 0.5V1.5C78.433 1.5 80 3.067 80 5H81ZM36.5 72.5H8.5V73.5H36.5V72.5ZM9 73V57H8V73H9ZM8.5 57.5H36.5V56.5H8.5V57.5ZM36 57V73H37V57H36ZM36.5 48.5H8.5V49.5H36.5V48.5ZM9 49V33H8V49H9ZM8.5 33.5H36.5V32.5H8.5V33.5ZM36 33V49H37V33H36ZM72.5 72.5H44.5V73.5H72.5V72.5ZM45 73V57H44V73H45ZM44.5 57.5H72.5V56.5H44.5V57.5ZM72 57V73H73V57H72ZM72.5 48.5H44.5V49.5H72.5V48.5ZM45 49V33H44V49H45ZM44.5 33.5H72.5V32.5H44.5V33.5ZM72 33V49H73V33H72ZM72.5 24.5H8.5V25.5H72.5V24.5ZM9 25V9H8V25H9ZM8.5 9.5H72.5V8.5H8.5V9.5ZM72 9V25H73V9H72Z" fill="currentColor"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M76.5 1H4.5C2.29086 1 0.5 2.79086 0.5 5V77C0.5 79.2091 2.29086 81 4.5 81H76.5C78.7091 81 80.5 79.2091 80.5 77V5C80.5 2.79086 78.7091 1 76.5 1ZM36.5 73H8.5V57H36.5V73ZM36.5 49H8.5V33H36.5V49ZM72.5 73H44.5V57H72.5V73ZM72.5 49H44.5V33H72.5V49ZM72.5 25H8.5V9H72.5V25Z" fill="currentColor" fill-opacity="0.25" stroke="currentColor"/>
+<path d="M36.5 73V73.5H37V73H36.5ZM8.5 73H8V73.5H8.5V73ZM8.5 57V56.5H8V57H8.5ZM36.5 57H37V56.5H36.5V57ZM36.5 49V49.5H37V49H36.5ZM8.5 49H8V49.5H8.5V49ZM8.5 33V32.5H8V33H8.5ZM36.5 33H37V32.5H36.5V33ZM72.5 73V73.5H73V73H72.5ZM44.5 73H44V73.5H44.5V73ZM44.5 57V56.5H44V57H44.5ZM72.5 57H73V56.5H72.5V57ZM72.5 49V49.5H73V49H72.5ZM44.5 49H44V49.5H44.5V49ZM44.5 33V32.5H44V33H44.5ZM72.5 33H73V32.5H72.5V33ZM72.5 25V25.5H73V25H72.5ZM8.5 25H8V25.5H8.5V25ZM8.5 9V8.5H8V9H8.5ZM72.5 9H73V8.5H72.5V9ZM76.5 0.5H4.5V1.5H76.5V0.5ZM4.5 0.5C2.01472 0.5 0 2.51472 0 5H1C1 3.067 2.567 1.5 4.5 1.5V0.5ZM0 5V77H1V5H0ZM0 77C0 79.4853 2.01472 81.5 4.5 81.5V80.5C2.567 80.5 1 78.933 1 77H0ZM4.5 81.5H76.5V80.5H4.5V81.5ZM76.5 81.5C78.9853 81.5 81 79.4853 81 77H80C80 78.933 78.433 80.5 76.5 80.5V81.5ZM81 77V5H80V77H81ZM81 5C81 2.51472 78.9853 0.5 76.5 0.5V1.5C78.433 1.5 80 3.067 80 5H81ZM36.5 72.5H8.5V73.5H36.5V72.5ZM9 73V57H8V73H9ZM8.5 57.5H36.5V56.5H8.5V57.5ZM36 57V73H37V57H36ZM36.5 48.5H8.5V49.5H36.5V48.5ZM9 49V33H8V49H9ZM8.5 33.5H36.5V32.5H8.5V33.5ZM36 33V49H37V33H36ZM72.5 72.5H44.5V73.5H72.5V72.5ZM45 73V57H44V73H45ZM44.5 57.5H72.5V56.5H44.5V57.5ZM72 57V73H73V57H72ZM72.5 48.5H44.5V49.5H72.5V48.5ZM45 49V33H44V49H45ZM44.5 33.5H72.5V32.5H44.5V33.5ZM72 33V49H73V33H72ZM72.5 24.5H8.5V25.5H72.5V24.5ZM9 25V9H8V25H9ZM8.5 9.5H72.5V8.5H8.5V9.5ZM72 9V25H73V9H72Z" fill="currentColor" fill-opacity="0.25" stroke="currentColor" />
 </svg>
diff --git a/superset-frontend/src/assets/images/empty.svg b/superset-frontend/packages/superset-ui-core/src/components/EmptyState/svgs/empty.svg
similarity index 100%
rename from superset-frontend/src/assets/images/empty.svg
rename to superset-frontend/packages/superset-ui-core/src/components/EmptyState/svgs/empty.svg
diff --git a/superset-frontend/src/assets/images/empty_sql_chart.svg b/superset-frontend/packages/superset-ui-core/src/components/EmptyState/svgs/empty_sql_chart.svg
similarity index 97%
rename from superset-frontend/src/assets/images/empty_sql_chart.svg
rename to superset-frontend/packages/superset-ui-core/src/components/EmptyState/svgs/empty_sql_chart.svg
index b729b471a65..b6d0dd73791 100644
--- a/superset-frontend/src/assets/images/empty_sql_chart.svg
+++ b/superset-frontend/packages/superset-ui-core/src/components/EmptyState/svgs/empty_sql_chart.svg
@@ -17,6 +17,6 @@ specific language governing permissions and limitations
 under the License.
 -->
 <svg viewBox="0 0 196 152" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M193.652 1.5C193.652 1.22386 193.428 1 193.152 1L52.3477 1V30.3478L193.152 30.3478C193.428 30.3478 193.652 30.124 193.652 29.8478V1.5ZM41.4781 1.5C41.4781 1.22386 41.2543 1 40.9781 1L1.26074 1V30.3478L40.9781 30.3478C41.2543 30.3478 41.4781 30.124 41.4781 29.8478V1.5ZM193.652 122.152C193.652 121.876 193.428 121.652 193.152 121.652H153.435V151H193.152C193.428 151 193.652 150.776 193.652 150.5V122.152ZM40.9781 81.4348C41.2543 81.4348 41.4781 81.6586 41.4781 81.9348V110.283C41.4781 110.559 41.2543 110.783 40.9781 110.783H1.26074V81.4348H40.9781ZM116.478 81.9348C116.478 81.6586 116.254 81.4348 115.978 81.4348H52.3477V110.783H115.978C116.254 110.783 116.478 110.559 116.478 110.283V81.9348ZM193.761 81C194.037 81 194.261 81.2239 194.261 81.5V110.5C194.261 110.776 194.037 111 193.761 111H127.261V81H193.761ZM142.065 121.652C142.341 121.652 142.565 121.876 142.565 122.152V150.5C142.565 150.776 142.341 151 142.065 151L1.26074 151V121.652L142.065 121.652ZM194.739 41.7174C194.739 41.4413 194.515 41.2174 194.239 41.2174L1.26074 41.2174V70.5652L194.239 70.5652C194.515 70.5652 194.739 70.3414 194.739 70.0652V41.7174Z" fill="currentColor"/>
-<path d="M193.152 1V0.500004V1ZM52.3477 1V0.5H51.8477V1H52.3477ZM52.3477 30.3478H51.8477V30.8478H52.3477V30.3478ZM193.152 30.3478V30.8478V30.3478ZM40.9781 1V1.5V1ZM1.26074 1L1.26074 0.500003L0.760742 0.500003V1H1.26074ZM1.26074 30.3478H0.760742V30.8478H1.26074L1.26074 30.3478ZM40.9781 30.3478V30.8478V30.3478ZM153.435 121.652V121.152H152.935V121.652H153.435ZM153.435 151H152.935V151.5H153.435V151ZM1.26074 110.783H0.760742V111.283H1.26074V110.783ZM1.26074 81.4348V80.9348H0.760742V81.4348H1.26074ZM52.3477 81.4348V80.9348H51.8477V81.4348H52.3477ZM52.3477 110.783H51.8477V111.283H52.3477V110.783ZM127.261 111H126.761V111.5H127.261V111ZM127.261 81V80.5H126.761V81H127.261ZM142.065 121.652V122.152V121.652ZM142.065 151V151.5V151ZM1.26074 151H0.760742V151.5H1.26074L1.26074 151ZM1.26074 121.652L1.26074 121.152H0.760742V121.652H1.26074ZM194.239 41.2174V41.7174V41.2174ZM1.26074 41.2174L1.26074 40.7174H0.760742V41.2174H1.26074ZM1.26074 70.5652H0.760742V71.0652H1.26074L1.26074 70.5652ZM194.239 70.5652V71.0652V70.5652ZM193.152 1.5V1.5H194.152C194.152 0.947717 193.704 0.500004 193.152 0.500004V1.5ZM52.3477 1.5L193.152 1.5V0.500004L52.3477 0.5V1.5ZM52.8477 30.3478V1H51.8477V30.3478H52.8477ZM193.152 29.8478L52.3477 29.8478V30.8478L193.152 30.8478V29.8478ZM193.152 29.8478V30.8478C193.704 30.8478 194.152 30.4001 194.152 29.8478H193.152ZM193.152 1.5V29.8478H194.152V1.5H193.152ZM40.9781 1.5H41.9781C41.9781 0.947719 41.5304 0.500004 40.9781 0.500004V1.5ZM1.26074 1.5L40.9781 1.5V0.500004L1.26074 0.500003L1.26074 1.5ZM1.76074 30.3478V1H0.760742V30.3478H1.76074ZM40.9781 29.8478L1.26074 29.8478L1.26074 30.8478L40.9781 30.8478V29.8478ZM40.9781 29.8478V30.8478C41.5304 30.8478 41.9781 30.4001 41.9781 29.8478H40.9781ZM40.9781 1.5V29.8478H41.9781V1.5H40.9781ZM193.152 122.152H194.152C194.152 121.6 193.704 121.152 193.152 121.152V122.152ZM153.435 122.152H193.152V121.152H153.435V122.152ZM153.935 151V121.652H152.935V151H153.935ZM193.152 150.5H153.435V151.5H193.152V150.5ZM193.152 150.5V150.5V151.5C193.704 151.5 194.152 151.052 194.152 150.5H193.152ZM193.152 122.152V150.5H194.152V122.152H193.152ZM41.9781 81.9348C41.9781 81.3825 41.5304 80.9348 40.9781 80.9348V81.9348H41.9781ZM41.9781 110.283V81.9348H40.9781V110.283H41.9781ZM40.9781 111.283C41.5304 111.283 41.9781 110.835 41.9781 110.283H40.9781V111.283ZM1.26074 111.283H40.9781V110.283H1.26074V111.283ZM0.760742 81.4348V110.783H1.76074V81.4348H0.760742ZM40.9781 80.9348H1.26074V81.9348H40.9781V80.9348ZM115.978 81.9348H116.978C116.978 81.3825 116.53 80.9348 115.978 80.9348V81.9348ZM52.3477 81.9348H115.978V80.9348H52.3477V81.9348ZM52.8477 110.783V81.4348H51.8477V110.783H52.8477ZM115.978 110.283H52.3477V111.283H115.978V110.283ZM115.978 110.283V111.283C116.53 111.283 116.978 110.835 116.978 110.283H115.978ZM115.978 81.9348V110.283H116.978V81.9348H115.978ZM194.761 81.5C194.761 80.9477 194.313 80.5 193.761 80.5V81.5H194.761ZM194.761 110.5V81.5H193.761V110.5H194.761ZM193.761 111.5C194.313 111.5 194.761 111.052 194.761 110.5H193.761V111.5ZM127.261 111.5H193.761V110.5H127.261V111.5ZM126.761 81V111H127.761V81H126.761ZM193.761 80.5H127.261V81.5H193.761V80.5ZM143.065 122.152C143.065 121.6 142.617 121.152 142.065 121.152V122.152H143.065ZM143.065 150.5V122.152H142.065V150.5H143.065ZM142.065 151.5C142.617 151.5 143.065 151.052 143.065 150.5H142.065V151.5ZM1.26074 151.5L142.065 151.5V150.5L1.26074 150.5L1.26074 151.5ZM0.760742 121.652V151H1.76074V121.652H0.760742ZM142.065 121.152L1.26074 121.152L1.26074 122.152L142.065 122.152V121.152ZM194.239 41.7174H195.239C195.239 41.1651 194.791 40.7174 194.239 40.7174V41.7174ZM1.26074 41.7174L194.239 41.7174V40.7174L1.26074 40.7174L1.26074 41.7174ZM1.76074 70.5652V41.2174H0.760742V70.5652H1.76074ZM194.239 70.0652L1.26074 70.0652L1.26074 71.0652L194.239 71.0652V70.0652ZM194.239 70.0652V71.0652C194.791 71.0652 195.239 70.6175 195.239 70.0652H194.239ZM194.239 41.7174V70.0652H195.239V41.7174H194.239Z" fill="currentColor"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M193.652 1.5C193.652 1.22386 193.428 1 193.152 1L52.3477 1V30.3478L193.152 30.3478C193.428 30.3478 193.652 30.124 193.652 29.8478V1.5ZM41.4781 1.5C41.4781 1.22386 41.2543 1 40.9781 1L1.26074 1V30.3478L40.9781 30.3478C41.2543 30.3478 41.4781 30.124 41.4781 29.8478V1.5ZM193.652 122.152C193.652 121.876 193.428 121.652 193.152 121.652H153.435V151H193.152C193.428 151 193.652 150.776 193.652 150.5V122.152ZM40.9781 81.4348C41.2543 81.4348 41.4781 81.6586 41.4781 81.9348V110.283C41.4781 110.559 41.2543 110.783 40.9781 110.783H1.26074V81.4348H40.9781ZM116.478 81.9348C116.478 81.6586 116.254 81.4348 115.978 81.4348H52.3477V110.783H115.978C116.254 110.783 116.478 110.559 116.478 110.283V81.9348ZM193.761 81C194.037 81 194.261 81.2239 194.261 81.5V110.5C194.261 110.776 194.037 111 193.761 111H127.261V81H193.761ZM142.065 121.652C142.341 121.652 142.565 121.876 142.565 122.152V150.5C142.565 150.776 142.341 151 142.065 151L1.26074 151V121.652L142.065 121.652ZM194.739 41.7174C194.739 41.4413 194.515 41.2174 194.239 41.2174L1.26074 41.2174V70.5652L194.239 70.5652C194.515 70.5652 194.739 70.3414 194.739 70.0652V41.7174Z" fill="currentColor" fill-opacity="0.25" stroke="currentColor"/>
+<path d="M193.152 1V0.500004V1ZM52.3477 1V0.5H51.8477V1H52.3477ZM52.3477 30.3478H51.8477V30.8478H52.3477V30.3478ZM193.152 30.3478V30.8478V30.3478ZM40.9781 1V1.5V1ZM1.26074 1L1.26074 0.500003L0.760742 0.500003V1H1.26074ZM1.26074 30.3478H0.760742V30.8478H1.26074L1.26074 30.3478ZM40.9781 30.3478V30.8478V30.3478ZM153.435 121.652V121.152H152.935V121.652H153.435ZM153.435 151H152.935V151.5H153.435V151ZM1.26074 110.783H0.760742V111.283H1.26074V110.783ZM1.26074 81.4348V80.9348H0.760742V81.4348H1.26074ZM52.3477 81.4348V80.9348H51.8477V81.4348H52.3477ZM52.3477 110.783H51.8477V111.283H52.3477V110.783ZM127.261 111H126.761V111.5H127.261V111ZM127.261 81V80.5H126.761V81H127.261ZM142.065 121.652V122.152V121.652ZM142.065 151V151.5V151ZM1.26074 151H0.760742V151.5H1.26074L1.26074 151ZM1.26074 121.652L1.26074 121.152H0.760742V121.652H1.26074ZM194.239 41.2174V41.7174V41.2174ZM1.26074 41.2174L1.26074 40.7174H0.760742V41.2174H1.26074ZM1.26074 70.5652H0.760742V71.0652H1.26074L1.26074 70.5652ZM194.239 70.5652V71.0652V70.5652ZM193.152 1.5V1.5H194.152C194.152 0.947717 193.704 0.500004 193.152 0.500004V1.5ZM52.3477 1.5L193.152 1.5V0.500004L52.3477 0.5V1.5ZM52.8477 30.3478V1H51.8477V30.3478H52.8477ZM193.152 29.8478L52.3477 29.8478V30.8478L193.152 30.8478V29.8478ZM193.152 29.8478V30.8478C193.704 30.8478 194.152 30.4001 194.152 29.8478H193.152ZM193.152 1.5V29.8478H194.152V1.5H193.152ZM40.9781 1.5H41.9781C41.9781 0.947719 41.5304 0.500004 40.9781 0.500004V1.5ZM1.26074 1.5L40.9781 1.5V0.500004L1.26074 0.500003L1.26074 1.5ZM1.76074 30.3478V1H0.760742V30.3478H1.76074ZM40.9781 29.8478L1.26074 29.8478L1.26074 30.8478L40.9781 30.8478V29.8478ZM40.9781 29.8478V30.8478C41.5304 30.8478 41.9781 30.4001 41.9781 29.8478H40.9781ZM40.9781 1.5V29.8478H41.9781V1.5H40.9781ZM193.152 122.152H194.152C194.152 121.6 193.704 121.152 193.152 121.152V122.152ZM153.435 122.152H193.152V121.152H153.435V122.152ZM153.935 151V121.652H152.935V151H153.935ZM193.152 150.5H153.435V151.5H193.152V150.5ZM193.152 150.5V150.5V151.5C193.704 151.5 194.152 151.052 194.152 150.5H193.152ZM193.152 122.152V150.5H194.152V122.152H193.152ZM41.9781 81.9348C41.9781 81.3825 41.5304 80.9348 40.9781 80.9348V81.9348H41.9781ZM41.9781 110.283V81.9348H40.9781V110.283H41.9781ZM40.9781 111.283C41.5304 111.283 41.9781 110.835 41.9781 110.283H40.9781V111.283ZM1.26074 111.283H40.9781V110.283H1.26074V111.283ZM0.760742 81.4348V110.783H1.76074V81.4348H0.760742ZM40.9781 80.9348H1.26074V81.9348H40.9781V80.9348ZM115.978 81.9348H116.978C116.978 81.3825 116.53 80.9348 115.978 80.9348V81.9348ZM52.3477 81.9348H115.978V80.9348H52.3477V81.9348ZM52.8477 110.783V81.4348H51.8477V110.783H52.8477ZM115.978 110.283H52.3477V111.283H115.978V110.283ZM115.978 110.283V111.283C116.53 111.283 116.978 110.835 116.978 110.283H115.978ZM115.978 81.9348V110.283H116.978V81.9348H115.978ZM194.761 81.5C194.761 80.9477 194.313 80.5 193.761 80.5V81.5H194.761ZM194.761 110.5V81.5H193.761V110.5H194.761ZM193.761 111.5C194.313 111.5 194.761 111.052 194.761 110.5H193.761V111.5ZM127.261 111.5H193.761V110.5H127.261V111.5ZM126.761 81V111H127.761V81H126.761ZM193.761 80.5H127.261V81.5H193.761V80.5ZM143.065 122.152C143.065 121.6 142.617 121.152 142.065 121.152V122.152H143.065ZM143.065 150.5V122.152H142.065V150.5H143.065ZM142.065 151.5C142.617 151.5 143.065 151.052 143.065 150.5H142.065V151.5ZM1.26074 151.5L142.065 151.5V150.5L1.26074 150.5L1.26074 151.5ZM0.760742 121.652V151H1.76074V121.652H0.760742ZM142.065 121.152L1.26074 121.152L1.26074 122.152L142.065 122.152V121.152ZM194.239 41.7174H195.239C195.239 41.1651 194.791 40.7174 194.239 40.7174V41.7174ZM1.26074 41.7174L194.239 41.7174V40.7174L1.26074 40.7174L1.26074 41.7174ZM1.76074 70.5652V41.2174H0.760742V70.5652H1.76074ZM194.239 70.0652L1.26074 70.0652L1.26074 71.0652L194.239 71.0652V70.0652ZM194.239 70.0652V71.0652C194.791 71.0652 195.239 70.6175 195.239 70.0652H194.239ZM194.239 41.7174V70.0652H195.239V41.7174H194.239Z" fill="currentColor" fill-opacity="0.25" stroke="currentColor" />
 </svg>
diff --git a/superset-frontend/src/assets/images/filter-results.svg b/superset-frontend/packages/superset-ui-core/src/components/EmptyState/svgs/filter-results.svg
similarity index 96%
rename from superset-frontend/src/assets/images/filter-results.svg
rename to superset-frontend/packages/superset-ui-core/src/components/EmptyState/svgs/filter-results.svg
index 7244f5538b2..424097d1f4f 100644
--- a/superset-frontend/src/assets/images/filter-results.svg
+++ b/superset-frontend/packages/superset-ui-core/src/components/EmptyState/svgs/filter-results.svg
@@ -36,7 +36,7 @@ under the License.
     height="9.44444"
     rx="0.5"
     fill="currentColor"
-    fill-opacity="0.5"
+    fill-opacity="0.25"
     stroke="currentColor"
     stroke-opacity="1"
     stroke-width="2"
@@ -49,7 +49,7 @@ under the License.
     height="9.44444"
     rx="0.5"
     fill="currentColor"
-    fill-opacity="0.5"
+    fill-opacity="0.25"
     stroke="currentColor"
     stroke-opacity="1"
     stroke-width="2"
@@ -62,7 +62,7 @@ under the License.
     height="9.44444"
     rx="0.5"
     fill="currentColor"
-    fill-opacity="0.5"
+    fill-opacity="0.25"
     stroke="currentColor"
     stroke-opacity="1"
     stroke-width="2"
diff --git a/superset-frontend/src/assets/images/filter.svg b/superset-frontend/packages/superset-ui-core/src/components/EmptyState/svgs/filter.svg
similarity index 95%
rename from superset-frontend/src/assets/images/filter.svg
rename to superset-frontend/packages/superset-ui-core/src/components/EmptyState/svgs/filter.svg
index 2e8c5e0f099..4145e5c2720 100644
--- a/superset-frontend/src/assets/images/filter.svg
+++ b/superset-frontend/packages/superset-ui-core/src/components/EmptyState/svgs/filter.svg
@@ -26,7 +26,7 @@ under the License.
     height="9.44444"
     rx="0.5"
     fill="currentColor"
-    fill-opacity="0.5"
+    fill-opacity="0.25"
     stroke="currentColor"
     stroke-opacity="1"
     stroke-width="1"
@@ -38,7 +38,7 @@ under the License.
     height="9.44444"
     rx="0.5"
     fill="currentColor"
-    fill-opacity="0.5"
+    fill-opacity="0.25"
     stroke="currentColor"
     stroke-opacity="1"
     stroke-width="1"
@@ -50,7 +50,7 @@ under the License.
     height="9.44444"
     rx="0.5"
     fill="currentColor"
-    fill-opacity="0.5"
+    fill-opacity="0.25"
     stroke="currentColor"
     stroke-opacity="1"
     stroke-width="1"
diff --git a/superset-frontend/src/assets/images/star-circle.svg b/superset-frontend/packages/superset-ui-core/src/components/EmptyState/svgs/star-circle.svg
similarity index 100%
rename from superset-frontend/src/assets/images/star-circle.svg
rename to superset-frontend/packages/superset-ui-core/src/components/EmptyState/svgs/star-circle.svg
diff --git a/superset-frontend/src/assets/images/union.svg b/superset-frontend/packages/superset-ui-core/src/components/EmptyState/svgs/union.svg
similarity index 84%
rename from superset-frontend/src/assets/images/union.svg
rename to superset-frontend/packages/superset-ui-core/src/components/EmptyState/svgs/union.svg
index 9ccf437b225..64542bc720b 100644
--- a/superset-frontend/src/assets/images/union.svg
+++ b/superset-frontend/packages/superset-ui-core/src/components/EmptyState/svgs/union.svg
@@ -18,5 +18,4 @@ under the License.
 -->
 <svg viewBox="0 0 119 76" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path fill-rule="evenodd" clip-rule="evenodd" d="M83.1952 1.36598L103 24V62C103 64.2091 101.209 66 99 66H20C17.7909 66 16 64.2091 16 62V24L35.8048 1.36598C36.5643 0.497921 37.6616 0 38.8151 0H80.1849C81.3384 0 82.4357 0.497922 83.1952 1.36598ZM101 26V62C101 63.1046 100.105 64 99 64H20C18.8954 64 18 63.1046 18 62V26H35.25C37.8734 26 40 28.1266 40 30.75C40 34.4779 43.0221 37.5 46.75 37.5H72.25C75.9779 37.5 79 34.4779 79 30.75C79 28.1266 81.1266 26 83.75 26H101ZM100.342 24L81.6901 2.68299C81.3103 2.24896 80.7617 2 80.1849 2H38.8151C38.2383 2 37.6897 2.24896 37.3099 2.68299L18.6575 24H35.25C38.9779 24 42 27.0221 42 30.75C42 33.3734 44.1266 35.5 46.75 35.5H72.25C74.8734 35.5 77 33.3734 77 30.75C77 27.0221 80.0221 24 83.75 24H100.342Z" fill="currentColor"/>
-<path d="M16 53.2892C6.07439 55.7013 0 58.9397 0 62.5C0 69.9558 26.6391 76 59.5 76C92.3609 76 119 69.9558 119 62.5C119 58.9397 112.926 55.7013 103 53.2892V62C103 64.2091 101.209 66 99 66H20C17.7909 66 16 64.2091 16 62V53.2892Z" fill="currentColor" stroke="currentColor" fill-opacity="0.25"/>
 </svg>
diff --git a/superset-frontend/src/assets/images/vector.svg b/superset-frontend/packages/superset-ui-core/src/components/EmptyState/svgs/vector.svg
similarity index 100%
rename from superset-frontend/src/assets/images/vector.svg
rename to superset-frontend/packages/superset-ui-core/src/components/EmptyState/svgs/vector.svg
diff --git a/superset-frontend/packages/superset-ui-core/src/components/EmptyState/types.ts b/superset-frontend/packages/superset-ui-core/src/components/EmptyState/types.ts
new file mode 100644
index 00000000000..76147a6ba68
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/EmptyState/types.ts
@@ -0,0 +1,31 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 type { ReactNode, SyntheticEvent } from 'react';
+
+export type EmptyStateSize = 'small' | 'medium' | 'large';
+
+export type EmptyStateProps = {
+  title?: ReactNode;
+  description?: ReactNode;
+  image?: ReactNode | string;
+  buttonText?: ReactNode;
+  buttonAction?: (event: SyntheticEvent) => void;
+  size?: EmptyStateSize;
+  children?: ReactNode;
+};
diff --git a/superset-frontend/packages/superset-ui-core/src/components/FaveStar/FaveStar.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/FaveStar/FaveStar.stories.tsx
new file mode 100644
index 00000000000..6834c4495c2
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/FaveStar/FaveStar.stories.tsx
@@ -0,0 +1,73 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 type { Meta, StoryObj } from '@storybook/react';
+import { FaveStar } from '.';
+
+export default {
+  title: 'Components/FaveStar',
+  component: FaveStar,
+  argTypes: {
+    itemId: {
+      control: false,
+      description: 'Unique identifier for the item',
+      table: {
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'false' },
+      },
+    },
+    isStarred: {
+      control: 'boolean',
+      description: 'Indicates if the item is starred',
+      table: {
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'false' },
+      },
+    },
+    showTooltip: {
+      control: 'boolean',
+      description: 'Show tooltip on hover',
+      table: {
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'false' },
+      },
+    },
+    fetchFaveStar: {
+      table: {
+        disable: true,
+      },
+    },
+  },
+  parameters: {
+    docs: {
+      description: {
+        component: 'FaveStar component for marking items as favorites',
+      },
+    },
+  },
+} as Meta<typeof FaveStar>;
+
+type Story = StoryObj<typeof FaveStar>;
+
+export const Default: Story = {
+  render: args => (
+    <div style={{ margin: '0 auto' }}>
+      <FaveStar {...args} />
+    </div>
+  ),
+};
diff --git a/superset-frontend/src/components/FaveStar/FaveStar.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/FaveStar/FaveStar.test.tsx
similarity index 91%
rename from superset-frontend/src/components/FaveStar/FaveStar.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/FaveStar/FaveStar.test.tsx
index f8c63500f6a..05cbab43a6b 100644
--- a/superset-frontend/src/components/FaveStar/FaveStar.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/FaveStar/FaveStar.test.tsx
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-import { render, screen, userEvent } from 'spec/helpers/testing-library';
-import FaveStar from '.';
+import { render, screen, userEvent } from '@superset-ui/core/spec';
+import { FaveStar } from '.';
 
-jest.mock('src/components/Tooltip', () => ({
+jest.mock('@superset-ui/core/components/Tooltip', () => ({
   Tooltip: (props: any) => <div data-test="tooltip" {...props} />,
 }));
 
@@ -35,7 +35,7 @@ test('render right content', async () => {
   expect(screen.getByRole('img', { name: 'starred' })).toBeInTheDocument();
 
   expect(props.saveFaveStar).toHaveBeenCalledTimes(0);
-  userEvent.click(screen.getByRole('button'));
+  await userEvent.click(screen.getByRole('button'));
   expect(props.saveFaveStar).toHaveBeenCalledTimes(1);
   expect(props.saveFaveStar).toHaveBeenCalledWith(props.itemId, true);
 
@@ -43,7 +43,7 @@ test('render right content', async () => {
   expect(await findByRole('img', { name: 'unstarred' })).toBeInTheDocument();
 
   expect(props.saveFaveStar).toHaveBeenCalledTimes(1);
-  userEvent.click(screen.getByRole('button'));
+  await userEvent.click(screen.getByRole('button'));
   expect(props.saveFaveStar).toHaveBeenCalledTimes(2);
   expect(props.saveFaveStar).toHaveBeenCalledWith(props.itemId, false);
 });
diff --git a/superset-frontend/src/components/FaveStar/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/FaveStar/index.tsx
similarity index 79%
rename from superset-frontend/src/components/FaveStar/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/FaveStar/index.tsx
index 83a75b1ad63..24aba3d5c00 100644
--- a/superset-frontend/src/components/FaveStar/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/FaveStar/index.tsx
@@ -20,26 +20,19 @@
 import { useCallback, useEffect, MouseEvent } from 'react';
 
 import { css, t, styled, useTheme } from '@superset-ui/core';
-import { Tooltip } from 'src/components/Tooltip';
-import { Icons } from 'src/components/Icons';
-
-export interface FaveStarProps {
-  itemId: number;
-  isStarred?: boolean;
-  showTooltip?: boolean;
-  saveFaveStar(id: number, isStarred: boolean): any;
-  fetchFaveStar?: (id: number) => void;
-}
+import { Icons } from '@superset-ui/core/components/Icons';
+import { Tooltip } from '../Tooltip';
+import type { FaveStarProps } from './types';
 
 const StyledLink = styled.a`
   ${({ theme }) => css`
-    font-size: ${theme.typography.sizes.xl}px;
+    font-size: ${theme.fontSizeXL}px;
     display: flex;
-    padding: 0 0 0 ${theme.gridUnit * 2}px;
+    padding: 0 0 0 ${theme.sizeUnit * 2}px;
   `};
 `;
 
-const FaveStar = ({
+export const FaveStar = ({
   itemId,
   isStarred,
   showTooltip,
@@ -71,13 +64,15 @@ const FaveStar = ({
         <Icons.StarFilled
           aria-label="starred"
           iconSize="l"
-          iconColor={theme.colors.warning.base}
+          iconColor={theme.colorWarning}
+          name="favorite-selected"
         />
       ) : (
         <Icons.StarOutlined
           aria-label="unstarred"
           iconSize="l"
-          iconColor={theme.colors.grayscale.light1}
+          iconColor={theme.colorTextTertiary}
+          name="favorite-unselected"
         />
       )}
     </StyledLink>
@@ -96,4 +91,5 @@ const FaveStar = ({
 
   return content;
 };
-export default FaveStar;
+
+export type { FaveStarProps };
diff --git a/superset-frontend/packages/superset-ui-core/src/components/FaveStar/types.ts b/superset-frontend/packages/superset-ui-core/src/components/FaveStar/types.ts
new file mode 100644
index 00000000000..cc69a957167
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/FaveStar/types.ts
@@ -0,0 +1,25 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+export interface FaveStarProps {
+  itemId: number;
+  isStarred?: boolean;
+  showTooltip?: boolean;
+  saveFaveStar(id: number, isStarred: boolean): any;
+  fetchFaveStar?: (id: number) => void;
+}
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Flex/Flex.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/Flex/Flex.stories.tsx
new file mode 100644
index 00000000000..d666ee920d0
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Flex/Flex.stories.tsx
@@ -0,0 +1,87 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { css } from '@superset-ui/core';
+import { Flex } from '.';
+import type { FlexProps } from './types';
+
+export default {
+  title: 'Design System/Components/Flex',
+  component: Flex,
+};
+
+export const InteractiveFlex = (args: FlexProps) => (
+  <Flex
+    {...args}
+    css={css`
+      width: 100%;
+      height: 90vh;
+    `}
+  >
+    {new Array(20).fill(null).map((_, i) => (
+      <p key={i}>Item</p>
+    ))}
+  </Flex>
+);
+
+InteractiveFlex.args = {
+  vertical: false,
+  wrap: 'nowrap',
+  justify: 'normal',
+  align: 'normal',
+  flex: 'normal',
+  gap: 'small',
+};
+
+InteractiveFlex.argTypes = {
+  vertical: {
+    control: { type: 'boolean' },
+    type: { name: 'boolean', required: false },
+  },
+  wrap: {
+    control: { type: 'select' },
+    options: ['nowrap', 'wrap', 'wrap-reverse', false, true],
+    type: { name: 'string', required: false },
+  },
+  justify: {
+    control: { type: 'select' },
+    options: [
+      'start',
+      'center',
+      'space-between',
+      'space-around',
+      'space-evenly',
+    ],
+    type: { name: 'string', required: false },
+  },
+  align: {
+    control: { type: 'select' },
+    options: ['start', 'center', 'end', 'stretch'],
+    type: { name: 'string', required: false },
+  },
+  flex: {
+    control: { type: 'string' },
+    type: { name: 'string', required: false },
+  },
+  gap: {
+    control: { type: 'select' },
+    options: ['small', 'medium', 'large'],
+    type: { name: 'string', required: false },
+  },
+};
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Flex/Flex.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Flex/Flex.test.tsx
new file mode 100644
index 00000000000..3353b96e612
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Flex/Flex.test.tsx
@@ -0,0 +1,30 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { render } from '@superset-ui/core/spec';
+import { Flex } from '.';
+
+test('should render', () => {
+  const { container } = render(
+    <Flex>
+      <p>Item</p>
+    </Flex>,
+  );
+  expect(container).toBeInTheDocument();
+});
diff --git a/superset-frontend/src/components/Checkbox/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Flex/index.tsx
similarity index 80%
rename from superset-frontend/src/components/Checkbox/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Flex/index.tsx
index 2c39120249b..ba0319a44a0 100644
--- a/superset-frontend/src/components/Checkbox/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Flex/index.tsx
@@ -16,6 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-export { default } from 'src/components/Checkbox/Checkbox';
-export type { CheckboxProps } from 'src/components/Checkbox/Checkbox';
-export * from 'src/components/Checkbox/CheckboxIcons';
+
+import { Flex as AntdFlex } from 'antd';
+import type { FlexProps } from './types';
+
+export function Flex(props: FlexProps) {
+  return <AntdFlex {...props} />;
+}
+
+export type { FlexProps };
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Flex/types.ts b/superset-frontend/packages/superset-ui-core/src/components/Flex/types.ts
new file mode 100644
index 00000000000..0ac7025bddf
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Flex/types.ts
@@ -0,0 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { Flex as AntdFlex } from 'antd';
+import { ComponentProps } from 'react';
+
+export type FlexProps = ComponentProps<typeof AntdFlex>;
diff --git a/superset-frontend/src/components/List/index.ts b/superset-frontend/packages/superset-ui-core/src/components/Form/Form.tsx
similarity index 70%
rename from superset-frontend/src/components/List/index.ts
rename to superset-frontend/packages/superset-ui-core/src/components/Form/Form.tsx
index 76acfc17d1a..2c2be866fe0 100644
--- a/superset-frontend/src/components/List/index.ts
+++ b/superset-frontend/packages/superset-ui-core/src/components/Form/Form.tsx
@@ -16,12 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { ListProps, ListItemProps, ListItemMetaProps } from 'antd-v5/lib/list';
-import { List as AntdList } from 'antd-v5';
+import { Form as AntdForm } from 'antd';
+import { FormProps } from './types';
 
-export type { ListProps, ListItemProps, ListItemMetaProps };
+function CustomForm(props: FormProps) {
+  return <AntdForm {...props} />;
+}
 
-export const List = Object.assign(AntdList, {
-  Item: AntdList.Item,
-  ItemMeta: AntdList.Item.Meta,
+export const Form = Object.assign(CustomForm, {
+  useForm: AntdForm.useForm,
+  Item: AntdForm.Item,
+  List: AntdForm.List,
+  ErrorList: AntdForm.ErrorList,
+  Provider: AntdForm.Provider,
 });
diff --git a/superset-frontend/src/components/Form/FormItem.tsx b/superset-frontend/packages/superset-ui-core/src/components/Form/FormItem.tsx
similarity index 72%
rename from superset-frontend/src/components/Form/FormItem.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Form/FormItem.tsx
index 97fee966891..c95a4c944c9 100644
--- a/superset-frontend/src/components/Form/FormItem.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Form/FormItem.tsx
@@ -16,32 +16,34 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-// eslint-disable-next-line no-restricted-imports
-import Form from 'antd/lib/form'; // TODO: Remove antd
+import { Form } from 'antd';
 import { styled } from '@superset-ui/core';
 
-const StyledItem = styled(Form.Item)`
+export const FormItem = styled(Form.Item)`
   ${({ theme }) => `
+    &.ant-form-item > .ant-row > .ant-form-item-label {
+      padding-bottom: ${theme.paddingXXS}px;
+    }
     .ant-form-item-label {
-      padding-bottom: ${theme.gridUnit}px;
       & > label {
-        font-size: ${theme.typography.sizes.s}px;
-        color: ${theme.colors.grayscale.base};
-
+        font-size: ${theme.fontSizeSM}px;
         &.ant-form-item-required:not(.ant-form-item-required-mark-optional) {
           &::before {
             display: none;
           }
           &::after {
             display: inline-block;
-            color: ${theme.colors.error.base};
-            font-size: ${theme.typography.sizes.s}px;
+            visibility: visible;
+            color: ${theme.colorError};
+            font-size: ${theme.fontSizeSM}px;
             content: '*';
           }
         }
       }
     }
+    .ant-form-item-extra {
+      margin-top: ${theme.sizeUnit}px;
+      font-size: ${theme.fontSizeSM}px;
+    }
   `}
 `;
-
-export default StyledItem;
diff --git a/superset-frontend/src/components/Form/FormLabel.tsx b/superset-frontend/packages/superset-ui-core/src/components/Form/FormLabel.tsx
similarity index 58%
rename from superset-frontend/src/components/Form/FormLabel.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Form/FormLabel.tsx
index bf52dacb82b..f6b3fcbdfd3 100644
--- a/superset-frontend/src/components/Form/FormLabel.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Form/FormLabel.tsx
@@ -26,35 +26,29 @@ export type FormLabelProps = {
   className?: string;
 };
 
-const Label = styled.label`
-  font-size: ${({ theme }) => theme.typography.sizes.s}px;
-  color: ${({ theme }) => theme.colors.grayscale.base};
-  margin-bottom: ${({ theme }) => theme.gridUnit}px;
+const Label = styled.label<{ required?: boolean }>`
+  ${({ required, theme }) =>
+    required &&
+    `
+      &::after {
+        display: inline-block;
+        margin-left: ${theme.sizeUnit}px;
+        color: ${theme.colorError};
+        font-size: ${theme.fontSize}px;
+        content: '*';
+      }
+    `}
 `;
 
-const RequiredLabel = styled.label`
-  font-size: ${({ theme }) => theme.typography.sizes.s}px;
-  color: ${({ theme }) => theme.colors.grayscale.base};
-  margin-bottom: ${({ theme }) => theme.gridUnit}px;
-  &::after {
-    display: inline-block;
-    margin-left: ${({ theme }) => theme.gridUnit}px;
-    color: ${({ theme }) => theme.colors.error.base};
-    font-size: ${({ theme }) => theme.typography.sizes.m}px;
-    content: '*';
-  }
-`;
-
-export default function FormLabel({
+export function FormLabel({
   children,
   htmlFor,
   required = false,
   className,
 }: FormLabelProps) {
-  const StyledLabel = required ? RequiredLabel : Label;
   return (
-    <StyledLabel htmlFor={htmlFor} className={className}>
+    <Label htmlFor={htmlFor} className={className} required={required}>
       {children}
-    </StyledLabel>
+    </Label>
   );
 }
diff --git a/superset-frontend/src/components/Form/LabeledErrorBoundInput.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/Form/LabeledErrorBoundInput.stories.tsx
similarity index 92%
rename from superset-frontend/src/components/Form/LabeledErrorBoundInput.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Form/LabeledErrorBoundInput.stories.tsx
index 2bf671ad08e..28b2b5f1add 100644
--- a/superset-frontend/src/components/Form/LabeledErrorBoundInput.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Form/LabeledErrorBoundInput.stories.tsx
@@ -17,12 +17,11 @@
  * under the License.
  */
 import { useState } from 'react';
-import LabeledErrorBoundInput, {
-  LabeledErrorBoundInputProps,
-} from './LabeledErrorBoundInput';
+import type { LabeledErrorBoundInputProps } from './types';
+import { LabeledErrorBoundInput } from './LabeledErrorBoundInput';
 
 export default {
-  title: 'LabeledErrorBoundInput',
+  title: 'Components/Form/LabeledErrorBoundInput',
   component: LabeledErrorBoundInput,
 };
 
diff --git a/superset-frontend/src/components/Form/LabeledErrorBoundInput.test.jsx b/superset-frontend/packages/superset-ui-core/src/components/Form/LabeledErrorBoundInput.test.jsx
similarity index 95%
rename from superset-frontend/src/components/Form/LabeledErrorBoundInput.test.jsx
rename to superset-frontend/packages/superset-ui-core/src/components/Form/LabeledErrorBoundInput.test.jsx
index c5ed00830d2..2b66127e237 100644
--- a/superset-frontend/src/components/Form/LabeledErrorBoundInput.test.jsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Form/LabeledErrorBoundInput.test.jsx
@@ -16,8 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { render, fireEvent, screen } from 'spec/helpers/testing-library';
-import LabeledErrorBoundInput from 'src/components/Form/LabeledErrorBoundInput';
+import { render, fireEvent, screen } from '@superset-ui/core/spec';
+import { LabeledErrorBoundInput } from './LabeledErrorBoundInput';
 
 const defaultProps = {
   id: 1,
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Form/LabeledErrorBoundInput.tsx b/superset-frontend/packages/superset-ui-core/src/components/Form/LabeledErrorBoundInput.tsx
new file mode 100644
index 00000000000..b768c764cce
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Form/LabeledErrorBoundInput.tsx
@@ -0,0 +1,121 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { styled, t } from '@superset-ui/core';
+import { Button, Icons, InfoTooltip, Tooltip, Flex } from '..';
+import { Input } from '../Input';
+import { FormLabel } from './FormLabel';
+import { FormItem } from './FormItem';
+import type { LabeledErrorBoundInputProps } from './types';
+
+const StyledInput = styled(Input)`
+  margin: ${({ theme }) => `${theme.sizeUnit}px 0 ${theme.sizeUnit * 2}px`};
+`;
+
+const StyledInputPassword = styled(Input.Password)`
+  margin: ${({ theme }) => `${theme.sizeUnit}px 0 ${theme.sizeUnit * 2}px`};
+`;
+
+const StyledFormGroup = styled('div')`
+  input::-webkit-outer-spin-button,
+  input::-webkit-inner-spin-button {
+    -webkit-appearance: none;
+    margin: 0;
+  }
+  margin-bottom: ${({ theme }) => theme.sizeUnit * 3}px;
+  .ant-form-item {
+    margin-bottom: 0;
+  }
+`;
+
+const StyledFormLabel = styled(FormLabel)`
+  margin-bottom: 0;
+`;
+
+export const LabeledErrorBoundInput = ({
+  label,
+  validationMethods,
+  errorMessage,
+  helpText,
+  required = false,
+  hasTooltip = false,
+  tooltipText,
+  id,
+  className,
+  visibilityToggle,
+  get_url,
+  description,
+  isValidating = false,
+  ...props
+}: LabeledErrorBoundInputProps) => {
+  const hasError = !!errorMessage;
+  return (
+    <StyledFormGroup className={className}>
+      <Flex align="center">
+        <StyledFormLabel htmlFor={id} required={required}>
+          {label}
+        </StyledFormLabel>
+        {hasTooltip && <InfoTooltip tooltip={`${tooltipText}`} />}
+      </Flex>
+      <FormItem
+        validateTrigger={Object.keys(validationMethods)}
+        validateStatus={
+          isValidating ? 'validating' : hasError ? 'error' : 'success'
+        }
+        help={errorMessage || helpText}
+        hasFeedback={!!hasError}
+      >
+        {visibilityToggle || props.name === 'password' ? (
+          <StyledInputPassword
+            {...props}
+            {...validationMethods}
+            iconRender={visible =>
+              visible ? (
+                <Tooltip title={t('Hide password.')}>
+                  <Icons.EyeInvisibleOutlined iconSize="m" />
+                </Tooltip>
+              ) : (
+                <Tooltip title={t('Show password.')}>
+                  <Icons.EyeOutlined iconSize="m" data-test="icon-eye" />
+                </Tooltip>
+              )
+            }
+            role="textbox"
+          />
+        ) : (
+          <StyledInput {...props} {...validationMethods} />
+        )}
+        {get_url && description ? (
+          <Button
+            type="link"
+            htmlType="button"
+            onClick={() => {
+              window.open(get_url);
+              return true;
+            }}
+          >
+            Get {description}
+          </Button>
+        ) : (
+          <br />
+        )}
+      </FormItem>
+    </StyledFormGroup>
+  );
+};
+export default LabeledErrorBoundInput;
diff --git a/superset-frontend/src/components/Form/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Form/index.tsx
similarity index 77%
rename from superset-frontend/src/components/Form/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Form/index.tsx
index ec198e0a828..ba225fb56dc 100644
--- a/superset-frontend/src/components/Form/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Form/index.tsx
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import Form, { FormProps } from './Form';
-import FormItem from './FormItem';
-import FormLabel from './FormLabel';
-import LabeledErrorBoundInput from './LabeledErrorBoundInput';
+import { Form } from './Form';
+import { FormItem } from './FormItem';
+import { FormLabel } from './FormLabel';
+import { LabeledErrorBoundInput } from './LabeledErrorBoundInput';
 
 export { Form, FormItem, FormLabel, LabeledErrorBoundInput };
-export type { FormProps };
+export type { FormInstance, FormProps, FormItemProps } from './types';
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Form/types.ts b/superset-frontend/packages/superset-ui-core/src/components/Form/types.ts
new file mode 100644
index 00000000000..2f069d8bf14
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Form/types.ts
@@ -0,0 +1,35 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+export type { FormProps, FormInstance, FormItemProps } from 'antd/es/form';
+
+export interface LabeledErrorBoundInputProps {
+  label?: string;
+  validationMethods:
+    | { onBlur: (value: any) => void }
+    | { onChange: (value: any) => void };
+  errorMessage?: string | null;
+  helpText?: string;
+  required?: boolean;
+  hasTooltip?: boolean;
+  tooltipText?: string | null;
+  id?: string;
+  classname?: string;
+  visibilityToggle?: boolean;
+  [x: string]: any;
+}
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Grid/Grid.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/Grid/Grid.stories.tsx
new file mode 100644
index 00000000000..0a09f703ddb
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Grid/Grid.stories.tsx
@@ -0,0 +1,266 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { Meta, StoryObj } from '@storybook/react';
+import Slider from '@superset-ui/core/components/Slider/index';
+import { useState } from 'react';
+import { Row, Col } from '.';
+import type { ColProps, RowProps } from './types';
+
+export default {
+  title: 'Design System/Components/Grid',
+  component: Row,
+  subcomponents: { Col },
+  argTypes: {
+    // Row properties
+    align: {
+      control: 'select',
+      options: ['top', 'middle', 'bottom', 'stretch'],
+      description: 'Vertical alignment of flex items.',
+      defaultValue: 'top',
+      table: {
+        category: 'Row',
+        type: { summary: 'string' },
+        defaultValue: { summary: 'top' },
+      },
+    },
+    justify: {
+      control: 'select',
+      options: [
+        'start',
+        'end',
+        'center',
+        'space-around',
+        'space-between',
+        'space-evenly',
+      ],
+      description: 'Horizontal arrangement of flex items.',
+      defaultValue: undefined,
+      table: {
+        category: 'Row',
+        type: { summary: 'string' },
+        defaultValue: { summary: 'start' },
+      },
+    },
+    gutter: {
+      control: false,
+      description: 'Spacing between grids (horizontal and vertical).',
+      defaultValue: 0,
+      table: {
+        category: 'Row',
+        type: { summary: 'number | object | array' },
+        defaultValue: { summary: '0' },
+      },
+    },
+    wrap: {
+      control: 'boolean',
+      description: 'Whether the flex container is allowed to wrap its items.',
+      defaultValue: true,
+      table: {
+        category: 'Row',
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'true' },
+      },
+    },
+    // Col properties
+    span: {
+      control: 'number',
+      description: 'Number of grid columns to span.',
+      defaultValue: 24,
+      table: {
+        category: 'Col',
+        type: { summary: 'number' },
+        defaultValue: { summary: 24 },
+      },
+    },
+    offset: {
+      control: 'number',
+      description: 'Number of grid columns to offset from the left.',
+      defaultValue: 0,
+      table: {
+        category: 'Col',
+        type: { summary: 'number' },
+        defaultValue: { summary: 0 },
+      },
+    },
+    order: {
+      control: 'number',
+      description: 'Flex order style of the grid column.',
+      defaultValue: 0,
+      table: {
+        category: 'Col',
+        type: { summary: 'number' },
+        defaultValue: { summary: 0 },
+      },
+    },
+    pull: {
+      control: 'number',
+      description: 'Number of grid columns to pull to the left.',
+      defaultValue: 0,
+      table: {
+        category: 'Col',
+        type: { summary: 'number' },
+        defaultValue: { summary: 0 },
+      },
+    },
+    push: {
+      control: 'number',
+      description: 'Number of grid columns to push to the right.',
+      defaultValue: 0,
+      table: {
+        category: 'Col',
+        type: { summary: 'number' },
+        defaultValue: { summary: 0 },
+      },
+    },
+    flex: {
+      control: 'text',
+      description: 'Flex layout style for the column.',
+      table: {
+        category: 'Col',
+        type: { summary: 'string | number' },
+      },
+    },
+    // Responsive properties (xs, sm, md, etc.)
+    xs: {
+      control: 'number',
+      description:
+        'Settings for extra small screens (< 576px). Can be a number (span) or object.',
+      table: {
+        category: 'Col',
+        type: { summary: 'number | object' },
+      },
+    },
+    sm: {
+      control: 'number',
+      description:
+        'Settings for small screens (≥ 576px). Can be a number (span) or object.',
+      table: {
+        category: 'Col',
+        type: { summary: 'number | object' },
+      },
+    },
+    md: {
+      control: 'number',
+      description:
+        'Settings for medium screens (≥ 768px). Can be a number (span) or object.',
+      table: {
+        category: 'Col',
+        type: { summary: 'number | object' },
+      },
+    },
+    lg: {
+      control: 'number',
+      description:
+        'Settings for large screens (≥ 992px). Can be a number (span) or object.',
+      table: {
+        category: 'Col',
+        type: { summary: 'number | object' },
+      },
+    },
+    xl: {
+      control: 'number',
+      description:
+        'Settings for extra-large screens (≥ 1200px). Can be a number (span) or object.',
+      table: {
+        category: 'Col',
+        type: { summary: 'number | object' },
+      },
+    },
+    xxl: {
+      control: 'number',
+      description:
+        'Settings for extra-extra-large screens (≥ 1600px). Can be a number (span) or object.',
+      table: {
+        category: 'Col',
+        type: { summary: 'number | object' },
+      },
+    },
+  },
+  parameters: {
+    docs: {
+      description: {
+        component:
+          'The Grid system of Ant Design is based on a 24-grid layout. The `Row` and `Col` components are used to create flexible and responsive grid layouts.',
+      },
+    },
+  },
+} as Meta<typeof Row>;
+
+type Story = StoryObj<typeof Row>;
+
+export const GridStory: Story = {
+  render: ({ align, justify, wrap, ...rest }: RowProps & ColProps) => {
+    const [gutter, setGutter] = useState(24);
+    const [vgutter, setVgutter] = useState(24);
+    const [colCount, setColCount] = useState(4);
+    const rowProps = { align, justify, wrap }; // Props for Row
+    const colProps = rest; // Props for Col
+
+    const cols = Array.from({ length: colCount }, (_, i) => (
+      <Col
+        key={i}
+        style={{
+          background: '#ddd',
+          padding: '8px',
+        }}
+        {...colProps}
+      >
+        Column {i + 1}
+      </Col>
+    ));
+
+    return (
+      <div style={{ padding: '20px' }}>
+        <div style={{ marginBottom: '16px' }}>
+          <span>Horizontal Gutter: </span>
+          <Slider
+            min={8}
+            max={48}
+            step={8}
+            value={gutter}
+            onChange={setGutter}
+          />
+        </div>
+        <div style={{ marginBottom: '16px' }}>
+          <span>Vertical Gutter: </span>
+          <Slider
+            min={8}
+            max={48}
+            step={8}
+            value={vgutter}
+            onChange={setVgutter}
+          />
+        </div>
+        <div style={{ marginBottom: '16px' }}>
+          <span>Column Count: </span>
+          <Slider
+            min={2}
+            max={12}
+            step={1}
+            value={colCount}
+            onChange={setColCount}
+          />
+        </div>
+        <Row gutter={[gutter, vgutter]} {...rowProps}>
+          {cols}
+        </Row>
+      </div>
+    );
+  },
+};
diff --git a/superset-frontend/src/components/Steps/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Grid/Grid.test.tsx
similarity index 58%
rename from superset-frontend/src/components/Steps/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Grid/Grid.test.tsx
index e582e125cf0..884ce75ed3b 100644
--- a/superset-frontend/src/components/Steps/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Grid/Grid.test.tsx
@@ -16,18 +16,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import { render, screen } from '@superset-ui/core/spec';
+import '@testing-library/jest-dom';
+import { Col, Row } from '.';
 
-/*
- * Re-exporting of components in src/components to facilitate
- * their imports by other components.
- * E.g. import { Select } from 'src/components'
- */
-
-import { Steps as AntdSteps } from 'antd-v5';
-import { StepsProps as AntdStepsProps } from 'antd-v5/es/steps';
-
-export type StepsProps = AntdStepsProps;
-
-export const Steps: typeof AntdSteps = Object.assign(AntdSteps, {
-  Step: AntdSteps.Step,
+describe('Grid Component', () => {
+  it('should render the grid with rows and columns', async () => {
+    render(
+      <Row>
+        <Col span={8}>Column 1</Col>
+        <Col span={8}>Column 2</Col>
+        <Col span={8}>Column 3</Col>
+      </Row>,
+    );
+    expect(screen.getByText('Column 1')).toBeInTheDocument();
+    expect(screen.getByText('Column 2')).toBeInTheDocument();
+    expect(screen.getByText('Column 3')).toBeInTheDocument();
+  });
 });
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Grid/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Grid/index.tsx
new file mode 100644
index 00000000000..a2dd36f4171
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Grid/index.tsx
@@ -0,0 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+export { Row, Col, Grid } from 'antd';
+export type { RowProps, ColProps } from './types';
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Grid/types.ts b/superset-frontend/packages/superset-ui-core/src/components/Grid/types.ts
new file mode 100644
index 00000000000..ffa430e6e37
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Grid/types.ts
@@ -0,0 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+export type { ColProps, ColSize } from 'antd/es/col';
+export type { RowProps } from 'antd/es/row';
diff --git a/superset-frontend/src/components/IconButton/IconButton.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/IconButton/IconButton.stories.tsx
similarity index 50%
rename from superset-frontend/src/components/IconButton/IconButton.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/IconButton/IconButton.stories.tsx
index 3b47e4a0c32..acf1085b3e3 100644
--- a/superset-frontend/src/components/IconButton/IconButton.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/IconButton/IconButton.stories.tsx
@@ -17,36 +17,67 @@
  * under the License.
  */
 import { Meta, StoryObj } from '@storybook/react';
-import { IconButton } from 'src/components/IconButton';
+import { IconButton } from '.';
 
-const meta: Meta<typeof IconButton> = {
+export default {
   title: 'Components/IconButton',
   component: IconButton,
   argTypes: {
-    onClick: { action: 'clicked' },
-  },
-  parameters: {
-    a11y: {
-      enabled: true,
+    altText: {
+      control: 'text',
+      description:
+        'The alt text for the button. If not provided, the button text is used as the alt text by default.',
+      table: {
+        type: { summary: 'string' },
+      },
+    },
+    buttonText: {
+      control: 'text',
+      description: 'The text inside the button',
+      table: {
+        type: { summary: 'string' },
+      },
+    },
+    icon: {
+      control: false,
+      description: 'Icon inside the button',
+      table: {
+        type: { summary: 'string' },
+        defaultValue: { summary: 'string' },
+      },
+    },
+    padded: {
+      control: 'boolean',
+      description: 'add padding between icon and button text',
+      table: {
+        type: { summary: 'boolean' },
+      },
     },
   },
-};
-
-export default meta;
+  parameters: {
+    docs: {
+      description: {
+        component:
+          'The IconButton component is a versatile button that allows you to combine an icon with a text label. It is designed for use in situations where you want to display an icon along with some text in a single clickable element.',
+      },
+      a11y: {
+        enabled: true,
+      },
+    },
+  },
+} as Meta<typeof IconButton>;
 
 type Story = StoryObj<typeof IconButton>;
 
 export const Default: Story = {
   args: {
     buttonText: 'Default IconButton',
-    altText: 'Default icon button alt text',
   },
 };
 
 export const CustomIcon: Story = {
   args: {
     buttonText: 'Custom icon IconButton',
-    altText: 'Custom icon button alt text',
     icon: '/images/sqlite.png',
   },
 };
diff --git a/superset-frontend/src/components/IconButton/IconButton.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/IconButton/IconButton.test.tsx
similarity index 95%
rename from superset-frontend/src/components/IconButton/IconButton.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/IconButton/IconButton.test.tsx
index dc45fe003ec..16448a92467 100644
--- a/superset-frontend/src/components/IconButton/IconButton.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/IconButton/IconButton.test.tsx
@@ -16,8 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { render, screen, fireEvent } from 'spec/helpers/testing-library';
-import { IconButton } from 'src/components/IconButton';
+import { render, screen, fireEvent } from '@superset-ui/core/spec';
+import { IconButton } from '.';
 
 const defaultProps = {
   buttonText: 'This is the IconButton text',
diff --git a/superset-frontend/src/components/IconButton/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/IconButton/index.tsx
similarity index 86%
rename from superset-frontend/src/components/IconButton/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/IconButton/index.tsx
index b8ec447a5ea..f61e8937b9f 100644
--- a/superset-frontend/src/components/IconButton/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/IconButton/index.tsx
@@ -18,13 +18,14 @@
  */
 
 // eslint-disable-next-line
-import { Typography } from 'src/components';
-import { Tooltip } from 'src/components/Tooltip';
-import Card, { CardProps } from 'src/components/Card';
-import { Icons } from 'src/components/Icons';
 import { SupersetTheme, css } from '@superset-ui/core';
+import { Typography } from '../Typography';
+import { Icons } from '../Icons';
+import { Card } from '../Card';
+import { Tooltip } from '../Tooltip';
+import { CardProps } from '../Card/types';
 
-export interface IconButtonProps extends CardProps {
+interface IconButtonProps extends CardProps {
   buttonText: string;
   icon: string;
   altText?: string;
@@ -51,12 +52,12 @@ const IconButton: React.FC<IconButtonProps> = ({
   const renderIcon = () => {
     const iconContent = icon ? (
       <img
-        src={icon}
+        src={icon as string}
         alt={altText || buttonText}
         css={css`
           width: 100%;
-          height: 120px;
           object-fit: contain;
+          height: 100px;
         `}
       />
     ) : (
@@ -65,7 +66,7 @@ const IconButton: React.FC<IconButtonProps> = ({
           display: flex;
           align-content: center;
           align-items: center;
-          height: 120px;
+          height: 100px;
         `}
       >
         <Icons.DatabaseOutlined
@@ -89,7 +90,7 @@ const IconButton: React.FC<IconButtonProps> = ({
       onKeyDown={handleKeyDown}
       cover={renderIcon()}
       css={(theme: SupersetTheme) => ({
-        padding: theme.gridUnit * 3,
+        padding: theme.sizeUnit * 3,
         textAlign: 'center',
         ...cardProps.style,
       })}
@@ -103,3 +104,4 @@ const IconButton: React.FC<IconButtonProps> = ({
 };
 
 export { IconButton };
+export type { IconButtonProps };
diff --git a/superset-frontend/src/components/IconTooltip/IconTooltip.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/IconTooltip/IconTooltip.stories.tsx
similarity index 82%
rename from superset-frontend/src/components/IconTooltip/IconTooltip.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/IconTooltip/IconTooltip.stories.tsx
index d4ba20d3421..b350c8c24ae 100644
--- a/superset-frontend/src/components/IconTooltip/IconTooltip.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/IconTooltip/IconTooltip.stories.tsx
@@ -16,12 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { css, useTheme } from '@superset-ui/core';
-import { IconTooltip, Props } from '.';
+import { IconTooltip } from '.';
+import type { IconTooltipProps } from './types';
 
 export default {
-  title: 'IconTooltip',
+  title: 'Components/IconTooltip',
 };
 
 const PLACEMENTS = [
@@ -39,13 +40,12 @@ const PLACEMENTS = [
   'topRight',
 ];
 
-export const InteractiveIconTooltip = (args: Props) => {
+export const InteractiveIconTooltip = (args: IconTooltipProps) => {
   const theme = useTheme();
-
   return (
     <div
       css={css`
-        margin: ${theme.gridUnit * 10}px ${theme.gridUnit * 17.5}px;
+        margin: ${theme.sizeUnit * 10}px ${theme.sizeUnit * 17.5}px;
       `}
     >
       <IconTooltip {...args}>
diff --git a/superset-frontend/src/components/IconTooltip/IconTooltip.test.jsx b/superset-frontend/packages/superset-ui-core/src/components/IconTooltip/IconTooltip.test.jsx
similarity index 89%
rename from superset-frontend/src/components/IconTooltip/IconTooltip.test.jsx
rename to superset-frontend/packages/superset-ui-core/src/components/IconTooltip/IconTooltip.test.jsx
index 6aac65dd585..befe566eb71 100644
--- a/superset-frontend/src/components/IconTooltip/IconTooltip.test.jsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/IconTooltip/IconTooltip.test.jsx
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { render } from 'spec/helpers/testing-library';
-import { IconTooltip } from 'src/components/IconTooltip';
+import { render } from '@superset-ui/core/spec';
+import { IconTooltip } from '.';
 
-jest.mock('src/components/Tooltip', () => ({
+jest.mock('@superset-ui/core/components/Tooltip', () => ({
   Tooltip: () => <div data-test="mock-tooltip" />,
 }));
 
diff --git a/superset-frontend/src/components/IconTooltip/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/IconTooltip/index.tsx
similarity index 63%
rename from superset-frontend/src/components/IconTooltip/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/IconTooltip/index.tsx
index 376d8aa13b0..471c4fce5d4 100644
--- a/superset-frontend/src/components/IconTooltip/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/IconTooltip/index.tsx
@@ -16,54 +16,30 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { ReactNode } from 'react';
-import { Tooltip } from 'src/components/Tooltip';
-import { styled } from '@superset-ui/core';
+import { Tooltip } from '../Tooltip';
+import { Button } from '../Button';
+import type { IconTooltipProps } from './types';
 
-export interface Props {
-  children?: ReactNode;
-  className?: string;
-  onClick?: () => void;
-  placement?:
-    | 'bottom'
-    | 'left'
-    | 'right'
-    | 'top'
-    | 'topLeft'
-    | 'topRight'
-    | 'bottomLeft'
-    | 'bottomRight'
-    | 'leftTop'
-    | 'leftBottom'
-    | 'rightTop'
-    | 'rightBottom';
-  style?: object;
-  tooltip?: string | null;
-}
-
-const StyledSpan = styled.span`
-  color: ${({ theme }) => theme.colors.primary.dark1};
-  &: hover {
-    color: ${({ theme }) => theme.colors.primary.dark2};
-  }
-`;
-
-const IconTooltip = ({
+export const IconTooltip = ({
   children = null,
   className = '',
   onClick = () => undefined,
   placement = 'top',
   style = {},
   tooltip = null,
-}: Props) => {
+}: IconTooltipProps) => {
   const iconTooltip = (
-    <StyledSpan
+    <Button
       onClick={onClick}
-      style={style}
+      style={{
+        padding: 0,
+        ...style,
+      }}
+      buttonStyle="link"
       className={`IconTooltip ${className}`}
     >
       {children}
-    </StyledSpan>
+    </Button>
   );
   if (tooltip) {
     return (
@@ -81,4 +57,4 @@ const IconTooltip = ({
   return iconTooltip;
 };
 
-export { IconTooltip };
+export type { IconTooltipProps };
diff --git a/superset-frontend/packages/superset-ui-core/src/components/IconTooltip/types.ts b/superset-frontend/packages/superset-ui-core/src/components/IconTooltip/types.ts
new file mode 100644
index 00000000000..80d01d2f190
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/IconTooltip/types.ts
@@ -0,0 +1,40 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { ReactNode } from 'react';
+
+export interface IconTooltipProps {
+  children?: ReactNode;
+  className?: string;
+  onClick?: () => void;
+  placement?:
+    | 'bottom'
+    | 'left'
+    | 'right'
+    | 'top'
+    | 'topLeft'
+    | 'topRight'
+    | 'bottomLeft'
+    | 'bottomRight'
+    | 'leftTop'
+    | 'leftBottom'
+    | 'rightTop'
+    | 'rightBottom';
+  style?: object;
+  tooltip?: string | null;
+}
diff --git a/superset-frontend/src/components/Icons/AntdEnhanced.tsx b/superset-frontend/packages/superset-ui-core/src/components/Icons/AntdEnhanced.tsx
similarity index 82%
rename from superset-frontend/src/components/Icons/AntdEnhanced.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Icons/AntdEnhanced.tsx
index 43eb75b426a..0c5712a42a1 100644
--- a/superset-frontend/src/components/Icons/AntdEnhanced.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Icons/AntdEnhanced.tsx
@@ -27,10 +27,14 @@ import {
   AppstoreOutlined,
   AreaChartOutlined,
   ArrowRightOutlined,
+  ArrowsAltOutlined,
   BarChartOutlined,
   BellOutlined,
+  BgColorsOutlined,
   BookOutlined,
+  BugOutlined,
   BulbOutlined,
+  CalculatorOutlined,
   CaretUpOutlined,
   CaretDownOutlined,
   CaretLeftOutlined,
@@ -41,9 +45,11 @@ import {
   CheckCircleOutlined,
   CheckCircleFilled,
   CheckSquareOutlined,
+  ClearOutlined,
   CloseOutlined,
   CloseCircleOutlined,
   ClockCircleOutlined,
+  ColumnHeightOutlined,
   ColumnWidthOutlined,
   CommentOutlined,
   ConsoleSqlOutlined,
@@ -59,12 +65,14 @@ import {
   EllipsisOutlined,
   ExclamationCircleOutlined,
   ExclamationCircleFilled,
+  ExpandOutlined,
   EyeOutlined,
   EyeInvisibleOutlined,
   FallOutlined,
   FieldNumberOutlined,
   FieldTimeOutlined,
   FileImageOutlined,
+  FileMarkdownOutlined,
   FileOutlined,
   FileTextOutlined,
   FireOutlined,
@@ -73,21 +81,30 @@ import {
   FullscreenOutlined,
   FundProjectionScreenOutlined,
   FunctionOutlined,
+  HighlightOutlined,
   InfoCircleOutlined,
   InfoCircleFilled,
   InsertRowAboveOutlined,
   InsertRowBelowOutlined,
   LineChartOutlined,
+  LineOutlined,
   LinkOutlined,
   MailOutlined,
+  MenuOutlined,
+  MenuFoldOutlined,
+  MenuUnfoldOutlined,
   MinusCircleOutlined,
+  MoonOutlined,
   LoadingOutlined,
+  LoginOutlined,
   MonitorOutlined,
   MoreOutlined,
+  OrderedListOutlined,
   PieChartOutlined,
   PicCenterOutlined,
   PlusCircleOutlined,
   PlusOutlined,
+  QuestionCircleOutlined,
   ReloadOutlined,
   RightOutlined,
   SaveOutlined,
@@ -97,6 +114,7 @@ import {
   StarOutlined,
   StarFilled,
   StopOutlined,
+  SunOutlined,
   SyncOutlined,
   TagOutlined,
   TagsOutlined,
@@ -105,6 +123,8 @@ import {
   UnlockOutlined,
   UploadOutlined,
   UpOutlined,
+  UserAddOutlined,
+  UsergroupAddOutlined,
   UserOutlined,
   VerticalAlignBottomOutlined,
   VerticalAlignTopOutlined,
@@ -112,11 +132,20 @@ import {
   VerticalRightOutlined,
   NumberOutlined,
   ThunderboltOutlined,
+  FacebookOutlined,
   FilterOutlined,
+  FontColorsOutlined,
   UnorderedListOutlined,
   WarningOutlined,
+  SortAscendingOutlined,
   KeyOutlined,
+  GithubOutlined,
+  GoogleOutlined,
+  DesktopOutlined,
+  FormatPainterOutlined,
   ExportOutlined,
+  CompressOutlined,
+  HistoryOutlined,
 } from '@ant-design/icons';
 import { FC } from 'react';
 import { IconType } from './types';
@@ -133,10 +162,14 @@ const AntdIcons = {
   AppstoreOutlined,
   AreaChartOutlined,
   ArrowRightOutlined,
+  ArrowsAltOutlined,
   BarChartOutlined,
+  BgColorsOutlined,
   BellOutlined,
   BookOutlined,
+  BugOutlined,
   BulbOutlined,
+  CalculatorOutlined,
   CaretUpOutlined,
   CaretDownOutlined,
   CaretLeftOutlined,
@@ -147,9 +180,11 @@ const AntdIcons = {
   CheckCircleOutlined,
   CheckCircleFilled,
   CheckSquareOutlined,
+  ClearOutlined,
   CloseOutlined,
   CloseCircleOutlined,
   ClockCircleOutlined,
+  ColumnHeightOutlined,
   ColumnWidthOutlined,
   CommentOutlined,
   ConsoleSqlOutlined,
@@ -165,12 +200,15 @@ const AntdIcons = {
   EllipsisOutlined,
   ExclamationCircleOutlined,
   ExclamationCircleFilled,
+  ExpandOutlined,
   EyeOutlined,
   EyeInvisibleOutlined,
+  FacebookOutlined,
   FallOutlined,
   FieldNumberOutlined,
   FieldTimeOutlined,
   FileImageOutlined,
+  FileMarkdownOutlined,
   FileOutlined,
   FileTextOutlined,
   FireOutlined,
@@ -179,27 +217,39 @@ const AntdIcons = {
   FullscreenOutlined,
   FundProjectionScreenOutlined,
   FunctionOutlined,
+  GithubOutlined,
+  GoogleOutlined,
+  HighlightOutlined,
   InfoCircleOutlined,
   InfoCircleFilled,
   InsertRowAboveOutlined,
   InsertRowBelowOutlined,
   LineChartOutlined,
+  LineOutlined,
   LinkOutlined,
   LoadingOutlined,
+  LoginOutlined,
   MailOutlined,
+  MenuOutlined,
+  MenuFoldOutlined,
+  MenuUnfoldOutlined,
   MinusCircleOutlined,
   MonitorOutlined,
+  MoonOutlined,
   MoreOutlined,
+  OrderedListOutlined,
   PieChartOutlined,
   PicCenterOutlined,
   PlusCircleOutlined,
   PlusOutlined,
   ReloadOutlined,
+  QuestionCircleOutlined,
   RightOutlined,
   SaveOutlined,
   SearchOutlined,
   SettingOutlined,
   ShareAltOutlined,
+  SunOutlined,
   StarOutlined,
   StarFilled,
   StopOutlined,
@@ -211,6 +261,8 @@ const AntdIcons = {
   UploadOutlined,
   UnlockOutlined,
   UpOutlined,
+  UserAddOutlined,
+  UsergroupAddOutlined,
   UserOutlined,
   VerticalAlignBottomOutlined,
   VerticalAlignTopOutlined,
@@ -219,10 +271,16 @@ const AntdIcons = {
   NumberOutlined,
   ThunderboltOutlined,
   FilterOutlined,
+  FontColorsOutlined,
   UnorderedListOutlined,
   WarningOutlined,
+  SortAscendingOutlined,
   KeyOutlined,
+  DesktopOutlined,
+  FormatPainterOutlined,
   ExportOutlined,
+  CompressOutlined,
+  HistoryOutlined,
 } as const;
 
 type AntdIconNames = keyof typeof AntdIcons;
diff --git a/superset-frontend/src/components/Icons/AsyncIcon.tsx b/superset-frontend/packages/superset-ui-core/src/components/Icons/AsyncIcon.tsx
similarity index 93%
rename from superset-frontend/src/components/Icons/AsyncIcon.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Icons/AsyncIcon.tsx
index 1ce39c25bd6..7c6aa6d2f79 100644
--- a/superset-frontend/src/components/Icons/AsyncIcon.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Icons/AsyncIcon.tsx
@@ -18,14 +18,14 @@
  */
 
 import { FC, SVGProps, useEffect, useRef, useState } from 'react';
-import TransparentIcon from 'src/assets/images/icons/transparent.svg';
+import TransparentIcon from './svgs/transparent.svg';
 import { IconType } from './types';
 import { BaseIconComponent } from './BaseIcon';
 
 const AsyncIcon = (props: IconType) => {
   const [, setLoaded] = useState(false);
   const ImportedSVG = useRef<FC<SVGProps<SVGSVGElement>>>();
-  const { fileName } = props;
+  const { fileName, ...restProps } = props;
 
   useEffect(() => {
     let cancelled = false;
@@ -46,7 +46,7 @@ const AsyncIcon = (props: IconType) => {
   return (
     <BaseIconComponent
       component={ImportedSVG.current || TransparentIcon}
-      {...props}
+      {...restProps}
     />
   );
 };
diff --git a/superset-frontend/src/components/Icons/BaseIcon.tsx b/superset-frontend/packages/superset-ui-core/src/components/Icons/BaseIcon.tsx
similarity index 79%
rename from superset-frontend/src/components/Icons/BaseIcon.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Icons/BaseIcon.tsx
index 68167d3cd00..e85cfbbbb64 100644
--- a/superset-frontend/src/components/Icons/BaseIcon.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Icons/BaseIcon.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { css, useTheme } from '@superset-ui/core';
+import { css, useTheme, themeObject } from '../..';
 import { AntdIconType, BaseIconProps, CustomIconType, IconType } from './types';
 
 const genAriaLabel = (fileName: string) => {
@@ -43,17 +43,19 @@ export const BaseIconComponent: React.FC<
   iconSize,
   viewBox,
   customIcons,
+  fileName,
   ...rest
 }) => {
   const theme = useTheme();
-  const iconCss = css`
-    color: ${iconColor || theme.colors.grayscale.base};
-    font-size: ${iconSize
-      ? `${theme.typography.sizes[iconSize] || theme.typography.sizes.m}px`
-      : '24px'};
-  `;
   const whatRole = rest?.onClick ? 'button' : 'img';
-  const ariaLabel = genAriaLabel(rest.fileName || '');
+  const ariaLabel = genAriaLabel(fileName || '');
+  const style = {
+    color: iconColor,
+    fontSize: iconSize
+      ? `${themeObject.getFontSize(iconSize)}px`
+      : `${theme.fontSize}px`,
+    cursor: rest?.onClick ? 'pointer' : undefined,
+  };
 
   return customIcons ? (
     <span
@@ -67,28 +69,28 @@ export const BaseIconComponent: React.FC<
           line-height: 0;
           vertical-align: middle;
         `,
-        iconCss,
       ]}
     >
       <Component
         viewBox={viewBox || '0 0 24 24'}
+        style={style}
         width={
           iconSize
-            ? `${theme.typography.sizes[iconSize] || theme.typography.sizes.m}px`
-            : '24px'
+            ? `${themeObject.getFontSize(iconSize) || theme.fontSize}px`
+            : `${theme.fontSize}px`
         }
         height={
           iconSize
-            ? `${theme.typography.sizes[iconSize] || theme.typography.sizes.m}px`
-            : '24px'
+            ? `${themeObject.getFontSize(iconSize) || theme.fontSize}px`
+            : `${theme.fontSize}px`
         }
         {...(rest as CustomIconType)}
       />
     </span>
   ) : (
     <Component
-      css={iconCss}
       role={whatRole}
+      style={style}
       aria-label={ariaLabel}
       data-test={ariaLabel}
       {...(rest as AntdIconType)}
diff --git a/superset-frontend/src/components/Icons/Icons.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/Icons/Icons.stories.tsx
similarity index 81%
rename from superset-frontend/src/components/Icons/Icons.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Icons/Icons.stories.tsx
index 672192e06bc..fa45056fdb1 100644
--- a/superset-frontend/src/components/Icons/Icons.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Icons/Icons.stories.tsx
@@ -18,48 +18,50 @@
  */
 import { useState } from 'react';
 import { styled, supersetTheme } from '@superset-ui/core';
-import { Input } from 'antd-v5';
+import { Input } from '../Input';
 import { Icons, IconNameType } from '.';
-import IconType from './types';
+import type { IconType } from './types';
 import { BaseIconComponent } from './BaseIcon';
 
 export default {
-  title: 'Icons',
+  title: 'Components/Icons',
   component: BaseIconComponent,
 };
 
 const palette: Record<string, string | null> = { Default: null };
 Object.entries(supersetTheme.colors).forEach(([familyName, family]) => {
-  Object.entries(family).forEach(([colorName, colorValue]) => {
-    palette[`${familyName} / ${colorName}`] = colorValue;
-  });
+  Object.entries(family as Record<string, string>).forEach(
+    ([colorName, colorValue]) => {
+      palette[`${familyName} / ${colorName}`] = colorValue;
+    },
+  );
 });
 
 const IconSet = styled.div`
   display: grid;
   grid-template-columns: repeat(auto-fit, 180px);
   grid-auto-rows: 90px;
-  margin-top: ${({ theme }) => theme.gridUnit * 2}px;
+  margin-top: ${({ theme }) => theme.sizeUnit * 2}px;
 `;
 
 const IconBlock = styled.div`
   display: flex;
   flex-direction: column;
   align-items: center;
-  padding: ${({ theme }) => theme.gridUnit * 2}px;
+  padding: ${({ theme }) => theme.sizeUnit * 2}px;
 
   span {
     margin-top: ${({ theme }) =>
-      2 * theme.gridUnit}px; // Add spacing between icon and name
+      2 * theme.sizeUnit}px; // Add spacing between icon and name
     font-size: ${({ theme }) =>
-      theme.typography.sizes.s}; // Optional: adjust font size for elegance
+      theme.fontSizeSM}; // Optional: adjust font size for elegance
     color: ${({ theme }) =>
-      theme.colors.grayscale.base}; // Optional: subtle color for the name
+      theme.colorText}; // Optional: subtle color for the name
   }
 `;
 
 const SearchBox = styled(Input.Search)`
-  margin-bottom: ${({ theme }) => theme.gridUnit * 4}px;
+  margin-bottom: ${({ theme }) => theme.sizeUnit * 4}px;
   width: 100%;
   max-width: 400px;
 `;
diff --git a/superset-frontend/src/components/Icons/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Icons/index.tsx
similarity index 98%
rename from superset-frontend/src/components/Icons/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Icons/index.tsx
index 0651d529d34..acb7588993a 100644
--- a/superset-frontend/src/components/Icons/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Icons/index.tsx
@@ -20,9 +20,9 @@
 import { FC } from 'react';
 import { antdEnhancedIcons } from './AntdEnhanced';
 import AsyncIcon from './AsyncIcon';
-import IconType from './types';
 
-export type { IconType };
+import type { IconType } from './types';
+
 /**
  * Filename is going to be inferred from the icon name.
  * i.e. BigNumberChartTile => assets/images/icons/big_number_chart_tile
@@ -77,3 +77,4 @@ export const Icons: IconComponentType = {
   ...antdEnhancedIcons,
   ...iconOverrides,
 };
+export type { IconType };
diff --git a/superset-frontend/src/assets/images/icons/transparent.svg b/superset-frontend/packages/superset-ui-core/src/components/Icons/svgs/transparent.svg
similarity index 100%
rename from superset-frontend/src/assets/images/icons/transparent.svg
rename to superset-frontend/packages/superset-ui-core/src/components/Icons/svgs/transparent.svg
diff --git a/superset-frontend/src/components/Icons/types.ts b/superset-frontend/packages/superset-ui-core/src/components/Icons/types.ts
similarity index 98%
rename from superset-frontend/src/components/Icons/types.ts
rename to superset-frontend/packages/superset-ui-core/src/components/Icons/types.ts
index 4d6a4255720..8ebf828d68f 100644
--- a/superset-frontend/src/components/Icons/types.ts
+++ b/superset-frontend/packages/superset-ui-core/src/components/Icons/types.ts
@@ -35,5 +35,3 @@ export type AntdIconType = typeof Icon;
 export interface BaseIconProps {
   component: CustomIconType | AntdIconType;
 }
-
-export default IconType;
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Image/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Image/index.tsx
new file mode 100644
index 00000000000..defb9bfebb3
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Image/index.tsx
@@ -0,0 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+export { Image, type ImageProps } from 'antd';
diff --git a/superset-frontend/src/components/InfoTooltip/InfoTooltip.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/InfoTooltip/InfoTooltip.stories.tsx
similarity index 94%
rename from superset-frontend/src/components/InfoTooltip/InfoTooltip.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/InfoTooltip/InfoTooltip.stories.tsx
index 17fa3e2d242..2339592addc 100644
--- a/superset-frontend/src/components/InfoTooltip/InfoTooltip.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/InfoTooltip/InfoTooltip.stories.tsx
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import InfoTooltip, { InfoTooltipProps } from 'src/components/InfoTooltip';
+import { InfoTooltip, InfoTooltipProps } from '.';
 
 export default {
-  title: 'InfoTooltip',
+  title: 'Components/InfoTooltip',
   component: InfoTooltip,
 };
 
diff --git a/superset-frontend/packages/superset-ui-core/src/components/InfoTooltip/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/InfoTooltip/index.tsx
new file mode 100644
index 00000000000..e5ddfba57aa
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/InfoTooltip/index.tsx
@@ -0,0 +1,127 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { KeyboardEvent, useMemo } from 'react';
+import { SerializedStyles, CSSObject } from '@emotion/react';
+import { kebabCase } from 'lodash';
+import { css, t, useTheme, themeObject } from '@superset-ui/core';
+import {
+  CloseCircleOutlined,
+  InfoCircleOutlined,
+  WarningOutlined,
+  ThunderboltOutlined,
+  QuestionCircleOutlined,
+} from '@ant-design/icons';
+import { Button } from 'antd';
+import { Tooltip, TooltipProps, TooltipPlacement } from '../Tooltip';
+
+export interface InfoTooltipProps {
+  label?: string;
+  tooltip?: TooltipProps['title'];
+  onClick?: () => void;
+  placement?: TooltipPlacement;
+  className?: string;
+  iconStyle?: CSSObject | SerializedStyles;
+  type?: 'info' | 'warning' | 'notice' | 'error' | 'question';
+  iconSize?: 'xs' | 's' | 'm' | 'l' | 'xl' | 'xxl';
+}
+
+export const InfoTooltip = ({
+  type = 'info',
+  iconSize = 's',
+  label,
+  tooltip,
+  onClick,
+  className = 'text-muted',
+  placement = 'right',
+  iconStyle,
+}: InfoTooltipProps) => {
+  const theme = useTheme();
+
+  const infoTooltipWithTriggerVariants = useMemo(
+    () => ({
+      info: { color: theme.colorIcon, icon: <InfoCircleOutlined /> },
+      question: { color: theme.colorIcon, icon: <QuestionCircleOutlined /> },
+      warning: { color: theme.colorWarning, icon: <WarningOutlined /> },
+      notice: { color: theme.colorWarning, icon: <ThunderboltOutlined /> },
+      error: { color: theme.colorError, icon: <CloseCircleOutlined /> },
+    }),
+    [theme],
+  );
+
+  const variant = type ? infoTooltipWithTriggerVariants[type] : null;
+
+  const iconCss = css`
+    color: ${variant?.color ?? theme.colorIcon};
+    font-size: ${themeObject.getFontSize(iconSize)}px;
+  `;
+
+  const handleKeyDown = (event: KeyboardEvent<HTMLSpanElement>) => {
+    if (onClick && (event.key === 'Enter' || event.key === ' ')) {
+      onClick();
+    }
+  };
+
+  const iconEl = (
+    <Button
+      type="text"
+      variant="text"
+      data-test="info-tooltip-icon"
+      aria-label={t('Show info tooltip')}
+      className={className}
+      css={[
+        theme => css`
+          vertical-align: text-bottom;
+          box-shadow: none;
+          padding: 0;
+          height: auto;
+          background: none;
+          &&&:hover,
+          &&&:focus,
+          &&&:active {
+            box-shadow: none;
+            background: none;
+            outline: none;
+            color: ${theme.colorTextTertiary};
+          }
+          ${onClick ? 'cursor: pointer;' : ''}
+        `,
+        iconCss,
+        iconStyle,
+      ]}
+      onClick={onClick}
+      onKeyDown={handleKeyDown}
+    >
+      {variant?.icon}
+    </Button>
+  );
+
+  if (!tooltip) {
+    return iconEl;
+  }
+
+  return (
+    <Tooltip
+      id={`${kebabCase(label) || Math.floor(Math.random() * 10000)}-tooltip`}
+      title={tooltip}
+      placement={placement}
+    >
+      {iconEl}
+    </Tooltip>
+  );
+};
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Input/Input.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/Input/Input.stories.tsx
new file mode 100644
index 00000000000..0d0ce36eb92
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Input/Input.stories.tsx
@@ -0,0 +1,179 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 type { Meta, StoryObj } from '@storybook/react';
+import { Input, InputNumber } from '.';
+import type { InputProps, InputNumberProps, TextAreaProps } from './types';
+
+const meta: Meta<typeof Input> = {
+  title: 'Components/Input',
+  component: Input,
+};
+
+export default meta;
+
+type Story = StoryObj<typeof Input>;
+type InputNumberStory = StoryObj<typeof InputNumber>;
+type TextAreaStory = StoryObj<typeof Input.TextArea>;
+
+export const InteractiveInput: Story = {
+  render: (args: InputProps) => <Input {...args} />,
+  args: {
+    allowClear: false,
+    disabled: false,
+    showCount: false,
+    type: 'text',
+    variant: 'outlined',
+  },
+  argTypes: {
+    defaultValue: {
+      control: { type: 'text' },
+      description: 'Default input value',
+      table: {
+        category: 'Input',
+        type: { summary: 'string' },
+      },
+    },
+    id: {
+      control: { type: 'text' },
+      description: 'HTML id attribute',
+      table: {
+        category: 'Input',
+        type: { summary: 'string' },
+      },
+    },
+    maxLength: {
+      control: { type: 'number' },
+      description: 'Maximum length of input',
+      table: {
+        category: 'Input',
+        type: { summary: 'number' },
+      },
+    },
+    status: {
+      control: { type: 'select' },
+      options: ['error', 'warning'],
+      description: 'Validation status',
+      table: {
+        category: 'Input',
+        type: { summary: `'error' | 'warning'` },
+      },
+    },
+    size: {
+      control: { type: 'select' },
+      options: ['large', 'middle', 'small'],
+      description: 'Size of the input',
+      table: {
+        category: 'Input',
+        type: { summary: `'large' | 'middle' | 'small'` },
+        defaultValue: { summary: 'middle' },
+      },
+    },
+    variant: {
+      control: { type: 'select' },
+      options: ['outlined', 'borderless', 'filled'],
+      description: 'Input style variant',
+      table: {
+        category: 'Input',
+        type: { summary: `'outlined' | 'borderless' | 'filled'` },
+        defaultValue: { summary: 'outlined' },
+      },
+    },
+  },
+};
+
+export const InteractiveInputNumber: InputNumberStory = {
+  render: (args: InputNumberProps) => <InputNumber {...args} />,
+  args: {
+    autoFocus: false,
+    disabled: false,
+    keyboard: true,
+    max: Number.MAX_SAFE_INTEGER,
+    min: Number.MIN_SAFE_INTEGER,
+    step: 1,
+    stringMode: false,
+  },
+  argTypes: {
+    controls: {
+      control: false,
+      description: 'Enable or disable controls',
+      table: {
+        category: 'InputNumber',
+        type: { summary: 'boolean' },
+      },
+    },
+    placeholder: {
+      control: { type: 'text' },
+      description: 'Placeholder text',
+      table: {
+        category: 'InputNumber',
+        type: { summary: 'string' },
+      },
+    },
+    defaultValue: {
+      control: { type: 'number' },
+      description: 'Default numeric value',
+      table: {
+        category: 'InputNumber',
+        type: { summary: 'number' },
+      },
+    },
+    precision: {
+      control: { type: 'number' },
+      description: 'Number of decimal places',
+      table: {
+        category: 'InputNumber',
+        type: { summary: 'number' },
+      },
+    },
+    status: {
+      ...InteractiveInput.argTypes?.status,
+      table: {
+        ...InteractiveInput.argTypes?.status?.table,
+        category: 'InputNumber',
+      },
+    },
+    size: {
+      ...InteractiveInput.argTypes?.size,
+      table: {
+        ...InteractiveInput.argTypes?.size?.table,
+        category: 'InputNumber',
+      },
+    },
+    variant: {
+      ...InteractiveInput.argTypes?.variant,
+      table: {
+        ...InteractiveInput.argTypes?.variant?.table,
+        category: 'InputNumber',
+      },
+    },
+  },
+};
+
+export const InteractiveTextArea: TextAreaStory = {
+  render: (args: TextAreaProps) => <Input.TextArea {...args} />,
+  args: {
+    allowClear: false,
+    disabled: false,
+    showCount: false,
+    variant: 'outlined',
+    autoSize: false,
+    prefix: undefined,
+  },
+  argTypes: InteractiveInput.argTypes,
+};
diff --git a/superset-frontend/src/components/Input/Input.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Input/Input.test.tsx
similarity index 88%
rename from superset-frontend/src/components/Input/Input.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Input/Input.test.tsx
index 2fdfcc9eca7..3444d4b421c 100644
--- a/superset-frontend/src/components/Input/Input.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Input/Input.test.tsx
@@ -16,8 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { render } from 'spec/helpers/testing-library';
-import { Input, InputNumber, TextArea } from '.';
+import { render } from '@superset-ui/core/spec';
+import { Input, InputNumber } from '.';
 
 test('should render Input', () => {
   const { container } = render(<Input />);
@@ -30,6 +30,6 @@ test('should render InputNumber', () => {
 });
 
 test('should render TextArea', () => {
-  const { container } = render(<TextArea />);
+  const { container } = render(<Input.TextArea />);
   expect(container).toBeInTheDocument();
 });
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Input/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Input/index.tsx
new file mode 100644
index 00000000000..32d612dd256
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Input/index.tsx
@@ -0,0 +1,26 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+export { Input, InputNumber } from 'antd';
+export type {
+  InputProps,
+  TextAreaProps,
+  InputNumberProps,
+  InputRef,
+  TextAreaRef,
+} from './types';
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Input/types.ts b/superset-frontend/packages/superset-ui-core/src/components/Input/types.ts
new file mode 100644
index 00000000000..fd3bdf2136c
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Input/types.ts
@@ -0,0 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+export type { InputProps, InputRef, TextAreaProps } from 'antd/es/input';
+export type { InputNumberProps } from 'antd/es/input-number';
+export { TextAreaRef } from 'antd/es/input/TextArea';
diff --git a/superset-frontend/src/components/Label/Label.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/Label/Label.stories.tsx
similarity index 90%
rename from superset-frontend/src/components/Label/Label.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Label/Label.stories.tsx
index b19666e1fcc..a1012c76e77 100644
--- a/superset-frontend/src/components/Label/Label.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Label/Label.stories.tsx
@@ -18,24 +18,24 @@
  */
 import { action } from '@storybook/addon-actions';
 import { Meta, StoryFn } from '@storybook/react';
-import Label, { Type, DatasetTypeLabel, PublishedLabel } from './index';
+import type { LabelType } from './types';
+import { Label, DatasetTypeLabel, PublishedLabel } from '.';
 
 // Define the default export with Storybook configuration
 export default {
-  title: 'Label',
+  title: 'Components/Label',
   component: Label,
   excludeStories: ['options'],
 } as Meta<typeof Label>;
 
 // Explicitly type the options array as an array of `Type`
-export const options: Type[] = [
+export const options: LabelType[] = [
   'default',
   'info',
   'success',
   'warning',
-  'danger',
+  'error',
   'primary',
-  'secondary',
 ];
 
 // Define the props for the `LabelGallery` component
@@ -53,14 +53,14 @@ export const LabelGallery: StoryFn<LabelGalleryProps> = (
   return (
     <>
       <h4>Non-interactive</h4>
-      {options.map((opt: Type) => (
+      {options.map((opt: LabelType) => (
         <Label key={opt} type={opt}>
           {`style: "${opt}"`}
         </Label>
       ))}
       <br />
       <h4>Interactive</h4>
-      {options.map((opt: Type) => (
+      {options.map((opt: LabelType) => (
         <Label key={opt} type={opt} {...props} onClick={onClick}>
           {`style: "${opt}"`}
         </Label>
diff --git a/superset-frontend/src/components/Label/Label.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Label/Label.test.tsx
similarity index 91%
rename from superset-frontend/src/components/Label/Label.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Label/Label.test.tsx
index ac57250bc77..1dff7c6e697 100644
--- a/superset-frontend/src/components/Label/Label.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Label/Label.test.tsx
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { fireEvent, render } from 'spec/helpers/testing-library';
+import { fireEvent, render } from '@superset-ui/core/spec';
 
-import Label from '.';
+import { Label } from '.';
 import { LabelGallery, options } from './Label.stories';
 
 // test the basic component
@@ -36,6 +36,7 @@ test('works with an onClick handler', () => {
 
 // test stories from the storybook!
 test('renders all the storybook gallery variants', () => {
+  // @ts-ignore: Suppress TypeScript error for LabelGallery usage
   const { container } = render(<LabelGallery />);
   const nonInteractiveLabelCount = 4;
   const renderedLabelCount = options.length * 2 + nonInteractiveLabelCount;
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Label/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Label/index.tsx
new file mode 100644
index 00000000000..74b882b2db7
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Label/index.tsx
@@ -0,0 +1,86 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { Tag } from '@superset-ui/core/components/Tag';
+import { css } from '@emotion/react';
+import { useTheme, themeObject } from '@superset-ui/core';
+import { DatasetTypeLabel } from './reusable/DatasetTypeLabel';
+import { PublishedLabel } from './reusable/PublishedLabel';
+import type { LabelProps } from './types';
+
+export function Label(props: LabelProps) {
+  const theme = useTheme();
+  const { transitionTiming } = theme;
+  const {
+    type = 'default',
+    monospace = false,
+    style,
+    onClick,
+    children,
+    icon,
+    id,
+    ...rest
+  } = props;
+
+  const baseColor = themeObject.getColorVariants(type);
+  const color = baseColor.active;
+  const borderColor = baseColor.border;
+  const backgroundColor = baseColor.bg;
+
+  const backgroundColorHover = onClick ? baseColor.bgHover : backgroundColor;
+  const borderColorHover = onClick ? baseColor.borderHover : borderColor;
+
+  const labelStyles = css`
+    transition: background-color ${transitionTiming}s;
+    white-space: nowrap;
+    cursor: ${onClick ? 'pointer' : 'default'};
+    overflow: hidden;
+    text-overflow: ellipsis;
+    background-color: ${backgroundColor};
+    border-radius: 8px;
+    border-color: ${borderColor};
+    padding: 0.35em 0.8em;
+    line-height: 1;
+    color: ${color};
+    display: inline-flex;
+    vertical-align: middle;
+    align-items: center;
+    max-width: 100%;
+    &:hover {
+      background-color: ${backgroundColorHover};
+      border-color: ${borderColorHover};
+      opacity: 1;
+    }
+    ${monospace ? `font-family: ${theme.fontFamilyCode};` : ''}
+  `;
+
+  return (
+    <Tag
+      onClick={onClick}
+      role={onClick ? 'button' : undefined}
+      style={style}
+      icon={icon}
+      css={labelStyles}
+      {...rest}
+    >
+      {children}
+    </Tag>
+  );
+}
+export { DatasetTypeLabel, PublishedLabel };
+export type { LabelType } from './types';
diff --git a/superset-frontend/src/components/Label/reusable/DatasetTypeLabel.tsx b/superset-frontend/packages/superset-ui-core/src/components/Label/reusable/DatasetTypeLabel.tsx
similarity index 80%
rename from superset-frontend/src/components/Label/reusable/DatasetTypeLabel.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Label/reusable/DatasetTypeLabel.tsx
index e779f379998..f40fcfe9088 100644
--- a/superset-frontend/src/components/Label/reusable/DatasetTypeLabel.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Label/reusable/DatasetTypeLabel.tsx
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { Icons } from 'src/components/Icons';
-import Label from 'src/components/Label';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { t, useTheme } from '@superset-ui/core';
+import { Label } from '..';
 
 // Define the prop types for DatasetTypeLabel
 interface DatasetTypeLabelProps {
@@ -27,7 +27,9 @@ interface DatasetTypeLabelProps {
 
 const SIZE = 's'; // Define the size as a constant
 
-const DatasetTypeLabel: React.FC<DatasetTypeLabelProps> = ({ datasetType }) => {
+export const DatasetTypeLabel: React.FC<DatasetTypeLabelProps> = ({
+  datasetType,
+}) => {
   const theme = useTheme();
   const label: string =
     datasetType === 'physical' ? t('Physical') : t('Virtual');
@@ -35,13 +37,12 @@ const DatasetTypeLabel: React.FC<DatasetTypeLabelProps> = ({ datasetType }) => {
     datasetType === 'physical' ? (
       <Icons.InsertRowAboveOutlined
         iconSize={SIZE}
-        iconColor={theme.colors.primary.dark1}
+        iconColor={theme.colorPrimary}
       />
     ) : (
       <Icons.ConsoleSqlOutlined iconSize={SIZE} />
     );
-  const labelType: 'primary' | 'secondary' =
-    datasetType === 'physical' ? 'primary' : 'secondary';
+  const labelType = datasetType === 'physical' ? 'primary' : 'default';
 
   return (
     <Label icon={icon} type={labelType}>
@@ -49,5 +50,3 @@ const DatasetTypeLabel: React.FC<DatasetTypeLabelProps> = ({ datasetType }) => {
     </Label>
   );
 };
-
-export default DatasetTypeLabel;
diff --git a/superset-frontend/src/components/Label/reusable/PublishedLabel.tsx b/superset-frontend/packages/superset-ui-core/src/components/Label/reusable/PublishedLabel.tsx
similarity index 77%
rename from superset-frontend/src/components/Label/reusable/PublishedLabel.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Label/reusable/PublishedLabel.tsx
index b25a3a64a1a..cd1611406cb 100644
--- a/superset-frontend/src/components/Label/reusable/PublishedLabel.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Label/reusable/PublishedLabel.tsx
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { Icons } from 'src/components/Icons';
-import Label from 'src/components/Label';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { t, useTheme } from '@superset-ui/core';
+import { Label } from '..';
 
 // Define props for the PublishedLabel component
 interface PublishedLabelProps {
@@ -26,21 +26,18 @@ interface PublishedLabelProps {
   onClick?: () => void; // Optional click handler
 }
 
-const PublishedLabel: React.FC<PublishedLabelProps> = ({
+export const PublishedLabel: React.FC<PublishedLabelProps> = ({
   isPublished,
   onClick,
 }) => {
   const theme = useTheme();
   const label = isPublished ? t('Published') : t('Draft');
   const icon = isPublished ? (
-    <Icons.CheckCircleOutlined
-      iconSize="s"
-      iconColor={theme.colors.primary.dark2}
-    />
+    <Icons.CheckCircleOutlined iconSize="s" iconColor={theme.colorSuccess} />
   ) : (
-    <Icons.MinusCircleOutlined iconSize="s" />
+    <Icons.MinusCircleOutlined iconSize="s" iconColor={theme.colorPrimary} />
   );
-  const labelType = isPublished ? 'primary' : 'secondary';
+  const labelType = isPublished ? 'success' : 'primary';
 
   return (
     <Label type={labelType} icon={icon} onClick={onClick}>
@@ -48,5 +45,3 @@ const PublishedLabel: React.FC<PublishedLabelProps> = ({
     </Label>
   );
 };
-
-export default PublishedLabel;
diff --git a/superset-frontend/src/components/Space/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Label/types.ts
similarity index 60%
rename from superset-frontend/src/components/Space/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Label/types.ts
index 0c155ff74a5..3cb38e947a1 100644
--- a/superset-frontend/src/components/Space/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Label/types.ts
@@ -17,17 +17,31 @@
  * under the License.
  */
 
-/*
- * Re-exporting of components in src/components to facilitate
- * their imports by other components.
- * E.g. import { Select } from 'src/components'
- */
+import type {
+  CSSProperties,
+  HTMLAttributes,
+  MouseEventHandler,
+  ReactNode,
+} from 'react';
 
-import { Space as AntdSpace } from 'antd-v5';
-import type { SpaceProps } from 'antd-v5/es/space';
+export type OnClickHandler = MouseEventHandler<HTMLElement>;
 
-export function Space(props: SpaceProps) {
-  return <AntdSpace {...props} />;
+export type LabelType =
+  | 'success'
+  | 'warning'
+  | 'error'
+  | 'info'
+  | 'default'
+  | 'primary';
+
+export interface LabelProps extends HTMLAttributes<HTMLSpanElement> {
+  key?: string;
+  className?: string;
+  onClick?: OnClickHandler;
+  type?: LabelType;
+  style?: CSSProperties;
+  children?: ReactNode;
+  role?: string;
+  monospace?: boolean;
+  icon?: ReactNode;
 }
-
-export { SpaceProps };
diff --git a/superset-frontend/src/components/LastUpdated/LastUpdated.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/LastUpdated/LastUpdated.test.tsx
similarity index 93%
rename from superset-frontend/src/components/LastUpdated/LastUpdated.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/LastUpdated/LastUpdated.test.tsx
index 3e54656f123..f3c76cc2d17 100644
--- a/superset-frontend/src/components/LastUpdated/LastUpdated.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/LastUpdated/LastUpdated.test.tsx
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { fireEvent, render, screen } from 'spec/helpers/testing-library';
+import { fireEvent, render, screen } from '@superset-ui/core/spec';
 
-import LastUpdated from '.';
+import { LastUpdated } from '.';
 
 const updatedAt = new Date('Sat Dec 12 2020 00:00:00 GMT-0800');
 
diff --git a/superset-frontend/src/components/LastUpdated/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/LastUpdated/index.tsx
similarity index 83%
rename from superset-frontend/src/components/LastUpdated/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/LastUpdated/index.tsx
index 91bee1997d9..a159c387626 100644
--- a/superset-frontend/src/components/LastUpdated/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/LastUpdated/index.tsx
@@ -16,24 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import {
-  useEffect,
-  useState,
-  FunctionComponent,
-  MouseEventHandler,
-} from 'react';
+import { useEffect, useState, FunctionComponent } from 'react';
 
-import { extendedDayjs } from 'src/utils/dates';
 import { t, styled, css } from '@superset-ui/core';
-import { Icons } from 'src/components/Icons';
 import dayjs from 'dayjs';
+import { extendedDayjs } from '../../utils/dates';
+import { Icons } from '../Icons';
+import type { LastUpdatedProps } from './types';
 
 const REFRESH_INTERVAL = 60000; // every minute
 
-interface LastUpdatedProps {
-  updatedAt: string | number | Date | undefined;
-  update?: MouseEventHandler<HTMLSpanElement>;
-}
 extendedDayjs.updateLocale('en', {
   calendar: {
     lastDay: '[Yesterday at] LTS',
@@ -52,10 +44,10 @@ const TextStyles = styled.span`
 const RefreshIcon = styled(Icons.SyncOutlined)`
   ${({ theme }) => `
   width: auto;
-  height: ${theme.gridUnit * 5}px;
+  height: ${theme.sizeUnit * 5}px;
   position: relative;
-  top: ${theme.gridUnit}px;
-  left: ${theme.gridUnit}px;
+  top: ${theme.sizeUnit}px;
+  left: ${theme.sizeUnit}px;
   cursor: pointer;
 `};
 `;
@@ -95,4 +87,4 @@ export const LastUpdated: FunctionComponent<LastUpdatedProps> = ({
   );
 };
 
-export default LastUpdated;
+export type { LastUpdatedProps };
diff --git a/superset-frontend/packages/superset-ui-core/src/components/LastUpdated/types.ts b/superset-frontend/packages/superset-ui-core/src/components/LastUpdated/types.ts
new file mode 100644
index 00000000000..f278e9355a0
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/LastUpdated/types.ts
@@ -0,0 +1,24 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { MouseEventHandler } from 'react';
+
+export interface LastUpdatedProps {
+  updatedAt: string | number | Date | undefined;
+  update?: MouseEventHandler<HTMLSpanElement>;
+}
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Layout/Layout.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/Layout/Layout.stories.tsx
new file mode 100644
index 00000000000..9040d7b43fd
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Layout/Layout.stories.tsx
@@ -0,0 +1,182 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { Meta, StoryObj } from '@storybook/react';
+import { Icons } from '@superset-ui/core/components/Icons';
+import { Menu } from '../Menu';
+import type { LayoutProps, SiderProps } from './types';
+import { Layout } from '.';
+
+const { Header, Footer, Sider, Content } = Layout;
+
+export default {
+  title: 'Design System/Components/Layout',
+  component: Layout,
+  subcomponents: { Header, Footer, Sider, Content },
+  argTypes: {
+    // Layout properties
+    className: {
+      control: false,
+      table: {
+        category: 'Layout',
+        type: { summary: 'string' },
+        defaultValue: { summary: 'undefined' },
+      },
+    },
+    hasSider: {
+      control: 'boolean',
+      description: 'Include a sider',
+      table: {
+        category: 'Layout',
+        type: { summary: 'boolean' },
+      },
+    },
+    // Layout.Sider properties
+    breakpoint: {
+      control: 'select',
+      options: ['xs', 'sm', 'md', 'lg', 'xl', 'xxl'],
+      description: 'Responsive breakpoint for the Sider',
+      table: {
+        category: 'Sider',
+        type: { summary: 'text' },
+      },
+    },
+    collapsible: {
+      control: 'boolean',
+      description: 'Whether the Sider can be collapsed',
+      table: {
+        category: 'Sider',
+        type: { summary: 'boolean' },
+      },
+    },
+    collapsed: {
+      control: 'boolean',
+      description: 'To set the current status of the Sider',
+      table: {
+        category: 'Sider',
+        type: { summary: 'boolean' },
+      },
+    },
+    collapsedWith: {
+      control: false,
+      description:
+        'Width of the collapsed sidebar, by setting to 0 a special trigger will appear',
+      table: {
+        category: 'Sider',
+        type: { summary: 'number' },
+        defaultValue: 80,
+      },
+    },
+    reverseArrow: {
+      control: 'boolean',
+      description: 'Whether the arrow icon is reversed',
+      table: {
+        category: 'Sider',
+        type: { summary: 'boolean' },
+      },
+    },
+    theme: {
+      control: 'select',
+      options: ['light', 'dark'],
+      description: 'Theme for the Sider',
+      table: {
+        category: 'Sider',
+        type: { summary: 'string' },
+        defaultValue: { summary: 'dark' },
+      },
+    },
+    width: {
+      control: 'number',
+      description: 'Width of the Sider',
+      table: {
+        category: 'Sider',
+        type: { summary: 'number' },
+        defaultValue: { summary: '200' },
+      },
+    },
+  },
+  parameters: {
+    docs: {
+      description: {
+        component:
+          'Ant Design Layout component with configurable Sider, Header, Footer, and Content.',
+      },
+    },
+  },
+} as Meta<typeof Layout & typeof Sider>;
+
+type Story = StoryObj<typeof Layout>;
+
+export const LayoutStory: Story = {
+  render: ({
+    className,
+    hasSider,
+    ...siderProps
+  }: LayoutProps & SiderProps) => (
+    <Layout
+      className={className}
+      hasSider={hasSider}
+      style={{ minHeight: '100vh' }}
+    >
+      {hasSider && (
+        <Sider {...siderProps}>
+          <div
+            className="logo"
+            style={{
+              height: '32px',
+              margin: '16px',
+              background: '#ffffff30',
+            }}
+          />
+          <Menu defaultSelectedKeys={['1']} mode="inline">
+            <Menu.Item key="1" icon={<Icons.MenuUnfoldOutlined />}>
+              Option 1
+            </Menu.Item>
+            <Menu.Item key="2" icon={<Icons.MenuFoldOutlined />}>
+              Option 2
+            </Menu.Item>
+          </Menu>
+        </Sider>
+      )}
+      <Layout>
+        <Header
+          style={{
+            background: '#fff',
+            padding: '0 16px',
+            textAlign: 'center',
+          }}
+        >
+          Header
+        </Header>
+        <Content
+          style={{
+            margin: '16px',
+            padding: '24px',
+            background: '#fff',
+            textAlign: 'center',
+          }}
+        >
+          Content Area
+        </Content>
+        <Footer style={{ textAlign: 'center' }}>
+          Ant Design Layout Footer
+        </Footer>
+      </Layout>
+    </Layout>
+  ),
+};
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Layout/Layout.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Layout/Layout.test.tsx
new file mode 100644
index 00000000000..cb79d78da5b
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Layout/Layout.test.tsx
@@ -0,0 +1,107 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { useState } from 'react';
+import { render, screen, fireEvent } from '@superset-ui/core/spec';
+import { Layout } from '.';
+import { Button } from '../Button';
+
+describe('Layout Component', () => {
+  it('renders Layout with Header, Content, and Footer', () => {
+    render(
+      <Layout hasSider={false}>
+        <Layout.Header>Header</Layout.Header>
+        <Layout.Content>Content Area</Layout.Content>
+        <Layout.Footer>Ant Design Layout Footer</Layout.Footer>
+      </Layout>,
+    );
+
+    expect(screen.getByText('Header')).toBeInTheDocument();
+    expect(screen.getByText('Content Area')).toBeInTheDocument();
+    expect(screen.getByText('Ant Design Layout Footer')).toBeInTheDocument();
+  });
+
+  it('renders Layout with Sider when hasSider is true', () => {
+    render(
+      <Layout hasSider>
+        <Layout.Sider>Sider Content</Layout.Sider>
+      </Layout>,
+    );
+
+    expect(screen.getByText('Sider Content')).toBeInTheDocument();
+  });
+
+  it('hides Header when headerVisible is false', () => {
+    render(
+      <Layout>
+        {false && <Layout.Header>Header</Layout.Header>}
+        <Layout.Content>Content Area</Layout.Content>
+        <Layout.Footer>Ant Design Layout Footer</Layout.Footer>
+      </Layout>,
+    );
+
+    expect(screen.queryByText('Header')).not.toBeInTheDocument();
+  });
+
+  it('hides Footer when footerVisible is false', () => {
+    render(
+      <Layout>
+        <Layout.Header>Header</Layout.Header>
+        <Layout.Content>Content Area</Layout.Content>
+        {false && <Layout.Footer>Ant Design Layout Footer</Layout.Footer>}
+      </Layout>,
+    );
+
+    expect(
+      screen.queryByText('Ant Design Layout Footer'),
+    ).not.toBeInTheDocument();
+  });
+  it('collapses Sider when clicked', () => {
+    const TestLayout = () => {
+      const [collapsed, setCollapsed] = useState(false);
+
+      return (
+        <Layout hasSider>
+          <Layout.Sider
+            collapsible
+            collapsed={collapsed}
+            collapsedWidth={80}
+            width={200}
+          >
+            <Button onClick={() => setCollapsed(!collapsed)}>Toggle</Button>
+            Sider Content
+          </Layout.Sider>
+        </Layout>
+      );
+    };
+
+    render(<TestLayout />);
+
+    const toggleButton = screen.getByRole('button', { name: 'Toggle' });
+
+    expect(screen.getByText('Sider Content').parentElement).toHaveStyle({
+      width: '200px',
+    });
+
+    fireEvent.click(toggleButton);
+
+    expect(screen.getByText('Sider Content').parentElement).toHaveStyle({
+      width: '80px',
+    });
+  });
+});
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Layout/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Layout/index.tsx
new file mode 100644
index 00000000000..1c6ec4fe596
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Layout/index.tsx
@@ -0,0 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { Layout } from 'antd';
+
+export type { LayoutProps, SiderProps } from './types';
+export { Layout };
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Layout/types.ts b/superset-frontend/packages/superset-ui-core/src/components/Layout/types.ts
new file mode 100644
index 00000000000..ff82a38d112
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Layout/types.ts
@@ -0,0 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+export type { LayoutProps, SiderProps } from 'antd/es/layout';
diff --git a/superset-frontend/src/components/List/List.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/List/List.stories.tsx
similarity index 95%
rename from superset-frontend/src/components/List/List.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/List/List.stories.tsx
index 0b10f0aaa6c..efb5bc09372 100644
--- a/superset-frontend/src/components/List/List.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/List/List.stories.tsx
@@ -17,10 +17,11 @@
  * under the License.
  */
 
-import { List, ListProps } from '.';
+import { List } from '.';
+import type { ListProps } from './types';
 
 export default {
-  title: 'List',
+  title: 'Components/List',
   component: List,
 };
 
diff --git a/superset-frontend/src/components/List/List.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/List/List.test.tsx
similarity index 92%
rename from superset-frontend/src/components/List/List.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/List/List.test.tsx
index b7094da509f..2423bc3a00f 100644
--- a/superset-frontend/src/components/List/List.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/List/List.test.tsx
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { render, screen } from 'spec/helpers/testing-library';
-import { ListProps } from 'antd-v5/lib/list';
+import { render, screen } from '@superset-ui/core/spec';
 import { List } from '.';
+import type { ListProps } from './types';
 
 const mockedProps: ListProps<any> = {
   dataSource: ['Item 1', 'Item 2', 'Item 3'],
diff --git a/superset-frontend/packages/superset-ui-core/src/components/List/index.ts b/superset-frontend/packages/superset-ui-core/src/components/List/index.ts
new file mode 100644
index 00000000000..7eaccbb8c58
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/List/index.ts
@@ -0,0 +1,56 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { css, styled } from '@superset-ui/core';
+import { List as AntdList } from 'antd';
+import type { ListProps, ListItemProps, ListItemMetaProps } from './types';
+
+export interface CompactListItemProps extends ListItemProps {
+  compact?: boolean;
+}
+
+const CompactListItem = styled(AntdList.Item)<CompactListItemProps>`
+  && {
+    ${({ compact, theme }) =>
+      compact &&
+      css`
+        padding: ${theme.sizeUnit / 2}px ${theme.sizeUnit * 3}px
+          ${theme.sizeUnit / 2}px ${theme.sizeUnit}px;
+      `}
+    ${({ theme }) => css`
+      && a {
+        color: ${theme.colorLink};
+        &:hover {
+          color: ${theme.colorLinkHover};
+        }
+      }
+    `}
+  }
+`;
+
+type CompactListItemWithMeta = typeof CompactListItem & {
+  Meta: typeof AntdList.Item.Meta;
+};
+
+(CompactListItem as CompactListItemWithMeta).Meta = AntdList.Item.Meta;
+
+export const List = Object.assign(AntdList, {
+  Item: CompactListItem,
+});
+
+export type { ListProps, ListItemProps, ListItemMetaProps };
diff --git a/superset-frontend/packages/superset-ui-core/src/components/List/types.ts b/superset-frontend/packages/superset-ui-core/src/components/List/types.ts
new file mode 100644
index 00000000000..114e36521b5
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/List/types.ts
@@ -0,0 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+export type { ListProps, ListItemProps, ListItemMetaProps } from 'antd/es/list';
diff --git a/superset-frontend/src/components/ListViewCard/ImageLoader.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/ListViewCard/ImageLoader.test.tsx
similarity index 93%
rename from superset-frontend/src/components/ListViewCard/ImageLoader.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/ListViewCard/ImageLoader.test.tsx
index 2449b838f28..abbc6c21cd5 100644
--- a/superset-frontend/src/components/ListViewCard/ImageLoader.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/ListViewCard/ImageLoader.test.tsx
@@ -18,10 +18,8 @@
  */
 import fetchMock from 'fetch-mock';
 
-import ImageLoader, {
-  BackgroundPosition,
-} from 'src/components/ListViewCard/ImageLoader';
-import { render, screen } from 'spec/helpers/testing-library';
+import { render, screen } from '@superset-ui/core/spec';
+import { ImageLoader, type BackgroundPosition } from './ImageLoader';
 
 global.URL.createObjectURL = jest.fn(() => '/local_url');
 const blob = new Blob([], { type: 'image/png' });
diff --git a/superset-frontend/src/components/ListViewCard/ImageLoader.tsx b/superset-frontend/packages/superset-ui-core/src/components/ListViewCard/ImageLoader.tsx
similarity index 98%
rename from superset-frontend/src/components/ListViewCard/ImageLoader.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/ListViewCard/ImageLoader.tsx
index ae4c4298431..94919dd054c 100644
--- a/superset-frontend/src/components/ListViewCard/ImageLoader.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/ListViewCard/ImageLoader.tsx
@@ -43,7 +43,7 @@ interface ImageLoaderProps
   position: BackgroundPosition;
 }
 
-export default function ImageLoader({
+export function ImageLoader({
   src,
   fallback,
   isLoading,
diff --git a/superset-frontend/src/components/ListViewCard/ListViewCard.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/ListViewCard/ListViewCard.stories.tsx
similarity index 78%
rename from superset-frontend/src/components/ListViewCard/ListViewCard.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/ListViewCard/ListViewCard.stories.tsx
index d3f81b23f01..77c6744c331 100644
--- a/superset-frontend/src/components/ListViewCard/ListViewCard.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/ListViewCard/ListViewCard.stories.tsx
@@ -17,14 +17,13 @@
  * under the License.
  */
 import { action } from '@storybook/addon-actions';
-import { Dropdown } from 'src/components/Dropdown';
-import { Menu } from 'src/components/Menu';
-import { Icons } from 'src/components/Icons';
-import FaveStar from 'src/components/FaveStar';
-import ListViewCard from '.';
+import { Icons } from '@superset-ui/core/components/Icons';
+import { Dropdown } from '../Dropdown';
+import { FaveStar } from '../FaveStar';
+import { ListViewCard } from '.';
 
 export default {
-  title: 'ListViewCard',
+  title: 'Components/ListViewCard',
   component: ListViewCard,
   argTypes: {
     loading: { control: 'boolean', defaultValue: false },
@@ -71,16 +70,22 @@ export const SupersetListViewCard = ({
           isStarred={isStarred}
         />
         <Dropdown
-          dropdownRender={() => (
-            <Menu>
-              <Menu.Item role="button" tabIndex={0} onClick={action('Delete')}>
-                <Icons.DeleteOutlined /> Delete
-              </Menu.Item>
-              <Menu.Item role="button" tabIndex={0} onClick={action('Edit')}>
-                <Icons.EditOutlined /> Edit
-              </Menu.Item>
-            </Menu>
-          )}
+          menu={{
+            items: [
+              {
+                key: 'delete',
+                label: 'Delete',
+                icon: <Icons.DeleteOutlined />,
+                onClick: action('Delete'),
+              },
+              {
+                key: 'edit',
+                label: 'Edit',
+                icon: <Icons.EditOutlined />,
+                onClick: action('Edit'),
+              },
+            ],
+          }}
         >
           <Icons.EllipsisOutlined />
         </Dropdown>
diff --git a/superset-frontend/src/components/ListViewCard/ListViewCard.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/ListViewCard/ListViewCard.test.tsx
similarity index 94%
rename from superset-frontend/src/components/ListViewCard/ListViewCard.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/ListViewCard/ListViewCard.test.tsx
index 4858d628489..4c21d68e2ea 100644
--- a/superset-frontend/src/components/ListViewCard/ListViewCard.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/ListViewCard/ListViewCard.test.tsx
@@ -18,8 +18,8 @@
  */
 import fetchMock from 'fetch-mock';
 
-import ListViewCard from 'src/components/ListViewCard';
-import { render, screen } from 'spec/helpers/testing-library';
+import { render, screen } from '@superset-ui/core/spec';
+import { ListViewCard } from '.';
 
 global.URL.createObjectURL = jest.fn(() => '/local_url');
 fetchMock.get('/thumbnail', { body: new Blob(), sendAsJson: false });
diff --git a/superset-frontend/packages/superset-ui-core/src/components/ListViewCard/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/ListViewCard/index.tsx
new file mode 100644
index 00000000000..9a5fb7863c5
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/ListViewCard/index.tsx
@@ -0,0 +1,263 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { FC } from 'react';
+import { styled, useTheme, css } from '@superset-ui/core';
+import { Skeleton } from '../Skeleton';
+import { Card } from '../Card';
+import { CertifiedBadge } from '../CertifiedBadge';
+import { Tooltip } from '../Tooltip';
+import { ImageLoader } from './ImageLoader';
+import type { ListViewCardProps, LinkProps } from './types';
+
+const ActionsWrapper = styled.div`
+  width: 64px;
+  display: flex;
+  justify-content: flex-end;
+`;
+
+// Styling part 2: Use CSS when necessary
+const StyledCard = styled(Card)`
+  ${({ theme }) => `
+    overflow: hidden;
+
+    .gradient-container {
+      position: relative;
+      height: 100%;
+    }
+    &:hover {
+      box-shadow: ${theme.boxShadow};
+      transition: box-shadow ${theme.motionDurationSlow} ease-in-out;
+
+      .cover-footer {
+        transform: translateY(0);
+      }
+    }
+  `}
+`;
+
+const Cover = styled.div`
+  height: 264px;
+  border-bottom: 1px solid ${({ theme }) => theme.colors.grayscale.light2};
+  overflow: hidden;
+
+  .cover-footer {
+    transform: translateY(${({ theme }) => theme.sizeUnit * 9}px);
+    transition: ${({ theme }) => theme.motionDurationMid} ease-out;
+  }
+`;
+
+const TitleContainer = styled.div`
+  display: flex;
+  justify-content: flex-start;
+  flex-direction: column;
+
+  .card-actions {
+    margin-left: auto;
+    align-self: flex-end;
+    padding-left: ${({ theme }) => theme.sizeUnit}px;
+    span[role='img'] {
+      display: flex;
+      align-items: center;
+    }
+  }
+
+  .titleRow {
+    display: flex;
+    justify-content: flex-start;
+    flex-direction: row;
+  }
+`;
+
+const TitleLink = styled.span`
+  overflow: hidden;
+  text-overflow: ellipsis;
+  & a {
+    color: ${({ theme }) => theme.colorText} !important;
+  }
+`;
+
+const TitleRight = styled.span`
+  ${({ theme }) => css`
+    position: absolute;
+    right: -1px;
+    font-weight: 400;
+    bottom: ${theme.sizeUnit * 3}px;
+    right: ${theme.sizeUnit * 2}px;
+  `}
+`;
+const CoverFooter = styled.div`
+  display: flex;
+  flex-wrap: nowrap;
+  position: relative;
+  top: -${({ theme }) => theme.sizeUnit * 9}px;
+  padding: 0 8px;
+`;
+
+const CoverFooterLeft = styled.div`
+  flex: 1;
+  overflow: hidden;
+`;
+
+const CoverFooterRight = styled.div`
+  align-self: flex-end;
+  margin-left: auto;
+  max-width: 200px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+`;
+
+const ThinSkeleton = styled(Skeleton)`
+  h3 {
+    margin: ${({ theme }) => theme.sizeUnit}px 0;
+  }
+
+  ul {
+    margin-bottom: 0;
+  }
+`;
+
+const paragraphConfig = { rows: 1, width: 150 };
+
+const AnchorLink: FC<LinkProps> = ({ to, children }) => (
+  <a href={to}>{children}</a>
+);
+
+function ListViewCard({
+  title,
+  subtitle,
+  url,
+  linkComponent,
+  titleRight,
+  imgURL,
+  imgFallbackURL,
+  description,
+  coverLeft,
+  coverRight,
+  actions,
+  avatar,
+  loading,
+  imgPosition = 'top',
+  cover,
+  certifiedBy,
+  certificationDetails,
+}: ListViewCardProps) {
+  const Link = url && linkComponent ? linkComponent : AnchorLink;
+  const theme = useTheme();
+  return (
+    <StyledCard
+      data-test="styled-card"
+      padded
+      cover={
+        cover || (
+          <Cover>
+            <Link to={url!}>
+              <div className="gradient-container">
+                <ImageLoader
+                  src={imgURL || ''}
+                  fallback={imgFallbackURL || ''}
+                  isLoading={loading}
+                  position={imgPosition}
+                />
+              </div>
+            </Link>
+            <CoverFooter className="cover-footer">
+              {!loading && coverLeft && (
+                <CoverFooterLeft>{coverLeft}</CoverFooterLeft>
+              )}
+              {!loading && coverRight && (
+                <CoverFooterRight>{coverRight}</CoverFooterRight>
+              )}
+            </CoverFooter>
+          </Cover>
+        )
+      }
+    >
+      {loading && (
+        <Card.Meta
+          data-test="skeleton-card"
+          title={
+            <>
+              <TitleContainer>
+                <Skeleton.Input
+                  active
+                  size="small"
+                  css={{
+                    width: Math.trunc(theme.sizeUnit * 62.5),
+                  }}
+                />
+                <div className="card-actions">
+                  <Skeleton.Button active shape="circle" />{' '}
+                  <Skeleton.Button
+                    active
+                    css={{
+                      width: theme.sizeUnit * 10,
+                    }}
+                  />
+                </div>
+              </TitleContainer>
+            </>
+          }
+          description={
+            <ThinSkeleton
+              round
+              active
+              title={false}
+              paragraph={paragraphConfig}
+            />
+          }
+        />
+      )}
+      {!loading && (
+        <Card.Meta
+          title={
+            <TitleContainer>
+              {subtitle || null}
+              <div className="titleRow">
+                <Tooltip title={title}>
+                  <TitleLink>
+                    {certifiedBy && (
+                      <>
+                        <CertifiedBadge
+                          certifiedBy={certifiedBy}
+                          details={certificationDetails}
+                        />{' '}
+                      </>
+                    )}
+                    {title}
+                  </TitleLink>
+                </Tooltip>
+                {titleRight && <TitleRight>{titleRight}</TitleRight>}
+                <div className="card-actions" data-test="card-actions">
+                  {actions}
+                </div>
+              </div>
+            </TitleContainer>
+          }
+          description={description}
+          avatar={avatar || null}
+        />
+      )}
+    </StyledCard>
+  );
+}
+
+ListViewCard.Actions = ActionsWrapper;
+
+export { ListViewCard, ImageLoader };
+export type { ListViewCardProps };
diff --git a/superset-frontend/packages/superset-ui-core/src/components/ListViewCard/types.ts b/superset-frontend/packages/superset-ui-core/src/components/ListViewCard/types.ts
new file mode 100644
index 00000000000..db0c2f6faf0
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/ListViewCard/types.ts
@@ -0,0 +1,45 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 type { ReactNode, ComponentType, ReactElement } from 'react';
+import type { BackgroundPosition } from './ImageLoader';
+
+export interface LinkProps {
+  to: string;
+}
+
+export interface ListViewCardProps {
+  title?: ReactNode;
+  subtitle?: ReactNode;
+  url?: string;
+  linkComponent?: ComponentType<LinkProps>;
+  imgURL?: string | null;
+  imgFallbackURL?: string;
+  imgPosition?: BackgroundPosition;
+  description: string;
+  loading?: boolean;
+  titleRight?: ReactNode;
+  coverLeft?: ReactNode;
+  coverRight?: ReactNode;
+  actions?: ReactNode | null;
+  rows?: number | string;
+  avatar?: ReactElement | null;
+  cover?: ReactNode | null;
+  certifiedBy?: string;
+  certificationDetails?: string;
+}
diff --git a/superset-frontend/src/components/Loading/Loading.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/Loading/Loading.stories.tsx
similarity index 89%
rename from superset-frontend/src/components/Loading/Loading.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Loading/Loading.stories.tsx
index 44fbce64acd..98da9c1c155 100644
--- a/superset-frontend/src/components/Loading/Loading.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Loading/Loading.stories.tsx
@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import Loading, { Props, PositionOption } from './index';
+import type { LoadingProps, PositionOption } from './types';
+import { Loading } from '.';
 
 export default {
-  title: 'Loading',
+  title: 'Components/Loading',
   component: Loading,
   includeStories: ['LoadingGallery', 'InteractiveLoading'],
 };
@@ -54,7 +55,7 @@ LoadingGallery.parameters = {
   },
 };
 
-export const InteractiveLoading = (args: Props) => <Loading {...args} />;
+export const InteractiveLoading = (args: LoadingProps) => <Loading {...args} />;
 
 InteractiveLoading.args = {
   image: '',
diff --git a/superset-frontend/src/components/Loading/Loading.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Loading/Loading.test.tsx
similarity index 96%
rename from superset-frontend/src/components/Loading/Loading.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Loading/Loading.test.tsx
index 6c7828a9f96..65893e8fc0a 100644
--- a/superset-frontend/src/components/Loading/Loading.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Loading/Loading.test.tsx
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { render, screen } from 'spec/helpers/testing-library';
-import Loading from './index';
+import { render, screen } from '@superset-ui/core/spec';
+import { Loading } from '.';
 
 test('Rerendering correctly with default props', () => {
   render(<Loading />);
diff --git a/superset-frontend/src/components/Loading/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Loading/index.tsx
similarity index 84%
rename from superset-frontend/src/components/Loading/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Loading/index.tsx
index 8eac082a1db..c97a27c2e7c 100644
--- a/superset-frontend/src/components/Loading/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Loading/index.tsx
@@ -19,18 +19,8 @@
 
 import { styled } from '@superset-ui/core';
 import cls from 'classnames';
-import Loader from 'src/assets/images/loading.gif';
-
-export type PositionOption =
-  | 'floating'
-  | 'inline'
-  | 'inline-centered'
-  | 'normal';
-export interface Props {
-  position?: PositionOption;
-  className?: string;
-  image?: string;
-}
+import { Loading as Loader } from '../assets';
+import type { LoadingProps } from './types';
 
 const LoaderImg = styled.img`
   z-index: 99;
@@ -56,11 +46,11 @@ const LoaderImg = styled.img`
     transform: translate(-50%, -50%);
   }
 `;
-export default function Loading({
+export function Loading({
   position = 'floating',
   image,
   className,
-}: Props) {
+}: LoadingProps) {
   return (
     <LoaderImg
       className={cls('loading', position, className)}
@@ -73,3 +63,5 @@ export default function Loading({
     />
   );
 }
+
+export type { LoadingProps };
diff --git a/superset-frontend/src/components/Input/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Loading/types.ts
similarity index 80%
rename from superset-frontend/src/components/Input/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Loading/types.ts
index 1fcb4a53696..28f013d9720 100644
--- a/superset-frontend/src/components/Input/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Loading/types.ts
@@ -16,11 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+export type PositionOption =
+  | 'floating'
+  | 'inline'
+  | 'inline-centered'
+  | 'normal';
 
-import { Input as AntdInput, InputNumber as AntdInputNumber } from 'antd-v5';
-
-export const Input = AntdInput;
-
-export const InputNumber = AntdInputNumber;
-
-export const { TextArea } = AntdInput;
+export interface LoadingProps {
+  position?: PositionOption;
+  className?: string;
+  image?: string;
+}
diff --git a/superset-frontend/src/components/Menu/Menu.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/Menu/Menu.stories.tsx
similarity index 74%
rename from superset-frontend/src/components/Menu/Menu.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Menu/Menu.stories.tsx
index 1ba01091672..b7bf895a2f4 100644
--- a/superset-frontend/src/components/Menu/Menu.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Menu/Menu.stories.tsx
@@ -19,30 +19,31 @@
 import { Menu, MainNav } from '.';
 
 export default {
-  title: 'Menu',
+  title: 'Components/Menu',
   component: Menu as React.FC,
 };
 
 export const MainNavigation = (args: any) => (
-  <MainNav mode="horizontal" {...args}>
-    <Menu.Item>
-      <a href="/">Dashboards</a>
-    </Menu.Item>
-    <Menu.Item>
-      <a href="/">Charts</a>
-    </Menu.Item>
-    <Menu.Item>
-      <a href="/">Datasets</a>
-    </Menu.Item>
-  </MainNav>
+  <MainNav
+    mode="horizontal"
+    items={[
+      { key: 'dashboards', label: 'Dashboards', href: '/' },
+      { key: 'charts', label: 'Charts', href: '/' },
+      { key: 'datasets', label: 'Datasets', href: '/' },
+    ]}
+    {...args}
+  />
 );
 
 export const InteractiveMenu = (args: any) => (
-  <Menu {...args}>
-    <Menu.Item>Dashboards</Menu.Item>
-    <Menu.Item>Charts</Menu.Item>
-    <Menu.Item>Datasets</Menu.Item>
-  </Menu>
+  <Menu
+    items={[
+      { label: 'Dashboards', key: '1' },
+      { label: 'Charts', key: '2' },
+      { label: 'Datasets', key: '3' },
+    ]}
+    {...args}
+  />
 );
 
 InteractiveMenu.args = {
diff --git a/superset-frontend/src/components/Menu/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Menu/index.tsx
similarity index 64%
rename from superset-frontend/src/components/Menu/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Menu/index.tsx
index aea3909f660..6437881a69c 100644
--- a/superset-frontend/src/components/Menu/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Menu/index.tsx
@@ -18,10 +18,11 @@
  */
 import { styled, css } from '@superset-ui/core';
 import { ReactElement } from 'react';
-import { Menu as AntdMenu } from 'antd-v5';
-import { MenuProps as AntdMenuProps } from 'antd-v5/es/menu';
+import { Menu as AntdMenu } from 'antd';
+import { MenuProps as AntdMenuProps } from 'antd/es/menu';
 
 export type MenuProps = AntdMenuProps;
+export type { ItemType, MenuItemType } from 'antd/es/menu/interface';
 
 export enum MenuItemKeyEnum {
   MenuItem = 'menu-item',
@@ -41,40 +42,41 @@ export type AntdMenuItemType = ReactElement & {
 export type MenuItemChildType = AntdMenuItemType;
 
 const StyledMenuItem = styled(AntdMenu.Item)`
-  a {
-    text-decoration: none;
-  }
-  &.antd5-menu-item {
-    div {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-    }
+  ${({ theme }) => css`
     a {
-      transition: background-color ${({ theme }) => theme.transitionTiming}s;
-      &:after {
-        content: '';
-        position: absolute;
-        bottom: -2px;
-        left: 50%;
-        width: 0;
-        height: 3px;
-        opacity: 0;
-        transform: translateX(-50%);
-        transition: all ${({ theme }) => theme.transitionTiming}s;
-        background-color: ${({ theme }) => theme.colors.primary.base};
+      text-decoration: none;
+    }
+    &.ant-menu-item {
+      div {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
       }
-      &:focus {
-        @media (max-width: 767px) {
-          background-color: ${({ theme }) => theme.colors.primary.light5};
+      a {
+        transition: background-color ${theme.motionDurationMid}s;
+        &:after {
+          content: '';
+          position: absolute;
+          bottom: -2px;
+          left: 50%;
+          width: 0;
+          height: 3px;
+          opacity: 0;
+          transform: translateX(-50%);
+          transition: translate ${theme.motionDurationMid}s;
+        }
+        &:focus {
+          @media (max-width: 767px) {
+            background-color: ${theme.colorPrimaryBgHover};
+          }
         }
       }
     }
-  }
+  `}
 `;
 
 const StyledMenu = styled(AntdMenu)`
-  &.antd5-menu-horizontal {
+  &.ant-menu-horizontal {
     background-color: inherit;
     border-bottom: 1px solid transparent;
   }
@@ -86,41 +88,47 @@ const StyledNav = styled(AntdMenu)`
     align-items: center;
     height: 100%;
     gap: 0;
-    &.antd5-menu-horizontal > .antd5-menu-item {
+    border-bottom: 0;
+    line-height: ${theme.lineHeight};
+    &.ant-menu-horizontal > .ant-menu-item {
       height: 100%;
       display: flex;
       align-items: center;
       margin: 0;
-      border-bottom: 2px solid transparent;
-      padding: ${theme.gridUnit * 2}px ${theme.gridUnit * 4}px;
-      &:hover {
-        background-color: ${theme.colors.primary.light5};
-        border-bottom: 2px solid transparent;
-        & a:after {
-          opacity: 1;
-          width: 100%;
-        }
+      padding: ${theme.sizeUnit * 2}px ${theme.sizeUnit * 4}px;
+      ::after {
+        content: '';
+        position: absolute;
+        width: 98%;
+        height: 2px;
+        background-color: ${theme.colorPrimaryBorderHover};
+        bottom: ${theme.sizeUnit / 4}px;
+        left: 0;
+        transform: scale(0);
+        transition: 0.2s all ease-out;
+      }
+      :hover::after {
+        transform: scale(1);
       }
     }
-    &.antd5-menu-horizontal > .antd5-menu-item-selected {
-      box-sizing: border-box;
-      border-bottom: 2px solid ${theme.colors.primary.base};
+    &.ant-menu-horizontal > .ant-menu-item-selected::after {
+      transform: scale(1);
     }
   `}
 `;
 
 const StyledSubMenu = styled(AntdMenu.SubMenu)`
   ${({ theme }) => css`
-    .antd5-menu-submenu-open,
-    .antd5-menu-submenu-active {
-      .antd5-menu-submenu-title {
+    .ant-menu-submenu-open,
+    .ant-menu-submenu-active {
+      .ant-menu-submenu-title {
         &:after {
           opacity: 1;
           width: calc(100% - 1);
         }
       }
     }
-    .antd5-menu-submenu-title {
+    .ant-menu-submenu-title {
       display: flex;
       flex-direction: row-reverse;
       &:after {
diff --git a/superset-frontend/src/components/Metadata/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Metadata/index.tsx
similarity index 87%
rename from superset-frontend/src/components/Metadata/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Metadata/index.tsx
index 05c2f572698..b40ba71fbb5 100644
--- a/superset-frontend/src/components/Metadata/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Metadata/index.tsx
@@ -25,13 +25,13 @@ const MetadataWrapper = styled.div`
   position: absolute;
   left: 0;
   top: 100%;
-  margin-top: ${({ theme }) => theme.gridUnit}px;
+  margin-top: ${({ theme }) => theme.sizeUnit}px;
 `;
 
 const MetadataText = styled.span`
-  font-size: ${({ theme }) => theme.typography.sizes.xs}px;
+  font-size: ${({ theme }) => theme.fontSizeXS}px;
   color: ${({ theme }) => theme.colors.grayscale.light1};
-  font-weight: ${({ theme }) => theme.typography.weights.medium};
+  font-weight: ${({ theme }) => theme.fontWeightStrong};
 `;
 
 export type MetadataProps = {
diff --git a/superset-frontend/src/components/MetadataBar/ContentConfig.tsx b/superset-frontend/packages/superset-ui-core/src/components/MetadataBar/ContentConfig.tsx
similarity index 96%
rename from superset-frontend/src/components/MetadataBar/ContentConfig.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/MetadataBar/ContentConfig.tsx
index 9ea1bd740fa..3216ceab80b 100644
--- a/superset-frontend/src/components/MetadataBar/ContentConfig.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/MetadataBar/ContentConfig.tsx
@@ -17,11 +17,11 @@
  * under the License.
  */
 import { ensureIsArray, styled, t } from '@superset-ui/core';
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { ContentType, MetadataType } from '.';
 
 const Header = styled.div`
-  font-weight: ${({ theme }) => theme.typography.weights.bold};
+  font-weight: ${({ theme }) => theme.fontWeightStrong};
 `;
 
 const Info = ({
diff --git a/superset-frontend/src/components/MetadataBar/ContentType.ts b/superset-frontend/packages/superset-ui-core/src/components/MetadataBar/ContentType.ts
similarity index 100%
rename from superset-frontend/src/components/MetadataBar/ContentType.ts
rename to superset-frontend/packages/superset-ui-core/src/components/MetadataBar/ContentType.ts
diff --git a/superset-frontend/src/components/MetadataBar/MetadataBar.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/MetadataBar/MetadataBar.stories.tsx
similarity index 100%
rename from superset-frontend/src/components/MetadataBar/MetadataBar.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/MetadataBar/MetadataBar.stories.tsx
diff --git a/superset-frontend/src/components/MetadataBar/MetadataBar.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/MetadataBar/MetadataBar.test.tsx
similarity index 90%
rename from superset-frontend/src/components/MetadataBar/MetadataBar.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/MetadataBar/MetadataBar.test.tsx
index 90753af6a2a..778df92a276 100644
--- a/superset-frontend/src/components/MetadataBar/MetadataBar.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/MetadataBar/MetadataBar.test.tsx
@@ -16,12 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import {
-  render,
-  screen,
-  userEvent,
-  within,
-} from 'spec/helpers/testing-library';
+import { render, screen, userEvent, within } from '@superset-ui/core/spec';
 import * as resizeDetector from 'react-resize-detector';
 import { supersetTheme, hexToRgb } from '@superset-ui/core';
 import MetadataBar, {
@@ -137,9 +132,9 @@ test('collapses the bar when min width is reached', async () => {
 test('always renders a tooltip when the bar is collapsed', async () => {
   await runWithBarCollapsed(async () => {
     render(<MetadataBar items={ITEMS.slice(0, 2)} />);
-    userEvent.hover(screen.getAllByRole('img')[0]);
+    await userEvent.hover(screen.getAllByRole('img')[0]);
     expect(await screen.findByText(DASHBOARD_DESCRIPTION)).toBeInTheDocument();
-    userEvent.hover(screen.getAllByRole('img')[1]);
+    await userEvent.hover(screen.getAllByRole('img')[1]);
     expect(await screen.findByText(DESCRIPTION_VALUE)).toBeInTheDocument();
   });
 });
@@ -147,16 +142,16 @@ test('always renders a tooltip when the bar is collapsed', async () => {
 test('renders a tooltip when one is provided even if not collapsed', async () => {
   render(<MetadataBar items={ITEMS.slice(0, 2)} />);
   expect(screen.getByText(DASHBOARD_TITLE)).toBeInTheDocument();
-  userEvent.hover(screen.getAllByRole('img')[0]);
+  await userEvent.hover(screen.getAllByRole('img')[0]);
   expect(await screen.findByText(DASHBOARD_DESCRIPTION)).toBeInTheDocument();
 });
 
-test('renders underlined text and emits event when clickable', () => {
+test('renders underlined text and emits event when clickable', async () => {
   const onClick = jest.fn();
   const items = [{ ...ITEMS[0], onClick }, ITEMS[1]];
   render(<MetadataBar items={items} />);
   const element = screen.getByText(DASHBOARD_TITLE);
-  userEvent.click(element);
+  await userEvent.click(element);
   expect(onClick).toHaveBeenCalled();
   const style = window.getComputedStyle(element);
   expect(style.textDecoration).toBe('underline');
@@ -170,9 +165,9 @@ test('renders clickable items with blue icons when the bar is collapsed', async
     const images = screen.getAllByRole('img');
     const clickableColor = window.getComputedStyle(images[0]).color;
     const nonClickableColor = window.getComputedStyle(images[1]).color;
-    expect(clickableColor).toBe(hexToRgb(supersetTheme.colors.primary.base));
-    expect(nonClickableColor).toBe(
-      hexToRgb(supersetTheme.colors.grayscale.base),
+    expect(clickableColor).toBe(hexToRgb(supersetTheme.colorPrimary));
+    expect(nonClickableColor.replace(/\s+/g, '')).toBe(
+      supersetTheme.colorTextTertiary.replace(/\s+/g, ''),
     );
   });
 });
@@ -189,7 +184,7 @@ test('renders the items sorted', () => {
 
 test('correctly renders the dashboards tooltip', async () => {
   render(<MetadataBar items={ITEMS.slice(0, 2)} />);
-  userEvent.hover(screen.getByText(DASHBOARD_TITLE));
+  await userEvent.hover(screen.getByText(DASHBOARD_TITLE));
   const tooltip = await screen.findByRole('tooltip');
   expect(tooltip).toBeInTheDocument();
   expect(within(tooltip).getByText(DASHBOARD_TITLE)).toBeInTheDocument();
@@ -199,7 +194,7 @@ test('correctly renders the dashboards tooltip', async () => {
 test('correctly renders the description tooltip', async () => {
   await runWithBarCollapsed(async () => {
     render(<MetadataBar items={ITEMS.slice(0, 2)} />);
-    userEvent.hover(screen.getAllByRole('img')[1]);
+    await userEvent.hover(screen.getAllByRole('img')[1]);
     const tooltip = await screen.findByRole('tooltip');
     expect(tooltip).toBeInTheDocument();
     expect(within(tooltip).getByText(DESCRIPTION_VALUE)).toBeInTheDocument();
@@ -208,7 +203,7 @@ test('correctly renders the description tooltip', async () => {
 
 test('correctly renders the last modified tooltip', async () => {
   render(<MetadataBar items={ITEMS.slice(0, 3)} />);
-  userEvent.hover(screen.getByText(TWO_DAYS_AGO));
+  await userEvent.hover(screen.getByText(TWO_DAYS_AGO));
   const tooltip = await screen.findByRole('tooltip');
   expect(tooltip).toBeInTheDocument();
   expect(within(tooltip).getByText(TWO_DAYS_AGO)).toBeInTheDocument();
@@ -217,7 +212,7 @@ test('correctly renders the last modified tooltip', async () => {
 
 test('correctly renders the owner tooltip', async () => {
   render(<MetadataBar items={ITEMS.slice(0, 4)} />);
-  userEvent.hover(screen.getByText(CREATED_BY));
+  await userEvent.hover(screen.getByText(CREATED_BY));
   const tooltip = await screen.findByRole('tooltip');
   expect(tooltip).toBeInTheDocument();
   expect(within(tooltip).getByText(CREATED_BY)).toBeInTheDocument();
@@ -230,7 +225,7 @@ test('correctly renders the owner tooltip', async () => {
 test('correctly renders the rows tooltip', async () => {
   await runWithBarCollapsed(async () => {
     render(<MetadataBar items={ITEMS.slice(4, 8)} />);
-    userEvent.hover(screen.getAllByRole('img')[2]);
+    await userEvent.hover(screen.getAllByRole('img')[2]);
     const tooltip = await screen.findByRole('tooltip');
     expect(tooltip).toBeInTheDocument();
     expect(within(tooltip).getByText(ROWS_TITLE)).toBeInTheDocument();
@@ -240,7 +235,7 @@ test('correctly renders the rows tooltip', async () => {
 test('correctly renders the sql tooltip', async () => {
   await runWithBarCollapsed(async () => {
     render(<MetadataBar items={ITEMS.slice(4, 8)} />);
-    userEvent.hover(screen.getAllByRole('img')[1]);
+    await userEvent.hover(screen.getAllByRole('img')[1]);
     const tooltip = await screen.findByRole('tooltip');
     expect(tooltip).toBeInTheDocument();
     expect(within(tooltip).getByText(SQL_TITLE)).toBeInTheDocument();
@@ -250,7 +245,7 @@ test('correctly renders the sql tooltip', async () => {
 test('correctly renders the table tooltip', async () => {
   await runWithBarCollapsed(async () => {
     render(<MetadataBar items={ITEMS.slice(4, 8)} />);
-    userEvent.hover(screen.getAllByRole('img')[0]);
+    await userEvent.hover(screen.getAllByRole('img')[0]);
     const tooltip = await screen.findByRole('tooltip');
     expect(tooltip).toBeInTheDocument();
     expect(within(tooltip).getByText(TABLE_TITLE)).toBeInTheDocument();
@@ -260,7 +255,7 @@ test('correctly renders the table tooltip', async () => {
 test('correctly renders the tags tooltip', async () => {
   await runWithBarCollapsed(async () => {
     render(<MetadataBar items={ITEMS.slice(4, 8)} />);
-    userEvent.hover(screen.getAllByRole('img')[3]);
+    await userEvent.hover(screen.getAllByRole('img')[3]);
     const tooltip = await screen.findByRole('tooltip');
     expect(tooltip).toBeInTheDocument();
     TAGS.forEach(tag =>
diff --git a/superset-frontend/src/components/MetadataBar/MetadataBar.tsx b/superset-frontend/packages/superset-ui-core/src/components/MetadataBar/MetadataBar.tsx
similarity index 95%
rename from superset-frontend/src/components/MetadataBar/MetadataBar.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/MetadataBar/MetadataBar.tsx
index 3503021f879..e09e8ba56af 100644
--- a/superset-frontend/src/components/MetadataBar/MetadataBar.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/MetadataBar/MetadataBar.tsx
@@ -20,7 +20,8 @@ import { useCallback, useEffect, useRef, useState } from 'react';
 import { useResizeDetector } from 'react-resize-detector';
 import { uniqWith } from 'lodash';
 import { styled } from '@superset-ui/core';
-import { Tooltip, TooltipPlacement } from 'src/components/Tooltip';
+import { Tooltip } from '../Tooltip';
+import { TooltipPlacement } from '../Tooltip/types';
 import { ContentType } from './ContentType';
 import { config } from './ContentConfig';
 import {
@@ -41,9 +42,9 @@ const Bar = styled.div<{ count: number }>`
     display: flex;
     align-items: center;
     padding: ${VERTICAL_PADDING}px ${HORIZONTAL_PADDING}px;
-    background-color: ${theme.colors.grayscale.light4};
-    color: ${theme.colors.grayscale.base};
-    font-size: ${theme.typography.sizes.s}px;
+    background-color: ${theme.colorBgLayout};
+    color: ${theme.colorTextTertiary};
+    font-size: ${theme.fontSizeSM}px;
     min-width: ${
       HORIZONTAL_PADDING * 2 +
       (ICON_WIDTH + SPACE_BETWEEN_ITEMS) * count -
@@ -79,17 +80,14 @@ const StyledItem = styled.div<{
     padding-right: ${last ? 0 : SPACE_BETWEEN_ITEMS}px;
     cursor: ${onClick ? 'pointer' : 'default'};
     & .metadata-icon {
-      color: ${
-        onClick && collapsed
-          ? theme.colors.primary.base
-          : theme.colors.grayscale.base
-      };
+      color: ${onClick && collapsed ? theme.colorPrimary : theme.colorTextTertiary};
       padding-right: ${collapsed ? 0 : ICON_PADDING}px;
       & .anticon {
         line-height: 0;
       }
     }
     & .metadata-text {
+      color: ${theme.colorTextSecondary};
       min-width: ${TEXT_MIN_WIDTH}px;
       overflow: hidden;
       text-overflow: ${collapsed ? 'unset' : 'ellipsis'};
diff --git a/superset-frontend/src/components/MetadataBar/MetadataBarOverview.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/MetadataBar/MetadataBarOverview.stories.tsx
similarity index 100%
rename from superset-frontend/src/components/MetadataBar/MetadataBarOverview.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/MetadataBar/MetadataBarOverview.stories.tsx
diff --git a/superset-frontend/src/components/MetadataBar/constants.ts b/superset-frontend/packages/superset-ui-core/src/components/MetadataBar/constants.ts
similarity index 100%
rename from superset-frontend/src/components/MetadataBar/constants.ts
rename to superset-frontend/packages/superset-ui-core/src/components/MetadataBar/constants.ts
diff --git a/superset-frontend/src/components/MetadataBar/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/MetadataBar/index.tsx
similarity index 100%
rename from superset-frontend/src/components/MetadataBar/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/MetadataBar/index.tsx
diff --git a/superset-frontend/src/components/Modal/FormModal.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Modal/FormModal.test.tsx
similarity index 88%
rename from superset-frontend/src/components/Modal/FormModal.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Modal/FormModal.test.tsx
index c061e83acd5..400efe668e4 100644
--- a/superset-frontend/src/components/Modal/FormModal.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Modal/FormModal.test.tsx
@@ -18,15 +18,16 @@
  */
 
 import {
-  render,
   fireEvent,
+  render,
   screen,
   userEvent,
   waitFor,
-} from 'spec/helpers/testing-library';
-import FormModal, { FormModalProps } from 'src/components/Modal/FormModal';
-import { FormItem } from 'src/components/Form';
-import { Input } from 'src/components/Input';
+} from '@superset-ui/core/spec';
+import type { FormModalProps } from './types';
+import { FormItem } from '../Form';
+import { Input } from '../Input';
+import { FormModal } from './FormModal';
 
 describe('FormModal Component', () => {
   const children = (
@@ -75,7 +76,7 @@ describe('FormModal Component', () => {
     renderComponent();
 
     const nameInput = screen.getByPlaceholderText('Enter your name');
-    userEvent.type(nameInput, 'Jane Doe');
+    await userEvent.type(nameInput, 'Jane Doe');
 
     await waitFor(() => {
       expect(screen.getByTestId('form-modal-save-button')).toBeEnabled();
@@ -86,7 +87,7 @@ describe('FormModal Component', () => {
     renderComponent();
 
     const emailInput = screen.getByPlaceholderText('Enter your email');
-    userEvent.type(emailInput, 'test@example.com');
+    await userEvent.type(emailInput, 'test@example.com');
 
     await waitFor(() => {
       expect(screen.getByTestId('form-modal-save-button')).toBeDisabled();
@@ -96,8 +97,11 @@ describe('FormModal Component', () => {
   it('should call formSubmitHandler with correct values when submitted', async () => {
     renderComponent();
 
-    userEvent.type(screen.getByPlaceholderText('Enter your name'), 'Jane Doe');
-    userEvent.type(
+    await userEvent.type(
+      screen.getByPlaceholderText('Enter your name'),
+      'Jane Doe',
+    );
+    await userEvent.type(
       screen.getByPlaceholderText('Enter your email'),
       'test@example.com',
     );
diff --git a/superset-frontend/src/components/Modal/FormModal.tsx b/superset-frontend/packages/superset-ui-core/src/components/Modal/FormModal.tsx
similarity index 88%
rename from superset-frontend/src/components/Modal/FormModal.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Modal/FormModal.tsx
index 69956b15fb1..3a177f6e408 100644
--- a/superset-frontend/src/components/Modal/FormModal.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Modal/FormModal.tsx
@@ -16,20 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import Modal, { ModalProps } from 'src/components/Modal';
-import Button from 'src/components/Button';
-import { Form } from 'src/components/Form';
 import { useState, useCallback } from 'react';
 import { t } from '@superset-ui/core';
+import { Button } from '../Button';
+import { Form } from '../Form';
+import { Modal } from './Modal';
+import type { FormModalProps } from './types';
 
-export interface FormModalProps extends ModalProps {
-  initialValues?: Object;
-  formSubmitHandler: (values: Object) => Promise<void>;
-  onSave: () => void;
-  requiredFields: string[];
-}
-
-function FormModal({
+export function FormModal({
   show,
   onHide,
   title,
@@ -122,5 +116,3 @@ function FormModal({
     </Modal>
   );
 }
-
-export default FormModal;
diff --git a/superset-frontend/src/components/Modal/Modal.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/Modal/Modal.stories.tsx
similarity index 91%
rename from superset-frontend/src/components/Modal/Modal.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Modal/Modal.stories.tsx
index 0eceb019b80..5edc2b782fb 100644
--- a/superset-frontend/src/components/Modal/Modal.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Modal/Modal.stories.tsx
@@ -17,11 +17,12 @@
  * under the License.
  */
 
-import Modal, { ModalProps, ModalFuncProps } from '.';
-import Button from '../Button';
+import { Button } from '../Button';
+import { Modal } from './Modal';
+import type { ModalProps, ModalFuncProps } from './types';
 
 export default {
-  title: 'Modal',
+  title: 'Components/Modal',
   component: Modal,
 };
 
diff --git a/superset-frontend/src/components/Modal/Modal.tsx b/superset-frontend/packages/superset-ui-core/src/components/Modal/Modal.tsx
similarity index 68%
rename from superset-frontend/src/components/Modal/Modal.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Modal/Modal.tsx
index a5215860863..5b9f1c25318 100644
--- a/superset-frontend/src/components/Modal/Modal.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Modal/Modal.tsx
@@ -16,73 +16,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import {
-  isValidElement,
-  cloneElement,
-  CSSProperties,
-  ReactNode,
-  useMemo,
-  useRef,
-  useState,
-} from 'react';
+import { isValidElement, cloneElement, useMemo, useRef, useState } from 'react';
 import { isNil } from 'lodash';
 import { css, styled, t } from '@superset-ui/core';
-import {
-  Modal as AntdModal,
-  ModalProps as AntdModalProps,
-  ModalFuncProps,
-} from 'antd-v5';
-import Button from 'src/components/Button';
-import { Resizable, ResizableProps } from 're-resizable';
+import { Modal as AntdModal, ModalProps as AntdModalProps } from 'antd';
+import { Resizable } from 're-resizable';
 import Draggable, {
   DraggableBounds,
   DraggableData,
   DraggableEvent,
-  DraggableProps,
 } from 'react-draggable';
-
-export interface ModalProps {
-  className?: string;
-  children: ReactNode;
-  disablePrimaryButton?: boolean;
-  primaryTooltipMessage?: ReactNode;
-  primaryButtonLoading?: boolean;
-  onHide: () => void;
-  onHandledPrimaryAction?: () => void;
-  primaryButtonName?: string;
-  primaryButtonType?: 'primary' | 'danger';
-  show: boolean;
-  name?: string;
-  title: ReactNode;
-  width?: string;
-  maxWidth?: string;
-  responsive?: boolean;
-  hideFooter?: boolean;
-  centered?: boolean;
-  footer?: ReactNode;
-  wrapProps?: object;
-  height?: string;
-  closable?: boolean;
-  resizable?: boolean;
-  resizableConfig?: ResizableProps;
-  draggable?: boolean;
-  draggableConfig?: DraggableProps;
-  destroyOnClose?: boolean;
-  maskClosable?: boolean;
-  zIndex?: number;
-  bodyStyle?: CSSProperties;
-}
-
-interface StyledModalProps {
-  maxWidth?: string;
-  responsive?: boolean;
-  height?: string;
-  hideFooter?: boolean;
-  draggable?: boolean;
-  resizable?: boolean;
-}
-
-export type { ModalFuncProps };
+import { Button } from '../Button';
+import type { ModalProps, StyledModalProps } from './types';
 
 const MODAL_HEADER_HEIGHT = 55;
 const MODAL_MIN_CONTENT_HEIGHT = 54;
@@ -104,74 +49,75 @@ export const StyledModal = styled(BaseModal)<StyledModalProps>`
     responsive &&
     css`
       max-width: ${maxWidth ?? '900px'};
-      padding-left: ${theme.gridUnit * 3}px;
-      padding-right: ${theme.gridUnit * 3}px;
+      padding-left: ${theme.sizeUnit * 3}px;
+      padding-right: ${theme.sizeUnit * 3}px;
       padding-bottom: 0;
       top: 0;
     `}
 
-  .antd5-modal-content {
+  .ant-modal-content {
+    background-color: ${({ theme }) => theme.colorBgContainer};
     display: flex;
     flex-direction: column;
-    max-height: ${({ theme }) => `calc(100vh - ${theme.gridUnit * 8}px)`};
-    margin-bottom: ${({ theme }) => theme.gridUnit * 4}px;
-    margin-top: ${({ theme }) => theme.gridUnit * 4}px;
+    max-height: ${({ theme }) => `calc(100vh - ${theme.sizeUnit * 8}px)`};
+    margin-bottom: ${({ theme }) => theme.sizeUnit * 4}px;
+    margin-top: ${({ theme }) => theme.sizeUnit * 4}px;
     padding: 0;
   }
 
-  .antd5-modal-header {
+  .ant-modal-header {
     flex: 0 0 auto;
     border-radius: ${({ theme }) => theme.borderRadius}px
       ${({ theme }) => theme.borderRadius}px 0 0;
-    padding: ${({ theme }) => theme.gridUnit * 4}px
-      ${({ theme }) => theme.gridUnit * 6}px;
+    padding: ${({ theme }) => theme.sizeUnit * 4}px
+      ${({ theme }) => theme.sizeUnit * 6}px;
 
-    .antd5-modal-title {
-      font-weight: ${({ theme }) => theme.typography.weights.medium};
+    .ant-modal-title {
+      font-weight: ${({ theme }) => theme.fontWeightStrong};
     }
 
-    .antd5-modal-title h4 {
+    .ant-modal-title h4 {
       display: flex;
       margin: 0;
       align-items: center;
     }
   }
 
-  .antd5-modal-close {
-    width: ${({ theme }) => theme.gridUnit * 14}px;
-    height: ${({ theme }) => theme.gridUnit * 14}px;
+  .ant-modal-close {
+    width: ${({ theme }) => theme.sizeUnit * 14}px;
+    height: ${({ theme }) => theme.sizeUnit * 14}px;
     top: 0;
     right: 0;
   }
 
-  .antd5-modal-close:hover {
+  .ant-modal-close:hover {
     background: transparent;
   }
 
-  .antd5-modal-close-x {
+  .ant-modal-close-x {
     display: flex;
     align-items: center;
 
     .close {
       flex: 1 1 auto;
-      margin-bottom: ${({ theme }) => theme.gridUnit}px;
-      color: ${({ theme }) => theme.colors.secondary.dark1};
+      margin-bottom: ${({ theme }) => theme.sizeUnit}px;
+      color: ${({ theme }) => theme.colorPrimaryText};
       font-size: 32px;
-      font-weight: ${({ theme }) => theme.typography.weights.light};
+      font-weight: ${({ theme }) => theme.fontWeightLight};
     }
   }
 
-  .antd5-modal-body {
+  .ant-modal-body {
     flex: 0 1 auto;
-    padding: ${({ theme }) => theme.gridUnit * 4}px;
+    padding: ${({ theme }) => theme.sizeUnit * 4}px;
     overflow: auto;
     ${({ resizable, height }) => !resizable && height && `height: ${height};`}
   }
-  .antd5-modal-footer {
+  .ant-modal-footer {
     flex: 0 0 1;
-    border-top: ${({ theme }) => theme.gridUnit / 4}px solid
-      ${({ theme }) => theme.colors.grayscale.light2};
-    padding: ${({ theme }) => theme.gridUnit * 4}px;
+    border-top: ${({ theme }) => theme.sizeUnit / 4}px solid
+      ${({ theme }) => theme.colorSplit};
+    padding: ${({ theme }) => theme.sizeUnit * 4}px;
     margin-top: 0;
 
     .btn {
@@ -179,29 +125,22 @@ export const StyledModal = styled(BaseModal)<StyledModalProps>`
     }
 
     .btn + .btn {
-      margin-left: ${({ theme }) => theme.gridUnit * 2}px;
+      margin-left: ${({ theme }) => theme.sizeUnit * 2}px;
     }
   }
 
-  // styling for Tabs component
-  // Aaron note 20-11-19: this seems to be exclusively here for the Edit Database modal.
-  // TODO: remove this as it is a special case.
-  .ant-tabs-top {
-    margin-top: -${({ theme }) => theme.gridUnit * 4}px;
-  }
-
-  &.no-content-padding .antd5-modal-body {
+  &.no-content-padding .ant-modal-body {
     padding: 0;
   }
 
   ${({ draggable, theme }) =>
     draggable &&
     `
-    .antd5-modal-header {
+    .ant-modal-header {
       padding: 0;
       .draggable-trigger {
           cursor: move;
-          padding: ${theme.gridUnit * 4}px;
+          padding: ${theme.sizeUnit * 4}px;
           width: 100%;
         }
     }
@@ -217,10 +156,10 @@ export const StyledModal = styled(BaseModal)<StyledModalProps>`
         height: 100%;
       }
 
-      .antd5-modal-content {
+      .ant-modal-content {
         height: 100%;
 
-        .antd5-modal-body {
+        .ant-modal-body {
           /* 100% - header height - footer height */
           height: ${
             hideFooter
@@ -275,23 +214,39 @@ const CustomModal = ({
   resizable = false,
   resizableConfig = defaultResizableConfig(hideFooter),
   draggableConfig,
-  destroyOnClose,
+  destroyOnHidden,
+  openerRef,
   ...rest
 }: ModalProps) => {
   const draggableRef = useRef<HTMLDivElement>(null);
   const [bounds, setBounds] = useState<DraggableBounds>();
   const [dragDisabled, setDragDisabled] = useState<boolean>(true);
+
+  const handleOnHide = () => {
+    openerRef?.current?.focus();
+    onHide();
+  };
+
   let FooterComponent;
-  if (isValidElement(footer)) {
+
+  // This safely avoids injecting "closeModal" into native elements like <div> or <span>
+  if (isValidElement(footer) && typeof footer.type === 'function')
     // If a footer component is provided inject a closeModal function
     // so the footer can provide a "close" button if desired
     FooterComponent = cloneElement(footer, {
-      closeModal: onHide,
+      closeModal: handleOnHide,
     } as Partial<unknown>);
-  }
+  else FooterComponent = footer;
+
   const modalFooter = isNil(FooterComponent)
     ? [
-        <Button key="back" onClick={onHide} cta data-test="modal-cancel-button">
+        <Button
+          key="back"
+          cta
+          data-test="modal-cancel-button"
+          buttonStyle="secondary"
+          onClick={handleOnHide}
+        >
           {t('Cancel')}
         </Button>,
         <Button
@@ -350,14 +305,14 @@ const CustomModal = ({
     <StyledModal
       centered={!!centered}
       onOk={onHandledPrimaryAction}
-      onCancel={onHide}
+      onCancel={handleOnHide}
       width={modalWidth}
       maxWidth={maxWidth}
       responsive={responsive}
       open={show}
       title={<ModalTitle />}
       closeIcon={
-        <span className="close" aria-hidden="true">
+        <span data-test="close-modal-btn" className="close" aria-hidden="true">
           ×
         </span>
       }
@@ -389,7 +344,7 @@ const CustomModal = ({
       mask={shouldShowMask}
       draggable={draggable}
       resizable={resizable}
-      destroyOnClose={destroyOnClose}
+      destroyOnHidden={destroyOnHidden}
       {...rest}
     >
       {children}
@@ -398,14 +353,9 @@ const CustomModal = ({
 };
 CustomModal.displayName = 'Modal';
 
-// TODO: in another PR, rename this to CompatabilityModal
-// and demote it as the default export.
-// We should start using AntD component interfaces going forward.
-const Modal = Object.assign(CustomModal, {
+export const Modal = Object.assign(CustomModal, {
   error: AntdModal.error,
   warning: AntdModal.warning,
   confirm: AntdModal.confirm,
   useModal: AntdModal.useModal,
 });
-
-export default Modal;
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Modal/index.ts b/superset-frontend/packages/superset-ui-core/src/components/Modal/index.ts
new file mode 100644
index 00000000000..a376ffa8ef5
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Modal/index.ts
@@ -0,0 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+export { Modal, StyledModal } from './Modal';
+export { FormModal } from './FormModal';
+export type { ModalProps, FormModalProps } from './types';
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Modal/types.ts b/superset-frontend/packages/superset-ui-core/src/components/Modal/types.ts
new file mode 100644
index 00000000000..38447fd0a3b
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Modal/types.ts
@@ -0,0 +1,73 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 type { CSSProperties, ReactNode } from 'react';
+import type { ModalFuncProps } from 'antd';
+import type { ResizableProps } from 're-resizable';
+import type { DraggableProps } from 'react-draggable';
+
+export interface ModalProps {
+  className?: string;
+  children: ReactNode;
+  disablePrimaryButton?: boolean;
+  primaryTooltipMessage?: ReactNode;
+  primaryButtonLoading?: boolean;
+  onHide: () => void;
+  onHandledPrimaryAction?: () => void;
+  primaryButtonName?: string;
+  primaryButtonType?: 'primary' | 'danger';
+  show: boolean;
+  name?: string;
+  title: ReactNode;
+  width?: string | number;
+  maxWidth?: string;
+  responsive?: boolean;
+  hideFooter?: boolean;
+  centered?: boolean;
+  footer?: ReactNode;
+  wrapProps?: object;
+  height?: string;
+  closable?: boolean;
+  resizable?: boolean;
+  resizableConfig?: ResizableProps;
+  draggable?: boolean;
+  draggableConfig?: DraggableProps;
+  destroyOnHidden?: boolean;
+  maskClosable?: boolean;
+  zIndex?: number;
+  bodyStyle?: CSSProperties;
+  openerRef?: React.RefObject<HTMLElement>;
+}
+
+export interface StyledModalProps {
+  maxWidth?: string;
+  responsive?: boolean;
+  height?: string;
+  hideFooter?: boolean;
+  draggable?: boolean;
+  resizable?: boolean;
+}
+
+export type { ModalFuncProps };
+
+export interface FormModalProps extends ModalProps {
+  initialValues?: Object;
+  formSubmitHandler: (values: Object) => Promise<void>;
+  onSave: () => void;
+  requiredFields: string[];
+}
diff --git a/superset-frontend/src/components/ModalTrigger/ModalTrigger.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/ModalTrigger/ModalTrigger.stories.tsx
similarity index 96%
rename from superset-frontend/src/components/ModalTrigger/ModalTrigger.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/ModalTrigger/ModalTrigger.stories.tsx
index 9c358fb3395..739cfecc87a 100644
--- a/superset-frontend/src/components/ModalTrigger/ModalTrigger.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/ModalTrigger/ModalTrigger.stories.tsx
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import ModalTrigger from '.';
+import { ModalTrigger } from '.';
 
 interface IModalTriggerProps {
   triggerNode: JSX.Element;
@@ -37,7 +37,7 @@ interface IModalTriggerProps {
 }
 
 export default {
-  title: 'ModalTrigger',
+  title: 'Components/ModalTrigger',
   component: ModalTrigger,
 };
 
diff --git a/superset-frontend/src/components/ModalTrigger/ModalTrigger.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/ModalTrigger/ModalTrigger.test.tsx
similarity index 76%
rename from superset-frontend/src/components/ModalTrigger/ModalTrigger.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/ModalTrigger/ModalTrigger.test.tsx
index aae751bf7fb..87eb2eec7f1 100644
--- a/superset-frontend/src/components/ModalTrigger/ModalTrigger.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/ModalTrigger/ModalTrigger.test.tsx
@@ -16,14 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import {
-  render,
-  screen,
-  userEvent,
-  waitFor,
-} from 'spec/helpers/testing-library';
-import { supersetTheme } from '@superset-ui/core';
-import ModalTrigger from '.';
+import { render, screen, userEvent } from '@superset-ui/core/spec';
+import { ModalTrigger } from '.';
 
 const mockedProps = {
   triggerNode: <span>Trigger</span>,
@@ -66,8 +60,8 @@ test('should render a tooltip on hover', async () => {
   };
   render(<ModalTrigger {...tooltipProps} />);
 
-  userEvent.hover(screen.getByRole('button'));
-  await waitFor(() => expect(screen.getByRole('tooltip')).toBeInTheDocument());
+  await userEvent.hover(screen.getByRole('button'));
+  await screen.findByRole('tooltip');
 });
 
 test('should not render a modal before click', () => {
@@ -75,20 +69,8 @@ test('should not render a modal before click', () => {
   expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
 });
 
-test('should render a modal after click', () => {
+test('should render a modal after click', async () => {
   render(<ModalTrigger {...mockedProps} />);
-  userEvent.click(screen.getByRole('button'));
+  await userEvent.click(screen.getByRole('button'));
   expect(screen.getByRole('dialog')).toBeInTheDocument();
 });
-
-test('renders with theme', () => {
-  const btnProps = {
-    ...mockedProps,
-    isButton: true,
-  };
-  render(<ModalTrigger {...btnProps} />);
-  const button = screen.getByRole('button');
-  expect(button.firstChild).toHaveStyle(`
-    fontSize: ${supersetTheme.typography.sizes.s};
-  `);
-});
diff --git a/superset-frontend/src/components/ModalTrigger/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/ModalTrigger/index.tsx
similarity index 92%
rename from superset-frontend/src/components/ModalTrigger/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/ModalTrigger/index.tsx
index d0de9db1d77..d4e11995a43 100644
--- a/superset-frontend/src/components/ModalTrigger/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/ModalTrigger/index.tsx
@@ -18,8 +18,8 @@
  */
 import { forwardRef, useState, ReactNode, MouseEvent } from 'react';
 
-import Modal from 'src/components/Modal';
-import Button from 'src/components/Button';
+import { Button } from '../Button';
+import { Modal } from '../Modal';
 
 export interface ModalTriggerProps {
   dialogClassName?: string;
@@ -39,7 +39,7 @@ export interface ModalTriggerProps {
   resizableConfig?: any;
   draggable?: boolean;
   draggableConfig?: any;
-  destroyOnClose?: boolean;
+  destroyOnHidden?: boolean;
 }
 
 export interface ModalTriggerRef {
@@ -50,7 +50,7 @@ export interface ModalTriggerRef {
   };
 }
 
-const ModalTrigger = forwardRef(
+export const ModalTrigger = forwardRef(
   (props: ModalTriggerProps, ref: ModalTriggerRef | null) => {
     const [showModal, setShowModal] = useState(false);
     const {
@@ -63,7 +63,7 @@ const ModalTrigger = forwardRef(
       tooltip,
       modalFooter,
       triggerNode,
-      destroyOnClose = true,
+      destroyOnHidden = true,
       modalBody,
       draggableConfig = {},
       resizableConfig = {},
@@ -120,7 +120,7 @@ const ModalTrigger = forwardRef(
           resizableConfig={resizableConfig}
           draggable={draggable}
           draggableConfig={draggableConfig}
-          destroyOnClose={destroyOnClose}
+          destroyOnHidden={destroyOnHidden}
         >
           {modalBody}
         </Modal>
@@ -128,5 +128,3 @@ const ModalTrigger = forwardRef(
     );
   },
 );
-
-export default ModalTrigger;
diff --git a/superset-frontend/src/components/PageHeaderWithActions/PageHeaderWithActions.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/PageHeaderWithActions/PageHeaderWithActions.test.tsx
similarity index 88%
rename from superset-frontend/src/components/PageHeaderWithActions/PageHeaderWithActions.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/PageHeaderWithActions/PageHeaderWithActions.test.tsx
index 2946495e59e..faff4bfafe5 100644
--- a/superset-frontend/src/components/PageHeaderWithActions/PageHeaderWithActions.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/PageHeaderWithActions/PageHeaderWithActions.test.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { render, screen, userEvent } from 'spec/helpers/testing-library';
+import { render, screen, userEvent } from '@superset-ui/core/spec';
 import { PageHeaderWithActions, PageHeaderWithActionsProps } from './index';
 import { Menu } from '../Menu';
 
@@ -36,9 +36,10 @@ const defaultProps: PageHeaderWithActionsProps = {
   titlePanelAdditionalItems: <button type="button">Title panel button</button>,
   rightPanelAdditionalItems: <button type="button">Save</button>,
   additionalActionsMenu: (
-    <Menu>
-      <Menu.Item>Test menu item</Menu.Item>
-    </Menu>
+    <Menu
+      items={[{ label: 'Test menu item', key: '1' }]}
+      data-test="additional-actions-menu"
+    />
   ),
   menuDropdownProps: { onVisibleChange: jest.fn(), visible: true },
 };
@@ -50,6 +51,6 @@ test('Renders', async () => {
   expect(screen.getByText('Title panel button')).toBeVisible();
   expect(screen.getByText('Save')).toBeVisible();
 
-  userEvent.click(screen.getByLabelText('Menu actions trigger'));
+  await userEvent.click(screen.getByLabelText('Menu actions trigger'));
   expect(defaultProps.menuDropdownProps.onVisibleChange).toHaveBeenCalled();
 });
diff --git a/superset-frontend/src/components/PageHeaderWithActions/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/PageHeaderWithActions/index.tsx
similarity index 77%
rename from superset-frontend/src/components/PageHeaderWithActions/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/PageHeaderWithActions/index.tsx
index 62c27ad8110..07b608aa8e8 100644
--- a/superset-frontend/src/components/PageHeaderWithActions/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/PageHeaderWithActions/index.tsx
@@ -18,34 +18,28 @@
  */
 import { ReactNode, ReactElement } from 'react';
 import { css, SupersetTheme, t, useTheme } from '@superset-ui/core';
-import { Dropdown, DropdownProps } from 'src/components/Dropdown';
-import { TooltipPlacement } from 'src/components/Tooltip';
-import { Icons } from 'src/components/Icons';
-import {
-  DynamicEditableTitle,
-  DynamicEditableTitleProps,
-} from '../DynamicEditableTitle';
-import CertifiedBadge, { CertifiedBadgeProps } from '../CertifiedBadge';
-import FaveStar, { FaveStarProps } from '../FaveStar';
-import Button from '../Button';
+import { Icons } from '@superset-ui/core/components/Icons';
+import type { DropdownProps } from '../Dropdown/types';
+import type { TooltipPlacement } from '../Tooltip/types';
+import type { CertifiedBadgeProps } from '../CertifiedBadge/types';
+import type { DynamicEditableTitleProps } from '../DynamicEditableTitle/types';
+import type { FaveStarProps } from '../FaveStar/types';
+import { FaveStar } from '../FaveStar';
+import { DynamicEditableTitle } from '../DynamicEditableTitle';
+import { Dropdown } from '../Dropdown';
+import { CertifiedBadge } from '../CertifiedBadge';
+import { Button } from '../Button';
 
 export const menuTriggerStyles = (theme: SupersetTheme) => css`
-  width: ${theme.gridUnit * 8}px;
-  height: ${theme.gridUnit * 8}px;
+  width: ${theme.sizeUnit * 8}px;
+  height: ${theme.sizeUnit * 8}px;
   padding: 0;
-  border: 1px solid ${theme.colors.primary.dark2};
+  border: 1px solid ${theme.colorPrimary};
 
-  &.antd5-btn > span.anticon {
+  &.ant-btn > span.anticon {
     line-height: 0;
     transition: inherit;
   }
-
-  &:hover:not(:focus) > span.anticon {
-    color: ${theme.colors.primary.light1};
-  }
-  &:focus-visible {
-    outline: 2px solid ${theme.colors.primary.dark2};
-  }
 `;
 
 const headerStyles = (theme: SupersetTheme) => css`
@@ -54,9 +48,9 @@ const headerStyles = (theme: SupersetTheme) => css`
   align-items: center;
   flex-wrap: nowrap;
   justify-content: space-between;
-  background-color: ${theme.colors.grayscale.light5};
-  height: ${theme.gridUnit * 16}px;
-  padding: 0 ${theme.gridUnit * 4}px;
+  background-color: ${theme.colorBgContainer};
+  height: ${theme.sizeUnit * 16}px;
+  padding: 0 ${theme.sizeUnit * 4}px;
 
   .editable-title {
     overflow: hidden;
@@ -79,7 +73,7 @@ const headerStyles = (theme: SupersetTheme) => css`
     display: flex;
     align-items: center;
     min-width: 0;
-    margin-right: ${theme.gridUnit * 12}px;
+    margin-right: ${theme.sizeUnit * 12}px;
   }
 
   .right-button-panel {
@@ -91,10 +85,10 @@ const headerStyles = (theme: SupersetTheme) => css`
 const buttonsStyles = (theme: SupersetTheme) => css`
   display: flex;
   align-items: center;
-  padding-left: ${theme.gridUnit * 2}px;
+  padding-left: ${theme.sizeUnit * 2}px;
 
   & .anticon-star {
-    padding: 0 ${theme.gridUnit}px;
+    padding: 0 ${theme.sizeUnit}px;
 
     &:first-of-type {
       padding-left: 0;
@@ -103,7 +97,7 @@ const buttonsStyles = (theme: SupersetTheme) => css`
 `;
 
 const additionalActionsContainerStyles = (theme: SupersetTheme) => css`
-  margin-left: ${theme.gridUnit * 2}px;
+  margin-left: ${theme.sizeUnit * 2}px;
 `;
 
 export type PageHeaderWithActionsProps = {
@@ -157,7 +151,7 @@ export const PageHeaderWithActions = ({
           {showMenuDropdown && (
             <Dropdown
               trigger={['click']}
-              dropdownRender={() => additionalActionsMenu}
+              popupRender={() => additionalActionsMenu}
               {...menuDropdownProps}
             >
               <Button
@@ -169,7 +163,7 @@ export const PageHeaderWithActions = ({
                 data-test="actions-trigger"
               >
                 <Icons.EllipsisOutlined
-                  iconColor={theme.colors.primary.dark2}
+                  iconColor={theme.colorPrimary}
                   iconSize="l"
                 />
               </Button>
diff --git a/superset-frontend/src/components/Pagination/Ellipsis.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Pagination/Ellipsis.test.tsx
similarity index 79%
rename from superset-frontend/src/components/Pagination/Ellipsis.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Pagination/Ellipsis.test.tsx
index 0a6d5d8a3bc..bb26d7848e8 100644
--- a/superset-frontend/src/components/Pagination/Ellipsis.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Pagination/Ellipsis.test.tsx
@@ -17,21 +17,21 @@
  * under the License.
  */
 
-import { render, screen, userEvent } from 'spec/helpers/testing-library';
+import { render, screen, userEvent } from '@superset-ui/core/spec';
 import { Ellipsis } from './Ellipsis';
 
-test('Ellipsis - click when the button is enabled', () => {
+test('Ellipsis - click when the button is enabled', async () => {
   const click = jest.fn();
   render(<Ellipsis onClick={click} />);
   expect(click).toHaveBeenCalledTimes(0);
-  userEvent.click(screen.getByRole('button'));
+  await userEvent.click(screen.getByRole('button'));
   expect(click).toHaveBeenCalledTimes(1);
 });
 
-test('Ellipsis - click when the button is disabled', () => {
+test('Ellipsis - click when the button is disabled', async () => {
   const click = jest.fn();
   render(<Ellipsis onClick={click} disabled />);
   expect(click).toHaveBeenCalledTimes(0);
-  userEvent.click(screen.getByRole('button'));
+  await userEvent.click(screen.getByRole('button'));
   expect(click).toHaveBeenCalledTimes(0);
 });
diff --git a/superset-frontend/src/components/Pagination/Ellipsis.tsx b/superset-frontend/packages/superset-ui-core/src/components/Pagination/Ellipsis.tsx
similarity index 100%
rename from superset-frontend/src/components/Pagination/Ellipsis.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Pagination/Ellipsis.tsx
diff --git a/superset-frontend/src/components/Pagination/Item.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Pagination/Item.test.tsx
similarity index 82%
rename from superset-frontend/src/components/Pagination/Item.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Pagination/Item.test.tsx
index fa0faf50b9f..9be49cf68c3 100644
--- a/superset-frontend/src/components/Pagination/Item.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Pagination/Item.test.tsx
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-import { render, screen, userEvent } from 'spec/helpers/testing-library';
+import { render, screen, userEvent } from '@superset-ui/core/spec';
 import { Item } from './Item';
 
-test('Item - click when the item is not active', () => {
+test('Item - click when the item is not active', async () => {
   const click = jest.fn();
   render(
     <Item onClick={click}>
@@ -28,12 +28,12 @@ test('Item - click when the item is not active', () => {
     </Item>,
   );
   expect(click).toHaveBeenCalledTimes(0);
-  userEvent.click(screen.getByRole('button'));
+  await userEvent.click(screen.getByRole('button'));
   expect(click).toHaveBeenCalledTimes(1);
   expect(screen.getByTestId('test')).toBeInTheDocument();
 });
 
-test('Item - click when the item is active', () => {
+test('Item - click when the item is active', async () => {
   const click = jest.fn();
   render(
     <Item onClick={click} active>
@@ -41,7 +41,7 @@ test('Item - click when the item is active', () => {
     </Item>,
   );
   expect(click).toHaveBeenCalledTimes(0);
-  userEvent.click(screen.getByRole('button'));
+  await userEvent.click(screen.getByRole('button'));
   expect(click).toHaveBeenCalledTimes(0);
   expect(screen.getByTestId('test')).toBeInTheDocument();
 });
diff --git a/superset-frontend/src/components/Pagination/Item.tsx b/superset-frontend/packages/superset-ui-core/src/components/Pagination/Item.tsx
similarity index 94%
rename from superset-frontend/src/components/Pagination/Item.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Pagination/Item.tsx
index d214499f9ed..b71da3c9392 100644
--- a/superset-frontend/src/components/Pagination/Item.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Pagination/Item.tsx
@@ -31,7 +31,8 @@ export function Item({ active, children, onClick }: PaginationItemButton) {
     <li className={classNames({ active })}>
       <span
         role="button"
-        tabIndex={active ? -1 : 0}
+        tabIndex={0}
+        aria-current={active ? 'page' : undefined}
         onClick={e => {
           e.preventDefault();
           if (!active) onClick(e);
diff --git a/superset-frontend/src/components/Pagination/Next.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Pagination/Next.test.tsx
similarity index 79%
rename from superset-frontend/src/components/Pagination/Next.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Pagination/Next.test.tsx
index 49f25db6da6..7b17857ff47 100644
--- a/superset-frontend/src/components/Pagination/Next.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Pagination/Next.test.tsx
@@ -17,21 +17,21 @@
  * under the License.
  */
 
-import { render, screen, userEvent } from 'spec/helpers/testing-library';
+import { render, screen, userEvent } from '@superset-ui/core/spec';
 import { Next } from './Next';
 
-test('Next - click when the button is enabled', () => {
+test('Next - click when the button is enabled', async () => {
   const click = jest.fn();
   render(<Next onClick={click} />);
   expect(click).toHaveBeenCalledTimes(0);
-  userEvent.click(screen.getByRole('button'));
+  await userEvent.click(screen.getByRole('button'));
   expect(click).toHaveBeenCalledTimes(1);
 });
 
-test('Next - click when the button is disabled', () => {
+test('Next - click when the button is disabled', async () => {
   const click = jest.fn();
   render(<Next onClick={click} disabled />);
   expect(click).toHaveBeenCalledTimes(0);
-  userEvent.click(screen.getByRole('button'));
+  await userEvent.click(screen.getByRole('button'));
   expect(click).toHaveBeenCalledTimes(0);
 });
diff --git a/superset-frontend/src/components/Pagination/Next.tsx b/superset-frontend/packages/superset-ui-core/src/components/Pagination/Next.tsx
similarity index 100%
rename from superset-frontend/src/components/Pagination/Next.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Pagination/Next.tsx
diff --git a/superset-frontend/src/components/Pagination/Prev.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Pagination/Prev.test.tsx
similarity index 79%
rename from superset-frontend/src/components/Pagination/Prev.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Pagination/Prev.test.tsx
index c100f36e9f7..576817b3772 100644
--- a/superset-frontend/src/components/Pagination/Prev.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Pagination/Prev.test.tsx
@@ -17,21 +17,21 @@
  * under the License.
  */
 
-import { render, screen, userEvent } from 'spec/helpers/testing-library';
+import { render, screen, userEvent } from '@superset-ui/core/spec';
 import { Prev } from './Prev';
 
-test('Prev - click when the button is enabled', () => {
+test('Prev - click when the button is enabled', async () => {
   const click = jest.fn();
   render(<Prev onClick={click} />);
   expect(click).toHaveBeenCalledTimes(0);
-  userEvent.click(screen.getByRole('button'));
+  await userEvent.click(screen.getByRole('button'));
   expect(click).toHaveBeenCalledTimes(1);
 });
 
-test('Prev - click when the button is disabled', () => {
+test('Prev - click when the button is disabled', async () => {
   const click = jest.fn();
   render(<Prev onClick={click} disabled />);
   expect(click).toHaveBeenCalledTimes(0);
-  userEvent.click(screen.getByRole('button'));
+  await userEvent.click(screen.getByRole('button'));
   expect(click).toHaveBeenCalledTimes(0);
 });
diff --git a/superset-frontend/src/components/Pagination/Prev.tsx b/superset-frontend/packages/superset-ui-core/src/components/Pagination/Prev.tsx
similarity index 100%
rename from superset-frontend/src/components/Pagination/Prev.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Pagination/Prev.tsx
diff --git a/superset-frontend/src/components/Pagination/Wrapper.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Pagination/Wrapper.test.tsx
similarity index 96%
rename from superset-frontend/src/components/Pagination/Wrapper.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Pagination/Wrapper.test.tsx
index 9685d08ea9b..1dc61e59d77 100644
--- a/superset-frontend/src/components/Pagination/Wrapper.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Pagination/Wrapper.test.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { render, screen, cleanup } from 'spec/helpers/testing-library';
+import { render, screen, cleanup } from '@superset-ui/core/spec';
 import Wrapper from './Wrapper';
 
 // Add cleanup after each test
diff --git a/superset-frontend/src/components/Pagination/Wrapper.tsx b/superset-frontend/packages/superset-ui-core/src/components/Pagination/Wrapper.tsx
similarity index 80%
rename from superset-frontend/src/components/Pagination/Wrapper.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Pagination/Wrapper.tsx
index 3287a3ccc58..a7ee66feace 100644
--- a/superset-frontend/src/components/Pagination/Wrapper.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Pagination/Wrapper.tsx
@@ -28,25 +28,27 @@ interface PaginationProps {
 }
 
 const PaginationList = styled.ul`
+  ${({ theme }) => `
   display: inline-block;
-  margin: 16px 0;
-  padding: 0;
+  padding: ${theme.sizeUnit * 3}px;
 
   li {
     display: inline;
     margin: 0 4px;
 
-    span {
+    > span {
       padding: 8px 12px;
       text-decoration: none;
-      background-color: ${({ theme }) => theme.colors.grayscale.light5};
-      border-radius: ${({ theme }) => theme.borderRadius}px;
+      background-color: ${theme.colorBgContainer};
+      border: 1px solid ${theme.colorBorder};
+      border-radius: ${theme.borderRadius}px;
+      color: ${theme.colorText};
 
       &:hover,
       &:focus {
         z-index: 2;
-        color: ${({ theme }) => theme.colors.grayscale.dark1};
-        background-color: ${({ theme }) => theme.colors.grayscale.light3};
+        color: ${theme.colorText};
+        background-color: ${theme.colorBgLayout};
       }
     }
 
@@ -63,9 +65,9 @@ const PaginationList = styled.ul`
     &.active {
       span {
         z-index: 3;
-        color: ${({ theme }) => theme.colors.grayscale.light5};
+        color: ${theme.colorBgLayout};
         cursor: default;
-        background-color: ${({ theme }) => theme.colors.primary.base};
+        background-color: ${theme.colorPrimary};
 
         &:focus {
           outline: none;
@@ -73,6 +75,7 @@ const PaginationList = styled.ul`
       }
     }
   }
+`}
 `;
 
 function Pagination({ children }: PaginationProps) {
diff --git a/superset-frontend/src/components/Pagination/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Pagination/index.tsx
similarity index 95%
rename from superset-frontend/src/components/Pagination/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Pagination/index.tsx
index 1fc6fe6d7b1..c1ba0da0df2 100644
--- a/superset-frontend/src/components/Pagination/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Pagination/index.tsx
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import Pagination from 'src/components/Pagination/Wrapper';
+import Pagination from '@superset-ui/core/components/Pagination/Wrapper';
 import {
   createUltimatePagination,
   ITEM_TYPES,
diff --git a/superset-frontend/src/components/Pagination/types.ts b/superset-frontend/packages/superset-ui-core/src/components/Pagination/types.ts
similarity index 100%
rename from superset-frontend/src/components/Pagination/types.ts
rename to superset-frontend/packages/superset-ui-core/src/components/Pagination/types.ts
diff --git a/superset-frontend/src/components/Popover/Popover.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/Popover/Popover.stories.tsx
similarity index 93%
rename from superset-frontend/src/components/Popover/Popover.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Popover/Popover.stories.tsx
index 4f23a702437..c7d58485ece 100644
--- a/superset-frontend/src/components/Popover/Popover.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Popover/Popover.stories.tsx
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import Button from 'src/components/Button';
-import Popover, { PopoverProps } from 'src/components/Popover';
+import { Popover, PopoverProps } from '@superset-ui/core/components/Popover';
+import { Button } from '../Button';
 
 export default {
-  title: 'Popover',
+  title: 'Components/Popover',
   component: Popover,
 };
 
diff --git a/superset-frontend/src/components/Popover/Popover.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Popover/Popover.test.tsx
similarity index 81%
rename from superset-frontend/src/components/Popover/Popover.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Popover/Popover.test.tsx
index 92bf0576b64..28dd12e4cb4 100644
--- a/superset-frontend/src/components/Popover/Popover.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Popover/Popover.test.tsx
@@ -16,16 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import {
-  render,
-  screen,
-  userEvent,
-  waitFor,
-} from 'spec/helpers/testing-library';
-import { supersetTheme } from '@superset-ui/core';
-import { Icons } from 'src/components/Icons';
-import Button from 'src/components/Button';
-import Popover from 'src/components/Popover';
+import { render, screen, userEvent, waitFor } from '@superset-ui/core/spec';
+import { Icons, Popover } from '..';
+import { Button } from '../Button';
 
 test('should render', () => {
   const { container } = render(<Popover />);
@@ -75,14 +68,6 @@ test('fires an event when visibility is changed', async () => {
       <Button>Hover me</Button>
     </Popover>,
   );
-  userEvent.hover(screen.getByRole('button'));
+  await userEvent.hover(screen.getByRole('button'));
   await waitFor(() => expect(onOpenChange).toHaveBeenCalledTimes(1));
 });
-
-test('renders with theme', () => {
-  render(<Popover content="Content sample" title="Popover title" open />);
-  const title = screen.getByText('Popover title');
-  expect(title).toHaveStyle({
-    fontSize: supersetTheme.gridUnit * 3.5,
-  });
-});
diff --git a/superset-frontend/src/components/Popover/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Popover/index.tsx
similarity index 80%
rename from superset-frontend/src/components/Popover/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Popover/index.tsx
index 4c290ed623c..f7e41b5be62 100644
--- a/superset-frontend/src/components/Popover/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Popover/index.tsx
@@ -16,13 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { Popover as AntdPopover } from 'antd-v5';
-import { PopoverProps as AntdPopoverProps } from 'antd-v5/lib/popover';
+import { Popover as AntdPopover } from 'antd';
+import { PopoverProps as AntdPopoverProps } from 'antd/es/popover';
 
 export interface PopoverProps extends AntdPopoverProps {
   forceRender?: boolean;
 }
 
-const Popover = (props: PopoverProps) => <AntdPopover {...props} />;
-
-export default Popover;
+export const Popover = (props: PopoverProps) => <AntdPopover {...props} />;
diff --git a/superset-frontend/src/components/PopoverDropdown/PopoverDropdown.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/PopoverDropdown/PopoverDropdown.stories.tsx
similarity index 94%
rename from superset-frontend/src/components/PopoverDropdown/PopoverDropdown.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/PopoverDropdown/PopoverDropdown.stories.tsx
index 36527b16ebc..8ac24d3ac17 100644
--- a/superset-frontend/src/components/PopoverDropdown/PopoverDropdown.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/PopoverDropdown/PopoverDropdown.stories.tsx
@@ -17,6 +17,7 @@
  * under the License.
  */
 import { useState } from 'react';
+import { Button } from '../Button';
 import PopoverDropdown, { PopoverDropdownProps, OptionProps } from '.';
 
 const OPTIONS: OptionProps[] = [
@@ -40,11 +41,7 @@ export const InteractivePopoverDropdown = (props: Props) => {
     (type: ElementType) =>
     ({ label, value }: OptionProps) => {
       if (type === 'button') {
-        return (
-          <button type="button" key={value}>
-            {label}
-          </button>
-        );
+        return <Button key={value}>{label}</Button>;
       }
       return <span>{label}</span>;
     };
@@ -80,7 +77,7 @@ InteractivePopoverDropdown.argTypes = {
 };
 
 export default {
-  title: 'PopoverDropdown',
+  title: 'Components/PopoverDropdown',
   includeStories: ['InteractivePopoverDropdown'],
   args: {
     value: OPTIONS[0].value,
diff --git a/superset-frontend/src/components/PopoverDropdown/PopoverDropdown.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/PopoverDropdown/PopoverDropdown.test.tsx
similarity index 88%
rename from superset-frontend/src/components/PopoverDropdown/PopoverDropdown.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/PopoverDropdown/PopoverDropdown.test.tsx
index 863ef046efa..9a4f669a5b9 100644
--- a/superset-frontend/src/components/PopoverDropdown/PopoverDropdown.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/PopoverDropdown/PopoverDropdown.test.tsx
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { render, screen, userEvent } from 'spec/helpers/testing-library';
+import { render, screen, userEvent } from '@superset-ui/core/spec';
 import PopoverDropdown, {
   PopoverDropdownProps,
   OptionProps,
-} from 'src/components/PopoverDropdown';
+} from '@superset-ui/core/components/PopoverDropdown';
 
 const defaultProps: PopoverDropdownProps = {
   id: 'popover-dropdown',
@@ -42,7 +42,7 @@ test('renders with default props', async () => {
 
 test('renders the menu on click', async () => {
   render(<PopoverDropdown {...defaultProps} />);
-  userEvent.click(screen.getByRole('button'));
+  await userEvent.click(screen.getByRole('button'));
   expect(await screen.findByRole('menu')).toBeInTheDocument();
 });
 
@@ -71,14 +71,14 @@ test('renders with custom option', async () => {
       )}
     />,
   );
-  userEvent.click(screen.getByRole('button'));
+  await userEvent.click(screen.getByRole('button'));
   expect(await screen.findByText('Custom Option 1')).toBeInTheDocument();
 });
 
 test('triggers onChange', async () => {
   render(<PopoverDropdown {...defaultProps} />);
-  userEvent.click(screen.getByRole('button'));
+  await userEvent.click(screen.getByRole('button'));
   expect(await screen.findByText('Option 2')).toBeInTheDocument();
-  userEvent.click(screen.getByText('Option 2'));
+  await userEvent.click(screen.getByText('Option 2'));
   expect(defaultProps.onChange).toHaveBeenCalled();
 });
diff --git a/superset-frontend/src/components/PopoverDropdown/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/PopoverDropdown/index.tsx
similarity index 66%
rename from superset-frontend/src/components/PopoverDropdown/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/PopoverDropdown/index.tsx
index 2c3c4d24070..7d07e97c8e5 100644
--- a/superset-frontend/src/components/PopoverDropdown/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/PopoverDropdown/index.tsx
@@ -18,10 +18,9 @@
  */
 import { Key } from 'react';
 import cx from 'classnames';
-import { styled, useTheme } from '@superset-ui/core';
-import { Dropdown } from 'src/components/Dropdown';
-import { Menu } from 'src/components/Menu';
-import { Icons } from 'src/components/Icons';
+import { css, useTheme } from '@superset-ui/core';
+import { Icons } from '@superset-ui/core/components/Icons';
+import { Dropdown } from '../Dropdown';
 
 export interface OptionProps {
   value: string;
@@ -45,13 +44,13 @@ interface HandleSelectProps {
   key: Key;
 }
 
-const MenuItem = styled(Menu.Item)`
+const menuItemStyles = (theme: any) => css`
   &.antd5-menu-item {
     height: auto;
     line-height: 1.4;
 
-    padding-top: ${({ theme }) => theme.gridUnit}px;
-    padding-bottom: ${({ theme }) => theme.gridUnit}px;
+    padding-top: ${theme.sizeUnit}px;
+    padding-bottom: ${theme.sizeUnit}px;
 
     margin-top: 0;
     margin-bottom: 0;
@@ -61,16 +60,16 @@ const MenuItem = styled(Menu.Item)`
     }
 
     &:hover {
-      background: ${({ theme }) => theme.colors.grayscale.light3};
+      background: ${theme.colors.grayscale.light3};
     }
 
     &.active {
-      font-weight: ${({ theme }) => theme.typography.weights.bold};
-      background: ${({ theme }) => theme.colors.grayscale.light2};
+      font-weight: ${theme.fontWeightStrong};
+      background: ${theme.colors.grayscale.light2};
     }
   }
 
-  &.antd5-menu-item-selected {
+  &.ant-menu-item-selected {
     color: unset;
   }
 `;
@@ -91,30 +90,26 @@ const PopoverDropdown = (props: PopoverDropdownProps) => {
   return (
     <Dropdown
       trigger={['click']}
-      overlayStyle={{ zIndex: theme.zIndex.max }}
-      dropdownRender={() => (
-        <Menu onClick={({ key }: HandleSelectProps) => onChange(key)}>
-          {options.map(option => (
-            <MenuItem
-              id="menu-item"
-              key={option.value}
-              className={cx('dropdown-item', {
-                active: option.value === value,
-              })}
-            >
-              {renderOption(option)}
-            </MenuItem>
-          ))}
-        </Menu>
-      )}
+      overlayStyle={{ zIndex: theme.zIndexBase }}
+      menu={{
+        onClick: ({ key }: HandleSelectProps) => onChange(key),
+        items: options.map(option => ({
+          key: option.value,
+          label: renderOption(option),
+          css: menuItemStyles(theme),
+          className: cx('dropdown-item', {
+            active: option.value === value,
+          }),
+        })),
+      }}
     >
       <div role="button" css={{ display: 'flex', alignItems: 'center' }}>
         {selected && renderButton(selected)}
         <Icons.DownOutlined
           iconSize="s"
           css={{
-            marginTop: theme.gridUnit * 0.5,
-            marginLeft: theme.gridUnit * 0.5,
+            marginTop: theme.sizeUnit * 0.5,
+            marginLeft: theme.sizeUnit * 0.5,
           }}
         />
       </div>
diff --git a/superset-frontend/src/components/PopoverSection/PopoverSection.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/PopoverSection/PopoverSection.stories.tsx
similarity index 97%
rename from superset-frontend/src/components/PopoverSection/PopoverSection.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/PopoverSection/PopoverSection.stories.tsx
index 6c3b8716467..4537a9e6ebe 100644
--- a/superset-frontend/src/components/PopoverSection/PopoverSection.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/PopoverSection/PopoverSection.stories.tsx
@@ -19,7 +19,7 @@
 import PopoverSection from '.';
 
 export default {
-  title: 'PopoverSection',
+  title: 'Components/PopoverSection',
 };
 
 export const InteractivePopoverSection = (args: any) => (
diff --git a/superset-frontend/src/components/PopoverSection/PopoverSection.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/PopoverSection/PopoverSection.test.tsx
similarity index 88%
rename from superset-frontend/src/components/PopoverSection/PopoverSection.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/PopoverSection/PopoverSection.test.tsx
index 29978aba637..09bbb44be38 100644
--- a/superset-frontend/src/components/PopoverSection/PopoverSection.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/PopoverSection/PopoverSection.test.tsx
@@ -16,8 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { render, screen, userEvent } from 'spec/helpers/testing-library';
-import PopoverSection from 'src/components/PopoverSection';
+import { render, screen, userEvent } from '@superset-ui/core/spec';
+import PopoverSection from '.';
 
 test('renders with default props', async () => {
   render(
@@ -44,7 +44,7 @@ test('renders a tooltip when hovered', async () => {
       <div role="form" />
     </PopoverSection>,
   );
-  userEvent.hover(screen.getAllByRole('img')[0]);
+  await userEvent.hover(screen.getAllByRole('img')[0]);
   expect(await screen.findByRole('tooltip')).toBeInTheDocument();
 });
 
@@ -55,6 +55,6 @@ test('calls onSelect when clicked', async () => {
       <div role="form" />
     </PopoverSection>,
   );
-  userEvent.click(await screen.findByRole('img'));
+  await userEvent.click(await screen.findByRole('img'));
   expect(onSelect).toHaveBeenCalled();
 });
diff --git a/superset-frontend/src/components/PopoverSection/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/PopoverSection/index.tsx
similarity index 80%
rename from superset-frontend/src/components/PopoverSection/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/PopoverSection/index.tsx
index bbff815388a..2e395e8a427 100644
--- a/superset-frontend/src/components/PopoverSection/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/PopoverSection/index.tsx
@@ -18,8 +18,8 @@
  */
 import { MouseEventHandler, ReactNode } from 'react';
 import { css, useTheme } from '@superset-ui/core';
-import { Tooltip } from 'src/components/Tooltip';
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
+import { Tooltip } from '../Tooltip';
 
 export interface PopoverSectionProps {
   title: string;
@@ -40,8 +40,8 @@ export default function PopoverSection({
   return (
     <div
       css={{
-        paddingBottom: theme.gridUnit * 2,
-        opacity: isSelected ? 1 : theme.opacity.mediumHeavy,
+        paddingBottom: theme.sizeUnit * 2,
+        opacity: isSelected ? 1 : 0.6,
       }}
     >
       <div
@@ -59,11 +59,11 @@ export default function PopoverSection({
           <Tooltip
             title={info}
             css={css`
-              margin-left: ${theme.gridUnit}px;
-              margin-right: ${theme.gridUnit}px;
+              margin-left: ${theme.sizeUnit}px;
+              margin-right: ${theme.sizeUnit}px;
             `}
           >
-            <Icons.InfoCircleFilled
+            <Icons.InfoCircleOutlined
               role="img"
               iconSize="s"
               iconColor={theme.colors.grayscale.light1}
@@ -74,14 +74,14 @@ export default function PopoverSection({
           iconSize="s"
           role="img"
           iconColor={
-            isSelected ? theme.colors.primary.base : theme.colors.grayscale.base
+            isSelected ? theme.colorPrimary : theme.colors.grayscale.base
           }
         />
       </div>
       <div
         css={css`
-          margin-left: ${theme.gridUnit}px;
-          margin-top: ${theme.gridUnit}px;
+          margin-left: ${theme.sizeUnit}px;
+          margin-top: ${theme.sizeUnit}px;
         `}
       >
         {children}
diff --git a/superset-frontend/src/components/ProgressBar/ProgressBar.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/ProgressBar/ProgressBar.stories.tsx
similarity index 98%
rename from superset-frontend/src/components/ProgressBar/ProgressBar.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/ProgressBar/ProgressBar.stories.tsx
index 37f65357546..46182af6e17 100644
--- a/superset-frontend/src/components/ProgressBar/ProgressBar.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/ProgressBar/ProgressBar.stories.tsx
@@ -19,7 +19,7 @@
 import ProgressBar, { ProgressBarProps } from '.';
 
 export default {
-  title: 'ProgressBar',
+  title: 'Components/ProgressBar',
   component: ProgressBar,
 };
 
diff --git a/superset-frontend/src/components/ProgressBar/ProgressBar.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/ProgressBar/ProgressBar.test.tsx
similarity index 97%
rename from superset-frontend/src/components/ProgressBar/ProgressBar.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/ProgressBar/ProgressBar.test.tsx
index cb419b51b5d..db606c0ff64 100644
--- a/superset-frontend/src/components/ProgressBar/ProgressBar.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/ProgressBar/ProgressBar.test.tsx
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { render, screen } from 'spec/helpers/testing-library';
+import { render, screen } from '@superset-ui/core/spec';
 import ProgressBar, { ProgressBarProps } from '.';
 
 const mockedProps: ProgressBarProps = {
diff --git a/superset-frontend/src/components/ProgressBar/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/ProgressBar/index.tsx
similarity index 90%
rename from superset-frontend/src/components/ProgressBar/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/ProgressBar/index.tsx
index 1fd2324cf58..34ed3bcb265 100644
--- a/superset-frontend/src/components/ProgressBar/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/ProgressBar/index.tsx
@@ -17,8 +17,8 @@
  * under the License.
  */
 import { styled } from '@superset-ui/core';
-import { Progress as AntdProgress } from 'antd-v5';
-import { ProgressProps } from 'antd-v5/lib/progress/progress';
+import { Progress as AntdProgress } from 'antd';
+import { ProgressProps } from 'antd/es/progress/progress';
 
 export interface ProgressBarProps extends ProgressProps {
   striped?: boolean;
@@ -29,10 +29,10 @@ const ProgressBar = styled(({ striped, ...props }: ProgressBarProps) => (
   <AntdProgress data-test="progress-bar" {...props} />
 ))`
   position: static;
-  .antd5-progress-inner {
+  .ant-progress-inner {
     position: static;
   }
-  .antd5-progress-bg {
+  .ant-progress-bg {
     position: static;
     ${({ striped }) =>
       striped &&
diff --git a/superset-frontend/src/components/Radio/Radio.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/Radio/Radio.stories.tsx
similarity index 95%
rename from superset-frontend/src/components/Radio/Radio.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Radio/Radio.stories.tsx
index 90b5c9b5a25..65ba411f1c2 100644
--- a/superset-frontend/src/components/Radio/Radio.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Radio/Radio.stories.tsx
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { Space } from 'src/components/Space';
-import { Icons } from 'src/components/Icons';
 import { css } from '@superset-ui/core';
-import { Radio, RadioProps, RadioGroupWrapperProps } from './index';
+import { Icons } from '@superset-ui/core/components/Icons';
+import { Space } from '../Space';
+import { Radio, type RadioProps, type RadioGroupWrapperProps } from '.';
 
 export default {
-  title: 'Radio',
+  title: 'Components/Radio',
   component: Radio,
   tags: ['autodocs'],
 };
diff --git a/superset-frontend/cypress-base/cypress/e2e/alerts_and_reports/alerts.test.ts b/superset-frontend/packages/superset-ui-core/src/components/Radio/Radio.test.tsx
similarity index 51%
rename from superset-frontend/cypress-base/cypress/e2e/alerts_and_reports/alerts.test.ts
rename to superset-frontend/packages/superset-ui-core/src/components/Radio/Radio.test.tsx
index b677507a460..2601ba95f15 100644
--- a/superset-frontend/cypress-base/cypress/e2e/alerts_and_reports/alerts.test.ts
+++ b/superset-frontend/packages/superset-ui-core/src/components/Radio/Radio.test.tsx
@@ -16,23 +16,31 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { ALERT_LIST } from 'cypress/utils/urls';
+import { render, screen, fireEvent } from '@superset-ui/core/spec';
+import '@testing-library/jest-dom';
+import { Radio } from '.';
 
-describe('Alert list view', () => {
-  before(() => {
-    cy.visit(ALERT_LIST);
-  });
+describe('Radio Component', () => {
+  it('renders radio button and allows selection', () => {
+    render(
+      <Radio.Group>
+        <Radio value="option1">Option 1</Radio>
+        <Radio value="option2">Option 2</Radio>
+      </Radio.Group>,
+    );
 
-  it('should load alert lists', () => {
-    cy.getBySel('listview-table').should('be.visible');
-    cy.getBySel('sort-header').eq(1).contains('Last run');
-    cy.getBySel('sort-header').eq(2).contains('Name');
-    cy.getBySel('sort-header').eq(3).contains('Schedule');
-    cy.getBySel('sort-header').eq(4).contains('Notification method');
-    cy.getBySel('sort-header').eq(5).contains('Owners');
-    cy.getBySel('sort-header').eq(6).contains('Last modified');
-    cy.getBySel('sort-header').eq(7).contains('Active');
-    // TODO Cypress won't recognize the Actions column
-    // cy.getBySel('sort-header').eq(9).contains('Actions');
+    const option1 = screen.getByLabelText('Option 1');
+    const option2 = screen.getByLabelText('Option 2');
+
+    expect(option1).not.toBeChecked();
+    expect(option2).not.toBeChecked();
+
+    fireEvent.click(option1);
+    expect(option1).toBeChecked();
+    expect(option2).not.toBeChecked();
+
+    fireEvent.click(option2);
+    expect(option1).not.toBeChecked();
+    expect(option2).toBeChecked();
   });
 });
diff --git a/superset-frontend/src/components/Radio/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Radio/index.tsx
similarity index 82%
rename from superset-frontend/src/components/Radio/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Radio/index.tsx
index 9311cdde5ad..9f5d3e83642 100644
--- a/superset-frontend/src/components/Radio/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Radio/index.tsx
@@ -16,14 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { Radio as Antd5Radio, CheckboxOptionType } from 'antd-v5';
-import type {
-  RadioChangeEvent,
-  RadioProps,
-  RadioGroupProps,
-} from 'antd-v5/lib/radio';
+import {
+  Radio as Antd5Radio,
+  type CheckboxOptionType,
+  type RadioGroupProps,
+} from 'antd';
 
-import { Space, SpaceProps } from 'src/components/Space';
+import { Space, type SpaceProps } from '../Space';
 
 export type RadioGroupWrapperProps = RadioGroupProps & {
   spaceConfig?: {
@@ -41,23 +40,23 @@ const RadioGroup = ({
   ...props
 }: RadioGroupWrapperProps) => {
   const content = options.map((option: CheckboxOptionType) => (
-    <Radio key={option.value} value={option.value}>
+    <Antd5Radio key={option.value} value={option.value}>
       {option.label}
-    </Radio>
+    </Antd5Radio>
   ));
   return (
-    <Radio.Group {...props}>
+    <Antd5Radio.Group {...props}>
       {spaceConfig ? <Space {...spaceConfig}>{content}</Space> : content}
-    </Radio.Group>
+    </Antd5Radio.Group>
   );
 };
-export type {
-  RadioChangeEvent,
-  RadioGroupProps,
-  RadioProps,
-  CheckboxOptionType,
-};
 export const Radio = Object.assign(Antd5Radio, {
   GroupWrapper: RadioGroup,
   Button: Antd5Radio.Button,
 });
+export type {
+  RadioChangeEvent,
+  RadioGroupProps,
+  RadioProps,
+  CheckboxOptionType,
+} from 'antd';
diff --git a/superset-frontend/src/components/RefreshLabel/RefreshLabel.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/RefreshLabel/RefreshLabel.stories.tsx
similarity index 96%
rename from superset-frontend/src/components/RefreshLabel/RefreshLabel.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/RefreshLabel/RefreshLabel.stories.tsx
index 0e5e7675d5c..58a009fa403 100644
--- a/superset-frontend/src/components/RefreshLabel/RefreshLabel.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/RefreshLabel/RefreshLabel.stories.tsx
@@ -19,7 +19,7 @@
 import RefreshLabel, { RefreshLabelProps } from '.';
 
 export default {
-  title: 'RefreshLabel',
+  title: 'Components/RefreshLabel',
 };
 
 export const InteractiveRefreshLabel = (args: RefreshLabelProps) => (
diff --git a/superset-frontend/src/components/RefreshLabel/RefreshLabel.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/RefreshLabel/RefreshLabel.test.tsx
similarity index 87%
rename from superset-frontend/src/components/RefreshLabel/RefreshLabel.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/RefreshLabel/RefreshLabel.test.tsx
index f90c503164a..c44b207e1dc 100644
--- a/superset-frontend/src/components/RefreshLabel/RefreshLabel.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/RefreshLabel/RefreshLabel.test.tsx
@@ -16,21 +16,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { render, screen, userEvent } from 'spec/helpers/testing-library';
-import RefreshLabel from 'src/components/RefreshLabel';
+import { render, screen, userEvent } from '@superset-ui/core/spec';
+import RefreshLabel from '@superset-ui/core/components/RefreshLabel';
 
 test('renders with default props', async () => {
   render(<RefreshLabel tooltipContent="Tooltip" onClick={jest.fn()} />);
   const refresh = await screen.findByRole('button');
   expect(refresh).toBeInTheDocument();
-  userEvent.hover(refresh);
+  await userEvent.hover(refresh);
 });
 
 test('renders tooltip on hover', async () => {
   const tooltipText = 'Tooltip';
   render(<RefreshLabel tooltipContent={tooltipText} onClick={jest.fn()} />);
   const refresh = screen.getByRole('button');
-  userEvent.hover(refresh);
+  await userEvent.hover(refresh);
   const tooltip = await screen.findByRole('tooltip');
   expect(tooltip).toBeInTheDocument();
   expect(tooltip).toHaveTextContent(tooltipText);
@@ -40,6 +40,6 @@ test('triggers on click event', async () => {
   const onClick = jest.fn();
   render(<RefreshLabel tooltipContent="Tooltip" onClick={onClick} />);
   const refresh = await screen.findByRole('button');
-  userEvent.click(refresh);
+  await userEvent.click(refresh);
   expect(onClick).toHaveBeenCalled();
 });
diff --git a/superset-frontend/src/components/RefreshLabel/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/RefreshLabel/index.tsx
similarity index 88%
rename from superset-frontend/src/components/RefreshLabel/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/RefreshLabel/index.tsx
index 153b6225b79..88b680ab1ec 100644
--- a/superset-frontend/src/components/RefreshLabel/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/RefreshLabel/index.tsx
@@ -18,8 +18,9 @@
  */
 import { MouseEventHandler, forwardRef } from 'react';
 import { SupersetTheme } from '@superset-ui/core';
-import { Tooltip } from 'src/components/Tooltip';
-import { Icons, IconType } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
+import type { IconType } from '@superset-ui/core/components/Icons/types';
+import { Tooltip } from '../Tooltip';
 
 export interface RefreshLabelProps {
   onClick: MouseEventHandler<HTMLSpanElement>;
@@ -45,7 +46,7 @@ const RefreshLabel = ({
         css={(theme: SupersetTheme) => ({
           cursor: 'pointer',
           color: theme.colors.grayscale.base,
-          '&:hover': { color: theme.colors.primary.base },
+          '&:hover': { color: theme.colorPrimary },
         })}
       />
     </Tooltip>
diff --git a/superset-frontend/src/components/Tags/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Result/index.tsx
similarity index 90%
rename from superset-frontend/src/components/Tags/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Result/index.tsx
index d9178e7a26f..5f08c34865c 100644
--- a/superset-frontend/src/components/Tags/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Result/index.tsx
@@ -17,5 +17,5 @@
  * under the License.
  */
 
-export { default as TagsList } from './TagsList';
-export { default as Tag } from './Tag';
+export { Result } from 'antd';
+export type { ResultProps } from 'antd';
diff --git a/superset-frontend/packages/superset-ui-core/src/components/SafeMarkdown.tsx b/superset-frontend/packages/superset-ui-core/src/components/SafeMarkdown/SafeMarkdown.tsx
similarity index 96%
rename from superset-frontend/packages/superset-ui-core/src/components/SafeMarkdown.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/SafeMarkdown/SafeMarkdown.tsx
index d35c2160e97..ed0a1cc4bfa 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/SafeMarkdown.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/SafeMarkdown/SafeMarkdown.tsx
@@ -20,7 +20,7 @@ import { useEffect, useMemo, useState } from 'react';
 import rehypeSanitize, { defaultSchema } from 'rehype-sanitize';
 import remarkGfm from 'remark-gfm';
 import { mergeWith } from 'lodash';
-import { FeatureFlag, isFeatureEnabled } from '../utils';
+import { FeatureFlag, isFeatureEnabled } from '../../utils';
 
 interface SafeMarkdownProps {
   source: string;
@@ -37,7 +37,7 @@ export function getOverrideHtmlSchema(
   );
 }
 
-function SafeMarkdown({
+export function SafeMarkdown({
   source,
   htmlSanitization = true,
   htmlSchemaOverrides = {},
@@ -85,5 +85,3 @@ function SafeMarkdown({
     </ReactMarkdown>
   );
 }
-
-export default SafeMarkdown;
diff --git a/superset-frontend/src/components/Select/AsyncSelect.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.stories.tsx
similarity index 98%
rename from superset-frontend/src/components/Select/AsyncSelect.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.stories.tsx
index b4caa0fde2e..862319a2a1d 100644
--- a/superset-frontend/src/components/Select/AsyncSelect.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.stories.tsx
@@ -17,16 +17,16 @@
  * under the License.
  */
 import { ReactNode, useState, useCallback, useRef, useMemo } from 'react';
-import Button from 'src/components/Button';
-import AsyncSelect from './AsyncSelect';
+import { Button } from '../Button';
 import {
   AsyncSelectProps,
   AsyncSelectRef,
   SelectOptionsTypePage,
 } from './types';
+import { AsyncSelect } from '.';
 
 export default {
-  title: 'AsyncSelect',
+  title: 'Components/Select/AsyncSelect',
   component: AsyncSelect,
 };
 
diff --git a/superset-frontend/src/components/Select/AsyncSelect.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.test.tsx
similarity index 92%
rename from superset-frontend/src/components/Select/AsyncSelect.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.test.tsx
index bfc05a5d27d..2a1cefd83f2 100644
--- a/superset-frontend/src/components/Select/AsyncSelect.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.test.tsx
@@ -20,16 +20,16 @@ import {
   createEvent,
   fireEvent,
   render,
-  screen,
   userEvent,
+  screen,
   waitFor,
   within,
-} from 'spec/helpers/testing-library';
-import { AsyncSelect } from 'src/components';
+} from '@superset-ui/core/spec';
+import { AsyncSelect } from '.';
 
 const ARIA_LABEL = 'Test';
 const NEW_OPTION = 'Kyle';
-const NO_DATA = 'No Data';
+const NO_DATA = 'No data';
 const LOADING = 'Loading...';
 const OPTIONS = [
   { label: 'John', value: 1, gender: 'Male' },
@@ -99,7 +99,8 @@ const getElementByClassName = (className: string) =>
 const getElementsByClassName = (className: string) =>
   document.querySelectorAll(className)! as NodeListOf<HTMLElement>;
 
-const getSelect = () => screen.getByRole('combobox', { name: ARIA_LABEL });
+const getSelect = () =>
+  screen.getByRole('combobox', { name: new RegExp(ARIA_LABEL, 'i') });
 
 const getAllSelectOptions = () =>
   getElementsByClassName('.ant-select-item-option-content');
@@ -137,9 +138,9 @@ const matchOrder = async (expectedLabels: string[]) => {
   return true;
 };
 
-const type = (text: string) => {
+const type = async (text: string) => {
   const select = getSelect();
-  userEvent.clear(select);
+  await userEvent.clear(select);
   return userEvent.type(select, text, { delay: 10 });
 };
 
@@ -200,7 +201,7 @@ test('does not add a new option if the value is already in the options', async (
 test('inverts the selection', async () => {
   render(<AsyncSelect {...defaultProps} invertSelection />);
   await open();
-  userEvent.click(await findSelectOption(OPTIONS[0].label));
+  await userEvent.click(await findSelectOption(OPTIONS[0].label));
   expect(await screen.findByLabelText('stop')).toBeInTheDocument();
 });
 
@@ -236,7 +237,7 @@ test('should sort selected to top when in single mode', async () => {
   render(<AsyncSelect {...defaultProps} mode="single" />);
   const originalLabels = OPTIONS.map(option => option.label);
   await open();
-  userEvent.click(await findSelectOption(originalLabels[1]));
+  await userEvent.click(await findSelectOption(originalLabels[1]));
   // after selection, keep the original order
   expect(await matchOrder(originalLabels)).toBe(true);
 
@@ -249,7 +250,7 @@ test('should sort selected to top when in single mode', async () => {
 
   // keep clicking other items, the updated order should still based on
   // original order
-  userEvent.click(await findSelectOption(originalLabels[5]));
+  await userEvent.click(await findSelectOption(originalLabels[5]));
   await matchOrder(labels);
   await type('{esc}');
   await open();
@@ -258,7 +259,7 @@ test('should sort selected to top when in single mode', async () => {
   expect(await matchOrder(labels)).toBe(true);
 
   // should revert to original order
-  clearAll();
+  await clearAll();
   await type('{esc}');
   await open();
   expect(await matchOrder(originalLabels)).toBe(true);
@@ -270,7 +271,7 @@ test('should sort selected to the top when in multi mode', async () => {
   let labels = originalLabels.slice();
 
   await open();
-  userEvent.click(await findSelectOption(labels[1]));
+  await userEvent.click(await findSelectOption(labels[1]));
   expect(await matchOrder(labels)).toBe(true);
 
   await type('{esc}');
@@ -279,14 +280,14 @@ test('should sort selected to the top when in multi mode', async () => {
   expect(await matchOrder(labels)).toBe(true);
 
   await open();
-  userEvent.click(await findSelectOption(labels[5]));
+  await userEvent.click(await findSelectOption(labels[5]));
   await type('{esc}');
   await open();
   labels = [labels.splice(0, 1)[0], labels.splice(4, 1)[0]].concat(labels);
   expect(await matchOrder(labels)).toBe(true);
 
   // should revert to original order
-  clearAll();
+  await clearAll();
   await type('{esc}');
   await open();
   expect(await matchOrder(originalLabels)).toBe(true);
@@ -373,7 +374,9 @@ test('searches for custom fields', async () => {
   expect(options[4]).toHaveTextContent('Nikole');
   expect(options[5]).toHaveTextContent('Olivia');
   await type('1');
-  expect(await screen.findByText(NO_DATA)).toBeInTheDocument();
+  expect(
+    await screen.findByText(NO_DATA, { selector: '.ant-empty-description' }),
+  ).toBeInTheDocument();
 });
 
 test('removes duplicated values', async () => {
@@ -398,9 +401,9 @@ test('removes duplicated values', async () => {
 test('renders a custom label', async () => {
   const loadOptions = jest.fn(async () => ({
     data: [
-      { label: 'John', value: 1, customLabel: <h1>John</h1> },
-      { label: 'Liam', value: 2, customLabel: <h1>Liam</h1> },
-      { label: 'Olivia', value: 3, customLabel: <h1>Olivia</h1> },
+      { value: 'John', label: <h1>John</h1> },
+      { value: 'Liam', label: <h1>Liam</h1> },
+      { value: 'Olivia', label: <h1>Olivia</h1> },
     ],
     totalCount: 3,
   }));
@@ -414,9 +417,9 @@ test('renders a custom label', async () => {
 test('searches for a word with a custom label', async () => {
   const loadOptions = jest.fn(async () => ({
     data: [
-      { label: 'John', value: 1, customLabel: <h1>John</h1> },
-      { label: 'Liam', value: 2, customLabel: <h1>Liam</h1> },
-      { label: 'Olivia', value: 3, customLabel: <h1>Olivia</h1> },
+      { value: 'John', label: <h1>John</h1> },
+      { value: 'Liam', label: <h1>Liam</h1> },
+      { value: 'Olivia', label: <h1>Olivia</h1> },
     ],
     totalCount: 3,
   }));
@@ -447,7 +450,7 @@ test('clear all the values', async () => {
       onClear={onClear}
     />,
   );
-  clearAll();
+  await clearAll();
   expect(onClear).toHaveBeenCalled();
   const values = await findAllSelectValues();
   expect(values.length).toBe(0);
@@ -457,7 +460,9 @@ test('does not add a new option if allowNewOptions is false', async () => {
   render(<AsyncSelect {...defaultProps} />);
   await open();
   await type(NEW_OPTION);
-  expect(await screen.findByText(NO_DATA)).toBeInTheDocument();
+  expect(
+    await screen.findByText(NO_DATA, { selector: '.ant-empty-description' }),
+  ).toBeInTheDocument();
 });
 
 test('adds the null option when selected in single mode', async () => {
@@ -467,7 +472,7 @@ test('adds the null option when selected in single mode', async () => {
   }));
   render(<AsyncSelect {...defaultProps} options={loadOptions} />);
   await open();
-  userEvent.click(await findSelectOption(NULL_OPTION.label));
+  await userEvent.click(await findSelectOption(NULL_OPTION.label));
   const values = await findAllSelectValues();
   expect(values[0]).toHaveTextContent(NULL_OPTION.label);
 });
@@ -481,8 +486,8 @@ test('adds the null option when selected in multiple mode', async () => {
     <AsyncSelect {...defaultProps} options={loadOptions} mode="multiple" />,
   );
   await open();
-  userEvent.click(await findSelectOption(OPTIONS[0].label));
-  userEvent.click(await findSelectOption(NULL_OPTION.label));
+  await userEvent.click(await findSelectOption(OPTIONS[0].label));
+  await userEvent.click(await findSelectOption(NULL_OPTION.label));
   const values = await findAllSelectValues();
   expect(values[0]).toHaveTextContent(OPTIONS[0].label);
   expect(values[1]).toHaveTextContent(NULL_OPTION.label);
@@ -501,13 +506,15 @@ test('opens the select without any data', async () => {
     />,
   );
   await open();
-  expect(await screen.findByText(/no data/i)).toBeInTheDocument();
+  expect(
+    await screen.findByText(NO_DATA, { selector: '.ant-empty-description' }),
+  ).toBeInTheDocument();
 });
 
 test('displays the loading indicator when opening', async () => {
   render(<AsyncSelect {...defaultProps} />);
-  await waitFor(() => {
-    userEvent.click(getSelect());
+  await waitFor(async () => {
+    await userEvent.click(getSelect());
     expect(screen.getByText(LOADING)).toBeInTheDocument();
   });
   expect(screen.queryByText(LOADING)).not.toBeInTheDocument();
@@ -517,7 +524,7 @@ test('makes a selection in single mode', async () => {
   render(<AsyncSelect {...defaultProps} />);
   const optionText = 'Emma';
   await open();
-  userEvent.click(await findSelectOption(optionText));
+  await userEvent.click(await findSelectOption(optionText));
   expect(await findSelectValue()).toHaveTextContent(optionText);
 });
 
@@ -525,8 +532,8 @@ test('multiple selections in multiple mode', async () => {
   render(<AsyncSelect {...defaultProps} mode="multiple" />);
   await open();
   const [firstOption, secondOption] = OPTIONS;
-  userEvent.click(await findSelectOption(firstOption.label));
-  userEvent.click(await findSelectOption(secondOption.label));
+  await userEvent.click(await findSelectOption(firstOption.label));
+  await userEvent.click(await findSelectOption(secondOption.label));
   const values = await findAllSelectValues();
   expect(values[0]).toHaveTextContent(firstOption.label);
   expect(values[1]).toHaveTextContent(secondOption.label);
@@ -537,7 +544,7 @@ test('changes the selected item in single mode', async () => {
   render(<AsyncSelect {...defaultProps} onChange={onChange} />);
   await open();
   const [firstOption, secondOption] = OPTIONS;
-  userEvent.click(await findSelectOption(firstOption.label));
+  await userEvent.click(await findSelectOption(firstOption.label));
   expect(onChange).toHaveBeenCalledWith(
     expect.objectContaining({
       label: firstOption.label,
@@ -546,7 +553,7 @@ test('changes the selected item in single mode', async () => {
     expect.objectContaining(firstOption),
   );
   expect(await findSelectValue()).toHaveTextContent(firstOption.label);
-  userEvent.click(await findSelectOption(secondOption.label));
+  await userEvent.click(await findSelectOption(secondOption.label));
   expect(onChange).toHaveBeenCalledWith(
     expect.objectContaining({
       label: secondOption.label,
@@ -562,8 +569,8 @@ test('deselects an item in multiple mode', async () => {
   await open();
   const option3 = OPTIONS[2];
   const option8 = OPTIONS[7];
-  userEvent.click(await findSelectOption(option8.label));
-  userEvent.click(await findSelectOption(option3.label));
+  await userEvent.click(await findSelectOption(option8.label));
+  await userEvent.click(await findSelectOption(option3.label));
 
   let options = await findAllSelectOptions();
   expect(options).toHaveLength(Math.min(defaultProps.pageSize, OPTIONS.length));
@@ -585,7 +592,7 @@ test('deselects an item in multiple mode', async () => {
   expect(values[0]).toHaveTextContent(option8.label);
   expect(values[1]).toHaveTextContent(option3.label);
 
-  userEvent.click(await findSelectOption(option3.label));
+  await userEvent.click(await findSelectOption(option3.label));
   values = await findAllSelectValues();
   expect(values.length).toBe(1);
   expect(values[0]).toHaveTextContent(option8.label);
@@ -615,7 +622,9 @@ test('shows "No data" when allowNewOptions is false and a new option is entered'
   render(<AsyncSelect {...defaultProps} allowNewOptions={false} showSearch />);
   await open();
   await type(NEW_OPTION);
-  expect(await screen.findByText(NO_DATA)).toBeInTheDocument();
+  expect(
+    await screen.findByText(NO_DATA, { selector: '.ant-empty-description' }),
+  ).toBeInTheDocument();
 });
 
 test('does not show "No data" when allowNewOptions is true and a new option is entered', async () => {
@@ -623,7 +632,9 @@ test('does not show "No data" when allowNewOptions is true and a new option is e
   await open();
   await type(NEW_OPTION);
   await waitFor(() =>
-    expect(screen.queryByText(NO_DATA)).not.toBeInTheDocument(),
+    expect(
+      screen.queryByText(NO_DATA, { selector: '.ant-empty-description' }),
+    ).not.toBeInTheDocument(),
   );
 });
 
@@ -838,8 +849,8 @@ test('does not fire onChange when searching but no selection', async () => {
   );
   await open();
   await type('Joh');
-  userEvent.click(await findSelectOption('John'));
-  userEvent.click(screen.getByRole('main'));
+  await userEvent.click(await findSelectOption('John'));
+  await userEvent.click(screen.getByRole('main'));
   expect(onChange).toHaveBeenCalledTimes(1);
 });
 
@@ -853,7 +864,7 @@ test('fires onChange when clearing the selection in single mode', async () => {
       value={OPTIONS[0]}
     />,
   );
-  clearAll();
+  await clearAll();
   expect(onChange).toHaveBeenCalledTimes(1);
 });
 
@@ -867,7 +878,7 @@ test('fires onChange when clearing the selection in multiple mode', async () =>
       value={OPTIONS[0]}
     />,
   );
-  clearAll();
+  await clearAll();
   expect(onChange).toHaveBeenCalledTimes(1);
 });
 
@@ -996,9 +1007,9 @@ test('does not fire onChange if the same value is selected in single mode', asyn
   const optionText = 'Emma';
   await open();
   expect(onChange).toHaveBeenCalledTimes(0);
-  userEvent.click(await findSelectOption(optionText));
+  await userEvent.click(await findSelectOption(optionText));
   expect(onChange).toHaveBeenCalledTimes(1);
-  userEvent.click(await findSelectOption(optionText));
+  await userEvent.click(await findSelectOption(optionText));
   expect(onChange).toHaveBeenCalledTimes(1);
 });
 
diff --git a/superset-frontend/src/components/Select/AsyncSelect.tsx b/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.tsx
similarity index 93%
rename from superset-frontend/src/components/Select/AsyncSelect.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.tsx
index 4615f934186..f48f101e07a 100644
--- a/superset-frontend/src/components/Select/AsyncSelect.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.tsx
@@ -37,17 +37,17 @@ import {
   usePrevious,
   getClientErrorObject,
 } from '@superset-ui/core';
-// eslint-disable-next-line no-restricted-imports
-import { LabeledValue as AntdLabeledValue } from 'antd/lib/select'; // TODO: Remove antd
+import {
+  LabeledValue as AntdLabeledValue,
+  RefSelectProps,
+} from 'antd/es/select';
 import { debounce, isEqual, uniq } from 'lodash';
-import { Icons } from 'src/components/Icons';
-import { FAST_DEBOUNCE, SLOW_DEBOUNCE } from 'src/constants';
+import { Constants, Icons } from '@superset-ui/core/components';
+import { Space } from '../Space';
 import {
   getValue,
   hasOption,
   isLabeledValue,
-  renderSelectOptions,
-  hasCustomLabels,
   sortSelectedFirstHelper,
   sortComparatorWithSearchHelper,
   sortComparatorForNoSearchHelper,
@@ -84,7 +84,6 @@ import {
   TOKEN_SEPARATORS,
   DEFAULT_SORT_COMPARATOR,
 } from './constants';
-import { customTagRender } from './CustomTag';
 
 const Error = ({ error }: { error: string }) => (
   <StyledError>
@@ -106,7 +105,7 @@ const getQueryCacheKey = (value: string, page: number, pageSize: number) =>
  * The Static type accepts a static array of options.
  * The Async type accepts a promise that will return the options.
  * Each of the categories come with different abilities. For a comprehensive guide please refer to
- * the storybook in src/components/Select/Select.stories.tsx.
+ * the storybook in @superset-ui/core/components/Select/Select.stories.tsx.
  */
 const AsyncSelect = forwardRef(
   (
@@ -130,7 +129,7 @@ const AsyncSelect = forwardRef(
       onError,
       onChange,
       onClear,
-      onDropdownVisibleChange,
+      onOpenChange,
       onDeselect,
       onSearch,
       onSelect,
@@ -221,7 +220,9 @@ const AsyncSelect = forwardRef(
       const missingValues: SelectOptionsType = ensureIsArray(selectValue)
         .filter(opt => !hasOption(getValue(opt), selectOptions))
         .map(opt =>
-          isLabeledValue(opt) ? opt : { value: opt, label: String(opt) },
+          isLabeledValue(opt)
+            ? { value: opt.value, label: opt.label }
+            : { value: opt, label: String(opt) },
         );
       return missingValues.length > 0
         ? missingValues.concat(selectOptions)
@@ -361,7 +362,7 @@ const AsyncSelect = forwardRef(
     );
 
     const debouncedFetchPage = useMemo(
-      () => debounce(fetchPage, SLOW_DEBOUNCE),
+      () => debounce(fetchPage, Constants.SLOW_DEBOUNCE),
       [fetchPage],
     );
 
@@ -393,7 +394,7 @@ const AsyncSelect = forwardRef(
       }
       setInputValue(search);
       onSearch?.(searchValue);
-    }, FAST_DEBOUNCE);
+    }, Constants.FAST_DEBOUNCE);
 
     useEffect(() => () => handleOnSearch.cancel(), [handleOnSearch]);
 
@@ -440,12 +441,12 @@ const AsyncSelect = forwardRef(
         }
       }
 
-      if (onDropdownVisibleChange) {
-        onDropdownVisibleChange(isDropdownVisible);
+      if (onOpenChange) {
+        onOpenChange(isDropdownVisible);
       }
     };
 
-    const dropdownRender = (
+    const popupRender = (
       originNode: ReactElement & { ref?: RefObject<HTMLElement> },
     ) =>
       dropDownRenderHelper(
@@ -535,7 +536,7 @@ const AsyncSelect = forwardRef(
     useImperativeHandle(
       ref,
       () => ({
-        ...(ref.current as HTMLInputElement),
+        ...(ref.current as RefSelectProps),
         clearCache,
       }),
       [ref],
@@ -588,11 +589,6 @@ const AsyncSelect = forwardRef(
       fireOnChange();
     };
 
-    const shouldRenderChildrenOptions = useMemo(
-      () => hasCustomLabels(fullSelectOptions),
-      [fullSelectOptions],
-    );
-
     return (
       <StyledContainer headerPosition={headerPosition}>
         {header && (
@@ -600,9 +596,16 @@ const AsyncSelect = forwardRef(
         )}
         <StyledSelect
           allowClear={!isLoading && allowClear}
-          aria-label={ariaLabel || name}
+          aria-label={
+            isSingleMode &&
+            isLabeledValue(selectValue) &&
+            typeof selectValue.label === 'string'
+              ? `${ariaLabel || name}: ${selectValue.label}`
+              : ariaLabel || name
+          }
+          data-test={ariaLabel || name}
           autoClearSearchValue={autoClearSearchValue}
-          dropdownRender={dropdownRender}
+          popupRender={popupRender}
           filterOption={handleFilterOption}
           filterSort={sortComparatorWithSearch}
           getPopupContainer={
@@ -615,17 +618,17 @@ const AsyncSelect = forwardRef(
           notFoundContent={isLoading ? t('Loading...') : notFoundContent}
           onBlur={handleOnBlur}
           onDeselect={handleOnDeselect}
-          onDropdownVisibleChange={handleOnDropdownVisibleChange}
+          onOpenChange={handleOnDropdownVisibleChange}
           // @ts-ignore
           onPaste={onPaste}
           onPopupScroll={handlePagination}
           onSearch={showSearch ? handleOnSearch : undefined}
           onSelect={handleOnSelect}
           onClear={handleClear}
-          options={shouldRenderChildrenOptions ? undefined : fullSelectOptions}
+          options={fullSelectOptions}
+          optionRender={option => <Space>{option.label || option.value}</Space>}
           placeholder={placeholder}
-          showSearch={showSearch}
-          showArrow
+          showSearch={allowNewOptions ? true : showSearch}
           tokenSeparators={tokenSeparators}
           value={selectValue}
           suffixIcon={getSuffixIcon(isLoading, showSearch, isDropdownVisible)}
@@ -637,13 +640,9 @@ const AsyncSelect = forwardRef(
             )
           }
           oneLine={oneLine}
-          tagRender={customTagRender}
           {...props}
           ref={ref}
-        >
-          {hasCustomLabels(fullSelectOptions) &&
-            renderSelectOptions(fullSelectOptions)}
-        </StyledSelect>
+        />
       </StyledContainer>
     );
   },
diff --git a/superset-frontend/src/components/Select/Select.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/Select/Select.stories.tsx
similarity index 90%
rename from superset-frontend/src/components/Select/Select.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Select/Select.stories.tsx
index 7f4dc851af7..3323a487281 100644
--- a/superset-frontend/src/components/Select/Select.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/Select.stories.tsx
@@ -17,12 +17,12 @@
  * under the License.
  */
 import { StoryObj } from '@storybook/react';
-import ControlHeader from 'src/explore/components/ControlHeader';
+import { noop } from 'lodash';
 import { SelectOptionsType, SelectProps } from './types';
-import Select from './Select';
+import { Select } from '.';
 
 export default {
-  title: 'Select',
+  title: 'Components/Select',
   component: Select,
 };
 
@@ -39,8 +39,7 @@ const options: SelectOptionsType = [
     value: 'Another incredibly awesome long long label',
   },
   {
-    label: 'JSX Label',
-    customLabel: <div style={{ color: 'red' }}>JSX Label</div>,
+    label: <div style={{ color: 'red' }}>JSX Label</div>,
     value: 'JSX Label',
   },
   { label: 'A', value: 'A' },
@@ -73,21 +72,6 @@ const selectPositions = [
   },
 ];
 
-const mountHeader = (type: String) => {
-  let header;
-  if (type === 'text') {
-    header = 'Text header';
-  } else if (type === 'control') {
-    header = (
-      <ControlHeader
-        label="Control header"
-        warning="Example of warning message"
-      />
-    );
-  }
-  return header;
-};
-
 const generateOptions = (opts: SelectOptionsType, count: number) => {
   let generated = opts.slice();
   let iteration = 0;
@@ -110,24 +94,26 @@ export const InteractiveSelect: StoryObj = {
     options,
     optionsCount,
     ...args
-  }: SelectProps & { header: string; optionsCount: number }) => (
-    <div
-      style={{
-        width: DEFAULT_WIDTH,
-      }}
-    >
-      <Select
-        {...args}
-        options={
-          Array.isArray(options)
-            ? generateOptions(options, optionsCount)
-            : options
-        }
-        header={mountHeader(header)}
-        mode="multiple"
-      />
-    </div>
-  ),
+  }: SelectProps & { header: string; optionsCount: number }) => {
+    noop(header);
+    return (
+      <div
+        style={{
+          width: DEFAULT_WIDTH,
+        }}
+      >
+        <Select
+          {...args}
+          options={
+            Array.isArray(options)
+              ? generateOptions(options, optionsCount)
+              : options
+          }
+          mode="multiple"
+        />
+      </div>
+    );
+  },
   args: {
     autoFocus: true,
     allowNewOptions: false,
diff --git a/superset-frontend/src/components/Select/Select.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Select/Select.test.tsx
similarity index 87%
rename from superset-frontend/src/components/Select/Select.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Select/Select.test.tsx
index 4ed6a384b37..b6c2af4a81d 100644
--- a/superset-frontend/src/components/Select/Select.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/Select.test.tsx
@@ -24,8 +24,8 @@ import {
   userEvent,
   waitFor,
   within,
-} from 'spec/helpers/testing-library';
-import Select from 'src/components/Select/Select';
+} from '@superset-ui/core/spec';
+import { Select } from '.';
 
 type Option = {
   label: string;
@@ -36,7 +36,7 @@ type Option = {
 
 const ARIA_LABEL = 'Test';
 const NEW_OPTION = 'Kyle';
-const NO_DATA = 'No Data';
+const NO_DATA = 'No data';
 const LOADING = 'Loading...';
 const OPTIONS: Option[] = [
   { label: 'John', value: 1, gender: 'Male' },
@@ -82,7 +82,8 @@ const getElementByClassName = (className: string) =>
 const getElementsByClassName = (className: string) =>
   document.querySelectorAll(className)! as NodeListOf<HTMLElement>;
 
-const getSelect = () => screen.getByRole('combobox', { name: ARIA_LABEL });
+const getSelect = () =>
+  screen.getByRole('combobox', { name: new RegExp(ARIA_LABEL, 'i') });
 
 const selectAllButtonText = (length: number) => `Select all (${length})`;
 const deselectAllButtonText = (length: number) => `Deselect all (${length})`;
@@ -123,15 +124,17 @@ const matchOrder = async (expectedLabels: string[]) => {
   return true;
 };
 
-const type = (text: string) => {
+const type = async (text: string, delay?: number, clear = true) => {
   const select = getSelect();
-  userEvent.clear(select);
-  return userEvent.type(select, text, { delay: 10 });
+  if (clear) {
+    await userEvent.clear(select);
+  }
+  return userEvent.type(select, text, { delay: delay ?? 10 });
 };
 
-const clearTypedText = () => {
+const clearTypedText = async () => {
   const select = getSelect();
-  userEvent.clear(select);
+  await userEvent.clear(select);
 };
 
 const open = () => waitFor(() => userEvent.click(getSelect()));
@@ -199,7 +202,7 @@ test('does not add new options when the value is in a nested/grouped option', as
 test('inverts the selection', async () => {
   render(<Select {...defaultProps} invertSelection />);
   await open();
-  userEvent.click(await findSelectOption(OPTIONS[0].label));
+  await userEvent.click(await findSelectOption(OPTIONS[0].label));
   expect(await screen.findByLabelText('stop')).toBeInTheDocument();
 });
 
@@ -217,7 +220,7 @@ test('should sort selected to top when in single mode', async () => {
   render(<Select {...defaultProps} mode="single" />);
   const originalLabels = OPTIONS.map(option => option.label);
   await open();
-  userEvent.click(await findSelectOption(originalLabels[1]));
+  await userEvent.click(await findSelectOption(originalLabels[1]));
   // after selection, keep the original order
   expect(await matchOrder(originalLabels)).toBe(true);
 
@@ -229,7 +232,7 @@ test('should sort selected to top when in single mode', async () => {
 
   // keep clicking other items, the updated order should still based on
   // original order
-  userEvent.click(await findSelectOption(originalLabels[5]));
+  await userEvent.click(await findSelectOption(originalLabels[5]));
   await matchOrder(labels);
   await reopen();
   labels = originalLabels.slice();
@@ -237,7 +240,7 @@ test('should sort selected to top when in single mode', async () => {
   expect(await matchOrder(labels)).toBe(true);
 
   // should revert to original order
-  clearAll();
+  await clearAll();
   await reopen();
   expect(await matchOrder(originalLabels)).toBe(true);
 });
@@ -248,7 +251,7 @@ test('should sort selected to the top when in multi mode', async () => {
   let labels = originalLabels.slice();
 
   await open();
-  userEvent.click(await findSelectOption(labels[2]));
+  await userEvent.click(await findSelectOption(labels[2]));
   expect(await matchOrder(labels)).toBe(true);
 
   await reopen();
@@ -256,17 +259,26 @@ test('should sort selected to the top when in multi mode', async () => {
   expect(await matchOrder(labels)).toBe(true);
 
   await open();
-  userEvent.click(await findSelectOption(labels[5]));
+  await userEvent.click(await findSelectOption(labels[5]));
   await reopen();
   labels = [labels.splice(0, 1)[0], labels.splice(4, 1)[0]].concat(labels);
   expect(await matchOrder(labels)).toBe(true);
 
   // should revert to original order
-  clearAll();
+  await clearAll();
   await reopen();
   expect(await matchOrder(originalLabels)).toBe(true);
 });
 
+test('order of selected values is preserved until dropdown is closed', async () => {
+  render(<Select {...defaultProps} mode="multiple" allowSelectAll={false} />);
+  const originalLabels = OPTIONS.map(option => option.label);
+  await open();
+  await userEvent.click(await findSelectOption(originalLabels[1]));
+  await userEvent.click(await findSelectOption(originalLabels[5]));
+  expect(await matchOrder(originalLabels)).toBe(true);
+});
+
 test('searches for label or value', async () => {
   const option = OPTIONS[11];
   render(<Select {...defaultProps} />);
@@ -341,7 +353,9 @@ test('searches for custom fields', async () => {
   expect(options[4]).toHaveTextContent('Nikole');
   expect(options[5]).toHaveTextContent('Olivia');
   await type('1');
-  expect(screen.getByText(NO_DATA)).toBeInTheDocument();
+  expect(
+    screen.getByText(NO_DATA, { selector: '.ant-empty-description' }),
+  ).toBeInTheDocument();
 });
 
 test('removes duplicated values', async () => {
@@ -363,9 +377,9 @@ test('removes duplicated values', async () => {
 
 test('renders a custom label', async () => {
   const options = [
-    { label: 'John', value: 1, customLabel: <h1>John</h1> },
-    { label: 'Liam', value: 2, customLabel: <h1>Liam</h1> },
-    { label: 'Olivia', value: 3, customLabel: <h1>Olivia</h1> },
+    { value: 'John', label: <h1>John</h1> },
+    { value: 'Liam', label: <h1>Liam</h1> },
+    { value: 'Olivia', label: <h1>Olivia</h1> },
   ];
   render(<Select {...defaultProps} options={options} />);
   await open();
@@ -376,9 +390,9 @@ test('renders a custom label', async () => {
 
 test('searches for a word with a custom label', async () => {
   const options = [
-    { label: 'John', value: 1, customLabel: <h1>John</h1> },
-    { label: 'Liam', value: 2, customLabel: <h1>Liam</h1> },
-    { label: 'Olivia', value: 3, customLabel: <h1>Olivia</h1> },
+    { value: 'John', label: <h1>John</h1> },
+    { value: 'Liam', label: <h1>Liam</h1> },
+    { value: 'Olivia', label: <h1>Olivia</h1> },
   ];
   render(<Select {...defaultProps} options={options} />);
   await type('Liam');
@@ -407,7 +421,7 @@ test('clear all the values', async () => {
       onClear={onClear}
     />,
   );
-  clearAll();
+  await clearAll();
   expect(onClear).toHaveBeenCalled();
   const values = await findAllSelectValues();
   expect(values.length).toBe(0);
@@ -417,13 +431,15 @@ test('does not add a new option if allowNewOptions is false', async () => {
   render(<Select {...defaultProps} options={OPTIONS} />);
   await open();
   await type(NEW_OPTION);
-  expect(await screen.findByText(NO_DATA)).toBeInTheDocument();
+  expect(
+    await screen.findByText(NO_DATA, { selector: '.ant-empty-description' }),
+  ).toBeInTheDocument();
 });
 
 test('adds the null option when selected in single mode', async () => {
   render(<Select {...defaultProps} options={[OPTIONS[0], NULL_OPTION]} />);
   await open();
-  userEvent.click(await findSelectOption(NULL_OPTION.label));
+  await userEvent.click(await findSelectOption(NULL_OPTION.label));
   const values = await findAllSelectValues();
   expect(values[0]).toHaveTextContent(NULL_OPTION.label);
 });
@@ -437,8 +453,8 @@ test('adds the null option when selected in multiple mode', async () => {
     />,
   );
   await open();
-  userEvent.click(await findSelectOption(OPTIONS[0].label));
-  userEvent.click(await findSelectOption(NULL_OPTION.label));
+  await userEvent.click(await findSelectOption(OPTIONS[0].label));
+  await userEvent.click(await findSelectOption(NULL_OPTION.label));
   const values = await findAllSelectValues();
   expect(values[0]).toHaveTextContent(OPTIONS[0].label);
   expect(values[1]).toHaveTextContent(NULL_OPTION.label);
@@ -452,14 +468,16 @@ test('renders the select with default props', () => {
 test('opens the select without any data', async () => {
   render(<Select {...defaultProps} options={[]} />);
   await open();
-  expect(screen.getByText(NO_DATA)).toBeInTheDocument();
+  expect(
+    screen.getByText(NO_DATA, { selector: '.ant-empty-description' }),
+  ).toBeInTheDocument();
 });
 
 test('makes a selection in single mode', async () => {
   render(<Select {...defaultProps} />);
   const optionText = 'Emma';
   await open();
-  userEvent.click(await findSelectOption(optionText));
+  await userEvent.click(await findSelectOption(optionText));
   expect(await findSelectValue()).toHaveTextContent(optionText);
 });
 
@@ -467,8 +485,8 @@ test('multiple selections in multiple mode', async () => {
   render(<Select {...defaultProps} mode="multiple" />);
   await open();
   const [firstOption, secondOption] = OPTIONS;
-  userEvent.click(await findSelectOption(firstOption.label));
-  userEvent.click(await findSelectOption(secondOption.label));
+  await userEvent.click(await findSelectOption(firstOption.label));
+  await userEvent.click(await findSelectOption(secondOption.label));
   const values = await findAllSelectValues();
   expect(values[0]).toHaveTextContent(firstOption.label);
   expect(values[1]).toHaveTextContent(secondOption.label);
@@ -479,7 +497,7 @@ test('changes the selected item in single mode', async () => {
   render(<Select {...defaultProps} onChange={onChange} />);
   await open();
   const [firstOption, secondOption] = OPTIONS;
-  userEvent.click(await findSelectOption(firstOption.label));
+  await userEvent.click(await findSelectOption(firstOption.label));
   expect(await findSelectValue()).toHaveTextContent(firstOption.label);
   expect(onChange).toHaveBeenCalledWith(
     expect.objectContaining({
@@ -488,7 +506,7 @@ test('changes the selected item in single mode', async () => {
     }),
     expect.objectContaining(firstOption),
   );
-  userEvent.click(await findSelectOption(secondOption.label));
+  await userEvent.click(await findSelectOption(secondOption.label));
   expect(onChange).toHaveBeenCalledWith(
     expect.objectContaining({
       label: secondOption.label,
@@ -503,13 +521,13 @@ test('deselects an item in multiple mode', async () => {
   render(<Select {...defaultProps} mode="multiple" />);
   await open();
   const [firstOption, secondOption] = OPTIONS;
-  userEvent.click(await findSelectOption(firstOption.label));
-  userEvent.click(await findSelectOption(secondOption.label));
+  await userEvent.click(await findSelectOption(firstOption.label));
+  await userEvent.click(await findSelectOption(secondOption.label));
   let values = await findAllSelectValues();
   expect(values.length).toBe(2);
   expect(values[0]).toHaveTextContent(firstOption.label);
   expect(values[1]).toHaveTextContent(secondOption.label);
-  userEvent.click(await findSelectOption(firstOption.label));
+  await userEvent.click(await findSelectOption(firstOption.label));
   values = await findAllSelectValues();
   expect(values.length).toBe(1);
   expect(values[0]).toHaveTextContent(secondOption.label);
@@ -526,7 +544,9 @@ test('shows "No data" when allowNewOptions is false and a new option is entered'
   render(<Select {...defaultProps} allowNewOptions={false} />);
   await open();
   await type(NEW_OPTION);
-  expect(await screen.findByText(NO_DATA)).toBeInTheDocument();
+  expect(
+    await screen.findByText(NO_DATA, { selector: '.ant-empty-description' }),
+  ).toBeInTheDocument();
 });
 
 test('does not show "No data" when allowNewOptions is true and a new option is entered', async () => {
@@ -662,7 +682,9 @@ test('selects all values', async () => {
     />,
   );
   await open();
-  userEvent.click(await screen.findByText(selectAllButtonText(OPTIONS.length)));
+  await userEvent.click(
+    await screen.findByText(selectAllButtonText(OPTIONS.length)),
+  );
   const values = await findAllSelectValues();
   expect(values.length).toBe(1);
   expect(values[0]).toHaveTextContent(`+ ${OPTIONS.length} ...`);
@@ -678,11 +700,13 @@ test('unselects all values', async () => {
     />,
   );
   await open();
-  userEvent.click(await screen.findByText(selectAllButtonText(OPTIONS.length)));
+  await userEvent.click(
+    await screen.findByText(selectAllButtonText(OPTIONS.length)),
+  );
   let values = await findAllSelectValues();
   expect(values.length).toBe(1);
   expect(values[0]).toHaveTextContent(`+ ${OPTIONS.length} ...`);
-  userEvent.click(
+  await userEvent.click(
     await screen.findByText(deselectAllButtonText(OPTIONS.length)),
   );
   values = await findAllSelectValues();
@@ -703,7 +727,7 @@ test('deselecting a new value also removes it from the options', async () => {
   expect(await findSelectOption(NEW_OPTION)).toBeInTheDocument();
   await type('{enter}');
   clearTypedText();
-  userEvent.click(await findSelectOption(NEW_OPTION));
+  await userEvent.click(await findSelectOption(NEW_OPTION));
   expect(await querySelectOption(NEW_OPTION)).not.toBeInTheDocument();
 });
 
@@ -806,7 +830,7 @@ test('do not count unselected disabled options in "Select all"', async () => {
 test('"Deselect all" counts all selected options', async () => {
   render(<Select {...defaultProps} allowNewOptions mode="multiple" />);
   await open();
-  userEvent.click(await findSelectOption('Ava'));
+  await userEvent.click(await findSelectOption('Ava'));
   expect(await screen.findByText(deselectAllButtonText(1))).toBeInTheDocument();
 });
 
@@ -814,10 +838,10 @@ test('"Deselect all" counts new selected options', async () => {
   render(<Select {...defaultProps} allowNewOptions mode="multiple" />);
   await open();
   await type(NEW_OPTION);
-  userEvent.click(await findSelectOption(NEW_OPTION));
+  await userEvent.click(await findSelectOption(NEW_OPTION));
   clearTypedText();
   await open();
-  userEvent.click(await findSelectOption('Ava'));
+  await userEvent.click(await findSelectOption('Ava'));
   expect(await screen.findByText(deselectAllButtonText(2))).toBeInTheDocument();
 });
 
@@ -849,12 +873,12 @@ test('"Select all" does not affect disabled options', async () => {
 
   // Checking Select all shouldn't affect the disabled options
   const selectAll = selectAllButtonText(OPTIONS.length - 1);
-  userEvent.click(await screen.findByText(selectAll));
+  await userEvent.click(await screen.findByText(selectAll));
   expect(await findSelectValue()).toHaveTextContent(options[0].label);
   expect(await findSelectValue()).not.toHaveTextContent(options[1].label);
 
   // Unchecking Select all shouldn't affect the disabled options
-  userEvent.click(await screen.findByText(selectAll));
+  await userEvent.click(await screen.findByText(selectAll));
   expect(await findSelectValue()).toHaveTextContent(options[0].label);
   expect(await findSelectValue()).not.toHaveTextContent(options[1].label);
 });
@@ -873,8 +897,8 @@ test('does not fire onChange when searching but no selection', async () => {
   );
   await open();
   await type('Joh');
-  userEvent.click(await findSelectOption('John'));
-  userEvent.click(screen.getByRole('main'));
+  await userEvent.click(await findSelectOption('John'));
+  await userEvent.click(screen.getByRole('main'));
   expect(onChange).toHaveBeenCalledTimes(1);
 });
 
@@ -888,7 +912,7 @@ test('fires onChange when clearing the selection in single mode', async () => {
       value={OPTIONS[0]}
     />,
   );
-  clearAll();
+  await clearAll();
   expect(onChange).toHaveBeenCalledTimes(1);
 });
 
@@ -902,7 +926,7 @@ test('fires onChange when clearing the selection in multiple mode', async () =>
       value={OPTIONS[0]}
     />,
   );
-  clearAll();
+  await clearAll();
   expect(onChange).toHaveBeenCalledTimes(1);
 });
 
@@ -994,12 +1018,35 @@ test('does not fire onChange if the same value is selected in single mode', asyn
   const optionText = 'Emma';
   await open();
   expect(onChange).toHaveBeenCalledTimes(0);
-  userEvent.click(await findSelectOption(optionText));
+  await userEvent.click(await findSelectOption(optionText));
   expect(onChange).toHaveBeenCalledTimes(1);
-  userEvent.click(await findSelectOption(optionText));
+  await userEvent.click(await findSelectOption(optionText));
   expect(onChange).toHaveBeenCalledTimes(1);
 });
 
+// Reference for the bug this tests: https://github.com/apache/superset/pull/33043#issuecomment-2809419640
+test('typing and deleting the last character for a new option displays correctly', async () => {
+  jest.useFakeTimers();
+  render(<Select {...defaultProps} allowNewOptions />);
+
+  await open();
+  await type('aaa', 0, false);
+
+  jest.runAllTimers();
+
+  await type('{backspace}', 0, false);
+  await type('a', 0, false);
+
+  jest.runAllTimers();
+
+  expect(
+    screen.queryByText(NO_DATA, { selector: '.ant-empty-description' }),
+  ).not.toBeInTheDocument();
+  expect(await findSelectOption('aaa')).toBeInTheDocument();
+
+  jest.useRealTimers();
+});
+
 /*
  TODO: Add tests that require scroll interaction. Needs further investigation.
  - Fetches more data when scrolling and more data is available
diff --git a/superset-frontend/src/components/Select/Select.tsx b/superset-frontend/packages/superset-ui-core/src/components/Select/Select.tsx
similarity index 89%
rename from superset-frontend/src/components/Select/Select.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Select/Select.tsx
index 46b4eb82c3c..48cb2cfe17a 100644
--- a/superset-frontend/src/components/Select/Select.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/Select.tsx
@@ -19,35 +19,36 @@
 import {
   forwardRef,
   FocusEvent,
-  ReactElement,
   RefObject,
   useEffect,
   useMemo,
   useState,
   useCallback,
   ClipboardEvent,
+  Ref,
+  ReactElement,
 } from 'react';
 
 import { ensureIsArray, t, usePrevious } from '@superset-ui/core';
-// eslint-disable-next-line no-restricted-imports
-import { LabeledValue as AntdLabeledValue } from 'antd/lib/select'; // TODO: Remove antd
-import { debounce, isEqual, uniq } from 'lodash';
-import { FAST_DEBOUNCE } from 'src/constants';
+import { Constants } from '@superset-ui/core/components';
 import {
+  LabeledValue as AntdLabeledValue,
+  RefSelectProps,
+} from 'antd/es/select';
+import { debounce, isEqual, uniq } from 'lodash';
+import {
+  dropDownRenderHelper,
+  getOption,
+  getSuffixIcon,
   getValue,
+  handleFilterOptionHelper,
   hasOption,
   isLabeledValue,
-  renderSelectOptions,
-  sortSelectedFirstHelper,
-  sortComparatorWithSearchHelper,
-  handleFilterOptionHelper,
-  dropDownRenderHelper,
-  getSuffixIcon,
-  mapValues,
-  mapOptions,
-  hasCustomLabels,
-  getOption,
   isObject,
+  mapOptions,
+  mapValues,
+  sortComparatorWithSearchHelper,
+  sortSelectedFirstHelper,
   isEqual as utilsIsEqual,
 } from './utils';
 import { RawValue, SelectOptionsType, SelectProps } from './types';
@@ -60,13 +61,14 @@ import {
   StyledStopOutlined,
 } from './styles';
 import {
+  DEFAULT_SORT_COMPARATOR,
   EMPTY_OPTIONS,
   MAX_TAG_COUNT,
   TOKEN_SEPARATORS,
-  DEFAULT_SORT_COMPARATOR,
+  VIRTUAL_THRESHOLD,
 } from './constants';
-import { customTagRender } from './CustomTag';
-import Button from '../Button';
+import { Space } from '../Space';
+import { Button } from '../Button';
 
 /**
  * This component is a customized version of the Antdesign 4.X Select component
@@ -78,7 +80,7 @@ import Button from '../Button';
  * The Static type accepts a static array of options.
  * The Async type accepts a promise that will return the options.
  * Each of the categories come with different abilities. For a comprehensive guide please refer to
- * the storybook in src/components/Select/Select.stories.tsx.
+ * the storybook in @superset-ui/core/components/Select/Select.stories.tsx.
  */
 const Select = forwardRef(
   (
@@ -102,7 +104,7 @@ const Select = forwardRef(
       onBlur,
       onChange,
       onClear,
-      onDropdownVisibleChange,
+      onOpenChange,
       onDeselect,
       onSearch,
       onSelect,
@@ -116,10 +118,10 @@ const Select = forwardRef(
       getPopupContainer,
       oneLine,
       maxTagCount: propsMaxTagCount,
-
+      virtual = undefined,
       ...props
     }: SelectProps,
-    ref: RefObject<HTMLInputElement>,
+    ref: Ref<RefSelectProps>,
   ) => {
     const isSingleMode = mode === 'single';
     const shouldShowSearch = allowNewOptions ? true : showSearch;
@@ -152,6 +154,7 @@ const Select = forwardRef(
         sortSelectedFirstHelper(a, b, selectValue),
       [selectValue],
     );
+
     const sortComparatorWithSearch = useCallback(
       (a: AntdLabeledValue, b: AntdLabeledValue) =>
         sortComparatorWithSearchHelper(
@@ -161,13 +164,14 @@ const Select = forwardRef(
           sortSelectedFirst,
           sortComparator,
         ),
-      [inputValue, sortComparator, sortSelectedFirst],
+      [inputValue, sortComparator, isDropdownVisible],
     );
 
     const initialOptions = useMemo(
       () => (Array.isArray(options) ? options.slice() : EMPTY_OPTIONS),
       [options],
     );
+
     const initialOptionsSorted = useMemo(
       () => initialOptions.slice().sort(sortSelectedFirst),
       [initialOptions, sortSelectedFirst],
@@ -182,7 +186,7 @@ const Select = forwardRef(
       let groupedOptions: SelectOptionsType;
       if (selectOptions.some(opt => opt.options)) {
         groupedOptions = selectOptions.reduce(
-          (acc, group) => [...acc, ...group.options],
+          (acc, group) => [...acc, ...(group.options as SelectOptionsType)],
           [] as SelectOptionsType,
         );
       }
@@ -305,8 +309,14 @@ const Select = forwardRef(
             )
             .map(option =>
               labelInValue
-                ? { label: option.label, value: option.value }
+                ? {
+                    label: option.label,
+                    value: option.value,
+                  }
                 : option.value,
+            )
+            .filter(
+              (val): val is RawValue => val !== null && val !== undefined,
             ),
         );
       }
@@ -343,12 +353,17 @@ const Select = forwardRef(
       let updatedOptions = selectOptions;
 
       if (allowNewOptions) {
-        const newOption = searchValue &&
-          !hasOption(searchValue, fullSelectOptions, true) && {
-            label: searchValue,
-            value: searchValue,
-            isNewOption: true,
-          };
+        const optionsWithoutTemporary = ensureIsArray(fullSelectOptions).filter(
+          opt => !opt.isNewOption,
+        );
+        const shouldCreateNewOption =
+          searchValue && !hasOption(searchValue, optionsWithoutTemporary, true);
+
+        const newOption = shouldCreateNewOption && {
+          label: searchValue,
+          value: searchValue,
+          isNewOption: true,
+        };
         const cleanSelectOptions = ensureIsArray(fullSelectOptions).filter(
           opt => !opt.isNewOption || hasOption(opt.value, selectValue),
         );
@@ -365,7 +380,7 @@ const Select = forwardRef(
       setVisibleOptions(filteredOptions);
       setInputValue(searchValue);
       onSearch?.(searchValue);
-    }, FAST_DEBOUNCE);
+    }, Constants.FAST_DEBOUNCE);
 
     useEffect(() => () => handleOnSearch.cancel(), [handleOnSearch]);
 
@@ -383,8 +398,8 @@ const Select = forwardRef(
       if (!isDropdownVisible) {
         setSelectOptions(initialOptionsSorted);
       }
-      if (onDropdownVisibleChange) {
-        onDropdownVisibleChange(isDropdownVisible);
+      if (onOpenChange) {
+        onOpenChange(isDropdownVisible);
       }
     };
 
@@ -398,17 +413,14 @@ const Select = forwardRef(
       const currentValues = ensureIsArray(selectValue);
       const currentValuesSet = new Set(currentValues.map(getValue));
 
-      const newValues = [...currentValues] as AntdLabeledValue[];
+      const newValues = [...currentValues] as RawValue[];
       optionsToSelect.forEach(option => {
-        if (!option.disabled && !currentValuesSet.has(option.value)) {
-          if (labelInValue) {
-            newValues.push({
-              label: option.label,
-              value: option.value,
-            });
-          } else {
-            newValues.push(option.value);
-          }
+        if (
+          option.value &&
+          !option.disabled &&
+          !currentValuesSet.has(option.value)
+        ) {
+          newValues.push(option.value);
         }
       });
 
@@ -420,7 +432,6 @@ const Select = forwardRef(
       visibleOptions,
       enabledOptions,
       selectValue,
-      labelInValue,
       fireOnChange,
     ]);
 
@@ -440,7 +451,7 @@ const Select = forwardRef(
 
     const bulkSelectComponent = useMemo(
       () => (
-        <StyledBulkActionsContainer className="select-bulk-actions" size={0}>
+        <StyledBulkActionsContainer justify="center">
           <Button
             type="link"
             buttonStyle="link"
@@ -462,6 +473,10 @@ const Select = forwardRef(
             onMouseDown={e => {
               e.preventDefault();
               e.stopPropagation();
+            }}
+            onClick={e => {
+              e.preventDefault();
+              e.stopPropagation();
               handleDeselectAll();
             }}
           >
@@ -477,7 +492,7 @@ const Select = forwardRef(
       ],
     );
 
-    const dropdownRender = (
+    const popupRender = (
       originNode: ReactElement & { ref?: RefObject<HTMLElement> },
     ) =>
       dropDownRenderHelper(
@@ -572,11 +587,6 @@ const Select = forwardRef(
       selectValue,
     ]);
 
-    const shouldRenderChildrenOptions = useMemo(
-      () => selectAllEnabled || hasCustomLabels(options),
-      [selectAllEnabled, options],
-    );
-
     const omittedCount = useMemo(() => {
       const num_selected = ensureIsArray(selectValue).length;
       const num_shown = maxTagCount as number;
@@ -675,9 +685,16 @@ const Select = forwardRef(
         <StyledSelect
           id={name}
           allowClear={!isLoading && allowClear}
-          aria-label={ariaLabel}
+          aria-label={
+            isSingleMode &&
+            isLabeledValue(selectValue) &&
+            typeof selectValue.label === 'string'
+              ? `${ariaLabel || name}: ${selectValue.label}`
+              : ariaLabel || name
+          }
+          data-test={ariaLabel || name}
           autoClearSearchValue={autoClearSearchValue}
-          dropdownRender={dropdownRender}
+          popupRender={popupRender}
           filterOption={handleFilterOption}
           filterSort={sortComparatorWithSearch}
           getPopupContainer={
@@ -691,7 +708,7 @@ const Select = forwardRef(
           notFoundContent={isLoading ? t('Loading...') : notFoundContent}
           onBlur={handleOnBlur}
           onDeselect={handleOnDeselect}
-          onDropdownVisibleChange={handleOnDropdownVisibleChange}
+          onOpenChange={handleOnDropdownVisibleChange}
           // @ts-ignore
           onPaste={onPaste}
           onPopupScroll={undefined}
@@ -699,10 +716,13 @@ const Select = forwardRef(
           onSelect={handleOnSelect}
           onClear={handleClear}
           placeholder={placeholder}
-          showSearch={shouldShowSearch}
-          showArrow
           tokenSeparators={tokenSeparators}
           value={selectValue}
+          virtual={
+            virtual !== undefined
+              ? virtual
+              : fullSelectOptions.length > VIRTUAL_THRESHOLD
+          }
           suffixIcon={getSuffixIcon(
             isLoading,
             shouldShowSearch,
@@ -715,14 +735,14 @@ const Select = forwardRef(
               <StyledCheckOutlined iconSize="m" aria-label="check" />
             )
           }
-          options={shouldRenderChildrenOptions ? undefined : visibleOptions}
+          options={visibleOptions}
+          optionRender={option => <Space>{option.label || option.value}</Space>}
           oneLine={oneLine}
-          tagRender={customTagRender}
+          css={props.css}
           {...props}
+          showSearch={shouldShowSearch}
           ref={ref}
-        >
-          {shouldRenderChildrenOptions && renderSelectOptions(visibleOptions)}
-        </StyledSelect>
+        />
       </StyledContainer>
     );
   },
diff --git a/superset-frontend/src/components/Select/constants.ts b/superset-frontend/packages/superset-ui-core/src/components/Select/constants.ts
similarity index 80%
rename from superset-frontend/src/components/Select/constants.ts
rename to superset-frontend/packages/superset-ui-core/src/components/Select/constants.ts
index 248f881df17..dd2797b4a58 100644
--- a/superset-frontend/src/components/Select/constants.ts
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/constants.ts
@@ -16,9 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-// eslint-disable-next-line no-restricted-imports
-import { LabeledValue as AntdLabeledValue } from 'antd/lib/select'; // TODO: Remove antd
-import { rankedSearchCompare } from 'src/utils/rankedSearchCompare';
+import { LabeledValue as AntdLabeledValue } from 'antd/es/select';
+import { t } from '@superset-ui/core';
+import { rankedSearchCompare } from '../../utils/rankedSearchCompare';
+import { RawValue } from './types';
 
 export const MAX_TAG_COUNT = 4;
 
@@ -28,6 +29,15 @@ export const EMPTY_OPTIONS = [];
 
 export const DEFAULT_PAGE_SIZE = 100;
 
+export const SELECT_ALL_VALUE: RawValue = t('Select All');
+
+export const VIRTUAL_THRESHOLD = 20;
+
+export const SELECT_ALL_OPTION = {
+  value: SELECT_ALL_VALUE,
+  label: String(SELECT_ALL_VALUE),
+};
+
 export const DEFAULT_SORT_COMPARATOR = (
   a: AntdLabeledValue,
   b: AntdLabeledValue,
diff --git a/superset-frontend/src/assets/stylesheets/less/index.less b/superset-frontend/packages/superset-ui-core/src/components/Select/index.ts
similarity index 62%
rename from superset-frontend/src/assets/stylesheets/less/index.less
rename to superset-frontend/packages/superset-ui-core/src/components/Select/index.ts
index fc91c477dbe..0b02349df8f 100644
--- a/superset-frontend/src/assets/stylesheets/less/index.less
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/index.ts
@@ -16,32 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-// Index .less, any imports here will be included in the final css build
+import Select from './Select';
+import AsyncSelect from './AsyncSelect';
 
-@import '~bootstrap/less/bootstrap.less';
-@import './fonts.less';
-@import './variables.less';
-@import './cosmo/bootswatch.less';
+export { Select, AsyncSelect };
+export * from './types';
+export * from './styles';
+export * from './constants';
 
-html,
-body {
-  font-size: @font-size-base;
-  line-height: @line-height-base;
-}
-
-body {
-  min-height: 100vh;
-  display: flex;
-  flex-direction: column;
-}
-
-header {
-  flex: 0 1 auto;
-}
-
-#app {
-  flex: 1 1 auto;
-  position: relative;
-  display: flex;
-  flex-direction: column;
-}
+// TODO hack to provide vanilla antd Select and SelectProps as
+// we mutated the interface quite a bit here, and some internal packages
+// are still using the vanilla antd Select
+export { Select as RawAntdSelect } from 'antd';
+export { type SelectProps as RawAntdSelectProps } from 'antd/es/select';
diff --git a/superset-frontend/src/components/Select/styles.tsx b/superset-frontend/packages/superset-ui-core/src/components/Select/styles.tsx
similarity index 65%
rename from superset-frontend/src/components/Select/styles.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Select/styles.tsx
index 966d9ade420..f5601fbd801 100644
--- a/superset-frontend/src/components/Select/styles.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/styles.tsx
@@ -17,19 +17,17 @@
  * under the License.
  */
 import { styled } from '@superset-ui/core';
-import { Icons } from 'src/components/Icons';
-// eslint-disable-next-line no-restricted-imports
-import { Spin, Tag } from 'antd'; // TODO: Remove antd
-// eslint-disable-next-line no-restricted-imports
-import AntdSelect from 'antd/lib/select'; // TODO: Remove antd
-import { Space } from '../Space';
+import { Select } from 'antd';
+import { Icons } from '@superset-ui/core/components/Icons';
+import { Spin } from '../Spin';
+import { Flex } from '../Flex';
 
 export const StyledHeader = styled.span<{ headerPosition: string }>`
   ${({ theme, headerPosition }) => `
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
-    margin-right: ${headerPosition === 'left' ? theme.gridUnit * 2 : 0}px;
+    margin-right: ${headerPosition === 'left' ? theme.sizeUnit * 2 : 0}px;
   `}
 `;
 
@@ -42,18 +40,27 @@ export const StyledContainer = styled.div<{ headerPosition: string }>`
   `}
 `;
 
-export const StyledSelect = styled(AntdSelect, {
+export const StyledSelect = styled(Select, {
   shouldForwardProp: prop => prop !== 'headerPosition' && prop !== 'oneLine',
 })<{ headerPosition?: string; oneLine?: boolean }>`
   ${({ theme, headerPosition, oneLine }) => `
-    flex: ${headerPosition === 'left' ? 1 : 0};
-    && .ant-select-selector {
-      border-radius: ${theme.gridUnit}px;
+    .ant-select-item-option-active:not(.ant-select-item-option-disabled) {
+      outline: 2px solid ${theme.colorPrimary};
+      outline-offset: -2px;
     }
-    // Open the dropdown when clicking on the suffix
-    // This is fixed in version 4.16
-    .ant-select-arrow .anticon:not(.ant-select-suffix) {
-      pointer-events: none;
+    flex: ${headerPosition === 'left' ? 1 : 0};
+    line-height: ${theme.sizeXL}px;
+
+    && .ant-select-selection-search {
+      left: 0px;
+    }
+
+    && .ant-select-selection-item, .ant-select-selection-placeholder {
+      max-height: ${theme.sizeXL}px;
+    }
+    .ant-select-selection-item::after {
+      height: 0;
+      display: block !important;
     }
     ${
       oneLine &&
@@ -64,7 +71,7 @@ export const StyledSelect = styled(AntdSelect, {
 
         .ant-select-selection-overflow-item:not(.ant-select-selection-overflow-item-rest):not(.ant-select-selection-overflow-item-suffix) {
           flex-shrink: 1;
-          min-width: ${theme.gridUnit * 13}px;
+          min-width: ${theme.sizeUnit * 13}px;
         }
 
         .ant-select-selection-overflow-item-suffix {
@@ -80,14 +87,6 @@ export const NoElement = styled.span`
   display: none;
 `;
 
-export const StyledTag = styled(Tag)`
-  ${({ theme }) => `
-    background: ${theme.colors.grayscale.light3};
-    font-size: ${theme.typography.sizes.m}px;
-    border: none;
-  `}
-`;
-
 export const StyledStopOutlined = styled(Icons.StopOutlined)`
   vertical-align: 0;
 `;
@@ -97,22 +96,22 @@ export const StyledCheckOutlined = styled(Icons.CheckOutlined)`
 `;
 
 export const StyledSpin = styled(Spin)`
-  margin-top: ${({ theme }) => -theme.gridUnit}px;
+  margin-top: ${({ theme }) => -theme.sizeUnit}px;
 `;
 
 export const StyledLoadingText = styled.div`
   ${({ theme }) => `
-   margin-left: ${theme.gridUnit * 3}px;
-   line-height: ${theme.gridUnit * 8}px;
+   margin-left: ${theme.sizeUnit * 3}px;
+   line-height: ${theme.sizeUnit * 8}px;
    color: ${theme.colors.grayscale.light1};
  `}
 `;
 
 export const StyledHelperText = styled.div`
   ${({ theme }) => `
-   padding: ${theme.gridUnit * 2}px ${theme.gridUnit * 3}px;
+   padding: ${theme.sizeUnit * 2}px ${theme.sizeUnit * 3}px;
    color: ${theme.colors.grayscale.base};
-   font-size: ${theme.typography.sizes.s}px;
+   font-size: ${theme.fontSizeSM}px;
    cursor: default;
    border-bottom: 1px solid ${theme.colors.grayscale.light2};
  `}
@@ -124,10 +123,10 @@ export const StyledError = styled.div`
     justify-content: center;
     align-items: flex-start;
     width: 100%;
-    padding: ${theme.gridUnit * 2}px;
-    color: ${theme.colors.error.base};
+    padding: ${theme.sizeUnit * 2}px;
+    color: ${theme.colorError};
     & svg {
-      margin-right: ${theme.gridUnit * 2}px;
+      margin-right: ${theme.sizeUnit * 2}px;
     }
   `}
 `;
@@ -137,18 +136,9 @@ export const StyledErrorMessage = styled.div`
   text-overflow: ellipsis;
 `;
 
-export const StyledBulkActionsContainer = styled(Space)`
+export const StyledBulkActionsContainer = styled(Flex)`
   ${({ theme }) => `
-    padding: ${theme.gridUnit}px;
-    display: flex;
-    justify-content: center;
+    padding: ${theme.sizeUnit}px;
     border-top: 1px solid ${theme.colors.grayscale.light3};
-    .superset-button {
-      color: ${theme.colors.primary.dark1};
-      font-weight: ${theme.typography.weights.normal};
-    }
-    .superset-button:disabled {
-      background-color: transparent;
-    }
   `}
 `;
diff --git a/superset-frontend/src/components/Select/types.ts b/superset-frontend/packages/superset-ui-core/src/components/Select/types.ts
similarity index 89%
rename from superset-frontend/src/components/Select/types.ts
rename to superset-frontend/packages/superset-ui-core/src/components/Select/types.ts
index 404253ef15c..2f52035b434 100644
--- a/superset-frontend/src/components/Select/types.ts
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/types.ts
@@ -16,39 +16,42 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import {
-  JSXElementConstructor,
-  ReactElement,
-  ReactNode,
-  RefObject,
-} from 'react';
-// eslint-disable-next-line no-restricted-imports
+import { JSXElementConstructor, ReactElement, ReactNode, Ref } from 'react';
 import {
   SelectProps as AntdSelectProps,
   SelectValue as AntdSelectValue,
   LabeledValue as AntdLabeledValue,
-} from 'antd/lib/select'; // TODO: Remove antd
-// eslint-disable-next-line no-restricted-imports
-import { TagProps } from 'antd/lib/tag'; // TODO: Remove antd
+  RefSelectProps,
+} from 'antd/es/select';
+import { Interpolation, Theme } from '@emotion/react';
 
 export type RawValue = string | number;
 
 export type V = string | number | null | undefined;
 
-export type LabeledValue = { label?: ReactNode; value?: V };
+export type LabeledValue = AntdLabeledValue;
+
+export type CustomLabeledValue = { label?: ReactNode; value?: V };
 
 export type AntdProps = AntdSelectProps<AntdSelectValue>;
 
+export type SelectValue = AntdSelectValue | null;
+
+export type { RefSelectProps };
+
 export type AntdExposedProps = Pick<
   AntdProps,
   | 'allowClear'
   | 'autoClearSearchValue'
   | 'autoFocus'
+  | 'className'
+  | 'defaultValue'
   | 'disabled'
   | 'filterOption'
   | 'filterSort'
   | 'loading'
   | 'labelInValue'
+  | 'labelRender'
   | 'maxTagCount'
   | 'notFoundContent'
   | 'onChange'
@@ -59,12 +62,13 @@ export type AntdExposedProps = Pick<
   | 'onBlur'
   | 'onPopupScroll'
   | 'onSearch'
-  | 'onDropdownVisibleChange'
+  | 'onOpenChange'
+  | 'optionRender'
   | 'placeholder'
   | 'showArrow'
   | 'showSearch'
   | 'tokenSeparators'
-  | 'value'
+  | 'virtual'
   | 'getPopupContainer'
   | 'menuItemSelectedIcon'
 >;
@@ -91,7 +95,7 @@ export interface BaseSelectProps extends AntdExposedProps {
   /**
    * Renders the dropdown
    */
-  dropdownRender?: (
+  popupRender?: (
     menu: ReactElement<any, string | JSXElementConstructor<any>>,
   ) => ReactElement<any, string | JSXElementConstructor<any>>;
   /**
@@ -158,10 +162,15 @@ export interface BaseSelectProps extends AntdExposedProps {
 
   suffixIcon?: ReactNode;
 
-  ref: RefObject<HTMLInputElement>;
+  value?: SelectValue | null;
+
+  ref: Ref<RefSelectProps>;
+
+  dropdownStyle?: React.CSSProperties;
 }
 
 export interface SelectProps extends BaseSelectProps {
+  css?: Interpolation<Theme>;
   /**
    * It enables the user to select all options.
    * True by default.
@@ -174,7 +183,9 @@ export interface SelectProps extends BaseSelectProps {
   options: SelectOptionsType;
 }
 
-export type AsyncSelectRef = HTMLInputElement & { clearCache: () => void };
+export type AsyncSelectRef = RefSelectProps & {
+  clearCache: () => void;
+};
 
 export type SelectOptionsTypePage = {
   data: SelectOptionsType;
@@ -221,9 +232,3 @@ export interface AsyncSelectProps extends BaseSelectProps {
    */
   onError?: (error: string) => void;
 }
-
-export type CustomTagProps = HTMLSpanElement &
-  TagProps & {
-    label: ReactNode;
-    value: string;
-  };
diff --git a/superset-frontend/src/components/Select/utils.tsx b/superset-frontend/packages/superset-ui-core/src/components/Select/utils.tsx
similarity index 76%
rename from superset-frontend/src/components/Select/utils.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Select/utils.tsx
index 528d9249df8..a5e405942a3 100644
--- a/superset-frontend/src/components/Select/utils.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/utils.tsx
@@ -17,14 +17,11 @@
  * under the License.
  */
 import { ensureIsArray, t } from '@superset-ui/core';
-// eslint-disable-next-line no-restricted-imports
-import AntdSelect, { LabeledValue as AntdLabeledValue } from 'antd/lib/select'; // TODO: Remove antd
 import { ReactElement, RefObject } from 'react';
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
+import { LabeledValue as AntdLabeledValue, SELECT_ALL_VALUE } from '.';
 import { StyledHelperText, StyledLoadingText, StyledSpin } from './styles';
-import { LabeledValue, RawValue, SelectOptionsType, V } from './types';
-
-const { Option } = AntdSelect;
+import { CustomLabeledValue, RawValue, SelectOptionsType, V } from './types';
 
 export function isObject(value: unknown): value is Record<string, unknown> {
   return (
@@ -44,9 +41,15 @@ export function getValue(
   return isLabeledValue(option) ? option.value : option;
 }
 
-export function isEqual(a: V | LabeledValue, b: V | LabeledValue, key: string) {
-  const actualA = isObject(a) && key in a ? a[key as keyof LabeledValue] : a;
-  const actualB = isObject(b) && key in b ? b[key as keyof LabeledValue] : b;
+export function isEqual(
+  a: V | CustomLabeledValue,
+  b: V | CustomLabeledValue,
+  key: string,
+) {
+  const actualA =
+    isObject(a) && key in a ? a[key as keyof CustomLabeledValue] : a;
+  const actualB =
+    isObject(b) && key in b ? b[key as keyof CustomLabeledValue] : b;
   // When comparing the values we use the equality
   // operator to automatically convert different types
   // eslint-disable-next-line eqeqeq
@@ -55,9 +58,9 @@ export function isEqual(a: V | LabeledValue, b: V | LabeledValue, key: string) {
 
 export function getOption(
   value: V,
-  options?: V | LabeledValue | (V | LabeledValue)[],
+  options?: V | CustomLabeledValue | (V | CustomLabeledValue)[],
   checkLabel = false,
-): V | LabeledValue {
+): V | CustomLabeledValue {
   const optionsArray = ensureIsArray(options);
   return optionsArray.find(
     x =>
@@ -67,7 +70,7 @@ export function getOption(
 
 export function hasOption(
   value: V,
-  options?: V | LabeledValue | (V | LabeledValue)[],
+  options?: V | CustomLabeledValue | (V | CustomLabeledValue)[],
   checkLabel = false,
 ): boolean {
   return getOption(value, options, checkLabel) !== undefined;
@@ -79,8 +82,8 @@ export function hasOption(
  * */
 export const propertyComparator =
   (property: string) => (a: AntdLabeledValue, b: AntdLabeledValue) => {
-    const propertyA = a[property as keyof LabeledValue];
-    const propertyB = b[property as keyof LabeledValue];
+    const propertyA = a[property as keyof CustomLabeledValue];
+    const propertyB = b[property as keyof CustomLabeledValue];
     if (typeof propertyA === 'string' && typeof propertyB === 'string') {
       return propertyA.localeCompare(propertyB);
     }
@@ -99,12 +102,16 @@ export const sortSelectedFirstHelper = (
     | RawValue[]
     | AntdLabeledValue
     | AntdLabeledValue[]
-    | undefined,
-) =>
-  selectValue && a.value !== undefined && b.value !== undefined
+    | undefined
+    | null,
+) => {
+  if (a.value === SELECT_ALL_VALUE) return -1;
+  if (b.value === SELECT_ALL_VALUE) return 1;
+  return selectValue && a.value !== undefined && b.value !== undefined
     ? Number(hasOption(b.value, selectValue)) -
-      Number(hasOption(a.value, selectValue))
+        Number(hasOption(a.value, selectValue))
     : 0;
+};
 
 export const sortComparatorWithSearchHelper = (
   a: AntdLabeledValue,
@@ -142,7 +149,7 @@ export const getSuffixIcon = (
   if (showSearch && isDropdownVisible) {
     return <Icons.SearchOutlined iconSize="s" />;
   }
-  return <Icons.DownOutlined iconSize="s" />;
+  return <Icons.DownOutlined iconSize="s" aria-label="down" />;
 };
 
 export const dropDownRenderHelper = (
@@ -163,12 +170,31 @@ export const dropDownRenderHelper = (
   if (errorComponent) {
     return errorComponent;
   }
+
+  // remap for accessibility for proper item count
+  const accessibilityNode = {
+    ...originNode,
+    props: {
+      ...originNode.props,
+      flattenOptions: ensureIsArray(originNode.props.flattenOptions).map(
+        (opt: Record<string, any>, idx: number) => ({
+          ...opt,
+          data: {
+            ...opt.data,
+            'aria-setsize': originNode.props.flattenOptions?.length || 0,
+            'aria-posinset': idx + 1,
+          },
+        }),
+      ),
+    },
+  };
+
   return (
     <>
       {helperText && (
         <StyledHelperText role="note">{helperText}</StyledHelperText>
       )}
-      {originNode}
+      {accessibilityNode}
       {bulkSelectComponents}
     </>
   );
@@ -188,8 +214,8 @@ export const handleFilterOptionHelper = (
     const searchValue = search.trim().toLowerCase();
     if (optionFilterProps?.length) {
       return optionFilterProps.some(prop => {
-        const optionProp = option?.[prop as keyof LabeledValue]
-          ? String(option[prop as keyof LabeledValue])
+        const optionProp = option?.[prop as keyof CustomLabeledValue]
+          ? String(option[prop as keyof CustomLabeledValue])
               .trim()
               .toLowerCase()
           : '';
@@ -201,24 +227,6 @@ export const handleFilterOptionHelper = (
   return false;
 };
 
-export const hasCustomLabels = (options: SelectOptionsType) =>
-  options?.some(opt => !!opt?.customLabel);
-
-export const renderSelectOptions = (
-  options: SelectOptionsType,
-): JSX.Element[] =>
-  options.map(opt => {
-    const isOptObject = typeof opt === 'object';
-    const label = isOptObject ? opt?.label || opt.value : opt;
-    const value = isOptObject ? opt.value : opt;
-    const { customLabel, ...optProps } = opt;
-    return (
-      <Option {...optProps} key={value} label={label} value={value}>
-        {isOptObject && customLabel ? customLabel : label}
-      </Option>
-    );
-  });
-
 export const mapValues = (
   values: SelectOptionsType,
   labelInValue: boolean,
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Skeleton/Skeleton.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/Skeleton/Skeleton.stories.tsx
new file mode 100644
index 00000000000..cafbfdb1de7
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Skeleton/Skeleton.stories.tsx
@@ -0,0 +1,166 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 type { Meta, StoryObj } from '@storybook/react';
+import { type SkeletonButtonProps } from 'antd/es/skeleton/Button';
+import { Space } from '../Space';
+import { AvatarProps } from '../Avatar/types';
+import { Skeleton, type SkeletonProps } from '.';
+
+const { Avatar, Button, Input, Image } = Skeleton;
+
+export default {
+  title: 'Components/Skeleton',
+  component: Skeleton,
+  subcomponents: { Avatar, Button, Input, Image },
+  argTypes: {
+    // Skeleton props
+    active: {
+      control: 'boolean',
+      description: 'Show animation effect',
+      table: {
+        category: 'Skeleton',
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'false' },
+      },
+    },
+    avatar: {
+      control: 'boolean',
+      description: 'Show avatar placeholder',
+      table: {
+        category: 'Skeleton',
+        type: { summary: 'boolean | object' },
+        defaultValue: { summary: false },
+      },
+    },
+    loading: {
+      control: 'boolean',
+      description: 'Display the skeleton when true',
+      table: {
+        category: 'Skeleton',
+        type: { summary: 'boolean' },
+      },
+    },
+    paragraph: {
+      control: 'false',
+      description: 'Paragraph skeleton',
+      table: {
+        category: 'Skeleton',
+        type: { summary: 'boolean | object' },
+        defaultValue: { summary: 'true' },
+      },
+    },
+    round: {
+      control: false,
+      description: 'Show paragraph and title radius when true	',
+      table: {
+        category: 'Skeleton',
+        type: { summary: 'boolean' },
+        defaultValue: { summary: false },
+      },
+    },
+    title: {
+      control: 'boolean',
+      description: 'Show title placeholder',
+      table: {
+        category: 'Skeleton',
+        type: { summary: 'boolean | object' },
+        defaultValue: { summary: true },
+      },
+    },
+
+    // Skeleton.Avatar props
+    shape: {
+      control: 'select',
+      description: 'Shape of the avatar',
+      options: ['circle', 'square'],
+      table: {
+        name: 'shape',
+        category: 'Avatar | Button',
+        type: { summary: 'string' },
+      },
+    },
+    size: {
+      control: 'select',
+      options: ['large', 'small', 'default'],
+      description: 'Set the size of avatar in the skeleton',
+      table: {
+        category: 'Avatar | Button',
+        type: { summary: 'number | string' },
+      },
+    },
+
+    // Skeleton.Title props
+    width: {
+      control: false,
+      description: 'Set the width of title in the skeleton',
+      table: {
+        category: 'Title',
+        type: { summary: 'number | string' },
+      },
+    },
+
+    // Skeleton.Button props
+    block: {
+      control: 'boolean',
+      description: 'Option to fit button width to its parent width',
+      table: {
+        category: 'Button',
+        type: { summary: 'boolean' },
+        defaultValue: { summary: false },
+      },
+    },
+  },
+  parameters: {
+    docs: {
+      description: {
+        component:
+          'Skeleton loading component with support for avatar, title, paragraph, button, and input placeholders.',
+      },
+    },
+  },
+} as Meta<
+  typeof Skeleton & typeof Avatar & typeof Button & typeof Input & typeof Image
+>;
+
+type Story = StoryObj<typeof Skeleton & typeof Button & typeof Avatar>;
+
+export const SkeletonStory: Story = {
+  render: (args: SkeletonProps & AvatarProps & SkeletonButtonProps) => {
+    const avatar = {
+      shape: args.shape,
+      size: args.size,
+    };
+    const button = {
+      block: args.block,
+      shape: args.shape,
+      size: args.size,
+    };
+
+    return (
+      <Space direction="vertical" size="middle">
+        Skeleton
+        <Skeleton {...args} />
+        Avatar
+        <Skeleton.Avatar {...avatar} />
+        Button
+        <Skeleton.Button {...button} />
+      </Space>
+    );
+  },
+};
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Skeleton/Skeleton.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Skeleton/Skeleton.test.tsx
new file mode 100644
index 00000000000..f36778c1085
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Skeleton/Skeleton.test.tsx
@@ -0,0 +1,47 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { render, screen } from '@superset-ui/core/spec';
+import '@testing-library/jest-dom';
+import { Skeleton } from '.';
+
+describe('Skeleton Component', () => {
+  it('renders skeleton', () => {
+    render(<Skeleton loading paragraph={{ rows: 3 }} active />);
+
+    expect(screen.getByRole('list')).toHaveClass('ant-skeleton-paragraph');
+  });
+
+  it('renders skeleton with correct number of paragraph rows', () => {
+    render(<Skeleton loading paragraph={{ rows: 3 }} active />);
+
+    const paragraph = screen.getByRole('list');
+    expect(paragraph.children.length).toBe(3);
+  });
+
+  it('does not render skeleton when loading is false', () => {
+    render(
+      <Skeleton loading={false} active>
+        <p>Loaded Content</p>
+      </Skeleton>,
+    );
+
+    expect(screen.queryByRole('status')).not.toBeInTheDocument();
+    expect(screen.getByText('Loaded Content')).toBeInTheDocument();
+  });
+});
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Skeleton/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Skeleton/index.tsx
new file mode 100644
index 00000000000..b808f1b9fc4
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Skeleton/index.tsx
@@ -0,0 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+export { Skeleton, type SkeletonProps } from 'antd';
diff --git a/superset-frontend/src/components/Slider/Slider.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/Slider/Slider.stories.tsx
similarity index 98%
rename from superset-frontend/src/components/Slider/Slider.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Slider/Slider.stories.tsx
index 34ac6440415..121f1fa0484 100644
--- a/superset-frontend/src/components/Slider/Slider.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Slider/Slider.stories.tsx
@@ -19,7 +19,7 @@
 import Slider, { SliderSingleProps, SliderRangeProps } from '.';
 
 export default {
-  title: 'Slider',
+  title: 'Components/Slider',
   component: Slider,
 };
 
diff --git a/superset-frontend/src/components/Slider/Slider.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Slider/Slider.test.tsx
similarity index 95%
rename from superset-frontend/src/components/Slider/Slider.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Slider/Slider.test.tsx
index 8413e0ebc67..f4fa3157909 100644
--- a/superset-frontend/src/components/Slider/Slider.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Slider/Slider.test.tsx
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { render, screen } from 'spec/helpers/testing-library';
+import { render, screen } from '@superset-ui/core/spec';
 import Slider from '.';
 
 const mockedProps = {
diff --git a/superset-frontend/src/components/Slider/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Slider/index.tsx
similarity index 88%
rename from superset-frontend/src/components/Slider/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Slider/index.tsx
index 05f21b0bb9e..8430819f3fd 100644
--- a/superset-frontend/src/components/Slider/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Slider/index.tsx
@@ -16,8 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { SliderSingleProps, SliderRangeProps } from 'antd-v5/lib/slider';
-import { Slider as AntdSlider } from 'antd-v5';
+import { SliderSingleProps, SliderRangeProps } from 'antd/es/slider';
+import { Slider as AntdSlider } from 'antd';
 
 export type { SliderSingleProps, SliderRangeProps };
 
diff --git a/superset-frontend/src/components/Space/Space.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/Space/Space.stories.tsx
similarity index 86%
rename from superset-frontend/src/components/Space/Space.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Space/Space.stories.tsx
index 40c3c653f8d..c6e935521d7 100644
--- a/superset-frontend/src/components/Space/Space.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Space/Space.stories.tsx
@@ -16,17 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
-/*
- * Re-exporting of components in src/components to facilitate
- * their imports by other components.
- * E.g. import { Select } from 'src/components'
- */
-
-import { Space, SpaceProps } from 'src/components/Space';
+import { Space, type SpaceProps } from '.';
 
 export default {
-  title: 'Space',
+  title: 'Design System/Components/Space',
   component: Space,
 };
 
diff --git a/superset-frontend/src/components/Space/Space.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Space/Space.test.tsx
similarity index 91%
rename from superset-frontend/src/components/Space/Space.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Space/Space.test.tsx
index 8d73af21988..2097cecb3a8 100644
--- a/superset-frontend/src/components/Space/Space.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Space/Space.test.tsx
@@ -16,8 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
-import { render } from 'spec/helpers/testing-library';
+import '@testing-library/jest-dom';
+import { render } from '@superset-ui/core/spec';
 import { Space } from '.';
 
 test('should render', () => {
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Space/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Space/index.tsx
new file mode 100644
index 00000000000..b67c0b527b0
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Space/index.tsx
@@ -0,0 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+export { Space, type SpaceProps } from 'antd';
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Spin/Spin.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Spin/Spin.test.tsx
new file mode 100644
index 00000000000..a0214651a44
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Spin/Spin.test.tsx
@@ -0,0 +1,26 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { render } from '@superset-ui/core/spec';
+import { Spin } from '.';
+
+test('renders spin with default props', () => {
+  render(<Spin />);
+  expect(document.querySelector('.ant-spin')).toBeInTheDocument();
+});
diff --git a/superset-frontend/src/components/CronPicker/index.ts b/superset-frontend/packages/superset-ui-core/src/components/Spin/index.tsx
similarity index 96%
rename from superset-frontend/src/components/CronPicker/index.ts
rename to superset-frontend/packages/superset-ui-core/src/components/Spin/index.tsx
index 17838fbb2d6..a06e9ccf3f6 100644
--- a/superset-frontend/src/components/CronPicker/index.ts
+++ b/superset-frontend/packages/superset-ui-core/src/components/Spin/index.tsx
@@ -17,4 +17,4 @@
  * under the License.
  */
 
-export * from './CronPicker';
+export { Spin } from 'antd';
diff --git a/superset-frontend/src/components/Steps/Steps.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/Steps/Steps.stories.tsx
similarity index 94%
rename from superset-frontend/src/components/Steps/Steps.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Steps/Steps.stories.tsx
index 9d50b1b4087..336c0ef0dd0 100644
--- a/superset-frontend/src/components/Steps/Steps.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Steps/Steps.stories.tsx
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { Steps as AntdSteps } from 'antd-v5';
-import { Steps, StepsProps } from '.';
+import { Steps as AntdSteps } from 'antd';
+import { Steps, type StepsProps } from '.';
 
 export default {
-  title: 'Steps',
+  title: 'Components/Steps',
   component: Steps as typeof AntdSteps,
 };
 
diff --git a/superset-frontend/src/components/Steps/Steps.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Steps/Steps.test.tsx
similarity index 94%
rename from superset-frontend/src/components/Steps/Steps.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Steps/Steps.test.tsx
index 53418e2f147..5c8996ac220 100644
--- a/superset-frontend/src/components/Steps/Steps.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Steps/Steps.test.tsx
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { render } from 'spec/helpers/testing-library';
+import { render } from '@superset-ui/core/spec';
 import { Steps } from '.';
 
 test('should render with default props', () => {
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Steps/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Steps/index.tsx
new file mode 100644
index 00000000000..4993be2366d
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Steps/index.tsx
@@ -0,0 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+export { Steps, type StepsProps } from 'antd';
diff --git a/superset-frontend/src/components/Switch/Switch.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/Switch/Switch.stories.tsx
similarity index 95%
rename from superset-frontend/src/components/Switch/Switch.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Switch/Switch.stories.tsx
index 3e5d12d3ea3..508549ac0e3 100644
--- a/superset-frontend/src/components/Switch/Switch.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Switch/Switch.stories.tsx
@@ -17,10 +17,10 @@
  * under the License.
  */
 import { useArgs } from '@storybook/preview-api';
-import { Switch, SwitchProps } from '.';
+import { Switch, type SwitchProps } from '.';
 
 export default {
-  title: 'Switch',
+  title: 'Components/Switch',
 };
 
 export const InteractiveSwitch = ({ checked, ...rest }: SwitchProps) => {
diff --git a/superset-frontend/src/components/Switch/Switch.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Switch/Switch.test.tsx
similarity index 95%
rename from superset-frontend/src/components/Switch/Switch.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Switch/Switch.test.tsx
index 0e8e762d041..03a4983115a 100644
--- a/superset-frontend/src/components/Switch/Switch.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Switch/Switch.test.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { render, screen } from 'spec/helpers/testing-library';
+import { render, screen } from '@superset-ui/core/spec';
 import { Switch } from '.';
 
 const mockedProps = {
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Switch/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Switch/index.tsx
new file mode 100644
index 00000000000..fe69eece59b
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Switch/index.tsx
@@ -0,0 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+export { Switch, type SwitchProps } from 'antd';
diff --git a/superset-frontend/src/components/Table/Table.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/Table/Table.stories.tsx
similarity index 96%
rename from superset-frontend/src/components/Table/Table.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Table/Table.stories.tsx
index ac45142e6fe..2a409e2a3c9 100644
--- a/superset-frontend/src/components/Table/Table.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Table/Table.stories.tsx
@@ -27,6 +27,7 @@ import {
   SUPERSET_TABLE_COLUMN,
   Table,
   TableSize,
+  TableProps,
 } from './index';
 import { alphabeticalSort, numericalSort } from './sorters';
 import ButtonCell from './cell-renderers/ButtonCell';
@@ -331,7 +332,7 @@ for (let i = 0; i < recordCount; i += 1) {
   });
 }
 
-export const Basic: StoryFn<typeof Table> = args => <Table {...args} />;
+export const Basic = (args: TableProps<object>) => <Table {...args} />;
 
 function handlers(record: object, rowIndex: number) {
   return {
@@ -357,7 +358,7 @@ Basic.args = {
   usePagination: false,
 };
 
-export const Pagination: StoryFn<typeof Table> = args => <Table {...args} />;
+export const Pagination = (args: TableProps<object>) => <Table {...args} />;
 
 Pagination.args = {
   data: basicData,
@@ -429,7 +430,7 @@ const paginationColumns: ColumnsType<BasicData> = [
   },
 ];
 
-export const ServerPagination: StoryFn<typeof Table> = args => {
+export const ServerPagination = (args: TableProps<any>) => {
   const [data, setData] = useState(generateData(0, 5));
   const [loading, setLoading] = useState(false);
 
@@ -484,9 +485,7 @@ ServerPagination.args = {
   defaultPageSize: 5,
 };
 
-export const VirtualizedPerformance: StoryFn<typeof Table> = args => (
-  <Table {...args} />
-);
+export const VirtualizedPerformance = (args: any) => <Table {...args} />;
 
 VirtualizedPerformance.args = {
   data: bigdata,
@@ -499,7 +498,7 @@ VirtualizedPerformance.args = {
   usePagination: false,
 };
 
-export const Loading: StoryFn<typeof Table> = args => <Table {...args} />;
+export const Loading = (args: TableProps<object>) => <Table {...args} />;
 
 Loading.args = {
   data: basicData,
@@ -508,7 +507,7 @@ Loading.args = {
   loading: true,
 };
 
-export const ResizableColumns: StoryFn<typeof Table> = args => (
+export const ResizableColumns = (args: TableProps<object>) => (
   <Table {...args} />
 );
 
@@ -519,7 +518,7 @@ ResizableColumns.args = {
   resizable: true,
 };
 
-export const ReorderableColumns: StoryFn<typeof Table> = args => {
+export const ReorderableColumns = (args: any) => {
   const [droppedItem, setDroppedItem] = useState<string | undefined>();
   const dragOver = (ev: DragEvent<HTMLDivElement>) => {
     ev.preventDefault();
@@ -598,7 +597,9 @@ const rendererData: RendererData[] = [
   },
 ];
 
-export const CellRenderers: StoryFn<typeof Table> = args => <Table {...args} />;
+export const CellRenderers: StoryFn = (args: TableProps<object>) => (
+  <Table {...args} />
+);
 
 CellRenderers.args = {
   data: rendererData,
diff --git a/superset-frontend/src/components/Table/Table.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Table/Table.test.tsx
similarity index 96%
rename from superset-frontend/src/components/Table/Table.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Table/Table.test.tsx
index 9e6b716704e..48fe7327bbd 100644
--- a/superset-frontend/src/components/Table/Table.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Table/Table.test.tsx
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { render, screen, waitFor } from 'spec/helpers/testing-library';
+import { render, screen, waitFor } from '@superset-ui/core/spec';
 import type { ColumnsType } from 'antd/es/table';
 import { Table, TableSize } from './index';
 
diff --git a/superset-frontend/src/components/Table/TableOverview.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/Table/TableOverview.stories.tsx
similarity index 98%
rename from superset-frontend/src/components/Table/TableOverview.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Table/TableOverview.stories.tsx
index 88e411e8c1e..acbb24fffbf 100644
--- a/superset-frontend/src/components/Table/TableOverview.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Table/TableOverview.stories.tsx
@@ -127,7 +127,7 @@ of the data object for that row, as the first argument of the sorter function.
 The alphabeticalSort is for columns that display a string of text.
 
 \`\`\`
-import { alphabeticalSort } from 'src/components/Table/sorters';
+import { alphabeticalSort } from '@superset-ui/core/components/Table/sorters';
 
 const basicColumns = [
   {
@@ -359,7 +359,7 @@ you can register \`onDragOver\` and \`onDragDrop\` event handlers on the destina
 as the getData key as shown below.
 
 \`\`\`
-import { SUPERSET_TABLE_COLUMN } from 'src/components/table';
+import { SUPERSET_TABLE_COLUMN } from '@superset-ui/core/components/table';
 
 const handleDrop = (ev:Event) => {
   const json = ev.dataTransfer?.getData?.(SUPERSET_TABLE_COLUMN);
diff --git a/superset-frontend/src/components/Table/VirtualTable.tsx b/superset-frontend/packages/superset-ui-core/src/components/Table/VirtualTable.tsx
similarity index 90%
rename from superset-frontend/src/components/Table/VirtualTable.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Table/VirtualTable.tsx
index 7e2f97a6e5d..2ab0be3980c 100644
--- a/superset-frontend/src/components/Table/VirtualTable.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Table/VirtualTable.tsx
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-// eslint-disable-next-line no-restricted-imports
-import AntTable, {
+import { Table as AntTable } from 'antd';
+import {
   TablePaginationConfig,
   TableProps as AntTableProps,
-} from 'antd/lib/table'; // TODO: Remove antd
+} from 'antd/es/table';
 import classNames from 'classnames';
 import { useResizeDetector } from 'react-resize-detector';
 import { useEffect, useRef, useState, useCallback, CSSProperties } from 'react';
@@ -30,7 +30,8 @@ import { useTheme, styled, safeHtmlSpan } from '@superset-ui/core';
 
 import { TableSize, ETableAction } from './index';
 
-interface VirtualTableProps<RecordType> extends AntTableProps<RecordType> {
+export interface VirtualTableProps<RecordType>
+  extends AntTableProps<RecordType> {
   height?: number;
   allowHTML?: boolean;
 }
@@ -40,34 +41,30 @@ const StyledCell = styled('div')<{ height?: number }>(
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
-  padding-left: ${theme.gridUnit * 2}px;
-  padding-right: ${theme.gridUnit}px;
-  border-bottom: 1px solid ${theme.colors.grayscale.light3};
+  padding-left: ${theme.sizeUnit * 2}px;
+  padding-right: ${theme.sizeUnit}px;
+  border-bottom: 1px solid ${theme.colorSplit};
   transition: background 0.3s;
   line-height: ${height}px;
   box-sizing: border-box;
 `,
 );
 
-const StyledTable = styled(AntTable)<{ height?: number }>(
+const StyledTable = styled(AntTable)(
   ({ theme }) => `
     th.ant-table-cell {
-      font-weight: ${theme.typography.weights.bold};
-      color: ${theme.colors.grayscale.dark1};
+      font-weight: ${theme.fontWeightStrong};
       white-space: nowrap;
       overflow: hidden;
       text-overflow: ellipsis;
     }
 
-    .ant-pagination-item-active {
-      border-color: ${theme.colors.primary.base};
-      }
-    }
-    .ant-table.ant-table-small {
-      font-size: ${theme.typography.sizes.s}px;
+    .ant-spin-nested-loading .ant-spin .ant-spin-dot {
+      width: ${theme.sizeUnit * 12}px;
+      height: unset;
     }
 `,
-);
+) as unknown as typeof AntTable;
 
 const SMALL = 39;
 const MIDDLE = 47;
@@ -92,7 +89,7 @@ const VirtualTable = <RecordType extends object>(
   const theme = useTheme();
 
   // If a column definition has no width, react-window will use this as the default column width
-  const DEFAULT_COL_WIDTH = theme?.gridUnit * 37 || 150;
+  const DEFAULT_COL_WIDTH = theme?.sizeUnit * 37 || 150;
   const widthColumnCount = columns!.filter(({ width }) => !width).length;
   let staticColWidthTotal = 0;
   columns?.forEach(column => {
@@ -184,7 +181,10 @@ const VirtualTable = <RecordType extends object>(
     );
   };
 
-  const renderVirtualList = (rawData: object[], { ref, onScroll }: any) => {
+  const renderVirtualList = (
+    rawData: readonly object[],
+    { ref, onScroll }: any,
+  ) => {
     // eslint-disable-next-line no-param-reassign
     ref.current = connectObject;
     const cellSize = size === TableSize.Middle ? MIDDLE : SMALL;
@@ -259,11 +259,12 @@ const VirtualTable = <RecordType extends object>(
         {...props}
         sticky={false}
         className="virtual-table"
-        columns={mergedColumns}
         components={{
           body: renderVirtualList,
         }}
         pagination={pagination ? modifiedPagination : false}
+        scroll={scroll}
+        columns={mergedColumns}
       />
     </div>
   );
diff --git a/superset-frontend/src/components/Table/cell-renderers/ActionCell/ActionCell.overview.tsx b/superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/ActionCell/ActionCell.overview.tsx
similarity index 100%
rename from superset-frontend/src/components/Table/cell-renderers/ActionCell/ActionCell.overview.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/ActionCell/ActionCell.overview.tsx
diff --git a/superset-frontend/src/components/Table/cell-renderers/ActionCell/ActionCell.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/ActionCell/ActionCell.stories.tsx
similarity index 100%
rename from superset-frontend/src/components/Table/cell-renderers/ActionCell/ActionCell.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/ActionCell/ActionCell.stories.tsx
diff --git a/superset-frontend/src/components/Table/cell-renderers/ActionCell/ActionCell.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/ActionCell/ActionCell.test.tsx
similarity index 87%
rename from superset-frontend/src/components/Table/cell-renderers/ActionCell/ActionCell.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/ActionCell/ActionCell.test.tsx
index c17ac0196b5..0da17300839 100644
--- a/superset-frontend/src/components/Table/cell-renderers/ActionCell/ActionCell.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/ActionCell/ActionCell.test.tsx
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { render, screen, userEvent } from 'spec/helpers/testing-library';
+import { render, screen, userEvent } from '@superset-ui/core/spec';
 import ActionCell, { appendDataToMenu } from './index';
 import { exampleMenuOptions, exampleRow } from './fixtures';
 
@@ -25,13 +25,13 @@ test('renders with default props', async () => {
   exampleMenuOptions[0].onClick = clickHandler;
   render(<ActionCell menuOptions={exampleMenuOptions} row={exampleRow} />);
   // Open the menu
-  userEvent.click(await screen.findByTestId('dropdown-trigger'));
+  await userEvent.click(await screen.findByTestId('dropdown-trigger'));
   // verify all of the menu items are being displayed
-  exampleMenuOptions.forEach((item, index) => {
+  exampleMenuOptions.forEach(async (item, index) => {
     expect(screen.getByText(item.label)).toBeInTheDocument();
     if (index === 0) {
       // verify the menu items' onClick gets invoked
-      userEvent.click(screen.getByText(item.label));
+      await userEvent.click(screen.getByText(item.label));
     }
   });
   expect(clickHandler).toHaveBeenCalled();
diff --git a/superset-frontend/src/components/Table/cell-renderers/ActionCell/fixtures.ts b/superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/ActionCell/fixtures.ts
similarity index 100%
rename from superset-frontend/src/components/Table/cell-renderers/ActionCell/fixtures.ts
rename to superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/ActionCell/fixtures.ts
diff --git a/superset-frontend/src/components/Table/cell-renderers/ActionCell/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/ActionCell/index.tsx
similarity index 88%
rename from superset-frontend/src/components/Table/cell-renderers/ActionCell/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/ActionCell/index.tsx
index 5b404ccbdd7..b1017f6df8a 100644
--- a/superset-frontend/src/components/Table/cell-renderers/ActionCell/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/ActionCell/index.tsx
@@ -18,8 +18,9 @@
  */
 import { useState, useEffect } from 'react';
 import { styled } from '@superset-ui/core';
-import { MenuDotsDropdown, IconOrientation } from 'src/components/Dropdown';
-import { Menu, MenuProps } from 'src/components/Menu';
+import { MenuDotsDropdown } from '../../../Dropdown';
+import { IconOrientation } from '../../../Dropdown/types';
+import { Menu, MenuProps } from '../../../Menu';
 
 /**
  * Props interface for Action Cell Renderer
@@ -102,11 +103,15 @@ function ActionMenu(props: ActionMenuProps) {
   };
 
   return (
-    <StyledMenu onClick={handleClick}>
-      {menuOptions?.map?.((option: ActionMenuItem, index: number) => (
-        <Menu.Item key={index}>{option?.label}</Menu.Item>
-      ))}
-    </StyledMenu>
+    <StyledMenu
+      onClick={handleClick}
+      items={menuOptions.map((option: ActionMenuItem, index: number) => ({
+        key: index.toString(),
+        label: option?.label,
+        title: option?.tooltip,
+        onClick: () => option?.onClick?.(option),
+      }))}
+    />
   );
 }
 
@@ -128,7 +133,7 @@ export function ActionCell(props: ActionCellProps) {
   return (
     <MenuDotsDropdown
       iconOrientation={IconOrientation.Horizontal}
-      onVisibleChange={handleVisibleChange}
+      onOpenChange={handleVisibleChange}
       trigger={['click']}
       overlay={
         <ActionMenu menuOptions={appendedMenuOptions} setVisible={setVisible} />
@@ -136,7 +141,7 @@ export function ActionCell(props: ActionCellProps) {
       disabled={
         !(appendedMenuOptions?.length && appendedMenuOptions.length > 0)
       }
-      visible={visible}
+      open={visible}
     />
   );
 }
diff --git a/superset-frontend/src/components/Table/cell-renderers/BooleanCell/BooleanCell.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/BooleanCell/BooleanCell.stories.tsx
similarity index 100%
rename from superset-frontend/src/components/Table/cell-renderers/BooleanCell/BooleanCell.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/BooleanCell/BooleanCell.stories.tsx
diff --git a/superset-frontend/src/components/Table/cell-renderers/BooleanCell/BooleanCell.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/BooleanCell/BooleanCell.test.tsx
similarity index 75%
rename from superset-frontend/src/components/Table/cell-renderers/BooleanCell/BooleanCell.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/BooleanCell/BooleanCell.test.tsx
index 7853e6a892b..6060b5cfe4e 100644
--- a/superset-frontend/src/components/Table/cell-renderers/BooleanCell/BooleanCell.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/BooleanCell/BooleanCell.test.tsx
@@ -16,21 +16,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { render, screen } from 'spec/helpers/testing-library';
-import { BOOL_FALSE_DISPLAY, BOOL_TRUE_DISPLAY } from 'src/constants';
+import { render, screen } from '@superset-ui/core/spec';
+import { Constants } from '@superset-ui/core/components';
 import BooleanCell from '.';
 
 test('renders true value', async () => {
   render(<BooleanCell value />);
-  expect(screen.getByText(BOOL_TRUE_DISPLAY)).toBeInTheDocument();
+  expect(screen.getByText(Constants.BOOL_TRUE_DISPLAY)).toBeInTheDocument();
 });
 
 test('renders false value', async () => {
   render(<BooleanCell value={false} />);
-  expect(screen.getByText(BOOL_FALSE_DISPLAY)).toBeInTheDocument();
+  expect(screen.getByText(Constants.BOOL_FALSE_DISPLAY)).toBeInTheDocument();
 });
 
 test('renders falsy value', async () => {
   render(<BooleanCell />);
-  expect(screen.getByText(BOOL_FALSE_DISPLAY)).toBeInTheDocument();
+  expect(screen.getByText(Constants.BOOL_FALSE_DISPLAY)).toBeInTheDocument();
 });
diff --git a/superset-frontend/src/components/Table/cell-renderers/BooleanCell/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/BooleanCell/index.tsx
similarity index 84%
rename from superset-frontend/src/components/Table/cell-renderers/BooleanCell/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/BooleanCell/index.tsx
index e12060737ed..353e7461f3d 100644
--- a/superset-frontend/src/components/Table/cell-renderers/BooleanCell/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/BooleanCell/index.tsx
@@ -16,14 +16,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { BOOL_FALSE_DISPLAY, BOOL_TRUE_DISPLAY } from 'src/constants';
+import { Constants } from '@superset-ui/core/components';
 
 export interface BooleanCellProps {
   value?: boolean;
 }
 
 function BooleanCell({ value }: BooleanCellProps) {
-  return <span>{value ? BOOL_TRUE_DISPLAY : BOOL_FALSE_DISPLAY}</span>;
+  return (
+    <span>
+      {value ? Constants.BOOL_TRUE_DISPLAY : Constants.BOOL_FALSE_DISPLAY}
+    </span>
+  );
 }
 
 export default BooleanCell;
diff --git a/superset-frontend/src/components/Table/cell-renderers/ButtonCell/ButtonCell.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/ButtonCell/ButtonCell.stories.tsx
similarity index 100%
rename from superset-frontend/src/components/Table/cell-renderers/ButtonCell/ButtonCell.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/ButtonCell/ButtonCell.stories.tsx
diff --git a/superset-frontend/src/components/Table/cell-renderers/ButtonCell/ButtonCell.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/ButtonCell/ButtonCell.test.tsx
similarity index 94%
rename from superset-frontend/src/components/Table/cell-renderers/ButtonCell/ButtonCell.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/ButtonCell/ButtonCell.test.tsx
index e7162f954ab..e9a8f8c97e5 100644
--- a/superset-frontend/src/components/Table/cell-renderers/ButtonCell/ButtonCell.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/ButtonCell/ButtonCell.test.tsx
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { render, screen, userEvent } from 'spec/helpers/testing-library';
+import { render, screen, userEvent } from '@superset-ui/core/spec';
 import ButtonCell from './index';
 import { exampleRow } from '../fixtures';
 
diff --git a/superset-frontend/src/components/Table/cell-renderers/ButtonCell/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/ButtonCell/index.tsx
similarity index 93%
rename from superset-frontend/src/components/Table/cell-renderers/ButtonCell/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/ButtonCell/index.tsx
index 1ffa483a0b9..70d6f395dcc 100644
--- a/superset-frontend/src/components/Table/cell-renderers/ButtonCell/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/ButtonCell/index.tsx
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import Button, { ButtonStyle, ButtonSize } from 'src/components/Button';
+import { Button } from '../../../Button';
+import { ButtonStyle, ButtonSize } from '../../../Button/types';
 
 type onClickFunction = (row: object, index: number) => void;
 
diff --git a/superset-frontend/src/components/Table/cell-renderers/NullCell/NullCell.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/NullCell/NullCell.stories.tsx
similarity index 100%
rename from superset-frontend/src/components/Table/cell-renderers/NullCell/NullCell.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/NullCell/NullCell.stories.tsx
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/NullCell/NullCell.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/NullCell/NullCell.test.tsx
new file mode 100644
index 00000000000..4a11cd737af
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/NullCell/NullCell.test.tsx
@@ -0,0 +1,26 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { render, screen } from '@superset-ui/core/spec';
+import { Constants } from '../../..';
+import NullCell from '.';
+
+test('renders null value', async () => {
+  render(<NullCell />);
+  expect(screen.getByText(Constants.NULL_DISPLAY)).toBeInTheDocument();
+});
diff --git a/superset-frontend/src/components/Table/cell-renderers/NullCell/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/NullCell/index.tsx
similarity index 87%
rename from superset-frontend/src/components/Table/cell-renderers/NullCell/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/NullCell/index.tsx
index 52fe59af9f1..e01b7c672ec 100644
--- a/superset-frontend/src/components/Table/cell-renderers/NullCell/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/NullCell/index.tsx
@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { styled } from '@superset-ui/core';
-import { NULL_DISPLAY } from 'src/constants';
+import { styled } from '../../../..';
+import { Constants } from '../../..';
 
 const GrayCell = styled.span`
   color: ${({ theme }) => theme.colors.grayscale.light1};
 `;
 
 function NullCell() {
-  return <GrayCell>{NULL_DISPLAY}</GrayCell>;
+  return <GrayCell>{Constants.NULL_DISPLAY}</GrayCell>;
 }
 
 export default NullCell;
diff --git a/superset-frontend/src/components/Table/cell-renderers/NumericCell/NumericCell.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/NumericCell/NumericCell.stories.tsx
similarity index 100%
rename from superset-frontend/src/components/Table/cell-renderers/NumericCell/NumericCell.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/NumericCell/NumericCell.stories.tsx
diff --git a/superset-frontend/src/components/Table/cell-renderers/NumericCell/NumericCell.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/NumericCell/NumericCell.test.tsx
similarity index 96%
rename from superset-frontend/src/components/Table/cell-renderers/NumericCell/NumericCell.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/NumericCell/NumericCell.test.tsx
index 7319942b69b..dbda8e91ed8 100644
--- a/superset-frontend/src/components/Table/cell-renderers/NumericCell/NumericCell.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/NumericCell/NumericCell.test.tsx
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { render, screen } from 'spec/helpers/testing-library';
+import { render, screen } from '@superset-ui/core/spec';
 import NumericCell, { CurrencyCode, LocaleCode, Style } from './index';
 
 test('renders with French locale and Euro currency format', () => {
diff --git a/superset-frontend/src/components/Table/cell-renderers/NumericCell/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/NumericCell/index.tsx
similarity index 100%
rename from superset-frontend/src/components/Table/cell-renderers/NumericCell/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/NumericCell/index.tsx
diff --git a/superset-frontend/src/components/Table/cell-renderers/TimeCell/TimeCell.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/TimeCell/TimeCell.stories.tsx
similarity index 100%
rename from superset-frontend/src/components/Table/cell-renderers/TimeCell/TimeCell.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/TimeCell/TimeCell.stories.tsx
diff --git a/superset-frontend/src/components/Table/cell-renderers/TimeCell/TimeCell.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/TimeCell/TimeCell.test.tsx
similarity index 96%
rename from superset-frontend/src/components/Table/cell-renderers/TimeCell/TimeCell.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/TimeCell/TimeCell.test.tsx
index 30b8f2f67b2..811a7b7d2fb 100644
--- a/superset-frontend/src/components/Table/cell-renderers/TimeCell/TimeCell.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/TimeCell/TimeCell.test.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { TimeFormats } from '@superset-ui/core';
-import { render, screen } from 'spec/helpers/testing-library';
+import { render, screen } from '@superset-ui/core/spec';
 import TimeCell from '.';
 
 const DATE = Date.parse('2022-01-01');
diff --git a/superset-frontend/src/components/Table/cell-renderers/TimeCell/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/TimeCell/index.tsx
similarity index 100%
rename from superset-frontend/src/components/Table/cell-renderers/TimeCell/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/TimeCell/index.tsx
diff --git a/superset-frontend/src/components/Table/cell-renderers/fixtures.ts b/superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/fixtures.ts
similarity index 100%
rename from superset-frontend/src/components/Table/cell-renderers/fixtures.ts
rename to superset-frontend/packages/superset-ui-core/src/components/Table/cell-renderers/fixtures.ts
diff --git a/superset-frontend/src/components/Table/header-renderers/HeaderWithRadioGroup.tsx b/superset-frontend/packages/superset-ui-core/src/components/Table/header-renderers/HeaderWithRadioGroup.tsx
similarity index 85%
rename from superset-frontend/src/components/Table/header-renderers/HeaderWithRadioGroup.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Table/header-renderers/HeaderWithRadioGroup.tsx
index c6e9562301c..cd54635b064 100644
--- a/superset-frontend/src/components/Table/header-renderers/HeaderWithRadioGroup.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Table/header-renderers/HeaderWithRadioGroup.tsx
@@ -17,10 +17,8 @@
  * under the License.
  */
 import { useState } from 'react';
-import { css, useTheme } from '@superset-ui/core';
-import { Radio } from 'src/components/Radio';
-import { Icons } from 'src/components/Icons';
-import Popover from 'src/components/Popover';
+import { css, useTheme } from '../../..';
+import { Icons, Radio, Popover } from '../..';
 
 export interface HeaderWithRadioGroupProps {
   headerTitle: string;
@@ -49,8 +47,8 @@ function HeaderWithRadioGroup(props: HeaderWithRadioGroupProps) {
           <div>
             <div
               css={css`
-                font-weight: ${theme.typography.weights.bold};
-                margin-bottom: ${theme.gridUnit}px;
+                font-weight: ${theme.fontWeightStrong};
+                margin-bottom: ${theme.sizeUnit}px;
               `}
             >
               {groupTitle}
@@ -78,8 +76,8 @@ function HeaderWithRadioGroup(props: HeaderWithRadioGroupProps) {
           iconSize="m"
           iconColor={theme.colors.grayscale.light1}
           css={css`
-            margin-top: ${theme.gridUnit * 0.75}px;
-            margin-right: ${theme.gridUnit}px;
+            margin-top: ${theme.sizeUnit * 0.75}px;
+            margin-right: ${theme.sizeUnit}px;
           `}
           onClick={() => setPopoverVisible(true)}
         />
diff --git a/superset-frontend/src/components/Table/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Table/index.tsx
similarity index 91%
rename from superset-frontend/src/components/Table/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Table/index.tsx
index b16f254a27e..945183d7bd7 100644
--- a/superset-frontend/src/components/Table/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Table/index.tsx
@@ -16,21 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { useState, useEffect, useRef, Key } from 'react';
+import { useState, useEffect, useRef, Key, FC } from 'react';
 
-// eslint-disable-next-line no-restricted-imports
-import AntTable, {
-  ColumnsType,
-  TableProps as AntTableProps,
-} from 'antd/lib/table'; // TODO: Remove antd
-// eslint-disable-next-line no-restricted-imports
-import { PaginationProps } from 'antd/lib/pagination'; // TODO: Remove antd
+import { Table as AntTable } from 'antd';
+import { ColumnsType, TableProps as AntTableProps } from 'antd/es/table';
+import { PaginationProps } from 'antd/es/pagination';
 import { t, useTheme, logging, styled } from '@superset-ui/core';
-import Loading from 'src/components/Loading';
-// eslint-disable-next-line no-restricted-imports
-import { RowSelectionType } from 'antd/lib/table/interface'; // TODO: Remove antd
+import { Loading } from '@superset-ui/core/components';
+import { RowSelectionType } from 'antd/es/table/interface';
 import InteractiveTableUtils from './utils/InteractiveTableUtils';
-import VirtualTable from './VirtualTable';
+import VirtualTable, { VirtualTableProps } from './VirtualTable';
 
 export const SUPERSET_TABLE_COLUMN = 'superset/table-column';
 
@@ -49,15 +44,18 @@ export enum ETableAction {
 }
 
 export type { ColumnsType };
+export type { TablePaginationConfig } from 'antd/es/table';
+export type { SorterResult } from 'antd/es/table/interface';
 export type OnChangeFunction<RecordType> =
   AntTableProps<RecordType>['onChange'];
 
 export enum TableSize {
   Small = 'small',
   Middle = 'middle',
+  Large = 'large',
 }
 
-export interface TableProps<RecordType> {
+export interface TableProps<RecordType> extends AntTableProps<RecordType> {
   /**
    * Data that will populate the each row and map to the column key.
    */
@@ -81,7 +79,7 @@ export interface TableProps<RecordType> {
   /**
    * Controls the size of the table.
    */
-  size: TableSize;
+  size?: TableSize;
   /**
    * Controls if table rows are selectable and if multiple select is supported.
    */
@@ -163,16 +161,20 @@ const defaultRowSelection: Key[] = [];
 const PAGINATION_HEIGHT = 40;
 const HEADER_HEIGHT = 68;
 
-const StyledTable = styled(AntTable)<{ height?: number }>(
+const StyledTable = styled(AntTable as FC<AntTableProps>)<{ height?: number }>(
   ({ theme, height }) => `
+    color: ${theme.colorText};
     .ant-table-body {
       overflow: auto;
       height: ${height ? `${height}px` : undefined};
     }
 
-    th.ant-table-cell {
-      font-weight: ${theme.typography.weights.bold};
-      color: ${theme.colors.grayscale.dark1};
+    .ant-spin-nested-loading .ant-spin .ant-spin-dot {
+      width: ${theme.sizeXXL}px;
+      height: unset;
+    }
+
+   td.ant-table-cell {
       white-space: nowrap;
       overflow: hidden;
       text-overflow: ellipsis;
@@ -181,20 +183,16 @@ const StyledTable = styled(AntTable)<{ height?: number }>(
     .ant-table-tbody > tr > td {
       white-space: nowrap;
       overflow: hidden;
-      text-overflow: ellipsis;
-      border-bottom: 1px solid ${theme.colors.grayscale.light3};
-    }
-
-    .ant-pagination-item-active {
-      border-color: ${theme.colors.primary.base};
     }
 
     .ant-table.ant-table-small {
-      font-size: ${theme.typography.sizes.s}px;
+      font-size: ${theme.fontSizeSM}px;
     }
   `,
 );
-const StyledVirtualTable = styled(VirtualTable)(
+const StyledVirtualTable = styled(
+  VirtualTable as React.FC<VirtualTableProps<any>>,
+)(
   ({ theme }) => `
   .virtual-table .ant-table-container:before,
   .virtual-table .ant-table-container:after {
@@ -202,7 +200,7 @@ const StyledVirtualTable = styled(VirtualTable)(
   }
   .virtual-table-cell {
     box-sizing: border-box;
-    padding: ${theme.gridUnit * 4}px;
+    padding: ${theme.sizeUnit * 4}px;
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
@@ -264,6 +262,7 @@ export function Table<RecordType extends object>(
     onRow,
     allowHTML = false,
     childrenColumnName,
+    ...rest
   } = props;
 
   const wrapperRef = useRef<HTMLDivElement | null>(null);
@@ -405,6 +404,7 @@ export function Table<RecordType extends object>(
           {...sharedProps}
           rowSelection={selectionTypeValue !== null ? rowSelection : undefined}
           sticky={sticky}
+          {...rest}
         />
       )}
       {virtualize && (
@@ -419,6 +419,7 @@ export function Table<RecordType extends object>(
             }),
           }}
           allowHTML={allowHTML}
+          {...rest}
         />
       )}
     </div>
diff --git a/superset-frontend/src/components/Table/sorters.test.ts b/superset-frontend/packages/superset-ui-core/src/components/Table/sorters.test.ts
similarity index 100%
rename from superset-frontend/src/components/Table/sorters.test.ts
rename to superset-frontend/packages/superset-ui-core/src/components/Table/sorters.test.ts
diff --git a/superset-frontend/src/components/Table/sorters.ts b/superset-frontend/packages/superset-ui-core/src/components/Table/sorters.ts
similarity index 100%
rename from superset-frontend/src/components/Table/sorters.ts
rename to superset-frontend/packages/superset-ui-core/src/components/Table/sorters.ts
diff --git a/superset-frontend/src/components/Table/utils/InteractiveTableUtils.ts b/superset-frontend/packages/superset-ui-core/src/components/Table/utils/InteractiveTableUtils.ts
similarity index 97%
rename from superset-frontend/src/components/Table/utils/InteractiveTableUtils.ts
rename to superset-frontend/packages/superset-ui-core/src/components/Table/utils/InteractiveTableUtils.ts
index 70030a3bc47..021ef81ff30 100644
--- a/superset-frontend/src/components/Table/utils/InteractiveTableUtils.ts
+++ b/superset-frontend/packages/superset-ui-core/src/components/Table/utils/InteractiveTableUtils.ts
@@ -16,9 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-// eslint-disable-next-line no-restricted-imports
-import type { ColumnsType } from 'antd/es/table'; // TODO: Remove antd
-import { SUPERSET_TABLE_COLUMN } from 'src/components/Table';
+import type { ColumnsType } from 'antd/es/table';
+import { SUPERSET_TABLE_COLUMN } from '..';
 import { withinRange } from './utils';
 
 interface IInteractiveColumn extends HTMLElement {
diff --git a/superset-frontend/src/components/Table/utils/utils.test.ts b/superset-frontend/packages/superset-ui-core/src/components/Table/utils/utils.test.ts
similarity index 97%
rename from superset-frontend/src/components/Table/utils/utils.test.ts
rename to superset-frontend/packages/superset-ui-core/src/components/Table/utils/utils.test.ts
index 267817d3f7e..fc60729dc98 100644
--- a/superset-frontend/src/components/Table/utils/utils.test.ts
+++ b/superset-frontend/packages/superset-ui-core/src/components/Table/utils/utils.test.ts
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { cleanup } from 'spec/helpers/testing-library';
+import { cleanup } from '@superset-ui/core/spec';
 import { withinRange } from './utils';
 
 // Add cleanup after each test
diff --git a/superset-frontend/src/components/Table/utils/utils.ts b/superset-frontend/packages/superset-ui-core/src/components/Table/utils/utils.ts
similarity index 100%
rename from superset-frontend/src/components/Table/utils/utils.ts
rename to superset-frontend/packages/superset-ui-core/src/components/Table/utils/utils.ts
diff --git a/superset-frontend/src/components/TableCollection/TableCollection.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/TableCollection/TableCollection.test.tsx
similarity index 63%
rename from superset-frontend/src/components/TableCollection/TableCollection.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/TableCollection/TableCollection.test.tsx
index 6600ed98f70..52461fff66a 100644
--- a/superset-frontend/src/components/TableCollection/TableCollection.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/TableCollection/TableCollection.test.tsx
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { render, screen } from 'spec/helpers/testing-library';
+import { render, screen } from '@superset-ui/core/spec';
 import { renderHook } from '@testing-library/react-hooks';
 import { TableInstance, useTable } from 'react-table';
 import TableCollection from '.';
@@ -29,10 +29,12 @@ beforeEach(() => {
     {
       Header: 'Column 1',
       accessor: 'col1',
+      id: 'col1',
     },
     {
       Header: 'Column 2',
       accessor: 'col2',
+      id: 'col2',
     },
   ];
   const data = [
@@ -61,17 +63,18 @@ beforeEach(() => {
     highlightRowId: 1,
     getTableProps: jest.fn(),
     getTableBodyProps: jest.fn(),
+    sticky: false,
   };
 });
 
-test('Should headers visible', () => {
+test('Headers should be visible', () => {
   render(<TableCollection {...defaultProps} />);
 
-  expect(screen.getByRole('columnheader', { name: 'Column 1' })).toBeVisible();
-  expect(screen.getByRole('columnheader', { name: 'Column 2' })).toBeVisible();
+  expect(screen.getByText('Column 1')).toBeVisible();
+  expect(screen.getByText('Column 2')).toBeVisible();
 });
 
-test('Should the body visible', () => {
+test('Body should be visible', () => {
   render(<TableCollection {...defaultProps} />);
 
   expect(screen.getByText('Line 01 - Col 01')).toBeVisible();
@@ -84,30 +87,16 @@ test('Should the body visible', () => {
   expect(screen.getByText('Line 03 - Col 02')).toBeVisible();
 });
 
-test('Should the body content not be visible during loading', () => {
+test('Body content should be blurred loading', () => {
   render(<TableCollection {...defaultProps} loading />);
 
-  expect(screen.getByText('Line 01 - Col 01')).toBeInTheDocument();
-  expect(screen.getByText('Line 01 - Col 01')).not.toBeVisible();
-  expect(screen.getByText('Line 01 - Col 02')).toBeInTheDocument();
-  expect(screen.getByText('Line 01 - Col 02')).not.toBeVisible();
-
-  expect(screen.getByText('Line 02 - Col 01')).toBeInTheDocument();
-  expect(screen.getByText('Line 02 - Col 01')).not.toBeVisible();
-  expect(screen.getByText('Line 02 - Col 02')).toBeInTheDocument();
-  expect(screen.getByText('Line 02 - Col 02')).not.toBeVisible();
-
-  expect(screen.getByText('Line 03 - Col 01')).toBeInTheDocument();
-  expect(screen.getByText('Line 03 - Col 01')).not.toBeVisible();
-  expect(screen.getByText('Line 03 - Col 02')).toBeInTheDocument();
-  expect(screen.getByText('Line 03 - Col 02')).not.toBeVisible();
+  expect(screen.getByTestId('listview-table').parentNode).toHaveClass(
+    'ant-spin-blur',
+  );
 });
 
-test('Should the loading bar be visible during loading', () => {
+test('Should the loading-indicator be visible during loading', () => {
   render(<TableCollection {...defaultProps} loading />);
 
-  expect(screen.getAllByRole('progressbar')).toHaveLength(6);
-  screen
-    .getAllByRole('progressbar')
-    .forEach(progressbar => expect(progressbar).toBeVisible());
+  expect(screen.getByTestId('loading-indicator')).toBeVisible();
 });
diff --git a/superset-frontend/packages/superset-ui-core/src/components/TableCollection/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/TableCollection/index.tsx
new file mode 100644
index 00000000000..e5c0fa0514c
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/TableCollection/index.tsx
@@ -0,0 +1,184 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { HTMLAttributes, memo, useMemo } from 'react';
+import {
+  ColumnInstance,
+  HeaderGroup,
+  Row,
+  SortingRule,
+  TableBodyPropGetter,
+  TablePropGetter,
+} from 'react-table';
+import { styled } from '@superset-ui/core';
+import { Table, TableSize } from '@superset-ui/core/components/Table';
+import { TableRowSelection, SorterResult } from 'antd/es/table/interface';
+import { mapColumns, mapRows } from './utils';
+
+interface TableCollectionProps<T extends object> {
+  getTableProps: TablePropGetter<T>;
+  getTableBodyProps: TableBodyPropGetter<T>;
+  prepareRow: (row: Row<T>) => void;
+  headerGroups: HeaderGroup<T>[];
+  rows: Row<T>[];
+  columns: ColumnInstance<T>[];
+  loading: boolean;
+  highlightRowId?: number;
+  columnsForWrapText?: string[];
+  setSortBy?: (updater: SortingRule<T>[]) => void;
+  bulkSelectEnabled?: boolean;
+  selectedFlatRows?: Row<T>[];
+  toggleRowSelected?: (rowId: string, value: boolean) => void;
+  toggleAllRowsSelected?: (value?: boolean) => void;
+  sticky?: boolean;
+  size?: TableSize;
+}
+
+const StyledTable = styled(Table)`
+  ${({ theme }) => `
+    th.ant-column-cell {
+      min-width: fit-content;
+    }
+    .actions {
+      opacity: 0;
+      font-size: ${theme.fontSizeXL}px;
+      display: flex;
+      white-space: nowrap;
+      min-width: 100px;
+      .action-button {
+        margin-right: ${theme.sizeUnit * 2}px;
+        cursor: pointer;
+        &:hover {
+          path {
+            fill: ${theme.colorPrimary};
+          }
+        }
+      }
+    }
+    .ant-table-column-title {
+      line-height: initial;
+    }
+    .ant-table-row:hover {
+      .actions {
+        opacity: 1;
+        transition: opacity ease-in ${theme.motionDurationMid};
+      }
+    }
+    .ant-table-cell {
+      font-feature-settings: 'tnum' 1;
+      text-overflow: ellipsis;
+      overflow: hidden;
+      max-width: 320px;
+      line-height: 1;
+      vertical-align: middle;
+      padding-left: ${theme.sizeUnit * 4}px;
+      white-space: nowrap;
+    }
+    .ant-table-placeholder .ant-table-cell {
+      border-bottom: 0;
+    }
+  `}
+`;
+
+function TableCollection<T extends object>({
+  columns,
+  rows,
+  loading,
+  setSortBy,
+  headerGroups,
+  columnsForWrapText,
+  bulkSelectEnabled = false,
+  selectedFlatRows = [],
+  toggleRowSelected,
+  toggleAllRowsSelected,
+  prepareRow,
+  sticky,
+  size = TableSize.Middle,
+}: TableCollectionProps<T>) {
+  const mappedColumns = mapColumns<T>(
+    columns,
+    headerGroups,
+    columnsForWrapText,
+  );
+  const mappedRows = mapRows(rows, prepareRow);
+
+  const selectedRowKeys = useMemo(
+    () => selectedFlatRows?.map(row => row.id) || [],
+    [selectedFlatRows],
+  );
+
+  const rowSelection: TableRowSelection | undefined = useMemo(() => {
+    if (!bulkSelectEnabled) return undefined;
+
+    return {
+      selectedRowKeys,
+      onSelect: (record, selected) => {
+        toggleRowSelected?.(record.rowId, selected);
+      },
+      onSelectAll: (selected: boolean) => {
+        toggleAllRowsSelected?.(selected);
+      },
+    };
+  }, [
+    bulkSelectEnabled,
+    selectedRowKeys,
+    toggleRowSelected,
+    toggleAllRowsSelected,
+  ]);
+  return (
+    <StyledTable
+      loading={loading}
+      sticky={sticky ?? false}
+      columns={mappedColumns}
+      data={mappedRows}
+      size={size}
+      data-test="listview-table"
+      pagination={false}
+      tableLayout="auto"
+      rowKey="rowId"
+      rowSelection={rowSelection}
+      locale={{ emptyText: null }}
+      sortDirections={['ascend', 'descend', 'ascend']}
+      components={{
+        header: {
+          cell: (props: HTMLAttributes<HTMLTableCellElement>) => (
+            <th {...props} data-test="sort-header" role="columnheader" />
+          ),
+        },
+        body: {
+          row: (props: HTMLAttributes<HTMLTableRowElement>) => (
+            <tr {...props} data-test="table-row" />
+          ),
+          cell: (props: HTMLAttributes<HTMLTableCellElement>) => (
+            <td {...props} data-test="table-row-cell" />
+          ),
+        },
+      }}
+      onChange={(_pagination, _filters, sorter: SorterResult) => {
+        setSortBy?.([
+          {
+            id: sorter.field,
+            desc: sorter.order === 'descend',
+          },
+        ] as SortingRule<T>[]);
+      }}
+    />
+  );
+}
+
+export default memo(TableCollection);
diff --git a/superset-frontend/packages/superset-ui-core/src/components/TableCollection/utils.tsx b/superset-frontend/packages/superset-ui-core/src/components/TableCollection/utils.tsx
new file mode 100644
index 00000000000..0cbf1175d06
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/TableCollection/utils.tsx
@@ -0,0 +1,137 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+
+/**
+ * This file contains utility functions for mapping columns and rows.
+ * These functions act as a compatibility layer between Ant Design Table and react-table.
+ */
+
+import { ReactNode } from 'react';
+import {
+  CellValue,
+  Row,
+  ColumnInstance as RTColumnInstance,
+  HeaderGroup as RTHeaderGroup,
+  UseSortByColumnOptions,
+  UseSortByColumnProps,
+  UseResizeColumnsColumnOptions,
+  UseResizeColumnsColumnProps,
+} from 'react-table';
+
+import { SortOrder } from '../Table';
+
+type TableSize = 'xs' | 'sm' | 'md' | 'lg' | 'xl' | 'xxl';
+
+type RowWithId<T extends object> = Row<T> & { rowId: string };
+
+const COLUMN_SIZE_MAP: Record<TableSize, number> = {
+  xs: 25,
+  sm: 50,
+  md: 75,
+  lg: 100,
+  xl: 150,
+  xxl: 200,
+};
+
+type EnhancedColumnInstance<T extends object = any> = RTColumnInstance<T> &
+  Partial<UseSortByColumnOptions<T>> &
+  Partial<UseSortByColumnProps<T>> &
+  Partial<UseResizeColumnsColumnOptions<T>> &
+  Partial<UseResizeColumnsColumnProps<T>> & {
+    hidden?: boolean;
+    size?: keyof typeof COLUMN_SIZE_MAP;
+  };
+
+type EnhancedHeaderGroup<T extends object = any> = RTHeaderGroup<T> & {
+  isSorted?: boolean;
+  isSortedDesc?: boolean;
+};
+
+function getSortingInfo<T extends object>(
+  headerGroups: EnhancedHeaderGroup<T>[],
+  headerId: string,
+): {
+  isSorted: boolean;
+  isSortedDesc: boolean;
+} {
+  for (const headerGroup of headerGroups) {
+    const header = headerGroup.headers.find(h => h.id === headerId);
+    if (header) {
+      return {
+        isSorted: header.isSorted ?? false,
+        isSortedDesc: header.isSortedDesc ?? false,
+      };
+    }
+  }
+  return { isSorted: false, isSortedDesc: false };
+}
+
+export function mapColumns<T extends object>(
+  columns: EnhancedColumnInstance<T>[],
+  headerGroups: EnhancedHeaderGroup<T>[],
+  columnsForWrapText?: string[],
+) {
+  return columns.map(column => {
+    const { isSorted, isSortedDesc } = getSortingInfo(headerGroups, column.id);
+    return {
+      title: column.Header,
+      dataIndex: column.id?.includes('.') ? column.id.split('.') : column.id,
+      hidden: column.hidden,
+      key: column.id,
+      minWidth: column.size ? COLUMN_SIZE_MAP[column.size] : COLUMN_SIZE_MAP.md,
+      ellipsis: !columnsForWrapText?.includes(column.id),
+      defaultSortOrder: (isSorted
+        ? isSortedDesc
+          ? 'descend'
+          : 'ascend'
+        : undefined) as SortOrder | undefined,
+      sorter: !column.disableSortBy,
+      render: (val: CellValue<T>, record: RowWithId<T>): ReactNode => {
+        if (column.Cell) {
+          const cellRenderer = column.Cell as ({
+            value,
+            row,
+            column,
+          }: {
+            value: CellValue<T>;
+            row: { original: Row<T>; id: string };
+            column: RTColumnInstance<T>;
+          }) => ReactNode;
+
+          return cellRenderer({
+            value: val,
+            row: { original: record, id: record.rowId },
+            column,
+          });
+        }
+        return val;
+      },
+    };
+  });
+}
+
+export function mapRows<T extends object>(
+  rows: Row<T>[],
+  prepareRow: (row: Row<T>) => void,
+) {
+  return rows.map(row => {
+    prepareRow(row);
+    return { rowId: row.id, ...row.original, ...row.getRowProps() };
+  });
+}
diff --git a/superset-frontend/src/components/TableView/TableView.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/TableView/TableView.stories.tsx
similarity index 94%
rename from superset-frontend/src/components/TableView/TableView.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/TableView/TableView.stories.tsx
index 5a5abbc71f5..08c131060e1 100644
--- a/superset-frontend/src/components/TableView/TableView.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/TableView/TableView.stories.tsx
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import TableView, { TableViewProps, EmptyWrapperType } from '.';
+import { TableView, TableViewProps, EmptyWrapperType } from '.';
 
 export default {
-  title: 'TableView',
+  title: 'Components/TableView',
   component: TableView,
 };
 
@@ -33,18 +33,22 @@ InteractiveTableView.args = {
       accessor: 'id',
       Header: 'ID',
       sortable: true,
+      id: 'id',
     },
     {
       accessor: 'age',
       Header: 'Age',
+      id: 'age',
     },
     {
       accessor: 'name',
       Header: 'Name',
+      id: 'name',
     },
     {
       accessor: 'summary',
       Header: 'Summary',
+      id: 'summary',
     },
   ],
   data: [
diff --git a/superset-frontend/src/components/TableView/TableView.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/TableView/TableView.test.tsx
similarity index 85%
rename from superset-frontend/src/components/TableView/TableView.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/TableView/TableView.test.tsx
index 65c64376c01..228ba4dbe34 100644
--- a/superset-frontend/src/components/TableView/TableView.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/TableView/TableView.test.tsx
@@ -16,8 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { render, screen, userEvent } from 'spec/helpers/testing-library';
-import TableView, { TableViewProps } from '.';
+import { render, screen, userEvent } from '@superset-ui/core/spec';
+import { TableView, TableViewProps } from '.';
 
 const mockedProps: TableViewProps = {
   columns: [
@@ -25,14 +25,17 @@ const mockedProps: TableViewProps = {
       accessor: 'id',
       Header: 'ID',
       sortable: true,
+      id: 'id',
     },
     {
       accessor: 'age',
       Header: 'Age',
+      id: 'age',
     },
     {
       accessor: 'name',
       Header: 'Name',
+      id: 'name',
     },
   ],
   data: [
@@ -62,12 +65,12 @@ test('should render the headers', () => {
 
 test('should render the rows', () => {
   render(<TableView {...mockedProps} />);
-  expect(screen.getAllByRole('row')).toHaveLength(2);
+  expect(screen.getAllByTestId('table-row')).toHaveLength(1);
 });
 
 test('should render the cells', () => {
   render(<TableView {...mockedProps} />);
-  expect(screen.getAllByRole('cell')).toHaveLength(3);
+  expect(screen.getAllByTestId('table-row-cell')).toHaveLength(3);
   expect(screen.getByText('123')).toBeInTheDocument();
   expect(screen.getByText('27')).toBeInTheDocument();
   expect(screen.getByText('Emily')).toBeInTheDocument();
@@ -113,19 +116,19 @@ test('should NOT render the pagination when fewer rows than page size', () => {
   expect(screen.queryByRole('navigation')).not.toBeInTheDocument();
 });
 
-test('should change page when « and » buttons are clicked', () => {
+test('should change page when « and » buttons are clicked', async () => {
   render(<TableView {...mockedProps} />);
   const nextBtn = screen.getByText('»');
   const prevBtn = screen.getByText('«');
 
-  userEvent.click(nextBtn);
+  await userEvent.click(nextBtn);
   expect(screen.getAllByRole('cell')).toHaveLength(3);
   expect(screen.getByText('321')).toBeInTheDocument();
   expect(screen.getByText('10')).toBeInTheDocument();
   expect(screen.getByText('Kate')).toBeInTheDocument();
   expect(screen.queryByText('Emily')).not.toBeInTheDocument();
 
-  userEvent.click(prevBtn);
+  await userEvent.click(prevBtn);
   expect(screen.getAllByRole('cell')).toHaveLength(3);
   expect(screen.getByText('123')).toBeInTheDocument();
   expect(screen.getByText('27')).toBeInTheDocument();
@@ -133,15 +136,13 @@ test('should change page when « and » buttons are clicked', () => {
   expect(screen.queryByText('Kate')).not.toBeInTheDocument();
 });
 
-test('should sort by age', () => {
+test('should sort by age', async () => {
   render(<TableView {...mockedProps} />);
-  const ageSort = screen.getAllByRole('columnheader')[1];
 
-  userEvent.click(ageSort);
-  expect(screen.getAllByRole('cell')[1]).toHaveTextContent('10');
-
-  userEvent.click(ageSort);
-  expect(screen.getAllByRole('cell')[1]).toHaveTextContent('27');
+  await userEvent.click(screen.getAllByTestId('sort-header')[1]);
+  expect(screen.getAllByTestId('table-row-cell')[1]).toHaveTextContent('10');
+  await userEvent.click(screen.getAllByTestId('sort-header')[1]);
+  expect(screen.getAllByTestId('table-row-cell')[1]).toHaveTextContent('27');
 });
 
 test('should sort by initialSortBy DESC', () => {
@@ -193,17 +194,17 @@ test('should render the right page', () => {
 test('should render the right wrap content text by columnsForWrapText', () => {
   const props = {
     ...mockedProps,
-    columnsForWrapText: ['Name'],
+    columnsForWrapText: ['name'],
   };
   render(<TableView {...props} />);
 
   expect(screen.getAllByTestId('table-row-cell')[0]).toHaveClass(
-    'table-cell__nowrap',
+    'ant-table-cell-ellipsis',
   );
   expect(screen.getAllByTestId('table-row-cell')[1]).toHaveClass(
-    'table-cell__nowrap',
+    'ant-table-cell-ellipsis',
   );
-  expect(screen.getAllByTestId('table-row-cell')[2]).toHaveClass(
-    'table-cell__wrap',
+  expect(screen.getAllByTestId('table-row-cell')[2]).not.toHaveClass(
+    'ant-table-cell-ellipsis',
   );
 });
diff --git a/superset-frontend/src/components/TableView/TableView.tsx b/superset-frontend/packages/superset-ui-core/src/components/TableView/TableView.tsx
similarity index 86%
rename from superset-frontend/src/components/TableView/TableView.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/TableView/TableView.tsx
index ff5e00337e7..ce99de46492 100644
--- a/superset-frontend/src/components/TableView/TableView.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/TableView/TableView.tsx
@@ -20,9 +20,10 @@ import { memo, useEffect, useRef } from 'react';
 import { isEqual } from 'lodash';
 import { styled, t } from '@superset-ui/core';
 import { useFilters, usePagination, useSortBy, useTable } from 'react-table';
-import { Empty } from 'src/components/EmptyState/Empty';
-import Pagination from 'src/components/Pagination';
-import TableCollection from 'src/components/TableCollection';
+import { Empty } from '@superset-ui/core/components';
+import Pagination from '@superset-ui/core/components/Pagination';
+import TableCollection from '@superset-ui/core/components/TableCollection';
+import { TableSize } from '@superset-ui/core/components/Table';
 import { SortByType, ServerPagination } from './types';
 
 const DEFAULT_PAGE_SIZE = 10;
@@ -52,10 +53,11 @@ export interface TableViewProps {
   scrollTopOnPagination?: boolean;
   small?: boolean;
   columnsForWrapText?: string[];
+  size?: TableSize;
 }
 
 const EmptyWrapper = styled.div`
-  margin: ${({ theme }) => theme.gridUnit * 40}px 0;
+  margin: ${({ theme }) => theme.sizeUnit * 40}px 0;
 `;
 
 const TableViewStyles = styled.div<{
@@ -67,19 +69,20 @@ const TableViewStyles = styled.div<{
     scrollTable &&
     `
     flex: 1 1 auto;
-    margin-bottom: ${theme.gridUnit * 4}px;
+    margin-bottom: ${theme.sizeUnit * 4}px;
     overflow: auto;
   `}
+  color: ${({ theme }) => theme.colorText};
 
   .table-row {
-    ${({ theme, small }) => !small && `height: ${theme.gridUnit * 11 - 1}px;`}
+    ${({ theme, small }) => !small && `height: ${theme.sizeUnit * 11 - 1}px;`}
 
     .table-cell {
       ${({ theme, small }) =>
         small &&
         `
-        padding-top: ${theme.gridUnit + 1}px;
-        padding-bottom: ${theme.gridUnit + 1}px;
+        padding-top: ${theme.sizeUnit + 1}px;
+        padding-bottom: ${theme.sizeUnit + 1}px;
         line-height: 1.45;
       `}
     }
@@ -88,7 +91,7 @@ const TableViewStyles = styled.div<{
   th[role='columnheader'] {
     z-index: 1;
     border-bottom: ${({ theme }) =>
-      `${theme.gridUnit - 2}px solid ${theme.colors.grayscale.light2}`};
+      `${theme.sizeUnit - 2}px solid ${theme.colorSplit}`};
     ${({ small }) => small && `padding-bottom: 0;`}
   }
 `;
@@ -100,7 +103,7 @@ const PaginationStyles = styled.div<{
   flex-direction: column;
   justify-content: center;
   align-items: center;
-  background-color: ${({ theme }) => theme.colors.grayscale.light5};
+  background-color: ${({ theme }) => theme.colorBgElevated};
 
   ${({ isPaginationSticky }) =>
     isPaginationSticky &&
@@ -111,12 +114,12 @@ const PaginationStyles = styled.div<{
     `};
 
   .row-count-container {
-    margin-top: ${({ theme }) => theme.gridUnit * 2}px;
-    color: ${({ theme }) => theme.colors.grayscale.base};
+    margin-top: ${({ theme }) => theme.sizeUnit * 2}px;
+    color: ${({ theme }) => theme.colorText};
   }
 `;
 
-const TableView = ({
+const RawTableView = ({
   columns,
   data,
   pageSize: initialPageSize,
@@ -132,6 +135,7 @@ const TableView = ({
   columnsForWrapText,
   onServerPagination = () => {},
   scrollTopOnPagination = false,
+  size = TableSize.Middle,
   ...props
 }: TableViewProps) => {
   const initialState = {
@@ -149,6 +153,7 @@ const TableView = ({
     prepareRow,
     pageCount,
     gotoPage,
+    setSortBy,
     state: { pageIndex, pageSize, sortBy },
   } = useTable(
     {
@@ -216,6 +221,8 @@ const TableView = ({
           rows={content}
           columns={columns}
           loading={loading}
+          setSortBy={setSortBy}
+          size={size}
           columnsForWrapText={columnsForWrapText}
         />
         {isEmpty && (
@@ -259,4 +266,4 @@ const TableView = ({
   );
 };
 
-export default memo(TableView);
+export const TableView = memo(RawTableView);
diff --git a/superset-frontend/src/components/TableView/index.ts b/superset-frontend/packages/superset-ui-core/src/components/TableView/index.ts
similarity index 95%
rename from superset-frontend/src/components/TableView/index.ts
rename to superset-frontend/packages/superset-ui-core/src/components/TableView/index.ts
index c1746ed7773..0ff8aafc024 100644
--- a/superset-frontend/src/components/TableView/index.ts
+++ b/superset-frontend/packages/superset-ui-core/src/components/TableView/index.ts
@@ -17,4 +17,3 @@
  * under the License.
  */
 export * from './TableView';
-export { default } from './TableView';
diff --git a/superset-frontend/src/components/TableView/types.ts b/superset-frontend/packages/superset-ui-core/src/components/TableView/types.ts
similarity index 100%
rename from superset-frontend/src/components/TableView/types.ts
rename to superset-frontend/packages/superset-ui-core/src/components/TableView/types.ts
diff --git a/superset-frontend/src/components/Tabs/Tabs.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/Tabs/Tabs.stories.tsx
similarity index 61%
rename from superset-frontend/src/components/Tabs/Tabs.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Tabs/Tabs.stories.tsx
index 2156e1ef849..9cc87fcc6a6 100644
--- a/superset-frontend/src/components/Tabs/Tabs.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Tabs/Tabs.stories.tsx
@@ -18,33 +18,38 @@
  */
 import Tabs, { TabsProps } from '.';
 
-const { TabPane } = Tabs;
-
 export default {
-  title: 'Tabs',
+  title: 'Components/Tabs',
   component: Tabs,
 };
 
-export const InteractiveTabs = (args: TabsProps) => (
-  <Tabs {...args}>
-    <TabPane tab="Tab 1" key="1">
-      Content of Tab Pane 1
-    </TabPane>
-    <TabPane tab="Tab 2" key="2">
-      Content of Tab Pane 2
-    </TabPane>
-    <TabPane tab="Tab 3" key="3">
-      Content of Tab Pane 3
-    </TabPane>
-  </Tabs>
-);
+export const InteractiveTabs = (args: TabsProps) => <Tabs {...args} />;
 
 InteractiveTabs.args = {
   defaultActiveKey: '1',
   animated: true,
   centered: false,
-  fullWidth: false,
   allowOverflow: false,
+  tabPosition: 'top',
+  size: 'middle',
+  tabBarGutter: 8,
+  items: [
+    {
+      key: '1',
+      label: 'Tab 1',
+      children: 'Content of Tab Pane 1',
+    },
+    {
+      key: '2',
+      label: 'Tab 2',
+      children: 'Content of Tab Pane 2',
+    },
+    {
+      key: '3',
+      label: 'Tab 3',
+      children: 'Content of Tab Pane 3',
+    },
+  ],
 };
 
 InteractiveTabs.argTypes = {
@@ -56,4 +61,21 @@ InteractiveTabs.argTypes = {
     },
     options: ['line', 'card', 'editable-card'],
   },
+  tabPosition: {
+    control: {
+      type: 'inline-radio',
+    },
+    options: ['top', 'bottom', 'left', 'right'],
+  },
+  size: {
+    control: {
+      type: 'inline-radio',
+    },
+    options: ['small', 'middle', 'large'],
+  },
+  tabBarGutter: {
+    control: {
+      type: 'number',
+    },
+  },
 };
diff --git a/superset-frontend/src/components/Tabs/Tabs.tsx b/superset-frontend/packages/superset-ui-core/src/components/Tabs/Tabs.tsx
similarity index 57%
rename from superset-frontend/src/components/Tabs/Tabs.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Tabs/Tabs.tsx
index ac05e0c3aab..2688e0b5ed7 100644
--- a/superset-frontend/src/components/Tabs/Tabs.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Tabs/Tabs.tsx
@@ -16,77 +16,63 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { css, styled } from '@superset-ui/core';
+import { css, styled, useTheme } from '@superset-ui/core';
+
 // eslint-disable-next-line no-restricted-imports
-import AntdTabs, { TabsProps as AntdTabsProps } from 'antd/lib/tabs'; // TODO: Remove antd
-import { Icons } from 'src/components/Icons';
+import { Tabs as AntdTabs, TabsProps as AntdTabsProps } from 'antd';
+import { Icons } from '@superset-ui/core/components/Icons';
 
 export interface TabsProps extends AntdTabsProps {
-  fullWidth?: boolean;
   allowOverflow?: boolean;
 }
 
 const StyledTabs = ({
   animated = false,
-  fullWidth = true,
   allowOverflow = true,
   ...props
-}: TabsProps) => (
-  <AntdTabs
-    animated={animated}
-    {...props}
-    css={theme => css`
-      overflow: ${allowOverflow ? 'visible' : 'hidden'};
+}: TabsProps) => {
+  const theme = useTheme();
+  return (
+    <AntdTabs
+      animated={animated}
+      {...props}
+      tabBarStyle={{ paddingLeft: theme.sizeUnit * 4 }}
+      css={theme => css`
+        overflow: ${allowOverflow ? 'visible' : 'hidden'};
 
-      .ant-tabs-content-holder {
-        overflow: ${allowOverflow ? 'visible' : 'auto'};
-      }
-      .ant-tabs-tab {
-        flex: 1 1 auto;
-        &.ant-tabs-tab-active .ant-tabs-tab-btn {
-          color: inherit;
+        .ant-tabs-content-holder {
+          overflow: ${allowOverflow ? 'visible' : 'auto'};
         }
-        &:hover {
-          .anchor-link-container {
-            cursor: pointer;
-            .fa.fa-link {
-              visibility: visible;
+        .ant-tabs-tab {
+          flex: 1 1 auto;
+
+          .short-link-trigger.btn {
+            padding: 0 ${theme.sizeUnit}px;
+            & > .fa.fa-link {
+              top: 0;
             }
           }
         }
-        .short-link-trigger.btn {
-          padding: 0 ${theme.gridUnit}px;
-          & > .fa.fa-link {
-            top: 0;
+        .ant-tabs-tab-btn {
+          display: flex;
+          flex: 1 1 auto;
+          align-items: center;
+          justify-content: center;
+          font-size: ${theme.fontSizeSM}px;
+          text-align: center;
+          user-select: none;
+          .required {
+            margin-left: ${theme.sizeUnit / 2}px;
+            color: ${theme.colorError};
+          }
+          &:focus-visible {
+            box-shadow: none;
           }
         }
-      }
-      ${fullWidth &&
-      css`
-        .ant-tabs-nav-list {
-          width: 100%;
-        }
-      `};
-
-      .ant-tabs-tab-btn {
-        display: flex;
-        flex: 1 1 auto;
-        align-items: center;
-        justify-content: center;
-        font-size: ${theme.typography.sizes.s}px;
-        text-align: center;
-        user-select: none;
-        .required {
-          margin-left: ${theme.gridUnit / 2}px;
-          color: ${theme.colors.error.base};
-        }
-      }
-      .ant-tabs-ink-bar {
-        background: ${theme.colors.secondary.base};
-      }
-    `}
-  />
-);
+      `}
+    />
+  );
+};
 
 const StyledTabPane = styled(AntdTabs.TabPane)``;
 
@@ -95,7 +81,7 @@ const Tabs = Object.assign(StyledTabs, {
 });
 
 const StyledEditableTabs = styled(StyledTabs)`
-  ${({ theme, fullWidth }) => `
+  ${({ theme }) => `
     .ant-tabs-content-holder {
       background: ${theme.colors.grayscale.light5};
     }
@@ -107,17 +93,7 @@ const StyledEditableTabs = styled(StyledTabs)`
     .ant-tabs-tab-remove {
       padding-top: 0;
       padding-bottom: 0;
-      height: ${theme.gridUnit * 6}px;
-    }
-
-    ${
-      fullWidth
-        ? css`
-            .ant-tabs-nav-list {
-              width: 100%;
-            }
-          `
-        : ''
+      height: ${theme.sizeUnit * 6}px;
     }
   `}
 `;
@@ -131,7 +107,6 @@ export const EditableTabs = Object.assign(StyledEditableTabs, {
 
 EditableTabs.defaultProps = {
   type: 'editable-card',
-  fullWidth: false,
   animated: { inkBar: true, tabPane: false },
 };
 
@@ -141,8 +116,8 @@ EditableTabs.TabPane.defaultProps = {
 
 export const StyledLineEditableTabs = styled(EditableTabs)`
   &.ant-tabs-card > .ant-tabs-nav .ant-tabs-tab {
-    margin: 0 ${({ theme }) => theme.gridUnit * 4}px;
-    padding: ${({ theme }) => `${theme.gridUnit * 3}px ${theme.gridUnit}px`};
+    margin: 0 ${({ theme }) => theme.sizeUnit * 4}px;
+    padding: ${({ theme }) => `${theme.sizeUnit * 3}px ${theme.sizeUnit}px`};
     background: transparent;
     border: none;
   }
@@ -152,7 +127,7 @@ export const StyledLineEditableTabs = styled(EditableTabs)`
   }
 
   .ant-tabs-tab-btn {
-    font-size: ${({ theme }) => theme.typography.sizes.m}px;
+    font-size: ${({ theme }) => theme.fontSize}px;
   }
 
   .ant-tabs-tab-remove {
diff --git a/superset-frontend/src/components/Tabs/index.ts b/superset-frontend/packages/superset-ui-core/src/components/Tabs/index.ts
similarity index 100%
rename from superset-frontend/src/components/Tabs/index.ts
rename to superset-frontend/packages/superset-ui-core/src/components/Tabs/index.ts
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Tag/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Tag/index.tsx
new file mode 100644
index 00000000000..f9b7884464a
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Tag/index.tsx
@@ -0,0 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+export { Tag } from 'antd';
diff --git a/superset-frontend/src/components/TelemetryPixel/TelemetryPixel.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/TelemetryPixel/TelemetryPixel.test.tsx
similarity index 96%
rename from superset-frontend/src/components/TelemetryPixel/TelemetryPixel.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/TelemetryPixel/TelemetryPixel.test.tsx
index 089c09140e8..7d12a612d7c 100644
--- a/superset-frontend/src/components/TelemetryPixel/TelemetryPixel.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/TelemetryPixel/TelemetryPixel.test.tsx
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { render } from 'spec/helpers/testing-library';
+import { render } from '@superset-ui/core/spec';
 import TelemetryPixel from '.';
 
 const OLD_ENV = process.env;
diff --git a/superset-frontend/src/components/TelemetryPixel/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/TelemetryPixel/index.tsx
similarity index 100%
rename from superset-frontend/src/components/TelemetryPixel/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/TelemetryPixel/index.tsx
diff --git a/superset-frontend/packages/superset-ui-core/src/components/ThemeEditor/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/ThemeEditor/index.tsx
new file mode 100644
index 00000000000..93dc0e9b53f
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/ThemeEditor/index.tsx
@@ -0,0 +1,150 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { Modal, Tooltip, Flex, Select } from 'antd';
+import { Button, JsonEditor } from '@superset-ui/core/components';
+import {
+  themeObject,
+  exampleThemes,
+  SerializableThemeConfig,
+  Theme,
+  AnyThemeConfig,
+} from '@superset-ui/core';
+import { useState } from 'react';
+import { Icons } from '@superset-ui/core/components/Icons';
+
+interface ThemeEditorProps {
+  tooltipTitle?: string;
+  modalTitle?: string;
+  theme?: Theme;
+  setTheme?: (config: AnyThemeConfig) => void;
+}
+
+const ThemeEditor: React.FC<ThemeEditorProps> = ({
+  tooltipTitle = 'Edit Theme',
+  modalTitle = 'Theme Editor',
+  theme,
+  setTheme,
+}) => {
+  const [isModalOpen, setIsModalOpen] = useState<boolean>(false);
+  const jsonTheme =
+    JSON.stringify(theme?.toSerializedConfig(), null, 2) || '{}';
+  const [jsonMetadata, setJsonMetadata] = useState<string>(jsonTheme);
+  const [selectedTheme, setSelectedTheme] = useState<string | null>(null);
+
+  // Get theme names for the Select options
+  const themeOptions: { value: string; label: string }[] = Object.keys(
+    exampleThemes,
+  ).map(key => ({
+    value: key,
+    label: key,
+  }));
+
+  const handleOpenModal = (): void => {
+    setIsModalOpen(true);
+    setJsonMetadata(JSON.stringify(theme?.toSerializedConfig(), null, 2));
+  };
+
+  const handleCancel = (): void => {
+    setIsModalOpen(false);
+  };
+
+  const handleSave = (): void => {
+    try {
+      const parsedTheme = JSON.parse(jsonMetadata);
+      setTheme?.(parsedTheme);
+      setIsModalOpen(false);
+    } catch (error) {
+      console.error('Invalid JSON in theme editor:', error);
+      alert('Error parsing JSON. Please check your input.');
+    }
+  };
+
+  const handleThemeChange = (value: string): void => {
+    setSelectedTheme(value);
+    // When a theme is selected, update the JSON editor with the theme definition
+    const themeData = exampleThemes[value] || ({} as SerializableThemeConfig);
+    setJsonMetadata(JSON.stringify(themeData, null, 2));
+  };
+
+  return (
+    <>
+      <Tooltip title={tooltipTitle} placement="bottom">
+        <Button
+          buttonStyle="link"
+          icon={
+            <Icons.BgColorsOutlined
+              iconSize="l"
+              iconColor={themeObject.theme.colorPrimary}
+            />
+          }
+          onClick={handleOpenModal}
+          aria-label="Edit theme"
+          size="large"
+        />
+      </Tooltip>
+      <Modal
+        title={modalTitle}
+        open={isModalOpen}
+        onCancel={handleCancel}
+        width={800}
+        centered
+        styles={{
+          body: {
+            padding: '24px',
+          },
+        }}
+        footer={
+          <Flex justify="end" gap="small">
+            <Button onClick={handleCancel} buttonStyle="secondary">
+              Cancel
+            </Button>
+            <Button type="primary" onClick={handleSave}>
+              Apply Theme
+            </Button>
+          </Flex>
+        }
+      >
+        <Flex vertical gap="middle">
+          <div>
+            Select a theme template:
+            <Select
+              placeholder="Choose a theme"
+              style={{ width: '100%', marginTop: '8px' }}
+              options={themeOptions}
+              onChange={handleThemeChange}
+              value={selectedTheme}
+            />
+          </div>
+          <JsonEditor
+            showLoadingForImport
+            name="json_metadata"
+            value={jsonMetadata}
+            onChange={setJsonMetadata}
+            tabSize={2}
+            width="100%"
+            height="200px"
+            wrapEnabled
+          />
+        </Flex>
+      </Modal>
+    </>
+  );
+};
+
+export default ThemeEditor;
diff --git a/superset-frontend/packages/superset-ui-core/src/components/ThemeSelect/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/ThemeSelect/index.tsx
new file mode 100644
index 00000000000..257f93a729c
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/ThemeSelect/index.tsx
@@ -0,0 +1,79 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { Tooltip } from 'antd';
+import { Dropdown, Icons } from '@superset-ui/core/components';
+import { t } from '@superset-ui/core';
+import { ThemeMode } from '../../theme/types';
+
+export interface ThemeSelectProps {
+  changeThemeMode: (newMode: ThemeMode) => void;
+  tooltipTitle?: string;
+  themeMode: ThemeMode;
+}
+
+const ThemeSelect: React.FC<ThemeSelectProps> = ({
+  changeThemeMode,
+  tooltipTitle = 'Select theme',
+  themeMode,
+}) => {
+  const handleSelect = (mode: ThemeMode) => {
+    changeThemeMode(mode);
+  };
+
+  const themeIconMap: Record<ThemeMode, React.ReactNode> = {
+    [ThemeMode.LIGHT]: <Icons.SunOutlined />,
+    [ThemeMode.DARK]: <Icons.MoonOutlined />,
+    [ThemeMode.SYSTEM]: <Icons.FormatPainterOutlined />,
+    [ThemeMode.COMPACT]: <Icons.CompressOutlined />,
+  };
+
+  return (
+    <Tooltip title={tooltipTitle} placement="bottom">
+      <Dropdown
+        menu={{
+          items: [
+            {
+              key: ThemeMode.LIGHT,
+              label: t('Light'),
+              onClick: () => handleSelect(ThemeMode.LIGHT),
+              icon: <Icons.SunOutlined />,
+            },
+            {
+              key: ThemeMode.DARK,
+              label: t('Dark'),
+              onClick: () => handleSelect(ThemeMode.DARK),
+              icon: <Icons.MoonOutlined />,
+            },
+            {
+              key: ThemeMode.SYSTEM,
+              label: t('Match system'),
+              onClick: () => handleSelect(ThemeMode.SYSTEM),
+              icon: <Icons.FormatPainterOutlined />,
+            },
+          ],
+        }}
+        trigger={['click']}
+      >
+        {themeIconMap[themeMode] || <Icons.FormatPainterOutlined />}
+      </Dropdown>
+    </Tooltip>
+  );
+};
+
+export default ThemeSelect;
diff --git a/superset-frontend/src/components/Timer/Timer.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/Timer/Timer.stories.tsx
similarity index 92%
rename from superset-frontend/src/components/Timer/Timer.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Timer/Timer.stories.tsx
index 5834c6c9e9f..e64567a100b 100644
--- a/superset-frontend/src/components/Timer/Timer.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Timer/Timer.stories.tsx
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { extendedDayjs } from 'src/utils/dates';
-import Timer, { TimerProps } from './index';
+import { extendedDayjs } from '../../utils/dates';
+import { Timer, TimerProps } from '.';
 
 export default {
-  title: 'Timer',
+  title: 'Components/Timer',
   component: Timer,
 };
 
diff --git a/superset-frontend/src/components/Timer/Timer.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Timer/Timer.test.tsx
similarity index 86%
rename from superset-frontend/src/components/Timer/Timer.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Timer/Timer.test.tsx
index 41f45a70cba..95baebd9020 100644
--- a/superset-frontend/src/components/Timer/Timer.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Timer/Timer.test.tsx
@@ -1,6 +1,3 @@
-/**
- * @jest-environment jsdom
- */
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -19,9 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { render, sleep, waitFor } from 'spec/helpers/testing-library';
-import Timer, { TimerProps } from 'src/components/Timer';
-import { now } from 'src/utils/dates';
+import { render, waitFor } from '@superset-ui/core/spec';
+import { Timer, TimerProps } from '.';
+import { now } from '../../utils/dates';
+
+function sleep(time: number) {
+  return new Promise(resolve => {
+    setTimeout(resolve, time);
+  });
+}
 
 function parseTime(text?: string | null) {
   return !!text && Number(text.replace(/:/g, ''));
@@ -53,17 +56,17 @@ describe('Timer', () => {
     screen.rerender(<Timer {...mockProps} isRunning={false} />);
     // the same node should still be in DOM and the content should not change
     expect(screen.getByRole('timer')).toBe(node);
-    expect(node).toHaveTextContent(text);
+    expect(node).toHaveTextContent(text.trim());
 
     // the timestamp should not change even after while
     await sleep(100);
     expect(screen.getByRole('timer')).toBe(node);
-    expect(node).toHaveTextContent(text);
+    expect(node).toHaveTextContent(text.trim());
 
     // should continue and start from stopped time
     screen.rerender(<Timer {...mockProps} isRunning />);
     expect(screen.getByRole('timer')).toBe(node);
-    expect(node).toHaveTextContent(text);
+    expect(node).toHaveTextContent(text.trim());
 
     await waitFor(() => {
       expect(screen.getByRole('timer')).toBe(node);
diff --git a/superset-frontend/src/components/Timer/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Timer/index.tsx
similarity index 64%
rename from superset-frontend/src/components/Timer/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Timer/index.tsx
index a9136657a46..0eaa8e456b6 100644
--- a/superset-frontend/src/components/Timer/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Timer/index.tsx
@@ -17,25 +17,18 @@
  * under the License.
  */
 import { useEffect, useRef, useState } from 'react';
-import { styled, useTheme } from '@superset-ui/core';
-import Label, { Type } from 'src/components/Label';
-import { Icons } from 'src/components/Icons';
-
-import { now, fDuration } from 'src/utils/dates';
+import { now, fDuration } from '../../utils/dates';
+import { useTheme } from '../..';
+import { Label, Icons, type LabelType } from '..';
 
 export interface TimerProps {
   endTime?: number;
   isRunning: boolean;
   startTime?: number;
-  status?: Type;
+  status?: LabelType;
 }
 
-const TimerLabel = styled(Label)`
-  text-align: left;
-  font-family: ${({ theme }) => theme.typography.families.monospace};
-`;
-
-export default function Timer({
+export function Timer({
   endTime,
   isRunning,
   startTime,
@@ -45,21 +38,6 @@ export default function Timer({
   const [clockStr, setClockStr] = useState('00:00:00.00');
   const timer = useRef<ReturnType<typeof setInterval>>();
 
-  const getIconColor = (status: Type) => {
-    const { colors } = theme;
-
-    const colorMap: Record<Type, string> = {
-      success: colors.success.dark2,
-      warning: colors.warning.dark2,
-      danger: colors.error.dark2,
-      info: colors.info.dark2,
-      default: colors.grayscale.dark1,
-      primary: colors.primary.dark2,
-      secondary: colors.secondary.dark2,
-    };
-
-    return colorMap[status] || colors.grayscale.dark1;
-  };
   useEffect(() => {
     const stopTimer = () => {
       if (timer.current) {
@@ -85,17 +63,13 @@ export default function Timer({
   }, [endTime, isRunning, startTime]);
 
   return (
-    <TimerLabel
-      icon={
-        <Icons.ClockCircleOutlined
-          iconColor={getIconColor(status)}
-          iconSize="m"
-        />
-      }
+    <Label
+      icon={<Icons.ClockCircleOutlined iconSize="m" />}
       type={status}
       role="timer"
+      style={{ fontFamily: theme.fontFamilyCode }}
     >
       {clockStr}
-    </TimerLabel>
+    </Label>
   );
 }
diff --git a/superset-frontend/src/components/TimezoneSelector/TimezoneSelector.DaylightSavingTime.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/TimezoneSelector/TimezoneSelector.DaylightSavingTime.test.tsx
similarity index 94%
rename from superset-frontend/src/components/TimezoneSelector/TimezoneSelector.DaylightSavingTime.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/TimezoneSelector/TimezoneSelector.DaylightSavingTime.test.tsx
index 98d823188ad..21fa1fc9abf 100644
--- a/superset-frontend/src/components/TimezoneSelector/TimezoneSelector.DaylightSavingTime.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/TimezoneSelector/TimezoneSelector.DaylightSavingTime.test.tsx
@@ -18,12 +18,7 @@
  */
 
 import { FC } from 'react';
-import {
-  render,
-  waitFor,
-  screen,
-  userEvent,
-} from 'spec/helpers/testing-library';
+import { render, waitFor, screen, userEvent } from '@superset-ui/core/spec';
 import type { TimezoneSelectorProps } from './index';
 
 const loadComponent = (mockCurrentTime?: string) => {
@@ -52,7 +47,7 @@ test('render timezones in correct order for daylight saving time', async () => {
   );
 
   const searchInput = screen.getByRole('combobox');
-  userEvent.click(searchInput);
+  await userEvent.click(searchInput);
 
   const options = await waitFor(() =>
     document.querySelectorAll('.ant-select-item-option-content'),
diff --git a/superset-frontend/src/components/TimezoneSelector/TimezoneSelector.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/TimezoneSelector/TimezoneSelector.stories.tsx
similarity index 97%
rename from superset-frontend/src/components/TimezoneSelector/TimezoneSelector.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/TimezoneSelector/TimezoneSelector.stories.tsx
index 1335331cc07..9f8b33e3f1c 100644
--- a/superset-frontend/src/components/TimezoneSelector/TimezoneSelector.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/TimezoneSelector/TimezoneSelector.stories.tsx
@@ -20,7 +20,7 @@ import { useArgs } from '@storybook/preview-api';
 import TimezoneSelector, { TimezoneSelectorProps } from './index';
 
 export default {
-  title: 'TimezoneSelector',
+  title: 'Components/TimezoneSelector',
   component: TimezoneSelector,
 };
 
diff --git a/superset-frontend/src/components/TimezoneSelector/TimezoneSelector.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/TimezoneSelector/TimezoneSelector.test.tsx
similarity index 95%
rename from superset-frontend/src/components/TimezoneSelector/TimezoneSelector.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/TimezoneSelector/TimezoneSelector.test.tsx
index 35c3448f9d1..ce31337aa31 100644
--- a/superset-frontend/src/components/TimezoneSelector/TimezoneSelector.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/TimezoneSelector/TimezoneSelector.test.tsx
@@ -17,13 +17,8 @@
  * under the License.
  */
 import { FC } from 'react';
-import { extendedDayjs } from 'src/utils/dates';
-import {
-  render,
-  screen,
-  userEvent,
-  waitFor,
-} from 'spec/helpers/testing-library';
+import { render, screen, userEvent, waitFor } from '@superset-ui/core/spec';
+import { extendedDayjs } from '../../utils/dates';
 import type { TimezoneSelectorProps } from './index';
 
 const loadComponent = (mockCurrentTime?: string) => {
@@ -111,10 +106,10 @@ test('can select a timezone values and returns canonical timezone name', async (
 
   const searchInput = screen.getByRole('combobox');
   // search for mountain time
-  userEvent.type(searchInput, 'mou');
+  await userEvent.type(searchInput, 'mou');
   const findTitle = 'GMT -07:00 (Mountain Standard Time)';
   const selectOption = await screen.findByTitle(findTitle);
-  userEvent.click(selectOption);
+  await userEvent.click(selectOption);
   expect(onTimezoneChange).toHaveBeenCalledTimes(1);
   expect(onTimezoneChange).toHaveBeenLastCalledWith('America/Boise');
 });
diff --git a/superset-frontend/src/components/TimezoneSelector/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/TimezoneSelector/index.tsx
similarity index 97%
rename from superset-frontend/src/components/TimezoneSelector/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/TimezoneSelector/index.tsx
index 4a3c69ca08c..ab7ef4fae56 100644
--- a/superset-frontend/src/components/TimezoneSelector/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/TimezoneSelector/index.tsx
@@ -19,8 +19,8 @@
 
 import { useEffect, useMemo } from 'react';
 import { t } from '@superset-ui/core';
-import { Select } from 'src/components';
-import { isDST, extendedDayjs } from 'src/utils/dates';
+import { Select } from '@superset-ui/core/components';
+import { isDST, extendedDayjs } from '../../utils/dates';
 
 const DEFAULT_TIMEZONE = {
   name: 'GMT Standard Time',
@@ -55,6 +55,7 @@ export default function TimezoneSelector({
   onTimezoneChange,
   timezone,
   minWidth = MIN_SELECT_WIDTH, // smallest size for current values
+  ...rest
 }: TimezoneSelectorProps) {
   const { TIMEZONE_OPTIONS, TIMEZONE_OPTIONS_SORT_COMPARATOR, validTimezone } =
     useMemo(() => {
@@ -151,11 +152,11 @@ export default function TimezoneSelector({
   return (
     <Select
       ariaLabel={t('Timezone selector')}
-      css={{ minWidth }}
       onChange={tz => onTimezoneChange(tz as string)}
       value={validTimezone}
       options={TIMEZONE_OPTIONS}
       sortComparator={TIMEZONE_OPTIONS_SORT_COMPARATOR}
+      {...rest}
     />
   );
 }
diff --git a/superset-frontend/src/components/Tooltip/Tooltip.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/Tooltip/Tooltip.stories.tsx
similarity index 91%
rename from superset-frontend/src/components/Tooltip/Tooltip.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Tooltip/Tooltip.stories.tsx
index b195a3544a6..0e0fa1ef1b6 100644
--- a/superset-frontend/src/components/Tooltip/Tooltip.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Tooltip/Tooltip.stories.tsx
@@ -16,11 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import Button from 'src/components/Button';
-import { Tooltip, TooltipPlacement, TooltipProps } from './index';
+import { Button } from '../Button';
+import { Tooltip } from '.';
+import { TooltipPlacement, TooltipProps } from './types';
 
 export default {
-  title: 'Tooltip',
+  title: 'Components/Tooltip',
   component: Tooltip,
 };
 
diff --git a/superset-frontend/src/components/Tooltip/Tooltip.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Tooltip/Tooltip.test.tsx
similarity index 69%
rename from superset-frontend/src/components/Tooltip/Tooltip.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Tooltip/Tooltip.test.tsx
index 8b2d418894b..6e0c5f9a6fd 100644
--- a/superset-frontend/src/components/Tooltip/Tooltip.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Tooltip/Tooltip.test.tsx
@@ -16,11 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { render, screen, userEvent } from 'spec/helpers/testing-library';
-import { supersetTheme } from '@superset-ui/core';
-import Button from 'src/components/Button';
-import { Icons } from 'src/components/Icons';
-import { Tooltip } from '.';
+import { render, screen, userEvent } from '@superset-ui/core/spec';
+import { Button, Icons, Tooltip } from '..';
 
 test('starts hidden with default props', () => {
   render(
@@ -37,28 +34,16 @@ test('renders on hover', async () => {
       <Button>Hover me</Button>
     </Tooltip>,
   );
-  userEvent.hover(screen.getByRole('button'));
+  await userEvent.hover(screen.getByRole('button'));
   expect(await screen.findByRole('tooltip')).toBeInTheDocument();
 });
 
-test('renders with theme', () => {
-  render(
-    <Tooltip title="Simple tooltip" defaultOpen>
-      <Button>Hover me</Button>
-    </Tooltip>,
-  );
-  const tooltip = screen.getByRole('tooltip');
-  expect(tooltip).toHaveStyle({
-    'background-color': `${supersetTheme.colors.grayscale.dark2}e6`,
-  });
-});
-
 test('renders with icon child', async () => {
   render(
     <Tooltip title="Simple tooltip">
       <Icons.WarningOutlined>Hover me</Icons.WarningOutlined>
     </Tooltip>,
   );
-  userEvent.hover(screen.getByRole('img'));
+  await userEvent.hover(screen.getByRole('img'));
   expect(await screen.findByRole('tooltip')).toBeInTheDocument();
 });
diff --git a/superset-frontend/src/components/Tooltip/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Tooltip/index.tsx
similarity index 74%
rename from superset-frontend/src/components/Tooltip/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/Tooltip/index.tsx
index 4fa37124b18..ee8844a540e 100644
--- a/superset-frontend/src/components/Tooltip/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Tooltip/index.tsx
@@ -16,12 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-// eslint-disable-next-line no-restricted-imports
-import { supersetTheme } from '@superset-ui/core'; // TODO: DO not import theme directly
-import { Tooltip as AntdTooltip } from 'antd-v5';
-import { TooltipProps, TooltipPlacement } from 'antd-v5/lib/tooltip';
+import { Tooltip as AntdTooltip } from 'antd';
 
-export { TooltipProps, TooltipPlacement };
+import type { TooltipProps, TooltipPlacement } from './types';
 
 export const Tooltip = ({ overlayStyle, ...props }: TooltipProps) => (
   <AntdTooltip
@@ -29,7 +26,7 @@ export const Tooltip = ({ overlayStyle, ...props }: TooltipProps) => (
       body: { overflow: 'hidden', textOverflow: 'ellipsis' },
       root: overlayStyle ?? {},
     }}
-    color={`${supersetTheme.colors.grayscale.dark2}e6`}
     {...props}
   />
 );
+export type { TooltipProps, TooltipPlacement };
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Tooltip/types.ts b/superset-frontend/packages/superset-ui-core/src/components/Tooltip/types.ts
new file mode 100644
index 00000000000..ab0f4875f21
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Tooltip/types.ts
@@ -0,0 +1,37 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { Tooltip } from 'antd';
+
+export type TooltipProps = React.ComponentProps<typeof Tooltip> & {
+  overlayStyle?: React.CSSProperties;
+};
+
+export type TooltipPlacement =
+  | 'top'
+  | 'left'
+  | 'right'
+  | 'bottom'
+  | 'topLeft'
+  | 'topRight'
+  | 'bottomLeft'
+  | 'bottomRight'
+  | 'leftTop'
+  | 'leftBottom'
+  | 'rightTop'
+  | 'rightBottom';
diff --git a/superset-frontend/src/components/TooltipParagraph/TooltipParagraph.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/TooltipParagraph/TooltipParagraph.stories.tsx
similarity index 97%
rename from superset-frontend/src/components/TooltipParagraph/TooltipParagraph.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/TooltipParagraph/TooltipParagraph.stories.tsx
index d03dfd411aa..beff2bf36fa 100644
--- a/superset-frontend/src/components/TooltipParagraph/TooltipParagraph.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/TooltipParagraph/TooltipParagraph.stories.tsx
@@ -19,7 +19,7 @@
 import TooltipParagraph from '.';
 
 export default {
-  title: 'DynamicTooltip',
+  title: 'Components/DynamicTooltip',
   component: TooltipParagraph,
 };
 
diff --git a/superset-frontend/src/components/TooltipParagraph/TooltipParagraph.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/TooltipParagraph/TooltipParagraph.test.tsx
similarity index 59%
rename from superset-frontend/src/components/TooltipParagraph/TooltipParagraph.test.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/TooltipParagraph/TooltipParagraph.test.tsx
index 798ba2879b2..e42bab3d7b9 100644
--- a/superset-frontend/src/components/TooltipParagraph/TooltipParagraph.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/TooltipParagraph/TooltipParagraph.test.tsx
@@ -16,12 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import {
-  render,
-  screen,
-  userEvent,
-  waitFor,
-} from 'spec/helpers/testing-library';
+import { render, screen, userEvent, waitFor } from '@superset-ui/core/spec';
 import TooltipParagraph from '.';
 
 test('starts hidden with default props', () => {
@@ -30,31 +25,47 @@ test('starts hidden with default props', () => {
 });
 
 test('not render on hover when not truncated', async () => {
-  const { container } = render(
+  render(
     <div style={{ width: '200px' }}>
       <TooltipParagraph>
         <span data-test="test-text">This is short</span>
       </TooltipParagraph>
     </div>,
   );
-  userEvent.hover(screen.getByTestId('test-text'));
-  await waitFor(() =>
-    expect(container.firstChild?.firstChild).not.toHaveClass(
-      'ant-tooltip-open',
-    ),
-  );
+
+  await userEvent.hover(screen.getByTestId('test-text'));
+
+  // Wait a moment for any potential tooltip to appear
+  await new Promise(resolve => setTimeout(resolve, 100));
+
+  // Check that no tooltip is visible in the document
+  expect(screen.queryByRole('tooltip')).not.toBeInTheDocument();
 });
 
 test('render on hover when truncated', async () => {
-  const { container } = render(
+  render(
     <div style={{ width: '200px' }}>
       <TooltipParagraph>
         <span data-test="test-text">This is too long and should truncate.</span>
       </TooltipParagraph>
     </div>,
   );
-  userEvent.hover(screen.getByTestId('test-text'));
-  await waitFor(() =>
-    expect(container.firstChild?.firstChild).toHaveClass('ant-tooltip-open'),
-  );
+
+  // Get the div with the ellipsis class to verify it's truncated
+  const ellipsisElement = screen
+    .getByTestId('test-text')
+    .closest('.ant-typography-ellipsis');
+  expect(ellipsisElement).toBeInTheDocument();
+
+  // Hover over the text
+  await userEvent.hover(screen.getByTestId('test-text'));
+
+  // In Ant Design v5, we can check if the aria-describedby attribute is present
+  // which indicates the tooltip functionality is active
+  await waitFor(() => {
+    const element = screen
+      .getByTestId('test-text')
+      .closest('[aria-describedby]');
+    expect(element).toHaveAttribute('aria-describedby');
+  });
 });
diff --git a/superset-frontend/src/components/TooltipParagraph/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/TooltipParagraph/index.tsx
similarity index 83%
rename from superset-frontend/src/components/TooltipParagraph/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/TooltipParagraph/index.tsx
index 54632a954b6..3355ae22d8a 100644
--- a/superset-frontend/src/components/TooltipParagraph/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/TooltipParagraph/index.tsx
@@ -17,11 +17,11 @@
  * under the License.
  */
 import { useState, FC } from 'react';
-// eslint-disable-next-line no-restricted-imports
-import { Typography } from 'antd'; // TODO: Remove antd
-// eslint-disable-next-line no-restricted-imports
-import { ParagraphProps } from 'antd/es/typography/Paragraph'; // TODO: Remove antd
-import { Tooltip } from '../Tooltip';
+import {
+  ParagraphProps,
+  Typography,
+  Tooltip,
+} from '@superset-ui/core/components';
 
 const TooltipParagraph: FC<ParagraphProps> = ({
   children,
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Tree/Tree.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/Tree/Tree.stories.tsx
new file mode 100644
index 00000000000..84aa0d614db
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Tree/Tree.stories.tsx
@@ -0,0 +1,239 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { Meta, StoryObj } from '@storybook/react';
+import { Icons } from '@superset-ui/core/components/Icons';
+import Tree, { TreeProps, type TreeDataNode } from './index';
+
+const meta = {
+  title: 'Components/Tree',
+  component: Tree,
+  argTypes: {
+    autoExpandParent: {
+      control: 'boolean',
+      description: 'Whether to automatically expand a parent treeNode	',
+      table: {
+        category: 'Tree',
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'false' },
+      },
+    },
+    checkable: {
+      control: 'boolean',
+      description: 'Add a Checkbox before the treeNodes',
+      table: {
+        category: 'Tree',
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'false' },
+      },
+    },
+    checkStrictly: {
+      control: 'boolean',
+      description:
+        'Check treeNode precisely; parent treeNode and children treeNodes are not associated',
+      table: {
+        category: 'Tree',
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'false' },
+      },
+    },
+    defaultExpandAll: {
+      control: 'boolean',
+      description: 'Whether to expand all treeNodes by default',
+      table: {
+        category: 'Tree',
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'false' },
+      },
+    },
+    defaultExpandParent: {
+      control: 'boolean',
+      description: 'If auto expand parent treeNodes when init	',
+      table: {
+        category: 'Tree',
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'false' },
+      },
+    },
+    disabled: {
+      control: 'boolean',
+      description: 'Whether disabled the tree',
+      table: {
+        category: 'Tree',
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'false' },
+      },
+    },
+    draggable: {
+      control: 'boolean',
+      description:
+        'Specifies whether this Tree or the node is draggable. Use icon: false to disable drag handler icon',
+      table: {
+        category: 'Tree',
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'false' },
+      },
+    },
+    height: {
+      control: 'number',
+      description:
+        'Config virtual scroll height. Will not support horizontal scroll when enable this',
+      table: {
+        category: 'Tree',
+        type: { summary: 'number' },
+      },
+    },
+    multiple: {
+      control: 'boolean',
+      description: 'Allows selecting multiple treeNodes	',
+      table: {
+        category: 'Tree',
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'false' },
+      },
+    },
+    selectable: {
+      control: 'boolean',
+      description: 'Whether can be selected',
+      table: {
+        category: 'Tree',
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'true' },
+      },
+    },
+    showIcon: {
+      control: 'boolean',
+      description:
+        'Controls whether to display the icon node, no default style',
+      table: {
+        category: 'Tree',
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'false' },
+      },
+    },
+    showLine: {
+      control: 'boolean',
+      description: 'Shows a connecting line',
+      table: {
+        category: 'Tree',
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'false' },
+      },
+    },
+    virtual: {
+      control: 'boolean',
+      description: 'Disable virtual scroll when set to false',
+      table: {
+        category: 'Tree',
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'true' },
+      },
+    },
+    // Exclude unwanted properties
+    defaultExpandedKeys: {
+      table: {
+        disable: true,
+      },
+    },
+    defaultSelectedKeys: {
+      table: {
+        disable: true,
+      },
+    },
+    treeData: {
+      table: {
+        disable: true,
+      },
+    },
+  },
+  parameters: {
+    docs: {
+      description: {
+        component:
+          'The Tree component is used to display hierarchical data in a tree structure. It allows for features such as selection, expansion, and drag-and-drop functionality.',
+      },
+    },
+  },
+} as Meta<typeof Tree>;
+
+export default meta;
+
+const treeData: TreeDataNode[] = [
+  {
+    title: 'parent 1',
+    key: '0-0',
+    children: [
+      {
+        title: 'parent 1-0',
+        key: '0-0-0',
+        icon: <Icons.FileImageOutlined />,
+        children: [
+          {
+            title: 'leaf',
+            key: '0-0-0-0',
+          },
+          {
+            title: 'leaf',
+            key: '0-0-0-1',
+          },
+          {
+            title: 'leaf',
+            key: '0-0-0-2',
+          },
+        ],
+      },
+      {
+        title: 'parent 1-1',
+        key: '0-0-1',
+        icon: <Icons.FileImageOutlined />,
+        children: [
+          {
+            title: 'leaf',
+            key: '0-0-1-0',
+          },
+        ],
+      },
+      {
+        title: 'parent 1-2',
+        key: '0-0-2',
+        icon: <Icons.FileImageOutlined />,
+        children: [
+          {
+            title: 'leaf',
+            key: '0-0-2-0',
+          },
+          {
+            title: 'leaf',
+            key: '0-0-2-1',
+          },
+        ],
+      },
+    ],
+  },
+];
+
+type Story = StoryObj<typeof Tree>;
+
+export const TreeStory: Story = {
+  args: {
+    defaultExpandedKeys: ['0-0-0', '0-0-1'],
+    defaultSelectedKeys: ['0-0-1'],
+    treeData,
+  },
+  render: (args: TreeProps) => <Tree {...args} />,
+};
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Tree/Tree.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Tree/Tree.test.tsx
new file mode 100644
index 00000000000..1075bb53b65
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Tree/Tree.test.tsx
@@ -0,0 +1,52 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { render, screen, fireEvent } from '@superset-ui/core/spec';
+import '@testing-library/jest-dom';
+import Tree from './index';
+
+const treeData = [
+  {
+    title: 'Parent 1',
+    key: '0-0',
+    children: [
+      { title: 'Child 1', key: '0-0-0' },
+      { title: 'Child 2', key: '0-0-1' },
+    ],
+  },
+];
+
+describe('Tree Component', () => {
+  it('expands and collapses parent node', async () => {
+    render(<Tree treeData={treeData} defaultExpandAll={false} />);
+
+    expect(screen.queryByText('Child 1')).not.toBeInTheDocument();
+    expect(screen.queryByText('Child 2')).not.toBeInTheDocument();
+
+    const toogleNode = screen.getByRole('img', { name: 'caret-down' });
+    fireEvent.click(toogleNode);
+
+    expect(await screen.findByText('Child 1')).toBeInTheDocument();
+    expect(await screen.findByText('Child 2')).toBeInTheDocument();
+
+    fireEvent.click(toogleNode);
+
+    expect(screen.queryByText('Child 1')).not.toBeInTheDocument();
+    expect(screen.queryByText('Child 2')).not.toBeInTheDocument();
+  });
+});
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Tree/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Tree/index.tsx
new file mode 100644
index 00000000000..5a05e5e908a
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Tree/index.tsx
@@ -0,0 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { Tree } from 'antd';
+
+export type { TreeProps, DataNode as TreeDataNode } from 'antd/es/tree';
+export default Tree;
diff --git a/superset-frontend/packages/superset-ui-core/src/components/TreeSelect/TreeSelect.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/TreeSelect/TreeSelect.stories.tsx
new file mode 100644
index 00000000000..7c0f6e33e0a
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/TreeSelect/TreeSelect.stories.tsx
@@ -0,0 +1,262 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { Meta, StoryObj } from '@storybook/react';
+import { TreeSelect, type TreeSelectProps } from '.';
+
+export default {
+  title: 'Components/TreeSelect',
+  component: TreeSelect,
+  argTypes: {
+    allowClear: {
+      control: { type: 'boolean' },
+      description: 'Whether to allow clearing the selected value.',
+      defaultValue: false,
+      table: {
+        category: 'TreeSelect',
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'false' },
+      },
+    },
+    autoClearSearchValue: {
+      control: { type: 'boolean' },
+      description: 'Whether to clear the search value automatically.',
+      defaultValue: false,
+      table: {
+        category: 'TreeSelect',
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'true' },
+      },
+    },
+    disabled: {
+      control: { type: 'boolean' },
+      description: 'Whether the component is disabled.',
+      defaultValue: false,
+      table: {
+        category: 'TreeSelect',
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'false' },
+      },
+    },
+    labelInValue: {
+      control: { type: 'boolean' },
+      description: 'Whether to use label in value.',
+      defaultValue: false,
+      table: {
+        category: 'TreeSelect',
+        type: { summary: 'boolean' },
+      },
+    },
+    listHeight: {
+      control: { type: 'number' },
+      description: 'Height of the dropdown list.',
+      defaultValue: 256,
+      table: {
+        category: 'TreeSelect',
+        type: { summary: 'number' },
+        defaultValue: { summary: '256' },
+      },
+    },
+    maxTagCount: {
+      control: { type: 'number' },
+      description: 'Maximum number of tags to display.',
+      table: {
+        category: 'TreeSelect',
+        type: { summary: 'number' },
+      },
+    },
+    maxTagTextLength: {
+      control: { type: 'number' },
+      description: 'Maximum length of tag text.',
+      defaultValue: 20,
+      table: {
+        category: 'TreeSelect',
+        type: { summary: 'number' },
+      },
+    },
+    multiple: {
+      control: { type: 'boolean' },
+      description: 'Whether to allow multiple selections.',
+      defaultValue: false,
+      table: {
+        category: 'TreeSelect',
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'false' },
+      },
+    },
+    placeholder: {
+      control: { type: 'text' },
+      description: 'Placeholder text for the input field.',
+      defaultValue: 'Please select',
+      table: {
+        category: 'TreeSelect',
+        type: { summary: 'string' },
+      },
+    },
+    placement: {
+      control: { type: 'select' },
+      options: ['topLeft', 'topRight', 'bottomLeft', 'bottomRight'],
+      description: 'Placement of the dropdown menu.',
+      defaultValue: 'bottomLeft',
+      table: {
+        category: 'TreeSelect',
+        type: { summary: 'string' },
+        defaultValue: { summary: 'bottomLeft' },
+      },
+    },
+    showSearch: {
+      control: { type: 'boolean' },
+      description: 'Whether to show the search input.',
+      defaultValue: false,
+      table: {
+        category: 'TreeSelect',
+        type: { summary: 'boolean' },
+      },
+    },
+    size: {
+      control: { type: 'select' },
+      options: ['large', 'middle', 'small'],
+      description: 'Size of the component.',
+      defaultValue: 'middle',
+      table: {
+        category: 'TreeSelect',
+        type: { summary: 'string' },
+      },
+    },
+    status: {
+      control: { type: 'select' },
+      options: ['error', 'warning'],
+      description: 'Status of the component.',
+      defaultValue: 'error',
+      table: {
+        category: 'TreeSelect',
+        type: { summary: 'string' },
+      },
+    },
+    treeCheckable: {
+      control: { type: 'boolean' },
+      description: 'Whether to show checkable tree nodes.',
+      defaultValue: false,
+      table: {
+        category: 'TreeSelect',
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'false' },
+      },
+    },
+    treeDefaultExpandAll: {
+      control: { type: 'boolean' },
+      description: 'Whether to expand all tree nodes by default.',
+      defaultValue: false,
+      table: {
+        category: 'TreeSelect',
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'false' },
+      },
+    },
+    treeIcon: {
+      control: { type: 'boolean' },
+      description: 'Whether to show tree icons.',
+      defaultValue: false,
+      table: {
+        category: 'TreeSelect',
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'false' },
+      },
+    },
+    treeLine: {
+      control: { type: 'boolean' },
+      description: 'Whether to show tree lines.',
+      defaultValue: false,
+      table: {
+        category: 'TreeSelect',
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'false' },
+      },
+    },
+    variant: {
+      control: { type: 'select' },
+      options: ['outlined', 'borderless', 'filled', 'underlined'],
+      description: 'Variant of the component.',
+      defaultValue: 'outlined',
+      table: {
+        category: 'TreeSelect',
+        type: { summary: 'string' },
+        defaultValue: { summary: 'outlined' },
+      },
+    },
+    virtual: {
+      control: { type: 'boolean' },
+      description: 'Whether to use virtual scrolling.',
+      defaultValue: false,
+      table: {
+        category: 'TreeSelect',
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'true' },
+      },
+    },
+    treeData: {
+      table: {
+        disable: true,
+      },
+    },
+  },
+  parameters: {
+    docs: {
+      description: {
+        component:
+          'TreeSelect is a select component that allows users to select from a tree structure.',
+      },
+    },
+  },
+} as Meta<typeof TreeSelect>;
+
+type Story = StoryObj<typeof TreeSelect>;
+
+const treeData = [
+  {
+    title: 'Node1',
+    value: '0-0',
+    children: [
+      {
+        title: 'Child Node1',
+        value: '0-0-0',
+      },
+      {
+        title: 'Child Node2',
+        value: '0-0-1',
+      },
+    ],
+  },
+  {
+    title: 'Node2',
+    value: '0-1',
+    children: [
+      {
+        title: 'Child Node3',
+        value: '0-1-0',
+      },
+    ],
+  },
+];
+
+export const Default: Story = {
+  args: {
+    treeData,
+  },
+  render: (args: TreeSelectProps) => <TreeSelect {...args} />,
+};
diff --git a/superset-frontend/packages/superset-ui-core/src/components/TreeSelect/TreeSelect.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/TreeSelect/TreeSelect.test.tsx
new file mode 100644
index 00000000000..86077691abe
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/TreeSelect/TreeSelect.test.tsx
@@ -0,0 +1,64 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { render, fireEvent, screen } from '@superset-ui/core/spec';
+import '@testing-library/jest-dom';
+import { TreeSelect } from '.';
+
+const treeData = [
+  {
+    title: 'Node1',
+    value: '0-0',
+    children: [
+      {
+        title: 'Child Node1',
+        value: '0-0-0',
+      },
+      {
+        title: 'Child Node2',
+        value: '0-0-1',
+      },
+    ],
+  },
+  {
+    title: 'Node2',
+    value: '0-1',
+    children: [
+      {
+        title: 'Child Node3',
+        value: '0-1-0',
+      },
+    ],
+  },
+];
+
+describe('TreeSelect Component', () => {
+  it('should render TreeSelect correctly', () => {
+    render(
+      <TreeSelect
+        treeData={treeData}
+        treeCheckable
+        showCheckedStrategy={TreeSelect.SHOW_PARENT}
+        placeholder="Please select"
+        style={{ width: '300px' }}
+      />,
+    );
+    expect(screen.getByText('Please select')).toBeInTheDocument();
+    fireEvent.click(screen.getByText('Please select'));
+  });
+});
diff --git a/superset-frontend/packages/superset-ui-core/src/components/TreeSelect/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/TreeSelect/index.tsx
new file mode 100644
index 00000000000..a443ce00ac3
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/TreeSelect/index.tsx
@@ -0,0 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+export { TreeSelect, type TreeSelectProps } from 'antd';
diff --git a/superset-frontend/src/components/TruncatedList/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/TruncatedList/index.tsx
similarity index 96%
rename from superset-frontend/src/components/TruncatedList/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/TruncatedList/index.tsx
index ec764bfb299..0348d064ccd 100644
--- a/superset-frontend/src/components/TruncatedList/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/TruncatedList/index.tsx
@@ -20,7 +20,7 @@
 import { ReactNode, Key, useMemo } from 'react';
 
 import { styled, t, useTruncation } from '@superset-ui/core';
-import { Tooltip } from '../Tooltip';
+import { Tooltip } from '@superset-ui/core/components';
 
 export type TruncatedListProps<ListItemType> = {
   /**
@@ -56,7 +56,7 @@ const StyledTruncatedList = styled.div`
     width: 100%;
     display: flex;
 
-    .antd5-tooltip-open {
+    .ant-tooltip-open {
       display: inline;
     }
   }
@@ -88,8 +88,8 @@ const StyledTooltipItem = styled.div`
 const StyledPlus = styled.span`
   ${({ theme }) => `
   cursor: pointer;
-  color: ${theme.colors.primary.dark1};
-  font-weight: ${theme.typography.weights.normal};
+  color: ${theme.colorPrimaryText};
+  font-weight: ${theme.fontWeightNormal};
   `}
 `;
 
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Typography/Typography.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/Typography/Typography.stories.tsx
new file mode 100644
index 00000000000..16700be76f0
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Typography/Typography.stories.tsx
@@ -0,0 +1,204 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 type { Meta, StoryObj } from '@storybook/react';
+import { Typography } from '.';
+
+export default {
+  title: 'Components/Typography',
+  component: Typography,
+  subcomponents: {
+    Text: Typography.Text,
+    Title: Typography.Title,
+    Paragraph: Typography.Paragraph,
+    Link: Typography.Link,
+  },
+  argTypes: {
+    code: {
+      control: 'boolean',
+      description: 'Code style',
+      table: {
+        category: 'Typography.Text',
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'false' },
+      },
+    },
+    copyable: {
+      control: 'boolean',
+      description: 'Whether to be copyable, customize it via setting an object',
+      table: {
+        category: 'Typography.Text',
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'false' },
+      },
+    },
+    delete: {
+      control: 'boolean',
+      description: 'Deleted line style',
+      table: {
+        category: 'Typography.Text',
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'false' },
+      },
+    },
+    disabled: {
+      control: 'boolean',
+      description: 'Disabled content',
+      table: {
+        category: 'Typography.Text',
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'false' },
+      },
+    },
+    editable: {
+      control: 'boolean',
+      description: 'Whether to be editable, customize it via setting an object',
+      table: {
+        category: 'Typography.Text',
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'false' },
+      },
+    },
+    ellipsis: {
+      control: 'boolean',
+      description:
+        'Display ellipsis when text overflows, can not configure expandable、rows and onExpand by using object. Diff with Typography.Paragraph, Text do not have 100% width style which means it will fix width on the first ellipsis. If you want to have responsive ellipsis, please set width manually',
+      table: {
+        category: 'Typography.Text',
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'false' },
+      },
+    },
+    keyboard: {
+      control: 'boolean',
+      description: 'Keyboard style',
+      table: {
+        category: 'Typography.Text',
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'false' },
+      },
+    },
+    mark: {
+      control: 'boolean',
+      description: 'Marked style',
+      table: {
+        category: 'Typography.Text',
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'false' },
+      },
+    },
+    italic: {
+      control: 'boolean',
+      description: 'Italic style',
+      table: {
+        category: 'Typography.Text',
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'false' },
+      },
+    },
+    type: {
+      control: 'select',
+      description: 'Text type',
+      options: ['secondary', 'success', 'warning', 'danger'],
+      table: {
+        category: 'Typography.Text',
+        type: { summary: 'string' },
+      },
+    },
+    underline: {
+      control: 'boolean',
+      description: 'Underlined style	',
+      table: {
+        category: 'Typography.Text',
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'false' },
+      },
+    },
+    level: {
+      control: {
+        type: 'number',
+        min: 1,
+        max: 5,
+      },
+      description: 'Set content importance. Match with h1, h2, h3, h4, h5',
+      table: {
+        category: 'Typography.Title',
+        type: { summary: 'number' },
+      },
+    },
+    strong: {
+      control: 'boolean',
+      description: 'Bold style',
+      table: {
+        category: 'Typography.Paragraph',
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'false' },
+      },
+    },
+  },
+  parameters: {
+    docs: {
+      description: {
+        component:
+          'Typography is a component for displaying text with various styles and formats. It includes subcomponents like Title, Paragraph, and Link.',
+      },
+    },
+  },
+} as Meta<
+  typeof Typography.Text &
+    typeof Typography.Paragraph &
+    typeof Typography.Link &
+    typeof Typography.Title
+>;
+
+type TextStory = StoryObj<typeof Typography.Text>;
+
+export const TextStory: TextStory = {
+  args: {
+    children: 'Default Text',
+  },
+  render: args => <Typography.Text {...args} />,
+};
+
+type TitleStory = StoryObj<typeof Typography.Title>;
+
+export const TitleStory: TitleStory = {
+  args: {
+    children: 'Default Title',
+  },
+  render: args => <Typography.Title {...args} />,
+};
+type ParagraphStory = StoryObj<typeof Typography.Paragraph>;
+
+export const ParagraphStory: ParagraphStory = {
+  args: {
+    children: 'Default Paragraph',
+  },
+  render: args => <Typography.Paragraph {...args} />,
+};
+
+type LinkStory = StoryObj<typeof Typography.Link>;
+
+export const LinkStory: LinkStory = {
+  args: {
+    children: 'Default Link',
+    href: 'https://example.com',
+    target: '_blank',
+  },
+  render: args => <Typography.Link {...args} />,
+};
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Typography/Typography.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Typography/Typography.test.tsx
new file mode 100644
index 00000000000..3aa2bb05c05
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Typography/Typography.test.tsx
@@ -0,0 +1,69 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { render, screen } from '@superset-ui/core/spec';
+import '@testing-library/jest-dom';
+import { Typography } from '.';
+
+describe('Typography Component', () => {
+  it('renders Text component', () => {
+    render(<Typography.Text>Text Content</Typography.Text>);
+    expect(screen.getByText('Text Content')).toBeInTheDocument();
+  });
+
+  it('renders Title component', () => {
+    render(<Typography.Title level={2}>Title Content</Typography.Title>);
+    expect(screen.getByText('Title Content')).toBeInTheDocument();
+    expect(screen.getByRole('heading', { level: 2 })).toBeInTheDocument();
+  });
+
+  it('renders Paragraph component', () => {
+    render(<Typography.Paragraph>Paragraph Content</Typography.Paragraph>);
+    expect(screen.getByText('Paragraph Content')).toBeInTheDocument();
+  });
+
+  it('renders Link component', () => {
+    render(
+      <Typography.Link href="https://example.com">
+        Link Content
+      </Typography.Link>,
+    );
+    const link = screen.getByRole('link', { name: 'Link Content' });
+    expect(link).toBeInTheDocument();
+    expect(link).toHaveAttribute('href', 'https://example.com');
+  });
+
+  it('renders strong text', () => {
+    render(<Typography.Text strong>Strong Text</Typography.Text>);
+    expect(screen.getByText('Strong Text')).toHaveStyle('font-weight: 500');
+  });
+
+  it('renders underlined text', () => {
+    render(<Typography.Text underline>Underlined Text</Typography.Text>);
+    expect(screen.getByText('Underlined Text')).toHaveStyle(
+      'text-decoration: underline',
+    );
+  });
+
+  it('renders disabled text', () => {
+    render(<Typography.Text disabled>Disabled Text</Typography.Text>);
+    expect(screen.getByText('Disabled Text')).toHaveClass(
+      'ant-typography-disabled',
+    );
+  });
+});
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Typography/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Typography/index.tsx
new file mode 100644
index 00000000000..1e088aca553
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Typography/index.tsx
@@ -0,0 +1,42 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { styled, css } from '@superset-ui/core';
+import { Typography as AntdTypography } from 'antd';
+
+export type { ParagraphProps } from 'antd/es/typography/Paragraph';
+
+const StyledLink = styled(AntdTypography.Link)`
+    ${({ theme }) =>
+      css`
+      && {
+        color: ${theme.colorLink};
+        &:hover {
+          color: ${theme.colorLinkHover};
+        }
+    `}
+  }
+`;
+
+export const Typography: typeof AntdTypography = Object.assign(AntdTypography, {
+  Text: AntdTypography.Text,
+  Link: StyledLink,
+  Title: AntdTypography.Title,
+  Paragraph: AntdTypography.Paragraph,
+});
+export type { TypographyProps } from 'antd';
diff --git a/superset-frontend/packages/superset-ui-core/src/components/UnsavedChangesModal/UnsavedChangesModal.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/UnsavedChangesModal/UnsavedChangesModal.stories.tsx
new file mode 100644
index 00000000000..4742c4da8fe
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/UnsavedChangesModal/UnsavedChangesModal.stories.tsx
@@ -0,0 +1,47 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { ReactElement } from 'react';
+import { UnsavedChangesModal, type UnsavedChangesModalProps } from '.';
+
+export default {
+  title: 'Components/UnsavedChangesModal',
+  component: UnsavedChangesModal,
+};
+
+export const InteractiveUnsavedChangesModal = (
+  props: UnsavedChangesModalProps,
+): ReactElement => (
+  <UnsavedChangesModal {...props}>
+    If you don't save, changes will be lost.
+  </UnsavedChangesModal>
+);
+
+InteractiveUnsavedChangesModal.args = {
+  showModal: true,
+  onHide: () => {},
+  handleSave: () => {},
+  onConfirmNavigation: () => {},
+  title: 'Unsaved Changes',
+};
+
+InteractiveUnsavedChangesModal.argTypes = {
+  onHide: { action: 'onHide' },
+  handleSave: { action: 'handleSave' },
+  onConfirmNavigation: { action: 'onConfirmNavigation' },
+};
diff --git a/superset-frontend/packages/superset-ui-core/src/components/UnsavedChangesModal/UnsavedChangesModal.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/UnsavedChangesModal/UnsavedChangesModal.test.tsx
new file mode 100644
index 00000000000..995bd704d6a
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/UnsavedChangesModal/UnsavedChangesModal.test.tsx
@@ -0,0 +1,96 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { render, screen, userEvent } from '@superset-ui/core/spec';
+import { UnsavedChangesModal } from '.';
+
+test('should render nothing if showModal is false', () => {
+  const { queryByRole } = render(
+    <UnsavedChangesModal
+      showModal={false}
+      onHide={() => {}}
+      handleSave={() => {}}
+      onConfirmNavigation={() => {}}
+    />,
+  );
+
+  expect(queryByRole('dialog')).not.toBeInTheDocument();
+});
+
+test('should render the UnsavedChangesModal component if showModal is true', async () => {
+  const { queryByRole } = render(
+    <UnsavedChangesModal
+      showModal
+      onHide={() => {}}
+      handleSave={() => {}}
+      onConfirmNavigation={() => {}}
+    />,
+  );
+
+  expect(queryByRole('dialog')).toBeInTheDocument();
+});
+
+test('should only call onConfirmNavigation when clicking the Discard button', async () => {
+  const mockOnHide = jest.fn();
+  const mockHandleSave = jest.fn();
+  const mockOnConfirmNavigation = jest.fn();
+
+  render(
+    <UnsavedChangesModal
+      showModal
+      onHide={mockOnHide}
+      handleSave={mockHandleSave}
+      onConfirmNavigation={mockOnConfirmNavigation}
+    />,
+  );
+
+  const discardButton: HTMLElement = await screen.findByRole('button', {
+    name: /discard/i,
+  });
+
+  userEvent.click(discardButton);
+
+  expect(mockOnConfirmNavigation).toHaveBeenCalled();
+  expect(mockHandleSave).not.toHaveBeenCalled();
+  expect(mockOnHide).not.toHaveBeenCalled();
+});
+
+test('should only call handleSave when clicking the Save button', async () => {
+  const mockOnHide = jest.fn();
+  const mockHandleSave = jest.fn();
+  const mockOnConfirmNavigation = jest.fn();
+
+  render(
+    <UnsavedChangesModal
+      showModal
+      onHide={mockOnHide}
+      handleSave={mockHandleSave}
+      onConfirmNavigation={mockOnConfirmNavigation}
+    />,
+  );
+
+  const saveButton: HTMLElement = await screen.findByRole('button', {
+    name: /save/i,
+  });
+
+  userEvent.click(saveButton);
+
+  expect(mockHandleSave).toHaveBeenCalled();
+  expect(mockOnHide).not.toHaveBeenCalled();
+  expect(mockOnConfirmNavigation).not.toHaveBeenCalled();
+});
diff --git a/superset-frontend/packages/superset-ui-core/src/components/UnsavedChangesModal/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/UnsavedChangesModal/index.tsx
new file mode 100644
index 00000000000..1493a38821a
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/UnsavedChangesModal/index.tsx
@@ -0,0 +1,129 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { t, styled, css } from '@superset-ui/core';
+import { Icons, Modal, Typography } from '@superset-ui/core/components';
+import { Button } from '@superset-ui/core/components/Button';
+import type { FC, ReactElement } from 'react';
+
+const StyledModalTitle = styled(Typography.Title)`
+  && {
+    font-weight: 600;
+    margin: 0;
+  }
+`;
+
+const StyledModalBody = styled(Typography.Text)`
+  ${({ theme }) => css`
+    padding: 0 ${theme.sizeUnit * 2}px;
+
+    && {
+      margin: 0;
+    }
+  `}
+`;
+
+const StyledDiscardBtn = styled(Button)`
+  ${({ theme }) => css`
+    min-width: ${theme.sizeUnit * 22}px;
+    height: ${theme.sizeUnit * 8}px;
+  `}
+`;
+
+const StyledSaveBtn = styled(Button)`
+  ${({ theme }) => css`
+    min-width: ${theme.sizeUnit * 17}px;
+    height: ${theme.sizeUnit * 8}px;
+    span > :first-of-type {
+      margin-right: 0;
+    }
+  `}
+`;
+
+const StyledWarningIcon = styled(Icons.WarningOutlined)`
+  ${({ theme }) => css`
+    color: ${theme.colorWarning};
+    margin-right: ${theme.sizeUnit * 4}px;
+  `}
+`;
+
+export type UnsavedChangesModalProps = {
+  showModal: boolean;
+  onHide: () => void;
+  handleSave: () => void;
+  onConfirmNavigation: () => void;
+  title?: string;
+  body?: string;
+};
+
+export const UnsavedChangesModal: FC<UnsavedChangesModalProps> = ({
+  showModal,
+  onHide,
+  handleSave,
+  onConfirmNavigation,
+  title = 'Unsaved Changes',
+  body = "If you don't save, changes will be lost.",
+}: UnsavedChangesModalProps): ReactElement => (
+  <Modal
+    centered
+    responsive
+    onHide={onHide}
+    show={showModal}
+    width="444px"
+    title={
+      <div
+        css={css`
+          align-items: center;
+          display: flex;
+        `}
+      >
+        <StyledWarningIcon iconSize="xl" />
+        <StyledModalTitle type="secondary" level={5}>
+          {title}
+        </StyledModalTitle>
+      </div>
+    }
+    footer={
+      <div
+        css={css`
+          display: flex;
+          justify-content: flex-end;
+          width: 100%;
+        `}
+      >
+        <StyledDiscardBtn
+          htmlType="button"
+          buttonSize="small"
+          onClick={onConfirmNavigation}
+        >
+          {t('Discard')}
+        </StyledDiscardBtn>
+        <StyledSaveBtn
+          htmlType="button"
+          buttonSize="small"
+          buttonStyle="primary"
+          onClick={handleSave}
+        >
+          {t('Save')}
+        </StyledSaveBtn>
+      </div>
+    }
+  >
+    <StyledModalBody type="secondary">{body}</StyledModalBody>
+  </Modal>
+);
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Upload/Upload.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/Upload/Upload.stories.tsx
new file mode 100644
index 00000000000..94b524958de
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Upload/Upload.stories.tsx
@@ -0,0 +1,132 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 type { Meta, StoryObj } from '@storybook/react';
+import { Icons } from '../Icons';
+import { Button } from '../Button';
+import { Upload } from '.';
+
+const meta: Meta<typeof Upload> = {
+  title: 'Components/Upload',
+  component: Upload,
+  argTypes: {
+    accept: {
+      control: false,
+      description: 'File types that can be accepted',
+      defaultValue: undefined,
+      type: 'string',
+    },
+    action: {
+      control: 'text',
+      description: 'Uploading URL',
+      defaultValue: undefined,
+      type: 'string',
+    },
+    name: {
+      control: false,
+      description: 'The name of uploading file',
+      table: {
+        type: { summary: 'string' },
+        defaultValue: { summary: 'file' },
+      },
+    },
+    multiple: {
+      control: 'boolean',
+      description: 'Support multiple file selection',
+      table: {
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'false' },
+      },
+    },
+    disabled: {
+      control: 'boolean',
+      description: 'Disable upload button',
+      table: {
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'false' },
+      },
+    },
+    listType: {
+      control: 'select',
+      options: ['text', 'picture', 'picture-card', 'picture-circle'],
+      description: 'Built-in stylesheets for file list display',
+      table: {
+        type: { summary: 'string' },
+        defaultValue: { summary: 'text' },
+      },
+    },
+    showUploadList: {
+      control: 'boolean',
+      description:
+        'Whether to show default upload list, could be an object to specify extra, showPreviewIcon, showRemoveIcon, showDownloadIcon, removeIcon and downloadIcon individually upload list display',
+      table: {
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'true' },
+      },
+    },
+    method: {
+      control: false,
+      description: 'The HTTP method of upload request',
+      table: {
+        type: { summary: 'string' },
+        defaultValue: { summary: 'post' },
+      },
+    },
+    withCredentials: {
+      control: false,
+      description: 'Send cookies with ajax upload',
+      table: {
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'false' },
+      },
+    },
+    openFileDialogOnClick: {
+      control: 'boolean',
+      description: 'Click open file dialog',
+      table: {
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'true' },
+      },
+    },
+    progress: {
+      control: false,
+      description: 'Custom progress bar',
+      table: {
+        type: { summary: 'object' },
+      },
+    },
+  },
+};
+
+export default meta;
+type Story = StoryObj<typeof Upload>;
+
+export const Default: Story = {
+  render: args => (
+    <Upload {...args}>
+      {args.listType !== 'picture-card' &&
+      args.listType !== 'picture-circle' ? (
+        <Button icon={<Icons.UploadOutlined iconColor="light" iconSize="l" />}>
+          Click to Upload
+        </Button>
+      ) : (
+        'Click to Upload'
+      )}
+    </Upload>
+  ),
+};
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Upload/Upload.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Upload/Upload.test.tsx
new file mode 100644
index 00000000000..fb0f08ed666
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Upload/Upload.test.tsx
@@ -0,0 +1,49 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { render, screen, fireEvent, waitFor } from '@superset-ui/core/spec';
+import { Button, Upload } from '..';
+
+describe('Upload Component', () => {
+  it('renders upload button and triggers file upload', async () => {
+    const handleChange = jest.fn();
+
+    render(
+      <Upload onChange={handleChange}>
+        <Button>Click to Upload</Button>
+      </Upload>,
+    );
+
+    const btn = screen.getByRole('button', { name: /click to upload/i });
+    expect(btn).toBeInTheDocument();
+
+    const fileInput = btn.closest('span')?.querySelector('input[type="file"]');
+    expect(fileInput).toBeTruthy();
+
+    const file = new File(['dummy content'], 'example.png', {
+      type: 'image/png',
+    });
+    if (fileInput) {
+      fireEvent.change(fileInput, { target: { files: [file] } });
+    }
+
+    await waitFor(() => {
+      expect(handleChange).toHaveBeenCalledTimes(1);
+    });
+  });
+});
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Upload/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Upload/index.tsx
new file mode 100644
index 00000000000..ecc176e8661
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Upload/index.tsx
@@ -0,0 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+export { Upload, type UploadFile } from 'antd';
+export type { UploadChangeParam } from 'antd/es/upload';
diff --git a/superset-frontend/src/components/WarningIconWithTooltip/WarningIconWithTooltip.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/WarningIconWithTooltip/WarningIconWithTooltip.stories.tsx
similarity index 96%
rename from superset-frontend/src/components/WarningIconWithTooltip/WarningIconWithTooltip.stories.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/WarningIconWithTooltip/WarningIconWithTooltip.stories.tsx
index 88cd08e8ec4..00fe40b0323 100644
--- a/superset-frontend/src/components/WarningIconWithTooltip/WarningIconWithTooltip.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/WarningIconWithTooltip/WarningIconWithTooltip.stories.tsx
@@ -19,7 +19,7 @@
 import WarningIconWithTooltip, { WarningIconWithTooltipProps } from '.';
 
 export default {
-  title: 'WarningIconWithTooltip',
+  title: 'Components/WarningIconWithTooltip',
   component: WarningIconWithTooltip,
 };
 
diff --git a/superset-frontend/src/components/WarningIconWithTooltip/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/WarningIconWithTooltip/index.tsx
similarity index 82%
rename from superset-frontend/src/components/WarningIconWithTooltip/index.tsx
rename to superset-frontend/packages/superset-ui-core/src/components/WarningIconWithTooltip/index.tsx
index 543b3fc29a8..607eed6f7c0 100644
--- a/superset-frontend/src/components/WarningIconWithTooltip/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/WarningIconWithTooltip/index.tsx
@@ -16,9 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { useTheme, SafeMarkdown } from '@superset-ui/core';
-import { Icons, IconType } from 'src/components/Icons';
-import { Tooltip } from 'src/components/Tooltip';
+import { useTheme } from '@superset-ui/core';
+import { Icons, type IconType, SafeMarkdown, Tooltip } from '..';
 
 export interface WarningIconWithTooltipProps {
   warningMarkdown: string;
@@ -38,9 +37,9 @@ function WarningIconWithTooltip({
       title={<SafeMarkdown source={warningMarkdown} />}
     >
       <Icons.WarningOutlined
-        iconColor={theme.colors.warning.base}
+        iconColor={theme.colorWarning}
         iconSize={size}
-        css={{ marginRight: marginRight ?? theme.gridUnit * 2 }}
+        css={{ marginRight: marginRight ?? theme.sizeUnit * 2 }}
       />
     </Tooltip>
   );
diff --git a/superset/static/assets/.gitkeep b/superset-frontend/packages/superset-ui-core/src/components/assets/images/.!80135!loading.gif
similarity index 100%
rename from superset/static/assets/.gitkeep
rename to superset-frontend/packages/superset-ui-core/src/components/assets/images/.!80135!loading.gif
diff --git a/superset-frontend/packages/superset-ui-core/src/components/assets/images/.!80342!loading.gif b/superset-frontend/packages/superset-ui-core/src/components/assets/images/.!80342!loading.gif
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/superset-frontend/packages/superset-ui-core/src/components/assets/images/.!80520!loading.gif b/superset-frontend/packages/superset-ui-core/src/components/assets/images/.!80520!loading.gif
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/superset-frontend/packages/superset-ui-core/src/components/assets/images/.!80903!loading.gif b/superset-frontend/packages/superset-ui-core/src/components/assets/images/.!80903!loading.gif
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/superset-frontend/src/components/Modal/index.ts b/superset-frontend/packages/superset-ui-core/src/components/assets/images/index.ts
similarity index 93%
rename from superset-frontend/src/components/Modal/index.ts
rename to superset-frontend/packages/superset-ui-core/src/components/assets/images/index.ts
index 9466591c7a1..c272c1186cd 100644
--- a/superset-frontend/src/components/Modal/index.ts
+++ b/superset-frontend/packages/superset-ui-core/src/components/assets/images/index.ts
@@ -16,5 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-export * from './Modal';
-export { default } from './Modal';
+import Loading from './loading.gif';
+
+export { Loading };
diff --git a/superset-frontend/packages/superset-ui-core/src/components/assets/images/loading.gif b/superset-frontend/packages/superset-ui-core/src/components/assets/images/loading.gif
new file mode 100644
index 00000000000..d82fc5d9244
Binary files /dev/null and b/superset-frontend/packages/superset-ui-core/src/components/assets/images/loading.gif differ
diff --git a/superset-frontend/packages/superset-ui-core/src/components/assets/index.ts b/superset-frontend/packages/superset-ui-core/src/components/assets/index.ts
new file mode 100644
index 00000000000..c59dc1dc385
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/assets/index.ts
@@ -0,0 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+export * from './svgs';
+export * from './images';
diff --git a/superset-frontend/src/assets/images/chart.svg b/superset-frontend/packages/superset-ui-core/src/components/assets/svgs/chart.svg
similarity index 96%
rename from superset-frontend/src/assets/images/chart.svg
rename to superset-frontend/packages/superset-ui-core/src/components/assets/svgs/chart.svg
index 34e45631e08..3ea5213f17b 100644
--- a/superset-frontend/src/assets/images/chart.svg
+++ b/superset-frontend/packages/superset-ui-core/src/components/assets/svgs/chart.svg
@@ -17,6 +17,6 @@ specific language governing permissions and limitations
 under the License.
 -->
 <svg width="160" height="170" viewBox="0 0 160 166" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M123.638 8C123.362 8 123.138 8.22386 123.138 8.5V158H151.896V8.5C151.896 8.22386 151.672 8 151.396 8H123.638ZM84.7933 40.6426C84.7933 40.3665 85.0171 40.1426 85.2933 40.1426H113.052C113.328 40.1426 113.552 40.3665 113.552 40.6426V158H84.7933V40.6426ZM46.9486 72.2853C46.6725 72.2853 46.4486 72.5091 46.4486 72.7853V157.999H75.2071V72.7853C75.2071 72.5091 74.9832 72.2853 74.7071 72.2853H46.9486ZM8.604 93.7147C8.32786 93.7147 8.104 93.9385 8.104 94.2147V158H36.8625V94.2147C36.8625 93.9385 36.6386 93.7147 36.3625 93.7147H8.604Z" fill="currentColor" stroke="currentColor" fill-opacity="0.5" />
-<path d="M123.138 158H122.638V158.5H123.138V158ZM151.896 158V158.5H152.396V158H151.896ZM113.552 158V158.5H114.052V158H113.552ZM84.7933 158H84.2933V158.5H84.7933V158ZM46.4486 157.999H45.9486V158.499H46.4486V157.999ZM75.2071 157.999V158.499H75.7071V157.999H75.2071ZM8.104 158H7.604V158.5H8.104V158ZM36.8625 158V158.5H37.3625V158H36.8625ZM123.638 8.5V8.5V7.5C123.086 7.5 122.638 7.94772 122.638 8.5H123.638ZM123.638 158V8.5H122.638V158H123.638ZM151.896 157.5H123.138V158.5H151.896V157.5ZM151.396 8.5V158H152.396V8.5H151.396ZM151.396 8.5H152.396C152.396 7.94772 151.949 7.5 151.396 7.5V8.5ZM123.638 8.5H151.396V7.5H123.638V8.5ZM85.2933 39.6426C84.741 39.6426 84.2933 40.0904 84.2933 40.6426H85.2933V39.6426ZM113.052 39.6426H85.2933V40.6426H113.052V39.6426ZM114.052 40.6426C114.052 40.0904 113.604 39.6426 113.052 39.6426V40.6426H114.052ZM114.052 158V40.6426H113.052V158H114.052ZM84.7933 158.5H113.552V157.5H84.7933V158.5ZM84.2933 40.6426V158H85.2933V40.6426H84.2933ZM46.9486 72.7853V71.7853C46.3964 71.7853 45.9486 72.233 45.9486 72.7853H46.9486ZM46.9486 157.999V72.7853H45.9486V157.999H46.9486ZM75.2071 157.499H46.4486V158.499H75.2071V157.499ZM74.7071 72.7853V157.999H75.7071V72.7853H74.7071ZM74.7071 72.7853H75.7071C75.7071 72.233 75.2594 71.7853 74.7071 71.7853V72.7853ZM46.9486 72.7853H74.7071V71.7853H46.9486V72.7853ZM8.604 94.2147H8.604V93.2147C8.05172 93.2147 7.604 93.6624 7.604 94.2147H8.604ZM8.604 158V94.2147H7.604V158H8.604ZM36.8625 157.5H8.104V158.5H36.8625V157.5ZM36.3625 94.2147V158H37.3625V94.2147H36.3625ZM36.3625 94.2147H37.3625C37.3625 93.6624 36.9147 93.2147 36.3625 93.2147V94.2147ZM8.604 94.2147H36.3625V93.2147H8.604V94.2147Z" fill="currentColor" stroke="currentColor" fill-opacity="0.5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M123.638 8C123.362 8 123.138 8.22386 123.138 8.5V158H151.896V8.5C151.896 8.22386 151.672 8 151.396 8H123.638ZM84.7933 40.6426C84.7933 40.3665 85.0171 40.1426 85.2933 40.1426H113.052C113.328 40.1426 113.552 40.3665 113.552 40.6426V158H84.7933V40.6426ZM46.9486 72.2853C46.6725 72.2853 46.4486 72.5091 46.4486 72.7853V157.999H75.2071V72.7853C75.2071 72.5091 74.9832 72.2853 74.7071 72.2853H46.9486ZM8.604 93.7147C8.32786 93.7147 8.104 93.9385 8.104 94.2147V158H36.8625V94.2147C36.8625 93.9385 36.6386 93.7147 36.3625 93.7147H8.604Z" fill="currentColor" stroke="currentColor" fill-opacity="0.25" />
+<path d="M123.138 158H122.638V158.5H123.138V158ZM151.896 158V158.5H152.396V158H151.896ZM113.552 158V158.5H114.052V158H113.552ZM84.7933 158H84.2933V158.5H84.7933V158ZM46.4486 157.999H45.9486V158.499H46.4486V157.999ZM75.2071 157.999V158.499H75.7071V157.999H75.2071ZM8.104 158H7.604V158.5H8.104V158ZM36.8625 158V158.5H37.3625V158H36.8625ZM123.638 8.5V8.5V7.5C123.086 7.5 122.638 7.94772 122.638 8.5H123.638ZM123.638 158V8.5H122.638V158H123.638ZM151.896 157.5H123.138V158.5H151.896V157.5ZM151.396 8.5V158H152.396V8.5H151.396ZM151.396 8.5H152.396C152.396 7.94772 151.949 7.5 151.396 7.5V8.5ZM123.638 8.5H151.396V7.5H123.638V8.5ZM85.2933 39.6426C84.741 39.6426 84.2933 40.0904 84.2933 40.6426H85.2933V39.6426ZM113.052 39.6426H85.2933V40.6426H113.052V39.6426ZM114.052 40.6426C114.052 40.0904 113.604 39.6426 113.052 39.6426V40.6426H114.052ZM114.052 158V40.6426H113.052V158H114.052ZM84.7933 158.5H113.552V157.5H84.7933V158.5ZM84.2933 40.6426V158H85.2933V40.6426H84.2933ZM46.9486 72.7853V71.7853C46.3964 71.7853 45.9486 72.233 45.9486 72.7853H46.9486ZM46.9486 157.999V72.7853H45.9486V157.999H46.9486ZM75.2071 157.499H46.4486V158.499H75.2071V157.499ZM74.7071 72.7853V157.999H75.7071V72.7853H74.7071ZM74.7071 72.7853H75.7071C75.7071 72.233 75.2594 71.7853 74.7071 71.7853V72.7853ZM46.9486 72.7853H74.7071V71.7853H46.9486V72.7853ZM8.604 94.2147H8.604V93.2147C8.05172 93.2147 7.604 93.6624 7.604 94.2147H8.604ZM8.604 158V94.2147H7.604V158H8.604ZM36.8625 157.5H8.104V158.5H36.8625V157.5ZM36.3625 94.2147V158H37.3625V94.2147H36.3625ZM36.3625 94.2147H37.3625C37.3625 93.6624 36.9147 93.2147 36.3625 93.2147V94.2147ZM8.604 94.2147H36.3625V93.2147H8.604V94.2147Z" fill="currentColor" stroke="currentColor" fill-opacity="0.25"/>
 </svg>
diff --git a/superset-frontend/src/assets/images/icons/error.svg b/superset-frontend/packages/superset-ui-core/src/components/assets/svgs/error.svg
similarity index 100%
rename from superset-frontend/src/assets/images/icons/error.svg
rename to superset-frontend/packages/superset-ui-core/src/components/assets/svgs/error.svg
diff --git a/superset-frontend/packages/superset-ui-core/src/components/assets/svgs/index.ts b/superset-frontend/packages/superset-ui-core/src/components/assets/svgs/index.ts
new file mode 100644
index 00000000000..e33811776f8
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/assets/svgs/index.ts
@@ -0,0 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 chart from './chart.svg';
+import error from './error.svg';
+
+export { chart, error };
diff --git a/superset-frontend/src/components/atomic-design.png b/superset-frontend/packages/superset-ui-core/src/components/atomic-design.png
similarity index 100%
rename from superset-frontend/src/components/atomic-design.png
rename to superset-frontend/packages/superset-ui-core/src/components/atomic-design.png
diff --git a/superset-frontend/packages/superset-ui-core/src/components/constants.ts b/superset-frontend/packages/superset-ui-core/src/components/constants.ts
index f252d725dd2..05b681c28f4 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/constants.ts
+++ b/superset-frontend/packages/superset-ui-core/src/components/constants.ts
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-/**
- * Faster debounce delay for inputs without expensive operation.
- */
-export const FAST_DEBOUNCE = 250;
+import { t } from '..';
 
-/**
- * Slower debounce delay for inputs with expensive API calls.
- */
-export const SLOW_DEBOUNCE = 500;
+export const Constants = {
+  FAST_DEBOUNCE: 250,
+  SLOW_DEBOUNCE: 500,
+  NULL_DISPLAY: t('N/A'),
+  BOOL_TRUE_DISPLAY: t('True'),
+  BOOL_FALSE_DISPLAY: t('False'),
+};
diff --git a/superset-frontend/packages/superset-ui-core/src/components/index.ts b/superset-frontend/packages/superset-ui-core/src/components/index.ts
index 6fe666c0372..f7eda5e3332 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/index.ts
+++ b/superset-frontend/packages/superset-ui-core/src/components/index.ts
@@ -1,4 +1,4 @@
-/*
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -17,5 +17,152 @@
  * under the License.
  */
 
+/*
+ * Re-exporting of components in @superset-ui/core/components to facilitate
+ * their imports by other components.
+ * E.g. import { Select } from '@superset-ui/core/components', probably in the future from '@superset-ui/components'
+ */
+export * from './Input';
+export { AntdThemeProvider } from './AntdThemeProvider';
+export {
+  ConfirmStatusChange,
+  type ConfirmStatusChangeProps,
+} from './ConfirmStatusChange';
+export { Alert, type AlertProps } from './Alert';
+export { CertifiedBadge } from './CertifiedBadge';
+export * from './Icons';
+export * from './Timer';
+export {
+  AsyncEsmComponent,
+  type PlaceholderProps as AsyncEsmPlaceholderProps,
+} from './AsyncEsmComponent';
+export {
+  AsyncAceEditor,
+  CssEditor,
+  JsonEditor,
+  SQLEditor,
+  FullSQLEditor,
+  MarkdownEditor,
+  TextAreaEditor,
+  ConfigEditor,
+  type AsyncAceEditorProps,
+  type Editor,
+} from './AsyncAceEditor';
+export { AutoComplete, type AutoCompleteProps } from './AutoComplete';
+export {
+  Avatar,
+  AvatarGroup,
+  type AvatarProps,
+  type AvatarGroupProps,
+} from './Avatar';
+export { Badge, type BadgeProps } from './Badge';
+export { Button, type ButtonProps, type OnClickHandler } from './Button';
+export { ButtonGroup, type ButtonGroupProps } from './ButtonGroup';
+export { Breadcrumb, type BreadcrumbProps } from './Breadcrumb';
+export { CachedLabel, type CacheLabelProps } from './CachedLabel';
+export { Card } from './Card';
+export {
+  Checkbox,
+  type CheckboxProps,
+  type CheckboxChangeEvent,
+} from './Checkbox';
+export {
+  Collapse,
+  type CollapseProps,
+  CollapseLabelInModal,
+  type CollapseLabelInModalProps,
+} from './Collapse';
+export { CronPicker, type CronError } from './CronPicker';
+export * from './DatePicker';
+export { DeleteModal, type DeleteModalProps } from './DeleteModal';
+export { Divider, type DividerProps } from './Divider';
+export {
+  Dropdown,
+  MenuDotsDropdown,
+  NoAnimationDropdown,
+  type DropdownProps,
+  type NoAnimationDropdownProps,
+  type MenuDotsDropdownProps,
+} from './Dropdown';
+export { DropdownButton, type DropdownButtonProps } from './DropdownButton';
+export {
+  DropdownContainer,
+  type DropdownItem,
+  type DropdownRef,
+} from './DropdownContainer';
+export {
+  DynamicEditableTitle,
+  type DynamicEditableTitleProps,
+} from './DynamicEditableTitle';
+export { EditableTitle, type EditableTitleProps } from './EditableTitle';
+export { EmptyState, type EmptyStateProps } from './EmptyState';
+export { Empty, type EmptyProps } from './EmptyState/Empty';
+export { FaveStar, type FaveStarProps } from './FaveStar';
+export {
+  Modal,
+  FormModal,
+  StyledModal,
+  type ModalProps,
+  type FormModalProps,
+} from './Modal';
+export * from './ModalTrigger';
+export { Flex, type FlexProps } from './Flex';
+export {
+  Form,
+  FormItem,
+  FormLabel,
+  LabeledErrorBoundInput,
+  type FormInstance,
+  type FormProps,
+  type FormItemProps,
+} from './Form';
+export { Grid, Row, Col, type RowProps, type ColProps } from './Grid';
+export { IconButton, type IconButtonProps } from './IconButton';
+export * from './Tooltip';
+export { Tooltip as RawAntdTooltip } from 'antd';
+export { IconTooltip, type IconTooltipProps } from './IconTooltip';
+export { InfoTooltip, type InfoTooltipProps } from './InfoTooltip';
+export {
+  Label,
+  DatasetTypeLabel,
+  PublishedLabel,
+  type LabelType,
+} from './Label';
+export { LastUpdated, type LastUpdatedProps } from './LastUpdated';
+export { Layout, type LayoutProps, type SiderProps } from './Layout';
+export { List, type ListProps, type ListItemProps } from './List';
+export {
+  ListViewCard,
+  ImageLoader,
+  type ListViewCardProps,
+} from './ListViewCard';
+export { Loading, type LoadingProps } from './Loading';
+
+export { Skeleton, type SkeletonProps } from './Skeleton';
+
+export { Switch, type SwitchProps } from './Switch';
+
+export { TreeSelect, type TreeSelectProps } from './TreeSelect';
+
+export {
+  Typography,
+  type TypographyProps,
+  type ParagraphProps,
+} from './Typography';
+
+export { Image, type ImageProps } from './Image';
+export { Upload, type UploadFile, type UploadChangeParam } from './Upload';
+// Add these to your index.ts
+export * from './Menu';
+export * from './Popover';
+export * from './Radio';
+export * from './SafeMarkdown/SafeMarkdown';
+export * from './Select';
+export * from './Space';
+export * from './Steps';
+export * from './Table';
+export * from './TableView';
+export * from './Tag';
+export * from './UnsavedChangesModal';
 export * from './constants';
-export { default as SafeMarkdown } from './SafeMarkdown';
+export * from './Result';
diff --git a/superset-frontend/packages/superset-ui-core/src/connection/README.md b/superset-frontend/packages/superset-ui-core/src/connection/README.md
index 628edbfaa64..52dad45db11 100644
--- a/superset-frontend/packages/superset-ui-core/src/connection/README.md
+++ b/superset-frontend/packages/superset-ui-core/src/connection/README.md
@@ -93,7 +93,6 @@ Per-request aborting is implemented through the `AbortController` API:
 
 ```javascript
 import { SupersetClient } from '@superset-ui/core';
-import AbortController from 'abortcontroller-polyfill';
 
 const controller = new AbortController();
 const { signal } = controller;
diff --git a/superset-frontend/packages/superset-ui-core/src/connection/callApi/callApi.ts b/superset-frontend/packages/superset-ui-core/src/connection/callApi/callApi.ts
index c682e5b7300..fddac0399c9 100644
--- a/superset-frontend/packages/superset-ui-core/src/connection/callApi/callApi.ts
+++ b/superset-frontend/packages/superset-ui-core/src/connection/callApi/callApi.ts
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-import 'whatwg-fetch';
 import fetchRetry from 'fetch-retry';
 import { CallApi, Payload, JsonValue, JsonObject } from '../types';
 import {
diff --git a/superset-frontend/packages/superset-ui-core/src/currency-format/CurrencyFormatter.ts b/superset-frontend/packages/superset-ui-core/src/currency-format/CurrencyFormatter.ts
index a5f215fe955..50be87adf69 100644
--- a/superset-frontend/packages/superset-ui-core/src/currency-format/CurrencyFormatter.ts
+++ b/superset-frontend/packages/superset-ui-core/src/currency-format/CurrencyFormatter.ts
@@ -21,6 +21,8 @@ import { ExtensibleFunction } from '../models';
 import { getNumberFormatter, NumberFormats } from '../number-format';
 import { Currency } from '../query';
 
+/* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */
+
 interface CurrencyFormatterConfig {
   d3Format?: string;
   currency: Currency;
diff --git a/superset-frontend/packages/superset-ui-core/src/index.ts b/superset-frontend/packages/superset-ui-core/src/index.ts
index 7258a3b6482..ceb5d08c90e 100644
--- a/superset-frontend/packages/superset-ui-core/src/index.ts
+++ b/superset-frontend/packages/superset-ui-core/src/index.ts
@@ -28,11 +28,10 @@ export * from './number-format';
 export * from './time-format';
 export * from './dimension';
 export * from './color';
-export * from './style';
+export * from './theme';
 export * from './validator';
 export * from './chart';
 export * from './chart-composition';
-export * from './components';
 export * from './math-expression';
 export * from './ui-overrides';
 export * from './hooks';
diff --git a/superset-frontend/packages/superset-ui-core/src/number-format/NumberFormatter.ts b/superset-frontend/packages/superset-ui-core/src/number-format/NumberFormatter.ts
index e8be9deba2e..42be0bb8324 100644
--- a/superset-frontend/packages/superset-ui-core/src/number-format/NumberFormatter.ts
+++ b/superset-frontend/packages/superset-ui-core/src/number-format/NumberFormatter.ts
@@ -20,6 +20,8 @@ import { ExtensibleFunction } from '../models';
 import { isRequired } from '../utils';
 import { NumberFormatFunction } from './types';
 
+/* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */
+
 export const PREVIEW_VALUE = 12345.432;
 
 export interface NumberFormatterConfig {
diff --git a/superset-frontend/packages/superset-ui-core/src/query/api/v1/types.ts b/superset-frontend/packages/superset-ui-core/src/query/api/v1/types.ts
index 06d1419e747..984eb52e5e6 100644
--- a/superset-frontend/packages/superset-ui-core/src/query/api/v1/types.ts
+++ b/superset-frontend/packages/superset-ui-core/src/query/api/v1/types.ts
@@ -43,7 +43,7 @@ export interface SupersetApiRequestOptions {
  * Superset API error types.
  * Ref: https://github.com/apache/incubator-superset/blob/318e5347bc6f88119725775baa4ab9a398a6f0b0/superset/errors.py#L24
  *
- * TODO: migrate superset-frontend/src/components/ErrorMessage/types.ts over
+ * TODO: migrate superset-frontend/@superset-ui/core/components/ErrorMessage/types.ts over
  */
 export enum SupersetApiErrorType {
   // Generic unknown error
diff --git a/superset-frontend/packages/superset-ui-core/src/query/constants.ts b/superset-frontend/packages/superset-ui-core/src/query/constants.ts
index 7976e87a4a2..0c2df20d3ab 100644
--- a/superset-frontend/packages/superset-ui-core/src/query/constants.ts
+++ b/superset-frontend/packages/superset-ui-core/src/query/constants.ts
@@ -48,6 +48,7 @@ export const EXTRA_FORM_DATA_OVERRIDE_REGULAR_MAPPINGS: Record<
   time_column: 'time_column',
   time_grain: 'time_grain',
   time_range: 'time_range',
+  time_compare: 'time_compare',
 };
 
 export const EXTRA_FORM_DATA_OVERRIDE_REGULAR_KEYS = Object.keys(
diff --git a/superset-frontend/packages/superset-ui-core/src/query/extractExtras.ts b/superset-frontend/packages/superset-ui-core/src/query/extractExtras.ts
index 39a4b4b2d80..ea7d7de0c4b 100644
--- a/superset-frontend/packages/superset-ui-core/src/query/extractExtras.ts
+++ b/superset-frontend/packages/superset-ui-core/src/query/extractExtras.ts
@@ -31,6 +31,7 @@ type ExtraFilterQueryField = {
   granularity_sqla?: string;
   time_grain_sqla?: TimeGranularity;
   granularity?: string;
+  time_compare?: string;
 };
 
 type ExtractedExtra = ExtraFilterQueryField & {
@@ -57,6 +58,7 @@ export default function extractExtras(formData: QueryFormData): ExtractedExtra {
     __time_col: 'granularity_sqla',
     __time_grain: 'time_grain_sqla',
     __granularity: 'granularity',
+    __time_compare: 'time_compare',
   };
 
   (formData.extra_filters || []).forEach(filter => {
diff --git a/superset-frontend/packages/superset-ui-core/src/query/types/PostProcessing.ts b/superset-frontend/packages/superset-ui-core/src/query/types/PostProcessing.ts
index 79bcabdaff1..96dd51bf7ba 100644
--- a/superset-frontend/packages/superset-ui-core/src/query/types/PostProcessing.ts
+++ b/superset-frontend/packages/superset-ui-core/src/query/types/PostProcessing.ts
@@ -97,6 +97,7 @@ interface _PostProcessingContribution {
     orientation?: 'row' | 'column';
     columns?: string[];
     rename_columns?: string[];
+    contribution_totals?: Record<string, number>;
   };
 }
 export type PostProcessingContribution =
diff --git a/superset-frontend/packages/superset-ui-core/src/query/types/Query.ts b/superset-frontend/packages/superset-ui-core/src/query/types/Query.ts
index 49fc4b4363c..5929fcec15f 100644
--- a/superset-frontend/packages/superset-ui-core/src/query/types/Query.ts
+++ b/superset-frontend/packages/superset-ui-core/src/query/types/Query.ts
@@ -71,6 +71,8 @@ export type QueryObjectExtras = Partial<{
   where?: string;
   /** Instant Time Comparison */
   instant_time_comparison_range?: string;
+
+  time_compare?: string;
 }>;
 
 export type ResidualQueryObjectData = {
diff --git a/superset-frontend/packages/superset-ui-core/src/query/types/QueryFormData.ts b/superset-frontend/packages/superset-ui-core/src/query/types/QueryFormData.ts
index ddc467b2c46..dee8bc0736f 100644
--- a/superset-frontend/packages/superset-ui-core/src/query/types/QueryFormData.ts
+++ b/superset-frontend/packages/superset-ui-core/src/query/types/QueryFormData.ts
@@ -122,7 +122,7 @@ export type ExtraFormDataAppend = {
  * filter clauses can't be overridden */
 export type ExtraFormDataOverrideExtras = Pick<
   QueryObjectExtras,
-  'relative_start' | 'relative_end' | 'time_grain_sqla'
+  'relative_start' | 'relative_end' | 'time_grain_sqla' | 'time_compare'
 >;
 
 /** These parameters override those already present in the form data/query object */
@@ -131,7 +131,7 @@ export type ExtraFormDataOverrideRegular = Partial<
 > &
   Partial<Pick<SqlaFormData, 'granularity'>> &
   Partial<Pick<BaseFormData, 'time_range'>> &
-  Partial<Pick<QueryObject, 'time_column' | 'time_grain'>>;
+  Partial<Pick<QueryObject, 'time_column' | 'time_grain' | 'time_compare'>>;
 
 /** These parameters override those already present in the form data/query object */
 export type ExtraFormDataOverride = ExtraFormDataOverrideRegular &
diff --git a/superset-frontend/packages/superset-ui-core/src/query/types/Time.ts b/superset-frontend/packages/superset-ui-core/src/query/types/Time.ts
index 56156166feb..6b0c4b79864 100644
--- a/superset-frontend/packages/superset-ui-core/src/query/types/Time.ts
+++ b/superset-frontend/packages/superset-ui-core/src/query/types/Time.ts
@@ -30,7 +30,8 @@ export type TimeColumnConfigKey =
   | '__time_col'
   | '__time_grain'
   | '__time_range'
-  | '__granularity';
+  | '__granularity'
+  | '__time_compare';
 
 export type AppliedTimeExtras = Partial<
   Record<TimeColumnConfigKey, keyof QueryObject>
diff --git a/superset-frontend/packages/superset-ui-core/src/spec/index.tsx b/superset-frontend/packages/superset-ui-core/src/spec/index.tsx
new file mode 100644
index 00000000000..13e280b47b8
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/spec/index.tsx
@@ -0,0 +1,47 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 userEvent from '@testing-library/user-event';
+import { ReactElement } from 'react';
+import { render, RenderOptions } from '@testing-library/react';
+import '@testing-library/jest-dom';
+import { themeObject } from '@superset-ui/core';
+
+// Define the wrapper component outside
+const AllTheProviders = ({ children }: { children: React.ReactNode }) => (
+  <themeObject.SupersetThemeProvider>
+    {children}
+  </themeObject.SupersetThemeProvider>
+);
+
+// Follow the exact pattern from RTL docs
+const customRender = (
+  ui: ReactElement,
+  options?: Omit<RenderOptions, 'wrapper'>,
+) => render(ui, { wrapper: AllTheProviders, ...options });
+
+export {
+  createEvent,
+  fireEvent,
+  screen,
+  waitFor,
+  cleanup,
+  within,
+  act,
+} from '@testing-library/react';
+export { customRender as render, userEvent };
diff --git a/superset-frontend/packages/superset-ui-core/src/style/index.tsx b/superset-frontend/packages/superset-ui-core/src/style/index.tsx
deleted file mode 100644
index d448b81e790..00000000000
--- a/superset-frontend/packages/superset-ui-core/src/style/index.tsx
+++ /dev/null
@@ -1,167 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 emotionStyled from '@emotion/styled';
-import { useTheme as useThemeBasic } from '@emotion/react';
-import createCache from '@emotion/cache';
-
-export {
-  css,
-  keyframes,
-  jsx,
-  ThemeProvider,
-  CacheProvider as EmotionCacheProvider,
-  withTheme,
-  type SerializedStyles,
-} from '@emotion/react';
-export { default as createEmotionCache } from '@emotion/cache';
-
-declare module '@emotion/react' {
-  // eslint-disable-next-line @typescript-eslint/no-empty-interface
-  export interface Theme extends SupersetTheme {}
-}
-
-export function useTheme() {
-  const theme = useThemeBasic();
-  // in the case there is no theme, useTheme returns an empty object
-  if (Object.keys(theme).length === 0 && theme.constructor === Object) {
-    throw new Error(
-      'useTheme() could not find a ThemeContext. The <ThemeProvider/> component is likely missing from the app.',
-    );
-  }
-  return theme;
-}
-
-export const emotionCache = createCache({
-  key: 'superset',
-});
-
-export const styled = emotionStyled;
-
-const defaultTheme = {
-  borderRadius: 4,
-  colors: {
-    text: {
-      label: '#879399',
-      help: '#737373',
-    },
-    primary: {
-      base: '#20A7C9',
-      dark1: '#1A85A0',
-      dark2: '#156378',
-      light1: '#79CADE',
-      light2: '#A5DAE9',
-      light3: '#D2EDF4',
-      light4: '#E9F6F9',
-      light5: '#F3F8FA',
-    },
-    secondary: {
-      base: '#444E7C',
-      dark1: '#363E63',
-      dark2: '#282E4A',
-      dark3: '#1B1F31',
-      light1: '#8E94B0',
-      light2: '#B4B8CA',
-      light3: '#D9DBE4',
-      light4: '#ECEEF2',
-      light5: '#F5F5F8',
-    },
-    grayscale: {
-      base: '#666666',
-      dark1: '#323232',
-      dark2: '#000000',
-      light1: '#B2B2B2',
-      light2: '#E0E0E0',
-      light3: '#F0F0F0',
-      light4: '#F7F7F7',
-      light5: '#FFFFFF',
-    },
-    error: {
-      base: '#E04355',
-      dark1: '#A7323F',
-      dark2: '#6F212A',
-      light1: '#EFA1AA',
-      light2: '#FAEDEE',
-    },
-    warning: {
-      base: '#FCC700',
-      dark1: '#BC9501',
-      dark2: '#7D6300',
-      light1: '#FDE380',
-      light2: '#FEF9E6',
-    },
-    success: {
-      base: '#5AC189',
-      dark1: '#439066',
-      dark2: '#2B6144',
-      light1: '#ACE1C4',
-      light2: '#EEF8F3',
-    },
-    info: {
-      base: '#66BCFE',
-      dark1: '#4D8CBE',
-      dark2: '#315E7E',
-      light1: '#B3DEFE',
-      light2: '#EFF8FE',
-    },
-  },
-  opacity: {
-    light: '10%',
-    mediumLight: '35%',
-    mediumHeavy: '60%',
-    heavy: '80%',
-  },
-  typography: {
-    families: {
-      sansSerif: `'Inter', Helvetica, Arial`,
-      serif: `Georgia, 'Times New Roman', Times, serif`,
-      monospace: `'Fira Code', 'Courier New', monospace`,
-    },
-    weights: {
-      light: 200,
-      normal: 400,
-      medium: 500,
-      bold: 600,
-    },
-    sizes: {
-      xxs: 9,
-      xs: 10,
-      s: 12,
-      m: 14,
-      l: 16,
-      xl: 21,
-      xxl: 28,
-    },
-  },
-  zIndex: {
-    aboveDashboardCharts: 10,
-    dropdown: 11,
-    max: 3000,
-  },
-  transitionTiming: 0.3,
-  gridUnit: 4,
-  brandIconMaxWidth: 37,
-};
-
-export type SupersetTheme = typeof defaultTheme;
-
-export interface SupersetThemeProps {
-  theme: SupersetTheme;
-}
-
-export const supersetTheme = defaultTheme;
diff --git a/superset-frontend/packages/superset-ui-core/src/theme/GlobalStyles.tsx b/superset-frontend/packages/superset-ui-core/src/theme/GlobalStyles.tsx
new file mode 100644
index 00000000000..d9936471af7
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/theme/GlobalStyles.tsx
@@ -0,0 +1,92 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { css, useTheme, Global } from '@emotion/react';
+
+export const GlobalStyles = () => {
+  const theme = useTheme();
+  return (
+    <Global
+      key={`global-${theme.colorLink}`}
+      styles={css`
+        // SPA
+        html,
+        body,
+        #app {
+          height: 100%;
+        }
+
+        body {
+          background-color: ${theme.colorBgBase};
+          color: ${theme.colorText};
+          -webkit-font-smoothing: antialiased;
+          margin: 0;
+          font-family: ${theme.fontFamily};
+        }
+
+        a {
+          color: ${theme.colorLink};
+        }
+
+        h1,
+        h2,
+        h3,
+        h4,
+        h5,
+        h6,
+        strong,
+        th {
+          font-weight: ${theme.fontWeightStrong};
+        }
+
+        .echarts-tooltip[style*='visibility: hidden'] {
+          display: none !important;
+        }
+
+        .no-wrap {
+          white-space: nowrap;
+        }
+
+        .column-config-popover {
+          & .ant-input-number {
+            width: 100%;
+          }
+          && .btn-group svg {
+            line-height: 0;
+            top: 0;
+          }
+          & .btn-group > .btn {
+            padding: 5px 10px 6px;
+          }
+        }
+
+        // Overriding bootstrap styles
+        #app {
+          flex: 1 1 auto;
+          position: relative;
+          display: flex;
+          flex-direction: column;
+          height: 100%;
+        }
+        [role='button'] {
+          cursor: pointer;
+        }
+      `}
+    />
+  );
+};
diff --git a/superset-frontend/packages/superset-ui-core/src/theme/Theme.test.tsx b/superset-frontend/packages/superset-ui-core/src/theme/Theme.test.tsx
new file mode 100644
index 00000000000..3c0d24b9ed5
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/theme/Theme.test.tsx
@@ -0,0 +1,224 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { theme as antdThemeImport } from 'antd';
+import { Theme } from './Theme';
+import { AnyThemeConfig } from './types';
+
+// Mock emotion's cache to avoid actual DOM operations
+jest.mock('@emotion/cache', () => ({
+  __esModule: true,
+  default: jest.fn().mockReturnValue({}),
+}));
+
+describe('Theme', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('json', () => {
+    it('serializes the theme configuration to a JSON string', () => {
+      const theme = Theme.fromConfig({
+        token: {
+          colorPrimary: '#ff0000',
+        },
+        algorithm: antdThemeImport.darkAlgorithm,
+      });
+
+      const jsonString = theme.json();
+      const parsedJson = JSON.parse(jsonString);
+
+      expect(parsedJson.token?.colorPrimary).toBe('#ff0000');
+      expect(parsedJson.algorithm).toBe('dark');
+    });
+  });
+
+  describe('fromConfig', () => {
+    it('creates a theme with default tokens when no config is provided', () => {
+      const theme = Theme.fromConfig();
+
+      // Verify default primary color is set
+      expect(theme.theme.colorPrimary).toBe('#2893b3');
+
+      // Verify default font family is set
+      expect(theme.theme.fontFamily).toContain('Inter');
+
+      // Verify the theme is initialized with colors
+      expect(theme.theme.colors).toBeDefined();
+    });
+
+    it('creates a theme with custom tokens when provided', () => {
+      const customConfig: AnyThemeConfig = {
+        token: {
+          colorPrimary: '#ff0000',
+          fontFamily: 'CustomFont, sans-serif',
+        },
+      };
+
+      const theme = Theme.fromConfig(customConfig);
+
+      // Verify custom primary color is set
+      expect(theme.theme.colorPrimary).toBe('#ff0000');
+
+      // Verify custom font family is set
+      expect(theme.theme.fontFamily).toBe('CustomFont, sans-serif');
+
+      // But default tokens should still be preserved for unspecified values
+      expect(theme.theme.colorError).toBe('#e04355');
+    });
+
+    it('creates a theme with dark mode when dark algorithm is specified', () => {
+      const darkConfig: AnyThemeConfig = {
+        algorithm: antdThemeImport.darkAlgorithm,
+      };
+
+      const theme = Theme.fromConfig(darkConfig);
+
+      // Verify dark mode by using the serialized config from the public method
+      const serialized = theme.toSerializedConfig();
+      expect(serialized.algorithm).toBe('dark');
+    });
+  });
+
+  describe('setConfig', () => {
+    it('updates theme with a new configuration', () => {
+      const theme = Theme.fromConfig();
+      const initialPrimaryColor = theme.theme.colorPrimary;
+
+      // Update with new config
+      theme.setConfig({
+        token: {
+          colorPrimary: '#0000ff',
+        },
+      });
+
+      // Verify the theme was updated
+      expect(theme.theme.colorPrimary).toBe('#0000ff');
+      expect(theme.theme.colorPrimary).not.toBe(initialPrimaryColor);
+    });
+
+    it('preserves default tokens when updating with partial config', () => {
+      const theme = Theme.fromConfig();
+      const initialErrorColor = theme.theme.colorError;
+
+      // Update with new config that doesn't specify error color
+      theme.setConfig({
+        token: {
+          colorPrimary: '#0000ff',
+        },
+      });
+
+      // Verify the error color is preserved
+      expect(theme.theme.colorError).toBe(initialErrorColor);
+    });
+
+    it('correctly applies algorithm changes', () => {
+      const theme = Theme.fromConfig();
+
+      // Change to dark mode via config
+      theme.setConfig({
+        algorithm: antdThemeImport.darkAlgorithm,
+      });
+
+      // Verify the algorithm was updated
+      const serialized = theme.toSerializedConfig();
+      expect(serialized.algorithm).toBe('dark');
+    });
+  });
+
+  describe('toggleDarkMode', () => {
+    it('switches to dark algorithm when toggling dark mode on', () => {
+      const theme = Theme.fromConfig();
+
+      // Toggle dark mode on
+      theme.toggleDarkMode(true);
+
+      // Verify dark algorithm is used
+      const serialized = theme.toSerializedConfig();
+      expect(serialized.algorithm).toBe('dark');
+    });
+
+    it('switches to default algorithm when toggling dark mode off', () => {
+      // Start with dark theme
+      const theme = Theme.fromConfig({
+        algorithm: antdThemeImport.darkAlgorithm,
+      });
+
+      // Toggle dark mode off
+      theme.toggleDarkMode(false);
+
+      // Verify default algorithm is used
+      const serialized = theme.toSerializedConfig();
+      expect(serialized.algorithm).toBe('default');
+    });
+
+    it('preserves other algorithms when toggling dark mode', () => {
+      // Start with compact and dark algorithms
+      const theme = Theme.fromConfig({
+        algorithm: [
+          antdThemeImport.compactAlgorithm,
+          antdThemeImport.darkAlgorithm,
+        ],
+      });
+
+      // Toggle dark mode off
+      theme.toggleDarkMode(false);
+
+      // Verify default algorithm replaces dark but compact is preserved
+      const serialized = theme.toSerializedConfig();
+      expect(Array.isArray(serialized.algorithm)).toBe(true);
+      expect(serialized.algorithm).toContain('default');
+      expect(serialized.algorithm).toContain('compact');
+      expect(serialized.algorithm).not.toContain('dark');
+    });
+  });
+
+  describe('getFontSize', () => {
+    it('returns correct font size for given key', () => {
+      const theme = Theme.fromConfig();
+
+      // Test different font size keys
+      expect(theme.getFontSize('xs')).toBe('8');
+      expect(theme.getFontSize('m')).toBeTruthy();
+      expect(theme.getFontSize('xxl')).toBe('28');
+    });
+
+    it('defaults to medium font size when no key is provided', () => {
+      const theme = Theme.fromConfig();
+      const mediumSize = theme.getFontSize('m');
+
+      expect(theme.getFontSize()).toBe(mediumSize);
+    });
+  });
+
+  describe('toSerializedConfig', () => {
+    it('serializes theme config correctly', () => {
+      const theme = Theme.fromConfig({
+        token: {
+          colorPrimary: '#ff0000',
+        },
+        algorithm: antdThemeImport.darkAlgorithm,
+      });
+
+      const serialized = theme.toSerializedConfig();
+
+      expect(serialized.token?.colorPrimary).toBe('#ff0000');
+      expect(serialized.algorithm).toBe('dark');
+    });
+  });
+});
diff --git a/superset-frontend/packages/superset-ui-core/src/theme/Theme.tsx b/superset-frontend/packages/superset-ui-core/src/theme/Theme.tsx
new file mode 100644
index 00000000000..4ea634cbd36
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/theme/Theme.tsx
@@ -0,0 +1,322 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+/* eslint-disable react-prefer-function-component/react-prefer-function-component */
+// eslint-disable-next-line no-restricted-syntax
+import React from 'react';
+import { theme as antdThemeImport, ConfigProvider } from 'antd';
+import tinycolor from 'tinycolor2';
+
+import '@fontsource/inter/200.css';
+import '@fontsource/inter/400.css';
+import '@fontsource/inter/500.css';
+import '@fontsource/inter/600.css';
+import '@fontsource/fira-code/400.css';
+import '@fontsource/fira-code/500.css';
+import '@fontsource/fira-code/600.css';
+
+import {
+  ThemeProvider,
+  CacheProvider as EmotionCacheProvider,
+} from '@emotion/react';
+import createCache from '@emotion/cache';
+import { noop } from 'lodash';
+import { GlobalStyles } from './GlobalStyles';
+
+import {
+  AntdThemeConfig,
+  AnyThemeConfig,
+  SerializableThemeConfig,
+  SupersetTheme,
+  allowedAntdTokens,
+  SharedAntdTokens,
+  ColorVariants,
+  DeprecatedThemeColors,
+  FontSizeKey,
+} from './types';
+
+import {
+  normalizeThemeConfig,
+  serializeThemeConfig,
+  getSystemColors,
+  getDeprecatedColors,
+} from './utils';
+
+/* eslint-disable theme-colors/no-literal-colors */
+
+export class Theme {
+  theme: SupersetTheme;
+
+  private static readonly defaultTokens = {
+    // Brand
+    brandLogoAlt: 'Apache Superset',
+    brandLogoUrl: '/static/assets/images/superset-logo-horiz.png',
+    brandLogoMargin: '18px',
+    brandLogoHref: '/',
+    brandLogoHeight: '24px',
+
+    // Default colors
+    colorPrimary: '#2893B3', // NOTE: previous lighter primary color was #20a7c9
+    colorLink: '#2893B3',
+    colorError: '#e04355',
+    colorWarning: '#fcc700',
+    colorSuccess: '#5ac189',
+    colorInfo: '#66bcfe',
+
+    // Forcing some default tokens
+    fontFamily: `'Inter', Helvetica, Arial`,
+    fontFamilyCode: `'Fira Code', 'Courier New', monospace`,
+
+    // Extra tokens
+    transitionTiming: 0.3,
+    brandIconMaxWidth: 37,
+    fontSizeXS: '8',
+    fontSizeXXL: '28',
+    fontWeightNormal: '400',
+    fontWeightLight: '300',
+    fontWeightStrong: 500,
+  };
+
+  private antdConfig: AntdThemeConfig;
+
+  private static readonly sizeMap: Record<FontSizeKey, string> = {
+    xs: 'fontSizeXS',
+    s: 'fontSizeSM',
+    m: 'fontSize',
+    l: 'fontSizeLG',
+    xl: 'fontSizeXL',
+    xxl: 'fontSizeXXL',
+  };
+
+  private constructor({ config }: { config?: AnyThemeConfig }) {
+    this.SupersetThemeProvider = this.SupersetThemeProvider.bind(this);
+
+    // Create a new config object with default tokens
+    const newConfig: AnyThemeConfig = config ? { ...config } : {};
+
+    // Ensure token property exists with defaults
+    newConfig.token = {
+      ...Theme.defaultTokens,
+      ...(config?.token || {}),
+    };
+
+    this.setConfig(newConfig);
+  }
+
+  /**
+   * Create a theme from any theme configuration
+   * Automatically handles both AntdThemeConfig and SerializableThemeConfig
+   * If simple tokens are provided as { token: {...} }, they will be applied with defaults
+   * If no config is provided, uses default tokens
+   * Dark mode can be set via the algorithm property in the config
+   */
+  static fromConfig(config?: AnyThemeConfig): Theme {
+    return new Theme({ config });
+  }
+
+  private static getFilteredAntdTheme(
+    antdConfig: AntdThemeConfig,
+  ): SharedAntdTokens {
+    // This method generates all antd tokens and filters out the ones not allowed
+    // in Superset
+    const theme = Theme.getAntdTokens(antdConfig);
+    return Object.fromEntries(
+      allowedAntdTokens.map(key => [key, (theme as Record<string, any>)[key]]),
+    ) as SharedAntdTokens;
+  }
+
+  private static getAntdTokens(
+    antdConfig: AntdThemeConfig,
+  ): Record<string, any> {
+    return antdThemeImport.getDesignToken(antdConfig);
+  }
+
+  /**
+   * Update the theme using any theme configuration
+   * Automatically handles both AntdThemeConfig and SerializableThemeConfig
+   * Dark mode should be specified via the algorithm property in the config
+   */
+  setConfig(config: AnyThemeConfig): void {
+    const antdConfig = normalizeThemeConfig(config);
+
+    // Apply default tokens to token property
+    antdConfig.token = {
+      ...Theme.defaultTokens,
+      ...(antdConfig.token || {}),
+    };
+
+    // First phase: Let Ant Design compute the tokens
+    const tokens = Theme.getFilteredAntdTheme(antdConfig);
+
+    // Set the base theme properties
+    this.antdConfig = antdConfig;
+    this.theme = {
+      ...Theme.defaultTokens,
+      ...antdConfig.token, // Passing through the extra, superset-specific tokens
+      ...tokens,
+      colors: {} as DeprecatedThemeColors, // Placeholder that will be filled in the second phase
+    };
+
+    // Second phase: Now that theme is initialized, we can determine if it's dark
+    // and generate the legacy colors correctly
+    const systemColors = getSystemColors(tokens);
+    const isDark = this.isThemeDark(); // Now we can safely call this
+    this.theme.colors = getDeprecatedColors(systemColors, isDark);
+
+    // Update the providers with the fully formed theme
+    this.updateProviders(
+      this.theme,
+      this.antdConfig,
+      createCache({ key: 'superset' }),
+    );
+  }
+
+  /**
+   * Export the current theme as a serializable configuration
+   */
+  toSerializedConfig(): SerializableThemeConfig {
+    return serializeThemeConfig(this.antdConfig);
+  }
+
+  private getToken(token: string): any {
+    return (this.theme as Record<string, any>)[token];
+  }
+
+  public getFontSize(size?: FontSizeKey): string {
+    const fontSizeKey = Theme.sizeMap[size || 'm'];
+    return this.getToken(fontSizeKey) || this.getToken('fontSize');
+  }
+
+  /**
+   * Check if the current theme is dark based on background color
+   */
+  isThemeDark(): boolean {
+    return tinycolor(this.theme.colorBgContainer).isDark();
+  }
+
+  toggleDarkMode(isDark: boolean): void {
+    // Create a new config based on the current one
+    const newConfig = { ...this.antdConfig };
+
+    // Determine the new algorithm based on isDark
+    const newAlgorithm = isDark
+      ? antdThemeImport.darkAlgorithm
+      : antdThemeImport.defaultAlgorithm;
+
+    // Handle the case where algorithm is an array
+    if (Array.isArray(newConfig.algorithm)) {
+      // Filter out any existing dark/default algorithms
+      const otherAlgorithms = newConfig.algorithm.filter(
+        alg =>
+          alg !== antdThemeImport.darkAlgorithm &&
+          alg !== antdThemeImport.defaultAlgorithm,
+      );
+
+      // Add the new algorithm to the front of the array
+      newConfig.algorithm = [newAlgorithm, ...otherAlgorithms];
+    } else {
+      // Simple case: just replace the algorithm
+      newConfig.algorithm = newAlgorithm;
+    }
+
+    // Update the theme with the new configuration
+    this.setConfig(newConfig);
+  }
+
+  json(): string {
+    return JSON.stringify(serializeThemeConfig(this.antdConfig), null, 2);
+  }
+
+  getColorVariants(color: string): ColorVariants {
+    const firstLetterCapped = color.charAt(0).toUpperCase() + color.slice(1);
+    if (color === 'default' || color === 'grayscale') {
+      const isDark = this.isThemeDark();
+
+      const flipBrightness = (baseColor: string): string => {
+        if (!isDark) return baseColor;
+        const { r, g, b } = tinycolor(baseColor).toRgb();
+        const invertedColor = tinycolor({ r: 255 - r, g: 255 - g, b: 255 - b });
+        return invertedColor.toHexString();
+      };
+
+      return {
+        active: flipBrightness('#222'),
+        textActive: flipBrightness('#444'),
+        text: flipBrightness('#555'),
+        textHover: flipBrightness('#666'),
+        hover: flipBrightness('#888'),
+        borderHover: flipBrightness('#AAA'),
+        border: flipBrightness('#CCC'),
+        bgHover: flipBrightness('#DDD'),
+        bg: flipBrightness('#F4F4F4'),
+      };
+    }
+
+    const theme = this.getToken.bind(this);
+    return {
+      active: theme(`color${firstLetterCapped}Active`),
+      textActive: theme(`color${firstLetterCapped}TextActive`),
+      text: theme(`color${firstLetterCapped}Text`),
+      textHover: theme(`color${firstLetterCapped}TextHover`),
+      hover: theme(`color${firstLetterCapped}Hover`),
+      borderHover: theme(`color${firstLetterCapped}BorderHover`),
+      border: theme(`color${firstLetterCapped}Border`),
+      bgHover: theme(`color${firstLetterCapped}BgHover`),
+      bg: theme(`color${firstLetterCapped}Bg`),
+    };
+  }
+
+  private updateProviders(
+    theme: SupersetTheme,
+    antdConfig: AntdThemeConfig,
+    emotionCache: any,
+  ): void {
+    noop(theme, antdConfig, emotionCache);
+    // Overridden at runtime by SupersetThemeProvider using setThemeState
+  }
+
+  SupersetThemeProvider({ children }: { children: React.ReactNode }) {
+    if (!this.theme || !this.antdConfig) {
+      throw new Error('Theme is not initialized.');
+    }
+
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    const [themeState, setThemeState] = React.useState({
+      theme: this.theme,
+      antdConfig: this.antdConfig,
+      emotionCache: createCache({ key: 'superset' }),
+    });
+
+    this.updateProviders = (theme, antdConfig, emotionCache) => {
+      setThemeState({ theme, antdConfig, emotionCache });
+    };
+
+    return (
+      <EmotionCacheProvider value={themeState.emotionCache}>
+        <ThemeProvider theme={themeState.theme}>
+          <GlobalStyles />
+          <ConfigProvider theme={themeState.antdConfig}>
+            {children}
+          </ConfigProvider>
+        </ThemeProvider>
+      </EmotionCacheProvider>
+    );
+  }
+}
+
+/* eslint-enable theme-colors/no-literal-colors */
diff --git a/superset-frontend/packages/superset-ui-core/src/theme/exampleThemes.ts b/superset-frontend/packages/superset-ui-core/src/theme/exampleThemes.ts
new file mode 100644
index 00000000000..a2393948b8c
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/theme/exampleThemes.ts
@@ -0,0 +1,61 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+/* eslint-disable theme-colors/no-literal-colors */
+import { SerializableThemeConfig } from './types';
+
+const exampleThemes: Record<string, SerializableThemeConfig> = {
+  superset: {
+    token: {
+      colorBgElevated: '#fafafa',
+    },
+  },
+  supersetDark: {
+    token: {},
+    algorithm: 'dark',
+  },
+  supersetCompact: {
+    token: {},
+    algorithm: 'compact',
+  },
+  funky: {
+    token: {
+      colorPrimary: '#f759ab', // hot pink
+      colorSuccess: '#52c41a',
+      colorWarning: '#faad14',
+      colorError: '#ff4d4f',
+      colorInfo: '#40a9ff',
+      borderRadius: 12,
+      fontFamily: 'Comic Sans MS, cursive',
+    },
+    algorithm: 'default',
+  },
+  funkyDark: {
+    token: {
+      colorPrimary: '#f759ab', // hot pink
+      colorSuccess: '#52c41a',
+      colorWarning: '#faad14',
+      colorError: '#ff4d4f',
+      colorInfo: '#40a9ff',
+      borderRadius: 12,
+      fontFamily: 'Comic Sans MS, cursive',
+    },
+    algorithm: 'dark',
+  },
+};
+export default exampleThemes;
diff --git a/superset-frontend/packages/superset-ui-core/src/theme/index.tsx b/superset-frontend/packages/superset-ui-core/src/theme/index.tsx
new file mode 100644
index 00000000000..4fe8dd93d8e
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/theme/index.tsx
@@ -0,0 +1,75 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 emotionStyled from '@emotion/styled';
+import { useTheme as useThemeBasic } from '@emotion/react';
+// import { theme as antdThemeImport } from 'antd';
+import { Theme } from './Theme';
+import type {
+  SupersetTheme,
+  SerializableThemeConfig,
+  AnyThemeConfig,
+  ThemeStorage,
+  ThemeControllerOptions,
+  ThemeContextType,
+} from './types';
+
+export {
+  css,
+  keyframes,
+  jsx,
+  ThemeProvider,
+  CacheProvider as EmotionCacheProvider,
+  withTheme,
+} from '@emotion/react';
+export { default as createEmotionCache } from '@emotion/cache';
+export { default as exampleThemes } from './exampleThemes';
+
+declare module '@emotion/react' {
+  // eslint-disable-next-line @typescript-eslint/no-empty-interface
+  export interface Theme extends SupersetTheme {}
+}
+
+export function useTheme() {
+  const theme = useThemeBasic();
+  // in the case there is no theme, useTheme returns an empty object
+  if (Object.keys(theme).length === 0 && theme.constructor === Object) {
+    throw new Error(
+      'useTheme() could not find a ThemeContext. The <ThemeProvider/> component is likely missing from the app.',
+    );
+  }
+  return theme;
+}
+
+const styled = emotionStyled;
+
+// launching in in dark mode for now while iterating
+const themeObject = Theme.fromConfig({ algorithm: 'default' });
+
+const { theme } = themeObject;
+const supersetTheme = theme;
+
+export { Theme, themeObject, styled, theme, supersetTheme };
+export type {
+  SupersetTheme,
+  SerializableThemeConfig,
+  AnyThemeConfig,
+  ThemeStorage,
+  ThemeControllerOptions,
+  ThemeContextType,
+};
diff --git a/superset-frontend/packages/superset-ui-core/src/theme/types.ts b/superset-frontend/packages/superset-ui-core/src/theme/types.ts
new file mode 100644
index 00000000000..10e75029bf3
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/theme/types.ts
@@ -0,0 +1,398 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+/* eslint-disable @typescript-eslint/no-unused-vars */
+// eslint-disable-next-line no-restricted-syntax
+import { theme as antdThemeImport } from 'antd';
+
+/**
+ * Get AntdThemeConfig type from the theme object
+ */
+import type { ThemeConfig } from 'antd';
+import { Theme } from '.';
+
+/**
+ * Grab all antd tokens via getDesignToken(...).
+ * (Same as in the original file.)
+ */
+export type AntdTokens = ReturnType<typeof antdThemeImport.getDesignToken>;
+export type AntdThemeConfig = ThemeConfig;
+
+/**
+ * A serializable version of Ant Design's ThemeConfig
+ * Compatible with theme editor exports
+ */
+export type SerializableThemeConfig = {
+  token?: Record<string, any>;
+  components?: Record<string, any>;
+  algorithm?:
+    | 'default'
+    | 'dark'
+    | 'compact'
+    | ('default' | 'dark' | 'compact')[];
+  hashed?: boolean;
+  inherit?: boolean;
+};
+
+/**
+ * A combined type that can be either a regular AntdThemeConfig or a SerializableThemeConfig
+ */
+export type AnyThemeConfig = AntdThemeConfig | SerializableThemeConfig;
+
+/** Minimal color system references. */
+export type FontSizeKey = 'xs' | 's' | 'm' | 'l' | 'xl' | 'xxl';
+
+export interface SystemColors {
+  colorPrimary: string;
+  colorError: string;
+  colorWarning: string;
+  colorSuccess: string;
+  colorInfo: string;
+}
+
+export interface ColorVariants {
+  bg: string;
+  border: string;
+  hover: string;
+  active: string;
+  textHover: string;
+  text: string;
+  borderHover: string;
+  bgHover: string;
+  textActive: string;
+}
+
+export interface DeprecatedColorVariations {
+  base: string;
+  light1: string;
+  light2: string;
+  light3: string;
+  light4: string;
+  light5: string;
+  dark1: string;
+  dark2: string;
+  dark3: string;
+  dark4: string;
+  dark5: string;
+}
+
+export interface DeprecatedThemeColors {
+  primary: DeprecatedColorVariations;
+  error: DeprecatedColorVariations;
+  warning: DeprecatedColorVariations;
+  success: DeprecatedColorVariations;
+  info: DeprecatedColorVariations;
+  grayscale: DeprecatedColorVariations;
+}
+
+export interface LegacySupersetTheme {
+  // Old colors structure with light/dark semantics still heavily referenced in code base
+  // TODO: replace/realign with antd-type tokens
+  colors: DeprecatedThemeColors;
+  transitionTiming: number;
+}
+
+export interface SupersetSpecificTokens {
+  // Font-related
+  fontSizeXS: string;
+  fontSizeXXL: string;
+  fontWeightNormal: string;
+  fontWeightLight: string;
+  fontWeightStrong: number;
+
+  // Brand-related
+  brandIconMaxWidth: number;
+  brandLogoAlt: string;
+  brandLogoUrl: string;
+  brandLogoMargin: string;
+  brandLogoHref: string;
+  brandLogoHeight: string;
+}
+
+/**
+ * This array is used to define which keys from the full Antd token set
+ * we actually allow in the SupersetTheme.
+ */
+export const allowedAntdTokens = [
+  'borderRadius',
+  'borderRadiusLG',
+  'borderRadiusOuter',
+  'borderRadiusSM',
+  'borderRadiusXS',
+  'boxShadow',
+  'boxShadowDrawerLeft',
+  'boxShadowDrawerRight',
+  'boxShadowDrawerUp',
+  'boxShadowPopoverArrow',
+  'boxShadowSecondary',
+  'boxShadowTabsOverflowBottom',
+  'boxShadowTabsOverflowLeft',
+  'boxShadowTabsOverflowRight',
+  'boxShadowTabsOverflowTop',
+  'boxShadowTertiary',
+  'colorError',
+  'colorErrorActive',
+  'colorErrorBg',
+  'colorErrorBgActive',
+  'colorErrorBgHover',
+  'colorErrorBorder',
+  'colorErrorBorderHover',
+  'colorErrorHover',
+  'colorErrorOutline',
+  'colorErrorText',
+  'colorErrorTextActive',
+  'colorErrorTextHover',
+  'colorPrimary',
+  'colorPrimaryActive',
+  'colorPrimaryBg',
+  'colorPrimaryBgHover',
+  'colorPrimaryBorder',
+  'colorPrimaryBorderHover',
+  'colorPrimaryHover',
+  'colorPrimaryText',
+  'colorPrimaryTextActive',
+  'colorPrimaryTextHover',
+  'colorSuccess',
+  'colorSuccessActive',
+  'colorSuccessBg',
+  'colorSuccessBgHover',
+  'colorSuccessBorder',
+  'colorSuccessBorderHover',
+  'colorSuccessHover',
+  'colorSuccessText',
+  'colorSuccessTextActive',
+  'colorSuccessTextHover',
+  'colorBgBase',
+  'colorBgBlur',
+  'colorBgContainer',
+  'colorBgContainerDisabled',
+  'colorBgElevated',
+  'colorBgLayout',
+  'colorBgMask',
+  'colorBgSpotlight',
+  'colorBgTextActive',
+  'colorBgTextHover',
+  'colorBorder',
+  'colorBorderBg',
+  'colorBorderSecondary',
+  'colorFill',
+  'colorFillAlter',
+  'colorFillContent',
+  'colorFillContentHover',
+  'colorFillQuaternary',
+  'colorFillSecondary',
+  'colorFillTertiary',
+  'colorHighlight',
+  'colorIcon',
+  'colorIconHover',
+  'colorInfo',
+  'colorInfoActive',
+  'colorInfoBg',
+  'colorInfoBgHover',
+  'colorInfoBorder',
+  'colorInfoBorderHover',
+  'colorInfoHover',
+  'colorInfoText',
+  'colorInfoTextActive',
+  'colorInfoTextHover',
+  'colorLink',
+  'colorLinkActive',
+  'colorLinkHover',
+  'colorSplit',
+  'colorText',
+  'colorTextBase',
+  'colorTextDescription',
+  'colorTextDisabled',
+  'colorTextHeading',
+  'colorTextLabel',
+  'colorTextLightSolid',
+  'colorTextPlaceholder',
+  'colorTextQuaternary',
+  'colorTextSecondary',
+  'colorTextTertiary',
+  'colorWarning',
+  'colorWarningActive',
+  'colorWarningBg',
+  'colorWarningBgHover',
+  'colorWarningBorder',
+  'colorWarningBorderHover',
+  'colorWarningHover',
+  'colorWarningOutline',
+  'colorWarningText',
+  'colorWarningTextActive',
+  'colorWarningTextHover',
+  'colorWhite',
+  'controlHeight',
+  'controlHeightLG',
+  'controlHeightSM',
+  'controlHeightXS',
+  'controlInteractiveSize',
+  'controlItemBgActive',
+  'controlItemBgActiveDisabled',
+  'controlItemBgActiveHover',
+  'controlItemBgHover',
+  'controlOutline',
+  'controlOutlineWidth',
+  'controlPaddingHorizontal',
+  'controlPaddingHorizontalSM',
+  'controlTmpOutline',
+  'fontFamily',
+  'fontFamilyCode',
+  'fontHeight',
+  'fontHeightLG',
+  'fontHeightSM',
+  'fontSize',
+  'fontSizeHeading1',
+  'fontSizeHeading2',
+  'fontSizeHeading3',
+  'fontSizeHeading4',
+  'fontSizeHeading5',
+  'fontSizeIcon',
+  'fontSizeLG',
+  'fontSizeSM',
+  'fontSizeXL',
+  'lineHeight',
+  'lineHeightHeading1',
+  'lineHeightHeading2',
+  'lineHeightHeading3',
+  'lineHeightHeading4',
+  'lineHeightHeading5',
+  'lineHeightLG',
+  'lineHeightSM',
+  'lineType',
+  'lineWidth',
+  'lineWidthBold',
+  'lineWidthFocus',
+  'linkDecoration',
+  'linkFocusDecoration',
+  'linkHoverDecoration',
+  'margin',
+  'marginLG',
+  'marginMD',
+  'marginSM',
+  'marginXL',
+  'marginXS',
+  'marginXXL',
+  'marginXXS',
+  'motion',
+  'motionBase',
+  'motionDurationFast',
+  'motionDurationMid',
+  'motionDurationSlow',
+  'motionEaseInBack',
+  'motionEaseInOut',
+  'motionEaseInOutCirc',
+  'motionEaseInQuint',
+  'motionEaseOut',
+  'motionEaseOutBack',
+  'motionEaseOutCirc',
+  'motionEaseOutQuint',
+  'motionUnit',
+  'opacityImage',
+  'opacityLoading',
+  'padding',
+  'paddingContentHorizontal',
+  'paddingContentHorizontalLG',
+  'paddingContentHorizontalSM',
+  'paddingContentVertical',
+  'paddingContentVerticalLG',
+  'paddingContentVerticalSM',
+  'paddingLG',
+  'paddingMD',
+  'paddingSM',
+  'paddingXL',
+  'paddingXS',
+  'paddingXXS',
+  'screenLG',
+  'screenLGMax',
+  'screenLGMin',
+  'screenMD',
+  'screenMDMax',
+  'screenMDMin',
+  'screenSM',
+  'screenSMMax',
+  'screenSMMin',
+  'screenXL',
+  'screenXLMax',
+  'screenXLMin',
+  'screenXS',
+  'screenXSMax',
+  'screenXSMin',
+  'screenXXL',
+  'screenXXLMin',
+  'size',
+  'sizeLG',
+  'sizeMD',
+  'sizeMS',
+  'sizePopupArrow',
+  'sizeSM',
+  'sizeStep',
+  'sizeUnit',
+  'sizeXL',
+  'sizeXS',
+  'sizeXXL',
+  'sizeXXS',
+  'wireframe',
+  'zIndexBase',
+  'zIndexPopupBase',
+] as const;
+
+/** We build a narrower type from these allowed keys. */
+export type AllowedAntdTokenKeys = Extract<
+  (typeof allowedAntdTokens)[number],
+  keyof AntdTokens
+>;
+
+export enum ThemeMode {
+  LIGHT = 'light',
+  DARK = 'dark',
+  SYSTEM = 'system',
+  COMPACT = 'compact',
+}
+
+export type SharedAntdTokens = Pick<AntdTokens, AllowedAntdTokenKeys>;
+
+/** The final shape for our custom theme object, combining old theme + shared antd + superset specifics. */
+export type SupersetTheme = LegacySupersetTheme &
+  SharedAntdTokens &
+  SupersetSpecificTokens;
+
+export interface ThemeStorage {
+  getItem(key: string): string | null;
+  setItem(key: string, value: string): void;
+  removeItem(key: string): void;
+}
+
+export interface ThemeControllerOptions {
+  themeObject: Theme;
+  storage?: ThemeStorage;
+  storageKey?: string;
+  modeStorageKey?: string;
+  defaultTheme?: AnyThemeConfig;
+  onChange?: (theme: Theme) => void;
+  canUpdateTheme?: () => boolean;
+  canUpdateMode?: () => boolean;
+}
+
+export interface ThemeContextType {
+  theme: Theme;
+  themeMode: ThemeMode;
+  setTheme: (config: AnyThemeConfig) => void;
+  changeThemeMode: (newMode: ThemeMode) => void;
+  resetTheme: () => void;
+}
diff --git a/superset-frontend/packages/superset-ui-core/src/theme/utils.test.ts b/superset-frontend/packages/superset-ui-core/src/theme/utils.test.ts
new file mode 100644
index 00000000000..343f59794fc
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/theme/utils.test.ts
@@ -0,0 +1,349 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { theme as antdThemeImport } from 'antd';
+import {
+  isSerializableConfig,
+  deserializeThemeConfig,
+  serializeThemeConfig,
+  normalizeThemeConfig,
+  getAntdConfig,
+  getSystemColors,
+  getDeprecatedColors,
+  genDeprecatedColorVariations,
+} from './utils';
+import {
+  AnyThemeConfig,
+  SerializableThemeConfig,
+  AntdThemeConfig,
+} from './types';
+
+// Mock tinycolor2 for consistent testing
+jest.mock('tinycolor2', () => {
+  const mockMix = jest.fn().mockImplementation(() => ({
+    toHexString: jest.fn().mockReturnValue('#mixed-color'),
+  }));
+
+  return {
+    mix: mockMix,
+  };
+});
+
+describe('Theme utilities', () => {
+  describe('isSerializableConfig', () => {
+    it('returns true when algorithm is undefined', () => {
+      const config: AnyThemeConfig = {
+        token: { colorPrimary: '#ff0000' },
+      };
+      expect(isSerializableConfig(config)).toBe(true);
+    });
+
+    it('returns true when algorithm is a string', () => {
+      const config: AnyThemeConfig = {
+        token: { colorPrimary: '#ff0000' },
+        algorithm: 'dark',
+      };
+      expect(isSerializableConfig(config)).toBe(true);
+    });
+
+    it('returns true when algorithm is an array of strings', () => {
+      const config: AnyThemeConfig = {
+        token: { colorPrimary: '#ff0000' },
+        algorithm: ['dark', 'compact'],
+      };
+      expect(isSerializableConfig(config)).toBe(true);
+    });
+
+    it('returns false when algorithm is a function', () => {
+      const config: AnyThemeConfig = {
+        token: { colorPrimary: '#ff0000' },
+        algorithm: antdThemeImport.darkAlgorithm,
+      };
+      expect(isSerializableConfig(config)).toBe(false);
+    });
+
+    it('returns false when algorithm is an array containing a function', () => {
+      const config: AnyThemeConfig = {
+        token: { colorPrimary: '#ff0000' },
+        // @ts-ignore
+        algorithm: [antdThemeImport.darkAlgorithm, 'compact'],
+      };
+      expect(isSerializableConfig(config)).toBe(false);
+    });
+  });
+
+  describe('deserializeThemeConfig', () => {
+    it('converts string algorithm to function reference', () => {
+      const config: SerializableThemeConfig = {
+        token: { colorPrimary: '#ff0000' },
+        algorithm: 'dark',
+      };
+      const result = deserializeThemeConfig(config);
+      expect(result.algorithm).toBe(antdThemeImport.darkAlgorithm);
+    });
+
+    it('converts array of string algorithms to function references', () => {
+      const config: SerializableThemeConfig = {
+        token: { colorPrimary: '#ff0000' },
+        algorithm: ['dark', 'compact'],
+      };
+      const result = deserializeThemeConfig(config);
+      expect(Array.isArray(result.algorithm)).toBe(true);
+      expect(result.algorithm).toContain(antdThemeImport.darkAlgorithm);
+      expect(result.algorithm).toContain(antdThemeImport.compactAlgorithm);
+    });
+
+    it('preserves other configuration properties', () => {
+      const config: SerializableThemeConfig = {
+        token: { colorPrimary: '#ff0000' },
+        algorithm: 'dark',
+        hashed: true,
+      };
+      const result = deserializeThemeConfig(config);
+      expect(result.token).toEqual({ colorPrimary: '#ff0000' });
+      expect(result.hashed).toBe(true);
+    });
+
+    it('handles undefined algorithm', () => {
+      const config: SerializableThemeConfig = {
+        token: { colorPrimary: '#ff0000' },
+      };
+      const result = deserializeThemeConfig(config);
+      expect(result.algorithm).toBeUndefined();
+    });
+
+    it('converts default algorithm string to function reference', () => {
+      const config: SerializableThemeConfig = {
+        token: { colorPrimary: '#ff0000' },
+        algorithm: 'default',
+      };
+      const result = deserializeThemeConfig(config);
+      expect(result.algorithm).toBe(antdThemeImport.defaultAlgorithm);
+    });
+
+    it('converts compact algorithm string to function reference', () => {
+      const config: SerializableThemeConfig = {
+        token: { colorPrimary: '#ff0000' },
+        algorithm: 'compact',
+      };
+      const result = deserializeThemeConfig(config);
+      expect(result.algorithm).toBe(antdThemeImport.compactAlgorithm);
+    });
+  });
+
+  describe('serializeThemeConfig', () => {
+    it('converts function algorithm to string', () => {
+      const config: AntdThemeConfig = {
+        token: { colorPrimary: '#ff0000' },
+        algorithm: antdThemeImport.darkAlgorithm,
+      };
+      const result = serializeThemeConfig(config);
+      expect(result.algorithm).toBe('dark');
+    });
+
+    it('converts array of function algorithms to strings', () => {
+      const config: AntdThemeConfig = {
+        token: { colorPrimary: '#ff0000' },
+        algorithm: [
+          antdThemeImport.darkAlgorithm,
+          antdThemeImport.compactAlgorithm,
+        ],
+      };
+      const result = serializeThemeConfig(config);
+      expect(Array.isArray(result.algorithm)).toBe(true);
+      expect(result.algorithm).toContain('dark');
+      expect(result.algorithm).toContain('compact');
+    });
+
+    it('preserves other configuration properties', () => {
+      const config: AntdThemeConfig = {
+        token: { colorPrimary: '#ff0000' },
+        algorithm: antdThemeImport.darkAlgorithm,
+        hashed: true,
+      };
+      const result = serializeThemeConfig(config);
+      expect(result.token).toEqual({ colorPrimary: '#ff0000' });
+      expect(result.hashed).toBe(true);
+    });
+
+    it('handles undefined algorithm', () => {
+      const config: AntdThemeConfig = {
+        token: { colorPrimary: '#ff0000' },
+      };
+      const result = serializeThemeConfig(config);
+      expect(result.algorithm).toBeUndefined();
+    });
+
+    it('defaults to "default" for unknown algorithms', () => {
+      const unknownAlgorithm = () => ({});
+      const config: AntdThemeConfig = {
+        token: { colorPrimary: '#ff0000' },
+        // @ts-ignore
+        algorithm: unknownAlgorithm,
+      };
+      const result = serializeThemeConfig(config);
+      expect(result.algorithm).toBe('default');
+    });
+
+    it('converts default algorithm function to string', () => {
+      const config: AntdThemeConfig = {
+        token: { colorPrimary: '#ff0000' },
+        algorithm: antdThemeImport.defaultAlgorithm,
+      };
+      const result = serializeThemeConfig(config);
+      expect(result.algorithm).toBe('default');
+    });
+
+    it('converts compact algorithm function to string', () => {
+      const config: AntdThemeConfig = {
+        token: { colorPrimary: '#ff0000' },
+        algorithm: antdThemeImport.compactAlgorithm,
+      };
+      const result = serializeThemeConfig(config);
+      expect(result.algorithm).toBe('compact');
+    });
+
+    it('defaults each unknown algorithm in array to "default"', () => {
+      const unknownAlgorithm = () => ({});
+      const config: AntdThemeConfig = {
+        token: { colorPrimary: '#ff0000' },
+        // @ts-ignore
+        algorithm: [antdThemeImport.darkAlgorithm, unknownAlgorithm],
+      };
+      const result = serializeThemeConfig(config);
+      expect(Array.isArray(result.algorithm)).toBe(true);
+      expect(result.algorithm).toEqual(['dark', 'default']);
+    });
+
+    it('handles mixed known and unknown algorithms in array', () => {
+      const unknownAlgorithm1 = () => ({});
+      const unknownAlgorithm2 = () => ({});
+      const config: AntdThemeConfig = {
+        token: { colorPrimary: '#ff0000' },
+        algorithm: [
+          antdThemeImport.darkAlgorithm,
+          // @ts-ignore
+          unknownAlgorithm1,
+          antdThemeImport.compactAlgorithm,
+          // @ts-ignore
+          unknownAlgorithm2,
+        ],
+      };
+      const result = serializeThemeConfig(config);
+      expect(Array.isArray(result.algorithm)).toBe(true);
+      expect(result.algorithm).toEqual([
+        'dark',
+        'default',
+        'compact',
+        'default',
+      ]);
+    });
+  });
+
+  describe('normalizeThemeConfig', () => {
+    it('returns the same config for non-serializable configs', () => {
+      const config: AntdThemeConfig = {
+        token: { colorPrimary: '#ff0000' },
+        algorithm: antdThemeImport.darkAlgorithm,
+      };
+      const result = normalizeThemeConfig(config);
+      expect(result).toBe(config);
+    });
+
+    it('deserializes serializable configs', () => {
+      const config: SerializableThemeConfig = {
+        token: { colorPrimary: '#ff0000' },
+        algorithm: 'dark',
+      };
+      const result = normalizeThemeConfig(config);
+      expect(result.algorithm).toBe(antdThemeImport.darkAlgorithm);
+    });
+  });
+
+  describe('getAntdConfig', () => {
+    it('returns config with default algorithm for light mode', () => {
+      const seed = { colorPrimary: '#ff0000' };
+      const result = getAntdConfig(seed, false);
+      expect(result.token).toBe(seed);
+      expect(result.algorithm).toBe(antdThemeImport.defaultAlgorithm);
+    });
+
+    it('returns config with dark algorithm for dark mode', () => {
+      const seed = { colorPrimary: '#ff0000' };
+      const result = getAntdConfig(seed, true);
+      expect(result.token).toBe(seed);
+      expect(result.algorithm).toBe(antdThemeImport.darkAlgorithm);
+    });
+  });
+
+  describe('getSystemColors', () => {
+    it('extracts system colors from tokens', () => {
+      const tokens = {
+        colorPrimary: '#primary',
+        colorError: '#error',
+        colorWarning: '#warning',
+        colorSuccess: '#success',
+        colorInfo: '#info',
+        otherToken: 'ignore-me',
+      };
+      const result = getSystemColors(tokens);
+      expect(result).toEqual({
+        colorPrimary: '#primary',
+        colorError: '#error',
+        colorWarning: '#warning',
+        colorSuccess: '#success',
+        colorInfo: '#info',
+      });
+    });
+  });
+
+  describe('genDeprecatedColorVariations', () => {
+    it('generates color variations for light mode', () => {
+      const result = genDeprecatedColorVariations('#base-color', false);
+      expect(result.base).toBe('#base-color');
+      expect(result.light1).toBe('#mixed-color');
+      expect(result.dark1).toBe('#mixed-color');
+    });
+
+    it('generates color variations for dark mode', () => {
+      const result = genDeprecatedColorVariations('#base-color', true);
+      expect(result.base).toBe('#base-color');
+      expect(result.light1).toBe('#mixed-color');
+      expect(result.dark1).toBe('#mixed-color');
+    });
+  });
+
+  describe('getDeprecatedColors', () => {
+    it('generates deprecated colors from system colors', () => {
+      const systemColors = {
+        colorPrimary: '#primary',
+        colorError: '#error',
+        colorWarning: '#warning',
+        colorSuccess: '#success',
+        colorInfo: '#info',
+      };
+      const result = getDeprecatedColors(systemColors, false);
+      expect(result.primary.base).toBe('#primary');
+      expect(result.error.base).toBe('#error');
+      expect(result.warning.base).toBe('#warning');
+      expect(result.success.base).toBe('#success');
+      expect(result.info.base).toBe('#info');
+      expect(result.grayscale.base).toBe('#666');
+    });
+  });
+});
diff --git a/superset-frontend/packages/superset-ui-core/src/theme/utils.ts b/superset-frontend/packages/superset-ui-core/src/theme/utils.ts
new file mode 100644
index 00000000000..98fd1b5d2de
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/theme/utils.ts
@@ -0,0 +1,189 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { theme as antdThemeImport } from 'antd';
+import tinycolor from 'tinycolor2';
+import {
+  AntdThemeConfig,
+  AnyThemeConfig,
+  SerializableThemeConfig,
+  DeprecatedColorVariations,
+  DeprecatedThemeColors,
+  SystemColors,
+  SupersetTheme,
+} from './types';
+
+/**
+ * Check if a theme config is serializable by detecting string-based algorithm
+ */
+export function isSerializableConfig(
+  config: AnyThemeConfig,
+): config is SerializableThemeConfig {
+  const { algorithm } = config;
+
+  if (algorithm === undefined) return true;
+
+  if (Array.isArray(algorithm)) {
+    return (algorithm as unknown[]).every(alg => typeof alg === 'string');
+  }
+
+  return typeof algorithm === 'string';
+}
+
+/**
+ * Converts a serializable theme config to an Ant Design ThemeConfig
+ */
+export function deserializeThemeConfig(
+  config: SerializableThemeConfig,
+): AntdThemeConfig {
+  const { algorithm, ...rest } = config;
+  const algorithmMap: Record<string, any> = {
+    default: antdThemeImport.defaultAlgorithm,
+    dark: antdThemeImport.darkAlgorithm,
+    compact: antdThemeImport.compactAlgorithm,
+  };
+
+  let resolvedAlgorithm;
+  if (Array.isArray(algorithm)) {
+    resolvedAlgorithm = algorithm.map(alg => algorithmMap[alg]);
+  } else if (algorithm) {
+    resolvedAlgorithm = algorithmMap[algorithm];
+  }
+
+  return {
+    ...rest,
+    algorithm: resolvedAlgorithm,
+  };
+}
+
+/**
+ * Converts an Ant Design ThemeConfig to a serializable format
+ */
+export function serializeThemeConfig(
+  config: AntdThemeConfig,
+): SerializableThemeConfig {
+  const { algorithm, ...rest } = config;
+
+  let serializedAlgorithm: SerializableThemeConfig['algorithm'];
+
+  if (Array.isArray(algorithm)) {
+    serializedAlgorithm = algorithm.map(alg => {
+      if (alg === antdThemeImport.defaultAlgorithm) return 'default';
+      if (alg === antdThemeImport.darkAlgorithm) return 'dark';
+      if (alg === antdThemeImport.compactAlgorithm) return 'compact';
+      return 'default'; // Fallback
+    }) as ('default' | 'dark' | 'compact')[];
+  } else if (algorithm) {
+    if (algorithm === antdThemeImport.defaultAlgorithm)
+      serializedAlgorithm = 'default';
+    else if (algorithm === antdThemeImport.darkAlgorithm)
+      serializedAlgorithm = 'dark';
+    else if (algorithm === antdThemeImport.compactAlgorithm)
+      serializedAlgorithm = 'compact';
+    else serializedAlgorithm = 'default'; // Fallback
+  }
+
+  return {
+    ...rest,
+    algorithm: serializedAlgorithm,
+  };
+}
+
+/**
+ * Normalize any theme config to a standard AntdThemeConfig
+ * This automatically detects and converts serializable configs
+ */
+export function normalizeThemeConfig(config: AnyThemeConfig): AntdThemeConfig {
+  if (isSerializableConfig(config)) {
+    return deserializeThemeConfig(config);
+  }
+  return config as AntdThemeConfig;
+}
+
+/**
+ * Creates default Ant Design configuration from tokens and dark mode preference
+ */
+export function getAntdConfig(
+  seed: Partial<SupersetTheme>,
+  isDark: boolean,
+): AntdThemeConfig {
+  const algorithm = isDark
+    ? antdThemeImport.darkAlgorithm
+    : antdThemeImport.defaultAlgorithm;
+  return {
+    token: seed,
+    algorithm,
+  };
+}
+
+/**
+ * Generate deprecated color variations from a base color
+ */
+export function genDeprecatedColorVariations(
+  color: string,
+  isDark: boolean,
+): DeprecatedColorVariations {
+  const bg = isDark ? '#FFF' : '#000';
+  const fg = isDark ? '#000' : '#FFF';
+  const adjustColor = (c: string, perc: number, tgt: string): string =>
+    tinycolor.mix(c, tgt, perc).toHexString();
+  return {
+    base: color,
+    light1: adjustColor(color, 20, fg),
+    light2: adjustColor(color, 45, fg),
+    light3: adjustColor(color, 70, fg),
+    light4: adjustColor(color, 90, fg),
+    light5: adjustColor(color, 95, fg),
+    dark1: adjustColor(color, 10, bg),
+    dark2: adjustColor(color, 20, bg),
+    dark3: adjustColor(color, 40, bg),
+    dark4: adjustColor(color, 60, bg),
+    dark5: adjustColor(color, 80, bg),
+  };
+}
+
+/**
+ * Generate deprecated theme colors from system colors
+ */
+export function getDeprecatedColors(
+  systemColors: SystemColors,
+  isDark: boolean,
+): DeprecatedThemeColors {
+  const sc = systemColors;
+  return {
+    primary: genDeprecatedColorVariations(sc.colorPrimary, isDark),
+    error: genDeprecatedColorVariations(sc.colorError, isDark),
+    warning: genDeprecatedColorVariations(sc.colorWarning, isDark),
+    success: genDeprecatedColorVariations(sc.colorSuccess, isDark),
+    info: genDeprecatedColorVariations(sc.colorInfo, isDark),
+    grayscale: genDeprecatedColorVariations('#666', isDark),
+  };
+}
+
+/**
+ * Extract system colors from Ant Design tokens
+ */
+export function getSystemColors(antdTokens: Record<string, any>): SystemColors {
+  return {
+    colorPrimary: antdTokens.colorPrimary,
+    colorError: antdTokens.colorError,
+    colorWarning: antdTokens.colorWarning,
+    colorSuccess: antdTokens.colorSuccess,
+    colorInfo: antdTokens.colorInfo,
+  };
+}
diff --git a/superset-frontend/packages/superset-ui-core/src/time-format/TimeFormatter.ts b/superset-frontend/packages/superset-ui-core/src/time-format/TimeFormatter.ts
index 3a2a2464bc1..9800b99dcc0 100644
--- a/superset-frontend/packages/superset-ui-core/src/time-format/TimeFormatter.ts
+++ b/superset-frontend/packages/superset-ui-core/src/time-format/TimeFormatter.ts
@@ -21,6 +21,8 @@ import { isRequired } from '../utils';
 import { TimeFormatFunction } from './types';
 import stringifyTimeInput from './utils/stringifyTimeInput';
 
+/* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */
+
 export const PREVIEW_TIME = new Date(Date.UTC(2017, 1, 14, 11, 22, 33));
 
 // Use type augmentation to indicate that
diff --git a/superset-frontend/packages/superset-ui-core/src/time-format/TimeRangeFormatter.ts b/superset-frontend/packages/superset-ui-core/src/time-format/TimeRangeFormatter.ts
index 48bf9de62e1..47649dc5028 100644
--- a/superset-frontend/packages/superset-ui-core/src/time-format/TimeRangeFormatter.ts
+++ b/superset-frontend/packages/superset-ui-core/src/time-format/TimeRangeFormatter.ts
@@ -19,6 +19,8 @@
 import { ExtensibleFunction } from '../models';
 import { TimeRangeFormatFunction } from './types';
 
+/* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */
+
 // Use type augmentation to indicate that
 // an instance of TimeFormatter is also a function
 interface TimeRangeFormatter {
diff --git a/superset-frontend/src/types/react-syntax-highlighter.d.ts b/superset-frontend/packages/superset-ui-core/src/types/react-syntax-highlighter.d.ts
similarity index 100%
rename from superset-frontend/src/types/react-syntax-highlighter.d.ts
rename to superset-frontend/packages/superset-ui-core/src/types/react-syntax-highlighter.d.ts
diff --git a/superset-frontend/packages/superset-ui-core/src/ui-overrides/types.ts b/superset-frontend/packages/superset-ui-core/src/ui-overrides/types.ts
index 6583bee7328..cdc9ed399af 100644
--- a/superset-frontend/packages/superset-ui-core/src/ui-overrides/types.ts
+++ b/superset-frontend/packages/superset-ui-core/src/ui-overrides/types.ts
@@ -51,7 +51,7 @@ export type LoadDrillByOptions = (
 interface MenuObjectChildProps {
   label: string;
   name?: string;
-  icon?: string;
+  icon?: React.ReactNode;
   index?: number;
   url?: string;
   isFrontendRoute?: boolean;
@@ -209,6 +209,16 @@ export interface CustomAutocomplete extends AutocompleteItem {
   insertMatch?: (editor: Editor, data: AutocompleteItem) => void;
 }
 
+export interface DateFilterControlProps {
+  name: string;
+  onChange: (timeRange: string) => void;
+  value?: string;
+  onOpenPopover?: () => void;
+  onClosePopover?: () => void;
+  overlayStyle?: 'Modal' | 'Popover';
+  isOverflowingFilterBar?: boolean;
+}
+
 export type Extensions = Partial<{
   'alertsreports.header.icon': ComponentType;
   'load.drillby.options': LoadDrillByOptions;
@@ -240,4 +250,5 @@ export type Extensions = Partial<{
     string,
     ComponentType<SQLTablePreviewExtensionProps>,
   ][];
+  'filter.dateFilterControl': ComponentType<DateFilterControlProps>;
 }>;
diff --git a/superset-frontend/src/utils/dates.test.ts b/superset-frontend/packages/superset-ui-core/src/utils/dates.test.ts
similarity index 99%
rename from superset-frontend/src/utils/dates.test.ts
rename to superset-frontend/packages/superset-ui-core/src/utils/dates.test.ts
index 53d4cef846e..7395bcb5884 100644
--- a/superset-frontend/src/utils/dates.test.ts
+++ b/superset-frontend/packages/superset-ui-core/src/utils/dates.test.ts
@@ -23,7 +23,7 @@ import {
   epochTimeXDaysAgo,
   epochTimeXYearsAgo,
   extendedDayjs,
-} from 'src/utils/dates';
+} from './dates';
 
 describe('extendedDayjs', () => {
   it('returns dayjs object with extended methods', () => {
diff --git a/superset-frontend/src/utils/dates.ts b/superset-frontend/packages/superset-ui-core/src/utils/dates.ts
similarity index 96%
rename from superset-frontend/src/utils/dates.ts
rename to superset-frontend/packages/superset-ui-core/src/utils/dates.ts
index a1155dc1af9..8124490fdbe 100644
--- a/superset-frontend/src/utils/dates.ts
+++ b/superset-frontend/packages/superset-ui-core/src/utils/dates.ts
@@ -25,6 +25,7 @@ import relativeTime from 'dayjs/plugin/relativeTime';
 import customParseFormat from 'dayjs/plugin/customParseFormat';
 import duration from 'dayjs/plugin/duration';
 import updateLocale from 'dayjs/plugin/updateLocale';
+import localizedFormat from 'dayjs/plugin/localizedFormat';
 import isSameOrBefore from 'dayjs/plugin/isSameOrBefore';
 
 dayjs.extend(utc);
@@ -34,6 +35,7 @@ dayjs.extend(relativeTime);
 dayjs.extend(customParseFormat);
 dayjs.extend(duration);
 dayjs.extend(updateLocale);
+dayjs.extend(localizedFormat);
 dayjs.extend(isSameOrBefore);
 
 dayjs.updateLocale('en', {
diff --git a/superset-frontend/packages/superset-ui-core/src/utils/featureFlags.ts b/superset-frontend/packages/superset-ui-core/src/utils/featureFlags.ts
index 7890fd7c573..f488629a079 100644
--- a/superset-frontend/packages/superset-ui-core/src/utils/featureFlags.ts
+++ b/superset-frontend/packages/superset-ui-core/src/utils/featureFlags.ts
@@ -52,6 +52,8 @@ export enum FeatureFlag {
   SqlValidatorsByEngine = 'SQL_VALIDATORS_BY_ENGINE',
   SshTunneling = 'SSH_TUNNELING',
   TaggingSystem = 'TAGGING_SYSTEM',
+  ThemeEnableDarkThemeSwitch = 'THEME_ENABLE_DARK_THEME_SWITCH',
+  ThemeAllowThemeEditorBeta = 'THEME_ALLOW_THEME_EDITOR_BETA',
   Thumbnails = 'THUMBNAILS',
   UseAnalogousColors = 'USE_ANALOGOUS_COLORS',
   ForceSqlLabRunAsync = 'SQLLAB_FORCE_RUN_ASYNC',
diff --git a/superset-frontend/packages/superset-ui-core/src/utils/html.test.tsx b/superset-frontend/packages/superset-ui-core/src/utils/html.test.tsx
index 3f38e8c9c16..12a0a4f9f5a 100644
--- a/superset-frontend/packages/superset-ui-core/src/utils/html.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/utils/html.test.tsx
@@ -27,7 +27,7 @@ import {
 } from './html';
 
 describe('sanitizeHtml', () => {
-  test('should sanitize the HTML string', () => {
+  it('should sanitize the HTML string', () => {
     const htmlString = '<script>alert("XSS")</script>';
     const sanitizedString = sanitizeHtml(htmlString);
     expect(sanitizedString).not.toContain('script');
@@ -35,13 +35,13 @@ describe('sanitizeHtml', () => {
 });
 
 describe('isProbablyHTML', () => {
-  test('should return true if the text contains HTML tags', () => {
+  it('should return true if the text contains HTML tags', () => {
     const htmlText = '<div>Some HTML content</div>';
     const isHTML = isProbablyHTML(htmlText);
     expect(isHTML).toBe(true);
   });
 
-  test('should return false if the text does not contain HTML tags', () => {
+  it('should return false if the text does not contain HTML tags', () => {
     const plainText = 'Just a plain text';
     const isHTML = isProbablyHTML(plainText);
     expect(isHTML).toBe(false);
@@ -52,13 +52,13 @@ describe('isProbablyHTML', () => {
 });
 
 describe('sanitizeHtmlIfNeeded', () => {
-  test('should sanitize the HTML string if it contains HTML tags', () => {
+  it('should sanitize the HTML string if it contains HTML tags', () => {
     const htmlString = '<div>Some <b>HTML</b> content</div>';
     const sanitizedString = sanitizeHtmlIfNeeded(htmlString);
     expect(sanitizedString).toEqual(htmlString);
   });
 
-  test('should return the string as is if it does not contain HTML tags', () => {
+  it('should return the string as is if it does not contain HTML tags', () => {
     const plainText = 'Just a plain text';
     const sanitizedString = sanitizeHtmlIfNeeded(plainText);
     expect(sanitizedString).toEqual(plainText);
@@ -66,7 +66,7 @@ describe('sanitizeHtmlIfNeeded', () => {
 });
 
 describe('safeHtmlSpan', () => {
-  test('should return a safe HTML span when the input is HTML', () => {
+  it('should return a safe HTML span when the input is HTML', () => {
     const htmlString = '<div>Some <b>HTML</b> content</div>';
     const safeSpan = safeHtmlSpan(htmlString);
     expect(safeSpan).toEqual(
@@ -77,7 +77,7 @@ describe('safeHtmlSpan', () => {
     );
   });
 
-  test('should return the input string as is when it is not HTML', () => {
+  it('should return the input string as is when it is not HTML', () => {
     const plainText = 'Just a plain text';
     const result = safeHtmlSpan(plainText);
     expect(result).toEqual(plainText);
@@ -85,31 +85,31 @@ describe('safeHtmlSpan', () => {
 });
 
 describe('removeHTMLTags', () => {
-  test('should remove HTML tags from the string', () => {
+  it('should remove HTML tags from the string', () => {
     const input = '<p>Hello, <strong>World!</strong></p>';
     const output = removeHTMLTags(input);
     expect(output).toBe('Hello, World!');
   });
 
-  test('should return the same string when no HTML tags are present', () => {
+  it('should return the same string when no HTML tags are present', () => {
     const input = 'This is a plain text.';
     const output = removeHTMLTags(input);
     expect(output).toBe('This is a plain text.');
   });
 
-  test('should remove nested HTML tags and return combined text content', () => {
+  it('should remove nested HTML tags and return combined text content', () => {
     const input = '<div><h1>Title</h1><p>Content</p></div>';
     const output = removeHTMLTags(input);
     expect(output).toBe('TitleContent');
   });
 
-  test('should handle self-closing tags and return an empty string', () => {
+  it('should handle self-closing tags and return an empty string', () => {
     const input = '<img src="image.png" alt="Image">';
     const output = removeHTMLTags(input);
     expect(output).toBe('');
   });
 
-  test('should handle malformed HTML tags and remove only well-formed tags', () => {
+  it('should handle malformed HTML tags and remove only well-formed tags', () => {
     const input = '<div><h1>Unclosed tag';
     const output = removeHTMLTags(input);
     expect(output).toBe('Unclosed tag');
@@ -117,44 +117,44 @@ describe('removeHTMLTags', () => {
 });
 
 describe('isJsonString', () => {
-  test('valid JSON object', () => {
+  it('valid JSON object', () => {
     const jsonString = '{"name": "John", "age": 30, "city": "New York"}';
     expect(isJsonString(jsonString)).toBe(true);
   });
 
-  test('valid JSON array', () => {
+  it('valid JSON array', () => {
     const jsonString = '[1, 2, 3, 4, 5]';
     expect(isJsonString(jsonString)).toBe(true);
   });
 
-  test('valid JSON string', () => {
+  it('valid JSON string', () => {
     const jsonString = '"Hello, world!"';
     expect(isJsonString(jsonString)).toBe(true);
   });
 
-  test('invalid JSON with syntax error', () => {
+  it('invalid JSON with syntax error', () => {
     const jsonString = '{"name": "John", "age": 30, "city": "New York"';
     expect(isJsonString(jsonString)).toBe(false);
   });
 
-  test('empty string', () => {
+  it('empty string', () => {
     const jsonString = '';
     expect(isJsonString(jsonString)).toBe(false);
   });
 
-  test('non-JSON string', () => {
+  it('non-JSON string', () => {
     const jsonString = '<p>Hello, <strong>World!</strong></p>';
     expect(isJsonString(jsonString)).toBe(false);
   });
 
-  test('non-JSON formatted number', () => {
+  it('non-JSON formatted number', () => {
     const jsonString = '12345abc';
     expect(isJsonString(jsonString)).toBe(false);
   });
 });
 
 describe('getParagraphContents', () => {
-  test('should return an object with keys for each paragraph tag', () => {
+  it('should return an object with keys for each paragraph tag', () => {
     const htmlString =
       '<div><p>First paragraph.</p><p>Second paragraph.</p></div>';
     const result = getParagraphContents(htmlString);
@@ -164,23 +164,23 @@ describe('getParagraphContents', () => {
     });
   });
 
-  test('should return null if the string is not HTML', () => {
+  it('should return null if the string is not HTML', () => {
     const nonHtmlString = 'Just a plain text string.';
     expect(getParagraphContents(nonHtmlString)).toBeNull();
   });
 
-  test('should return null if there are no <p> tags in the HTML string', () => {
+  it('should return null if there are no <p> tags in the HTML string', () => {
     const htmlStringWithoutP = '<div><span>No paragraph here.</span></div>';
     expect(getParagraphContents(htmlStringWithoutP)).toBeNull();
   });
 
-  test('should return an object with empty string for empty <p> tag', () => {
+  it('should return an object with empty string for empty <p> tag', () => {
     const htmlStringWithEmptyP = '<div><p></p></div>';
     const result = getParagraphContents(htmlStringWithEmptyP);
     expect(result).toEqual({ p1: '' });
   });
 
-  test('should handle HTML strings with nested <p> tags correctly', () => {
+  it('should handle HTML strings with nested <p> tags correctly', () => {
     const htmlStringWithNestedP =
       '<div><p>First paragraph <span>with nested</span> content.</p></div>';
     const result = getParagraphContents(htmlStringWithNestedP);
diff --git a/superset-frontend/packages/superset-ui-core/src/utils/html.tsx b/superset-frontend/packages/superset-ui-core/src/utils/html.tsx
index 723c0dc3d96..9213fef07f8 100644
--- a/superset-frontend/packages/superset-ui-core/src/utils/html.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/utils/html.tsx
@@ -35,6 +35,13 @@ const xssFilter = new FilterXSS({
       'width',
       'muted',
     ],
+    table: ['width', 'border', 'align', 'valign', 'style'],
+    tr: ['rowspan', 'align', 'valign', 'style'],
+    td: ['width', 'rowspan', 'colspan', 'align', 'valign', 'style'],
+    th: ['width', 'rowspan', 'colspan', 'align', 'valign', 'style'],
+    tbody: ['align', 'valign', 'style'],
+    thead: ['align', 'valign', 'style'],
+    tfoot: ['align', 'valign', 'style'],
   },
   stripIgnoreTag: true,
   css: false,
diff --git a/superset-frontend/src/utils/rankedSearchCompare.test.ts b/superset-frontend/packages/superset-ui-core/src/utils/rankedSearchCompare.test.ts
similarity index 100%
rename from superset-frontend/src/utils/rankedSearchCompare.test.ts
rename to superset-frontend/packages/superset-ui-core/src/utils/rankedSearchCompare.test.ts
diff --git a/superset-frontend/src/utils/rankedSearchCompare.ts b/superset-frontend/packages/superset-ui-core/src/utils/rankedSearchCompare.ts
similarity index 100%
rename from superset-frontend/src/utils/rankedSearchCompare.ts
rename to superset-frontend/packages/superset-ui-core/src/utils/rankedSearchCompare.ts
diff --git a/superset-frontend/packages/superset-ui-core/src/utils/tooltip.ts b/superset-frontend/packages/superset-ui-core/src/utils/tooltip.ts
index 6105af0f715..59d5b08bb52 100644
--- a/superset-frontend/packages/superset-ui-core/src/utils/tooltip.ts
+++ b/superset-frontend/packages/superset-ui-core/src/utils/tooltip.ts
@@ -17,6 +17,7 @@
  * under the License.
  */
 import { t } from '../translation';
+import { sanitizeHtml } from './html';
 
 const TRUNCATION_STYLE = `
   max-width: 300px;
@@ -32,7 +33,7 @@ export function tooltipHtml(
   const titleRow = title
     ? `<span style="font-weight: 700;${TRUNCATION_STYLE}">${title}</span>`
     : '';
-  return `
+  return sanitizeHtml(`
     <div>
       ${titleRow}
       <table>
@@ -53,5 +54,5 @@ export function tooltipHtml(
             })
             .join('')}
       </table>
-    </div>`;
+    </div>`);
 }
diff --git a/superset-frontend/packages/superset-ui-core/test/chart-composition/ChartFrame.test.tsx b/superset-frontend/packages/superset-ui-core/test/chart-composition/ChartFrame.test.tsx
index 4125bc0161e..bb4ccd12ee4 100644
--- a/superset-frontend/packages/superset-ui-core/test/chart-composition/ChartFrame.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/test/chart-composition/ChartFrame.test.tsx
@@ -37,7 +37,7 @@ type Props = {
 
 const renderChartFrame = (props: Props) => render(<ChartFrame {...props} />);
 
-it('renders content that requires smaller space than frame', () => {
+test('renders content that requires smaller space than frame', () => {
   const { getByText } = renderChartFrame({
     width: 400,
     height: 400,
@@ -52,7 +52,7 @@ it('renders content that requires smaller space than frame', () => {
   expect(getByText('400/400')).toBeInTheDocument();
 });
 
-it('renders content without specifying content size', () => {
+test('renders content without specifying content size', () => {
   const { getByText } = renderChartFrame({
     width: 400,
     height: 400,
@@ -65,7 +65,7 @@ it('renders content without specifying content size', () => {
   expect(getByText('400/400')).toBeInTheDocument();
 });
 
-it('renders content that requires equivalent size to frame', () => {
+test('renders content that requires equivalent size to frame', () => {
   const { getByText } = renderChartFrame({
     width: 400,
     height: 400,
@@ -80,7 +80,7 @@ it('renders content that requires equivalent size to frame', () => {
   expect(getByText('400/400')).toBeInTheDocument();
 });
 
-it('renders content that requires space larger than frame', () => {
+test('renders content that requires space larger than frame', () => {
   const { getByText, container } = renderChartFrame({
     width: 400,
     height: 400,
@@ -97,7 +97,7 @@ it('renders content that requires space larger than frame', () => {
   expect(containerDiv).toHaveStyle({ overflowX: 'auto', overflowY: 'auto' });
 });
 
-it('renders content when width is larger than frame', () => {
+test('renders content when width is larger than frame', () => {
   const { getByText, container } = renderChartFrame({
     width: 400,
     height: 400,
@@ -113,7 +113,7 @@ it('renders content when width is larger than frame', () => {
   expect(containerDiv).toHaveStyle({ overflowX: 'auto', overflowY: 'hidden' });
 });
 
-it('renders content when height is larger than frame', () => {
+test('renders content when height is larger than frame', () => {
   const { getByText, container } = renderChartFrame({
     width: 400,
     height: 400,
diff --git a/superset-frontend/packages/superset-ui-core/test/chart-composition/tooltip/TooltipTable.test.tsx b/superset-frontend/packages/superset-ui-core/test/chart-composition/tooltip/TooltipTable.test.tsx
index 7df4e8c5faa..c27cb44f4c5 100644
--- a/superset-frontend/packages/superset-ui-core/test/chart-composition/tooltip/TooltipTable.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/test/chart-composition/tooltip/TooltipTable.test.tsx
@@ -18,20 +18,25 @@
  */
 
 import '@testing-library/jest-dom';
-import { screen, render } from '@testing-library/react';
+import { screen, render, within } from '@testing-library/react';
 import { TooltipTable } from '@superset-ui/core';
 import { CSSProperties } from 'react';
 
 describe('TooltipTable', () => {
   it('sets className', () => {
-    const { container } = render(<TooltipTable className="test-class" />);
-    expect(container.querySelector('[class="test-class"]')).toBeInTheDocument();
+    const { container } = render(
+      <TooltipTable className="test-class" data={[]} />,
+    );
+    expect(container.querySelector('.test-class')).toBeInTheDocument();
   });
 
   it('renders empty table', () => {
-    const { container } = render(<TooltipTable />);
-    expect(container.querySelector('tbody')).toBeInTheDocument();
-    expect(container.querySelector('tr')).not.toBeInTheDocument();
+    render(<TooltipTable data={[]} />);
+    const table = screen.getByRole('table');
+    expect(table).toBeInTheDocument();
+    const rows = within(table).queryAllByRole('row');
+    expect(rows.length).toBe(1);
+    expect(rows[0]).toHaveTextContent(/No Data|empty/i);
   });
 
   it('renders table with content', async () => {
@@ -41,29 +46,33 @@ describe('TooltipTable', () => {
         keyColumn: 'Cersei',
         keyStyle: { padding: '10' },
         valueColumn: 2,
-        valueStyle: { textAlign: 'right' } as CSSProperties,
+        valueStyle: { textAlign: 'right' as CSSProperties['textAlign'] },
       },
       {
         key: 'Jaime',
         keyColumn: 'Jaime',
         keyStyle: { padding: '10' },
         valueColumn: 1,
-        valueStyle: { textAlign: 'right' } as CSSProperties,
-      },
-      {
-        key: 'Tyrion',
-        keyStyle: { padding: '10' },
-        valueColumn: 2,
+        valueStyle: { textAlign: 'right' as CSSProperties['textAlign'] },
       },
+      { key: 'Tyrion', keyStyle: { padding: '10' }, valueColumn: 2 },
     ];
 
     render(<TooltipTable data={data} />);
 
-    for await (const { key, valueColumn } of data) {
-      const keyCell = await screen.findByText(key);
-      const valueCell = keyCell?.nextSibling as HTMLElement;
-      expect(keyCell).toBeInTheDocument();
-      expect(valueCell?.textContent).toEqual(String(valueColumn));
-    }
+    await Promise.all(
+      data.map(async ({ keyColumn, key, valueColumn }) => {
+        const keyText = keyColumn ?? key;
+        const keyCell = await screen.findByText(keyText);
+        expect(keyCell).toBeInTheDocument();
+
+        const row = keyCell.closest('tr');
+        expect(row).toBeInTheDocument();
+
+        const cells = within(row!).getAllByRole('cell');
+        expect(cells[0]).toHaveTextContent(String(keyText));
+        expect(cells[1]).toHaveTextContent(String(valueColumn));
+      }),
+    );
   });
 });
diff --git a/superset-frontend/packages/superset-ui-core/test/chart/components/FallbackComponent.test.tsx b/superset-frontend/packages/superset-ui-core/test/chart/components/FallbackComponent.test.tsx
index 638e5b17bda..e48a244a7aa 100644
--- a/superset-frontend/packages/superset-ui-core/test/chart/components/FallbackComponent.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/test/chart/components/FallbackComponent.test.tsx
@@ -17,30 +17,23 @@
  * under the License.
  */
 
-import { render } from '@testing-library/react';
+import { render } from '@superset-ui/core/spec';
 import '@testing-library/jest-dom';
 import { FallbackProps } from 'react-error-boundary';
-import { ThemeProvider, supersetTheme } from '../../../src/style';
 
 import FallbackComponent from '../../../src/chart/components/FallbackComponent';
 
-const renderWithTheme = (
-  props: Partial<FallbackProps> & FallbackProps['error'],
-) =>
-  render(
-    <ThemeProvider theme={supersetTheme}>
-      <FallbackComponent {...props} />
-    </ThemeProvider>,
-  );
+const setup = (props: Partial<FallbackProps> & FallbackProps['error']) =>
+  render(<FallbackComponent {...props} />);
 
 const ERROR = new Error('CaffeineOverLoadException');
 
 test('renders error only', () => {
-  const { getByText } = renderWithTheme({ error: ERROR });
+  const { getByText } = setup({ error: ERROR });
   expect(getByText('Error: CaffeineOverLoadException')).toBeInTheDocument();
 });
 
 test('renders when nothing is given', () => {
-  const { getByText } = renderWithTheme({});
+  const { getByText } = setup({});
   expect(getByText('Unknown Error')).toBeInTheDocument();
 });
diff --git a/superset-frontend/packages/superset-ui-core/test/chart/components/MockChartPlugins.tsx b/superset-frontend/packages/superset-ui-core/test/chart/components/MockChartPlugins.tsx
index 45e46289c05..768fed2d0ba 100644
--- a/superset-frontend/packages/superset-ui-core/test/chart/components/MockChartPlugins.tsx
+++ b/superset-frontend/packages/superset-ui-core/test/chart/components/MockChartPlugins.tsx
@@ -51,8 +51,8 @@ export const TestComponent = ({
       style={{
         width,
         height,
-        backgroundColor: theme.colors.primary.light5,
-        color: theme.colors.grayscale.light3,
+        backgroundColor: theme.colorPrimaryBg,
+        color: theme.colorTextSecondary,
         display: 'flex',
         flexDirection: 'column',
         alignItems: 'center',
@@ -66,7 +66,7 @@ export const TestComponent = ({
         {[width, height].join('x')}
       </div>
       <div className="formData" style={{ padding: 10 }}>
-        <code style={{ color: theme.colors.primary.light2 }}>
+        <code style={{ color: theme.colorTextSecondary }}>
           {JSON.stringify(formData)}
         </code>
       </div>
diff --git a/superset-frontend/packages/superset-ui-core/test/chart/components/NoResultsComponent.test.tsx b/superset-frontend/packages/superset-ui-core/test/chart/components/NoResultsComponent.test.tsx
index f736d44b995..8dfa6d19337 100644
--- a/superset-frontend/packages/superset-ui-core/test/chart/components/NoResultsComponent.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/test/chart/components/NoResultsComponent.test.tsx
@@ -17,17 +17,12 @@
  * under the License.
  */
 
-import { render, screen } from '@testing-library/react';
+import { render, screen } from '@superset-ui/core/spec';
 import '@testing-library/jest-dom';
-import { ThemeProvider, supersetTheme } from '../../../src/style';
 import NoResultsComponent from '../../../src/chart/components/NoResultsComponent';
 
 const renderNoResultsComponent = () =>
-  render(
-    <ThemeProvider theme={supersetTheme}>
-      <NoResultsComponent height="400" width="300" />
-    </ThemeProvider>,
-  );
+  render(<NoResultsComponent height="400" width="300" />);
 
 test('renders the no results error', () => {
   renderNoResultsComponent();
diff --git a/superset-frontend/packages/superset-ui-core/test/chart/components/SuperChart.test.tsx b/superset-frontend/packages/superset-ui-core/test/chart/components/SuperChart.test.tsx
index 4ec88755dde..fc5aaeea81c 100644
--- a/superset-frontend/packages/superset-ui-core/test/chart/components/SuperChart.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/test/chart/components/SuperChart.test.tsx
@@ -18,18 +18,12 @@
  */
 
 import '@testing-library/jest-dom';
-import { render, screen } from '@testing-library/react';
-import { ReactElement } from 'react';
+import { render, screen } from '@superset-ui/core/spec';
 import mockConsole, { RestoreConsole } from 'jest-mock-console';
 import { triggerResizeObserver } from 'resize-observer-polyfill';
 import { ErrorBoundary } from 'react-error-boundary';
 
-import {
-  promiseTimeout,
-  SuperChart,
-  supersetTheme,
-  ThemeProvider,
-} from '@superset-ui/core';
+import { promiseTimeout, SuperChart } from '@superset-ui/core';
 import { WrapperProps } from '../../../src/chart/components/SuperChart';
 
 import {
@@ -51,13 +45,6 @@ function getDimensionText(container: HTMLElement) {
   return dimensionEl?.textContent || '';
 }
 
-const renderWithTheme = (component: ReactElement) =>
-  render(component, {
-    wrapper: ({ children }) => (
-      <ThemeProvider theme={supersetTheme}>{children}</ThemeProvider>
-    ),
-  });
-
 describe('SuperChart', () => {
   jest.setTimeout(5000);
 
@@ -108,7 +95,7 @@ describe('SuperChart', () => {
 
     it('renders default FallbackComponent', async () => {
       expectedErrors = 1;
-      renderWithTheme(
+      render(
         <SuperChart
           chartType={ChartKeys.BUGGY}
           queriesData={[DEFAULT_QUERY_DATA]}
@@ -128,7 +115,7 @@ describe('SuperChart', () => {
         <div>Custom Fallback!</div>
       ));
 
-      renderWithTheme(
+      render(
         <SuperChart
           chartType={ChartKeys.BUGGY}
           queriesData={[DEFAULT_QUERY_DATA]}
@@ -144,7 +131,7 @@ describe('SuperChart', () => {
     it('call onErrorBoundary', async () => {
       expectedErrors = 1;
       const handleError = jest.fn();
-      renderWithTheme(
+      render(
         <SuperChart
           chartType={ChartKeys.BUGGY}
           queriesData={[DEFAULT_QUERY_DATA]}
@@ -163,7 +150,7 @@ describe('SuperChart', () => {
       expectedErrors = 1;
       const inactiveErrorHandler = jest.fn();
       const activeErrorHandler = jest.fn();
-      renderWithTheme(
+      render(
         <ErrorBoundary
           fallbackRender={() => <div>Error!</div>}
           onError={activeErrorHandler}
@@ -195,7 +182,7 @@ describe('SuperChart', () => {
 
   // Update the props test to wait for component to render
   it('passes the props to renderer correctly', async () => {
-    const { container } = renderWithTheme(
+    const { container } = render(
       <SuperChart
         chartType={ChartKeys.DILIGENT}
         queriesData={[DEFAULT_QUERY_DATA]}
@@ -273,7 +260,7 @@ describe('SuperChart', () => {
 
   // Update the resize observer trigger to ensure it's called after component mount
   it.skip('works when width and height are percent', async () => {
-    const { container } = renderWithTheme(
+    const { container } = render(
       <SuperChart
         chartType={ChartKeys.DILIGENT}
         queriesData={[DEFAULT_QUERY_DATA]}
@@ -321,7 +308,7 @@ describe('SuperChart', () => {
   });
 
   it('passes the props with multiple queries to renderer correctly', async () => {
-    const { container } = renderWithTheme(
+    const { container } = render(
       <SuperChart
         chartType={ChartKeys.DILIGENT}
         queriesData={DEFAULT_QUERIES_DATA}
@@ -341,7 +328,7 @@ describe('SuperChart', () => {
 
   describe('supports NoResultsComponent', () => {
     it('renders NoResultsComponent when queriesData is missing', () => {
-      renderWithTheme(
+      render(
         <SuperChart chartType={ChartKeys.DILIGENT} width="200" height="200" />,
       );
 
@@ -349,7 +336,7 @@ describe('SuperChart', () => {
     });
 
     it('renders NoResultsComponent when queriesData data is null', () => {
-      renderWithTheme(
+      render(
         <SuperChart
           chartType={ChartKeys.DILIGENT}
           queriesData={[{ data: null }]}
@@ -376,7 +363,7 @@ describe('SuperChart', () => {
     }
 
     it('works with width and height that are numbers', async () => {
-      const { container } = renderWithTheme(
+      const { container } = render(
         <SuperChart
           chartType={ChartKeys.DILIGENT}
           queriesData={[DEFAULT_QUERY_DATA]}
@@ -397,7 +384,7 @@ describe('SuperChart', () => {
       const wrapper = createSizedWrapper();
       document.body.appendChild(wrapper);
 
-      const { container } = renderWithTheme(
+      const { container } = render(
         <div style={{ width: '100%', height: '100%', position: 'absolute' }}>
           <SuperChart
             chartType={ChartKeys.DILIGENT}
diff --git a/superset-frontend/packages/superset-ui-core/test/chart/components/SuperChartCore.test.tsx b/superset-frontend/packages/superset-ui-core/test/chart/components/SuperChartCore.test.tsx
index 9d6db540432..454319dc301 100644
--- a/superset-frontend/packages/superset-ui-core/test/chart/components/SuperChartCore.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/test/chart/components/SuperChartCore.test.tsx
@@ -18,10 +18,9 @@
  */
 
 import '@testing-library/jest-dom';
-import { ReactElement } from 'react';
 import mockConsole, { RestoreConsole } from 'jest-mock-console';
-import { ChartProps, supersetTheme, ThemeProvider } from '@superset-ui/core';
-import { render, screen, waitFor } from '@testing-library/react';
+import { ChartProps, supersetTheme } from '@superset-ui/core';
+import { render, screen, waitFor } from '@superset-ui/core/spec';
 import SuperChartCore from '../../../src/chart/components/SuperChartCore';
 import {
   ChartKeys,
@@ -30,9 +29,6 @@ import {
   SlowChartPlugin,
 } from './MockChartPlugins';
 
-const renderWithTheme = (component: ReactElement) =>
-  render(<ThemeProvider theme={supersetTheme}>{component}</ThemeProvider>);
-
 describe('SuperChartCore', () => {
   const chartProps = new ChartProps();
   const plugins = [
@@ -66,7 +62,7 @@ describe('SuperChartCore', () => {
 
   describe('registered charts', () => {
     it('renders registered chart', async () => {
-      const { container } = renderWithTheme(
+      const { container } = render(
         <SuperChartCore
           chartType={ChartKeys.DILIGENT}
           chartProps={chartProps}
@@ -79,7 +75,7 @@ describe('SuperChartCore', () => {
     });
 
     it('renders registered chart with lazy loading', async () => {
-      const { container } = renderWithTheme(
+      const { container } = render(
         <SuperChartCore chartType={ChartKeys.LAZY} />,
       );
 
@@ -90,7 +86,7 @@ describe('SuperChartCore', () => {
 
     it('does not render if chartType is not set', async () => {
       // @ts-ignore chartType is required
-      const { container } = renderWithTheme(<SuperChartCore />);
+      const { container } = render(<SuperChartCore />);
 
       await waitFor(() => {
         const testComponent = container.querySelector('.test-component');
@@ -99,7 +95,7 @@ describe('SuperChartCore', () => {
     });
 
     it('adds id to container if specified', async () => {
-      const { container } = renderWithTheme(
+      const { container } = render(
         <SuperChartCore chartType={ChartKeys.DILIGENT} id="the-chart" />,
       );
 
@@ -111,7 +107,7 @@ describe('SuperChartCore', () => {
     });
 
     it('adds class to container if specified', async () => {
-      const { container } = renderWithTheme(
+      const { container } = render(
         <SuperChartCore chartType={ChartKeys.DILIGENT} className="the-chart" />,
       );
 
@@ -123,7 +119,7 @@ describe('SuperChartCore', () => {
     });
 
     it('uses overrideTransformProps when specified', async () => {
-      renderWithTheme(
+      render(
         <SuperChartCore
           chartType={ChartKeys.DILIGENT}
           overrideTransformProps={() => ({ message: 'hulk' })}
@@ -141,7 +137,7 @@ describe('SuperChartCore', () => {
         theme: supersetTheme,
       });
 
-      renderWithTheme(
+      render(
         <SuperChartCore
           chartType={ChartKeys.DILIGENT}
           preTransformProps={() => chartPropsWithPayload}
@@ -155,7 +151,7 @@ describe('SuperChartCore', () => {
     });
 
     it('uses postTransformProps when specified', async () => {
-      renderWithTheme(
+      render(
         <SuperChartCore
           chartType={ChartKeys.DILIGENT}
           postTransformProps={() => ({ message: 'hulk' })}
@@ -168,7 +164,7 @@ describe('SuperChartCore', () => {
     });
 
     it('renders if chartProps is not specified', async () => {
-      const { container } = renderWithTheme(
+      const { container } = render(
         <SuperChartCore chartType={ChartKeys.DILIGENT} />,
       );
 
@@ -178,7 +174,7 @@ describe('SuperChartCore', () => {
     });
 
     it('does not render anything while waiting for Chart code to load', () => {
-      const { container } = renderWithTheme(
+      const { container } = render(
         <SuperChartCore chartType={ChartKeys.SLOW} />,
       );
 
@@ -187,7 +183,7 @@ describe('SuperChartCore', () => {
     });
 
     it('eventually renders after Chart is loaded', async () => {
-      const { container } = renderWithTheme(
+      const { container } = render(
         <SuperChartCore chartType={ChartKeys.SLOW} />,
       );
 
@@ -202,7 +198,7 @@ describe('SuperChartCore', () => {
     });
 
     it('does not render if chartProps is null', async () => {
-      const { container } = renderWithTheme(
+      const { container } = render(
         <SuperChartCore chartType={ChartKeys.DILIGENT} chartProps={null} />,
       );
 
@@ -214,7 +210,7 @@ describe('SuperChartCore', () => {
 
   describe('unregistered charts', () => {
     it('renders error message', async () => {
-      renderWithTheme(
+      render(
         <SuperChartCore chartType="4d-pie-chart" chartProps={chartProps} />,
       );
 
diff --git a/superset-frontend/packages/superset-ui-core/test/chart/components/reactify.test.tsx b/superset-frontend/packages/superset-ui-core/test/chart/components/reactify.test.tsx
index 1d00b372c58..c2b7c43450a 100644
--- a/superset-frontend/packages/superset-ui-core/test/chart/components/reactify.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/test/chart/components/reactify.test.tsx
@@ -106,19 +106,12 @@ describe('reactify(renderFn)', () => {
   describe('propTypes', () => {
     it('has propTypes if renderFn.propTypes is defined', () => {
       /* eslint-disable-next-line react/forbid-foreign-prop-types */
-      expect(Object.keys(TheChart.propTypes ?? {})).toEqual([
-        'id',
-        'className',
-        'content',
-      ]);
+      expect(Object.keys(TheChart.propTypes ?? {})).toEqual(['content']);
     });
     it('does not have propTypes if renderFn.propTypes is not defined', () => {
       const AnotherChart = reactify(() => {});
       /* eslint-disable-next-line react/forbid-foreign-prop-types */
-      expect(Object.keys(AnotherChart.propTypes ?? {})).toEqual([
-        'id',
-        'className',
-      ]);
+      expect(Object.keys(AnotherChart.propTypes ?? {})).toEqual([]);
     });
   });
   describe('defaultProps', () => {
diff --git a/superset-frontend/packages/superset-ui-core/test/components/SafeMarkdown.test.ts b/superset-frontend/packages/superset-ui-core/test/components/SafeMarkdown.test.ts
index 4b4c826923b..93d3e4a2ecc 100644
--- a/superset-frontend/packages/superset-ui-core/test/components/SafeMarkdown.test.ts
+++ b/superset-frontend/packages/superset-ui-core/test/components/SafeMarkdown.test.ts
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { getOverrideHtmlSchema } from '../../src/components/SafeMarkdown';
+import { getOverrideHtmlSchema } from '../../src/components/SafeMarkdown/SafeMarkdown';
 
 describe('getOverrideHtmlSchema', () => {
   it('should append the override items', () => {
diff --git a/superset-frontend/packages/superset-ui-core/test/connection/SupersetClient.test.ts b/superset-frontend/packages/superset-ui-core/test/connection/SupersetClient.test.ts
index 500c7d95640..0e545d50fc1 100644
--- a/superset-frontend/packages/superset-ui-core/test/connection/SupersetClient.test.ts
+++ b/superset-frontend/packages/superset-ui-core/test/connection/SupersetClient.test.ts
@@ -110,7 +110,7 @@ describe('SupersetClient', () => {
     networkCalls.map((url: string) =>
       expect(fetchMock.calls(url)[0][1]?.headers).toStrictEqual({
         Accept: 'application/json',
-        'X-CSRFToken': '',
+        'X-CSRFToken': '1234',
       }),
     );
 
diff --git a/superset-frontend/packages/superset-ui-core/test/currency-format/CurrencyFormatter.test.ts b/superset-frontend/packages/superset-ui-core/test/currency-format/CurrencyFormatter.test.ts
index 5172e3b0ed3..b731b1ba498 100644
--- a/superset-frontend/packages/superset-ui-core/test/currency-format/CurrencyFormatter.test.ts
+++ b/superset-frontend/packages/superset-ui-core/test/currency-format/CurrencyFormatter.test.ts
@@ -23,7 +23,7 @@ import {
   NumberFormats,
 } from '@superset-ui/core';
 
-it('getCurrencySymbol', () => {
+test('getCurrencySymbol', () => {
   expect(
     getCurrencySymbol({ symbol: 'PLN', symbolPosition: 'prefix' }),
   ).toEqual('PLN');
@@ -36,7 +36,7 @@ it('getCurrencySymbol', () => {
   ).toThrow(RangeError);
 });
 
-it('CurrencyFormatter object fields', () => {
+test('CurrencyFormatter object fields', () => {
   const defaultCurrencyFormatter = new CurrencyFormatter({
     currency: { symbol: 'USD', symbolPosition: 'prefix' },
   });
@@ -60,7 +60,7 @@ it('CurrencyFormatter object fields', () => {
   });
 });
 
-it('CurrencyFormatter:hasValidCurrency', () => {
+test('CurrencyFormatter:hasValidCurrency', () => {
   const currencyFormatter = new CurrencyFormatter({
     currency: { symbol: 'USD', symbolPosition: 'prefix' },
   });
@@ -83,7 +83,7 @@ it('CurrencyFormatter:hasValidCurrency', () => {
   expect(currencyFormatterWithoutCurrency.hasValidCurrency()).toBe(false);
 });
 
-it('CurrencyFormatter:getNormalizedD3Format', () => {
+test('CurrencyFormatter:getNormalizedD3Format', () => {
   const currencyFormatter = new CurrencyFormatter({
     currency: { symbol: 'USD', symbolPosition: 'prefix' },
   });
@@ -112,7 +112,7 @@ it('CurrencyFormatter:getNormalizedD3Format', () => {
   expect(currencyFormatter4.getNormalizedD3Format()).toEqual(',.1');
 });
 
-it('CurrencyFormatter:format', () => {
+test('CurrencyFormatter:format', () => {
   const VALUE = 56100057;
   const currencyFormatterWithPrefix = new CurrencyFormatter({
     currency: { symbol: 'USD', symbolPosition: 'prefix' },
diff --git a/superset-frontend/packages/superset-ui-core/test/models/ExtensibleFunction.test.ts b/superset-frontend/packages/superset-ui-core/test/models/ExtensibleFunction.test.ts
index 931989853d6..11db53fd9af 100644
--- a/superset-frontend/packages/superset-ui-core/test/models/ExtensibleFunction.test.ts
+++ b/superset-frontend/packages/superset-ui-core/test/models/ExtensibleFunction.test.ts
@@ -17,6 +17,8 @@
  * under the License.
  */
 
+/* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */
+
 import { ExtensibleFunction } from '@superset-ui/core';
 
 describe('ExtensibleFunction', () => {
diff --git a/superset-frontend/packages/superset-ui-core/test/query/api/v1/handleError.test.ts b/superset-frontend/packages/superset-ui-core/test/query/api/v1/handleError.test.ts
index 72b1a0f4117..bcb47044f97 100644
--- a/superset-frontend/packages/superset-ui-core/test/query/api/v1/handleError.test.ts
+++ b/superset-frontend/packages/superset-ui-core/test/query/api/v1/handleError.test.ts
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import 'whatwg-fetch'; // for adding Response polyfill
 import {
   JsonObject,
   SupersetApiError,
diff --git a/superset-frontend/packages/superset-ui-core/test/style/index.test.tsx b/superset-frontend/packages/superset-ui-core/test/style/index.test.tsx
deleted file mode 100644
index 352ea4b6a01..00000000000
--- a/superset-frontend/packages/superset-ui-core/test/style/index.test.tsx
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 {
-  styled,
-  supersetTheme,
-  SupersetThemeProps,
-  useTheme,
-  ThemeProvider,
-  EmotionCacheProvider,
-  emotionCache,
-} from '@superset-ui/core';
-import { render } from '@testing-library/react';
-
-describe('@superset-ui/style package', () => {
-  it('exports a theme', () => {
-    expect(typeof supersetTheme).toBe('object');
-  });
-
-  it('exports styled component templater', () => {
-    expect(typeof styled.div).toBe('function');
-  });
-
-  it('exports SupersetThemeProps', () => {
-    const props: SupersetThemeProps = {
-      theme: supersetTheme,
-    };
-    expect(typeof props).toBe('object');
-  });
-
-  describe('useTheme()', () => {
-    it('returns the theme', () => {
-      function ThemeUser() {
-        expect(useTheme()).toStrictEqual(supersetTheme);
-        return <div>test</div>;
-      }
-      render(<ThemeUser />, {
-        wrapper: ({ children }) => (
-          <EmotionCacheProvider value={emotionCache}>
-            <ThemeProvider theme={supersetTheme}>{children}</ThemeProvider>
-          </EmotionCacheProvider>
-        ),
-      });
-    });
-
-    it('throws when a theme is not present', () => {
-      function ThemeUser() {
-        expect(useTheme).toThrow(/could not find a ThemeContext/);
-        return <div>test</div>;
-      }
-      render(<ThemeUser />, {
-        wrapper: ({ children }) => <div>{children}</div>,
-      });
-    });
-  });
-});
diff --git a/superset-frontend/packages/superset-ui-core/test/utils/featureFlag.test.ts b/superset-frontend/packages/superset-ui-core/test/utils/featureFlag.test.ts
index 12a644c062a..b3c68f7e71d 100644
--- a/superset-frontend/packages/superset-ui-core/test/utils/featureFlag.test.ts
+++ b/superset-frontend/packages/superset-ui-core/test/utils/featureFlag.test.ts
@@ -18,7 +18,7 @@
  */
 import * as uiCore from '@superset-ui/core';
 
-it('initializes feature flags', () => {
+test('initializes feature flags', () => {
   Object.defineProperty(window, 'featureFlags', {
     value: undefined,
   });
@@ -26,7 +26,7 @@ it('initializes feature flags', () => {
   expect(window.featureFlags).toEqual({});
 });
 
-it('initializes feature flags with predefined values', () => {
+test('initializes feature flags with predefined values', () => {
   Object.defineProperty(window, 'featureFlags', {
     value: undefined,
   });
@@ -37,7 +37,7 @@ it('initializes feature flags with predefined values', () => {
   expect(window.featureFlags).toEqual(featureFlags);
 });
 
-it('does nothing if feature flags are already initialized', () => {
+test('does nothing if feature flags are already initialized', () => {
   const featureFlags = { DRILL_BY: false };
   Object.defineProperty(window, 'featureFlags', {
     value: featureFlags,
@@ -46,7 +46,7 @@ it('does nothing if feature flags are already initialized', () => {
   expect(window.featureFlags).toEqual(featureFlags);
 });
 
-it('returns false and raises console error if feature flags have not been initialized', () => {
+test('returns false and raises console error if feature flags have not been initialized', () => {
   const logging = jest.spyOn(uiCore.logging, 'error');
   Object.defineProperty(window, 'featureFlags', {
     value: undefined,
@@ -56,14 +56,14 @@ it('returns false and raises console error if feature flags have not been initia
   expect(logging).toHaveBeenCalledWith('Failed to query feature flag DRILL_BY');
 });
 
-it('returns false for unset feature flag', () => {
+test('returns false for unset feature flag', () => {
   Object.defineProperty(window, 'featureFlags', {
     value: {},
   });
   expect(uiCore.isFeatureEnabled(uiCore.FeatureFlag.DrillBy)).toEqual(false);
 });
 
-it('returns true for set feature flag', () => {
+test('returns true for set feature flag', () => {
   Object.defineProperty(window, 'featureFlags', {
     value: {
       DRILL_BY: true,
diff --git a/superset-frontend/packages/superset-ui-core/test/utils/tooltip.test.ts b/superset-frontend/packages/superset-ui-core/test/utils/tooltip.test.ts
index fbd29175ec4..1cb708bccdb 100644
--- a/superset-frontend/packages/superset-ui-core/test/utils/tooltip.test.ts
+++ b/superset-frontend/packages/superset-ui-core/test/utils/tooltip.test.ts
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { tooltipHtml } from '@superset-ui/core';
+import { sanitizeHtml, tooltipHtml } from '@superset-ui/core';
 
 const TITLE_STYLE =
   'style="font-weight: 700;max-width:300px;overflow:hidden;text-overflow:ellipsis;"';
@@ -39,7 +39,8 @@ function removeWhitespaces(text: string) {
 test('should return a table with the given data', () => {
   const title = 'Title';
   const html = removeWhitespaces(tooltipHtml(data, title));
-  const expectedHtml = removeWhitespaces(`
+  const expectedHtml = removeWhitespaces(
+    sanitizeHtml(`
     <div>
         <span ${TITLE_STYLE}>Title</span>
         <table>
@@ -54,7 +55,8 @@ test('should return a table with the given data', () => {
                 <td ${TD_NUMBER_STYLE}>3</td>
             </tr>
         </table>
-    </div>`);
+    </div>`),
+  );
   expect(html).toMatch(expectedHtml);
 });
 
@@ -62,7 +64,8 @@ test('should return a table with the given data and a focused row', () => {
   const title = 'Title';
   const focusedRow = 1;
   const html = removeWhitespaces(tooltipHtml(data, title, focusedRow));
-  const expectedHtml = removeWhitespaces(`
+  const expectedHtml = removeWhitespaces(
+    sanitizeHtml(`
     <div>
         <span ${TITLE_STYLE}>Title</span>
         <table>
@@ -77,26 +80,30 @@ test('should return a table with the given data and a focused row', () => {
                 <td ${TD_NUMBER_STYLE}>3</td>
             </tr>
         </table>
-    </div>`);
+    </div>`),
+  );
   expect(html).toMatch(expectedHtml);
 });
 
 test('should return a table with no data', () => {
   const title = 'Title';
   const html = removeWhitespaces(tooltipHtml([], title));
-  const expectedHtml = removeWhitespaces(`
+  const expectedHtml = removeWhitespaces(
+    sanitizeHtml(`
     <div>
         <span ${TITLE_STYLE}>Title</span>
         <table>
             <tr><td>No data</td></tr>
         </table>
-    </div>`);
+    </div>`),
+  );
   expect(html).toMatch(expectedHtml);
 });
 
 test('should return a table with the given data and no title', () => {
   const html = removeWhitespaces(tooltipHtml(data));
-  const expectedHtml = removeWhitespaces(`
+  const expectedHtml = removeWhitespaces(
+    sanitizeHtml(`
     <div>
         <table>
             <tr ${TR_STYLE}>
@@ -110,6 +117,65 @@ test('should return a table with the given data and no title', () => {
                 <td ${TD_NUMBER_STYLE}>3</td>
             </tr>
         </table>
-    </div>`);
+    </div>`),
+  );
   expect(html).toMatch(expectedHtml);
 });
+
+test('should sanitize HTML input', () => {
+  const title = 'Title<script>alert("message");</script>';
+  const data = [
+    ['<b onclick="alert(\'message\')">B message</b>', 'message2'],
+    ['<img src="x" onerror="alert(\'message\');" />', '<i>Italic</i>'],
+  ];
+
+  const html = removeWhitespaces(tooltipHtml(data, title));
+
+  const expectedHtml = removeWhitespaces(
+    sanitizeHtml(`
+    <div>
+        <span ${TITLE_STYLE}>Titlealert("message");</span>
+        <table>
+            <tr ${TR_STYLE}>
+                <td ${TD_TEXT_STYLE}><b>B message</b></td>
+                <td ${TD_NUMBER_STYLE}>message2</td>
+            </tr>
+            <tr ${TR_STYLE}>
+                <td ${TD_TEXT_STYLE}><img src="x" /></td>
+                <td ${TD_NUMBER_STYLE}><i>Italic</i></td>
+            </tr>
+        </table>
+    </div>`),
+  );
+
+  expect(html).toMatch(expectedHtml);
+});
+
+test('should preserve table styling after sanitization (fixes ECharts tooltip formatting)', () => {
+  const tableWithStyles = `
+    <table>
+      <tr style="opacity: 0.8;">
+        <td style="text-align: left; padding-left: 0px;">Label</td>
+        <td style="text-align: right; padding-left: 16px;">Value</td>
+      </tr>
+    </table>
+  `;
+
+  const sanitized = sanitizeHtml(tableWithStyles);
+  expect(sanitized).toContain('style="opacity: 0.8;"');
+  expect(sanitized).toContain('style="text-align: left; padding-left: 0px;"');
+  expect(sanitized).toContain('style="text-align: right; padding-left: 16px;"');
+
+  const data = [
+    ['Metric', 'Value'],
+    ['Sales', '$1,234'],
+  ];
+  const html = tooltipHtml(data, 'Test Tooltip');
+
+  expect(html).toContain('style="opacity: 0.8;"');
+  expect(html).toContain('text-align: left');
+  expect(html).toContain('text-align: right');
+  expect(html).toContain('padding-left: 0px');
+  expect(html).toContain('padding-left: 16px');
+  expect(html).toContain('max-width: 300px');
+});
diff --git a/superset-frontend/packages/superset-ui-core/tsconfig.json b/superset-frontend/packages/superset-ui-core/tsconfig.json
index d345ae88fc0..4e39d068d5f 100644
--- a/superset-frontend/packages/superset-ui-core/tsconfig.json
+++ b/superset-frontend/packages/superset-ui-core/tsconfig.json
@@ -1,18 +1,24 @@
 {
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "declarationDir": "lib",
     "outDir": "lib",
-    "rootDir": "src"
+    "rootDir": "src",
+    "baseUrl": ".",
+    "paths": {
+      "src/*": ["./src/*"],
+      "@superset-ui/core": ["src"],
+      "@superset-ui/core/*": ["src/*"]
+    }
   },
   "exclude": [
     "lib",
     "test"
   ],
-  "extends": "../../tsconfig.json",
   "include": [
     "src/**/*",
-    "types/**/*",
-    "../../types/**/*"
+    "spec/**/*",
+    "types/**/*"
   ],
   "references": []
 }
diff --git a/superset-frontend/src/types/ace-builds.d.ts b/superset-frontend/packages/superset-ui-core/types/ace-builds.d.ts
similarity index 100%
rename from superset-frontend/src/types/ace-builds.d.ts
rename to superset-frontend/packages/superset-ui-core/types/ace-builds.d.ts
diff --git a/superset-frontend/packages/superset-ui-core/types/assets.d.ts b/superset-frontend/packages/superset-ui-core/types/assets.d.ts
new file mode 100644
index 00000000000..76f6dc1a771
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/types/assets.d.ts
@@ -0,0 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+declare module '*.gif';
+declare module '*.svg';
+declare module '*.png';
diff --git a/superset-frontend/packages/superset-ui-core/types/brace.d.ts b/superset-frontend/packages/superset-ui-core/types/brace.d.ts
new file mode 100644
index 00000000000..0b3770eebed
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/types/brace.d.ts
@@ -0,0 +1,29 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+declare module 'brace/mode/sql';
+declare module 'brace/mode/markdown';
+declare module 'brace/mode/json';
+declare module 'brace/mode/css';
+declare module 'brace/mode/html';
+declare module 'brace/mode/yaml';
+declare module 'brace/mode/javascript';
+declare module 'brace/theme/textmate';
+declare module 'brace/theme/github';
+declare module 'brace/ext/language_tools';
+declare module 'brace/ext/searchbox';
diff --git a/superset-frontend/src/types/react-table-config.d.ts b/superset-frontend/packages/superset-ui-core/types/react-table-config.d.ts
similarity index 100%
rename from superset-frontend/src/types/react-table-config.d.ts
rename to superset-frontend/packages/superset-ui-core/types/react-table-config.d.ts
diff --git a/superset-frontend/packages/superset-ui-demo/.storybook/preview.js b/superset-frontend/packages/superset-ui-demo/.storybook/preview.js
index 30e48845c0d..1786f8a88b3 100644
--- a/superset-frontend/packages/superset-ui-demo/.storybook/preview.js
+++ b/superset-frontend/packages/superset-ui-demo/.storybook/preview.js
@@ -12,7 +12,6 @@ import {
 } from '@superset-ui/core';
 import themeDecorator from './themeDecorator';
 
-import 'bootstrap/dist/css/bootstrap.min.css';
 import './storybook.css';
 
 export const decorators = [withJsx, themeDecorator];
diff --git a/superset-frontend/packages/superset-ui-demo/package.json b/superset-frontend/packages/superset-ui-demo/package.json
index 7cefa74aefe..60a10ebea1e 100644
--- a/superset-frontend/packages/superset-ui-demo/package.json
+++ b/superset-frontend/packages/superset-ui-demo/package.json
@@ -33,16 +33,15 @@
   "dependencies": {
     "@emotion/cache": "^11.14.0",
     "@emotion/react": "^11.14.0",
-    "@emotion/styled": "^11.14.0",
+    "@emotion/styled": "^11.14.1",
     "@mihkeleidast/storybook-addon-source": "^1.0.1",
     "@react-icons/all-files": "^4.1.0",
-    "@storybook/addon-actions": "8.1.11",
+    "@storybook/addon-actions": "9.0.8",
     "@storybook/addon-controls": "8.1.11",
     "@storybook/addon-links": "8.1.11",
     "@storybook/react": "8.1.11",
     "@storybook/types": "8.4.7",
     "@types/react-loadable": "^5.5.11",
-    "antd": "4.10.3",
     "core-js": "3.40.0",
     "gh-pages": "^6.2.0",
     "jquery": "^3.7.1",
@@ -59,7 +58,7 @@
     "@babel/preset-typescript": "^7.23.3",
     "@storybook/react-webpack5": "8.2.9",
     "babel-loader": "^10.0.0",
-    "fork-ts-checker-webpack-plugin": "^9.0.2",
+    "fork-ts-checker-webpack-plugin": "^9.1.0",
     "ts-loader": "^9.5.2",
     "typescript": "^5.7.2"
   },
diff --git a/superset-frontend/packages/superset-ui-demo/storybook/shared/components/VerifyCORS.tsx b/superset-frontend/packages/superset-ui-demo/storybook/shared/components/VerifyCORS.tsx
index 82d3c536d43..ca3b580730a 100644
--- a/superset-frontend/packages/superset-ui-demo/storybook/shared/components/VerifyCORS.tsx
+++ b/superset-frontend/packages/superset-ui-demo/storybook/shared/components/VerifyCORS.tsx
@@ -25,6 +25,7 @@ import {
   SupersetApiError,
   t,
 } from '@superset-ui/core';
+import { Button } from '@superset-ui/core/components';
 import ErrorMessage from './ErrorMessage';
 
 export type Props = {
@@ -117,13 +118,9 @@ export default class VerifyCORS extends Component<Props, State> {
           3) click below to verify authentication. You may debug CORS further
           using the `@superset-ui/connection` story. <br />
           <br />
-          <button
-            type="button"
-            className="btn btn-primary btn-sm"
-            onClick={this.handleVerify}
-          >
+          <Button type="primary" size="small" onClick={this.handleVerify}>
             {t('Verify')}
-          </button>
+          </Button>
           <br />
           <br />
         </div>
diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/ExampleApp.stories.jsx b/superset-frontend/packages/superset-ui-demo/storybook/stories/ExampleApp.stories.jsx
new file mode 100644
index 00000000000..85bdbbf9619
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-demo/storybook/stories/ExampleApp.stories.jsx
@@ -0,0 +1,91 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 {
+  Layout,
+  Menu,
+  Button,
+  Card,
+  Alert,
+  Input,
+  Table,
+  Space,
+} from '@superset-ui/core/components';
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { Icons } from '@superset-ui/core/components/Icons';
+
+const { Header, Content, Sider } = Layout;
+
+export default {
+  title: 'Example/ExampleApp',
+};
+
+export const KitchenSink = () => {
+  const columns = [
+    { title: 'Name', dataIndex: 'name' },
+    { title: 'Age', dataIndex: 'age' },
+    { title: 'Address', dataIndex: 'address' },
+  ];
+
+  const data = [
+    { key: 1, name: 'John Brown', age: 32, address: 'New York' },
+    { key: 2, name: 'Jim Green', age: 42, address: 'London' },
+    { key: 3, name: 'Joe Black', age: 28, address: 'Sydney' },
+  ];
+
+  return (
+    <Layout style={{ minHeight: '100vh' }}>
+      <Header style={{ color: 'white', fontSize: 18 }}>My App</Header>
+      <Layout>
+        <Sider width={200}>
+          <Menu
+            mode="inline"
+            defaultSelectedKeys={['1']}
+            style={{ height: '100%' }}
+            items={[
+              { key: '1', icon: <Icons.UserOutlined />, label: 'Users' },
+              { key: '2', icon: <Icons.BookOutlined />, label: 'Devices' },
+              { key: '3', icon: <Icons.CheckCircleFilled />, label: 'Alerts' },
+            ]}
+          />
+        </Sider>
+        <Layout style={{ padding: '24px' }}>
+          <Content>
+            <Space direction="vertical" size="large" style={{ width: '100%' }}>
+              <Alert
+                message="Welcome"
+                description="You are logged in."
+                type="info"
+              />
+              <Card title="Quick Actions">
+                <Space>
+                  <Button type="primary">Create</Button>
+                  <Button>Settings</Button>
+                  <Input placeholder="Search..." />
+                </Space>
+              </Card>
+              <Card title="User Table">
+                <Table columns={columns} dataSource={data} pagination={false} />
+              </Card>
+            </Space>
+          </Content>
+        </Layout>
+      </Layout>
+    </Layout>
+  );
+};
diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-plugin-chart-map-box/data.ts b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-plugin-chart-map-box/data.ts
index 19a3c4c5a59..b138443942c 100644
--- a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-plugin-chart-map-box/data.ts
+++ b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-plugin-chart-map-box/data.ts
@@ -5539,5 +5539,5 @@ export const generateData = (theme: SupersetTheme) => ({
   ],
   renderWhileDragging: true,
   tooltip: null,
-  color: theme.colors.primary.base,
+  color: theme.colorPrimary,
 });
diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Path/payload.js b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Path/payload.js
index 5a36d7e32c3..f92ad3210a5 100644
--- a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Path/payload.js
+++ b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Path/payload.js
@@ -81,7 +81,7 @@ export const payload = theme => ({
   data: {
     features: [
       {
-        color: theme.colors.primary.base,
+        color: theme.colorPrimary,
         path: [
           [-122.3535851, 37.9360513],
           [-122.3179784, 37.9249513],
@@ -108,10 +108,10 @@ export const payload = theme => ({
           [-122.3876274, 37.5993171],
         ],
         __timestamp: null,
-        extraProps: { color: theme.colors.primary.base },
+        extraProps: { color: theme.colorPrimary },
       },
       {
-        color: theme.colors.warning.base,
+        color: theme.colorWarning,
         path: [
           [-122.353165, 37.936887],
           [-122.317269, 37.925655],
@@ -133,10 +133,10 @@ export const payload = theme => ({
           [-121.9772135, 37.5567286],
         ],
         __timestamp: null,
-        extraProps: { color: theme.colors.warning.base },
+        extraProps: { color: theme.colorWarning },
       },
       {
-        color: theme.colors.error.base,
+        color: theme.colorError,
         path: [
           [-121.945154, 38.018914],
           [-122.024597, 38.003275],
@@ -166,10 +166,10 @@ export const payload = theme => ({
           [-122.38666, 37.599787],
         ],
         __timestamp: null,
-        extraProps: { color: theme.colors.error.base },
+        extraProps: { color: theme.colorError },
       },
       {
-        color: theme.colors.success.base,
+        color: theme.colorSuccess,
         path: [
           [-121.900367, 37.701695],
           [-121.928099, 37.699759],
@@ -191,10 +191,10 @@ export const payload = theme => ({
           [-122.469081, 37.706121],
         ],
         __timestamp: null,
-        extraProps: { color: theme.colors.success.base },
+        extraProps: { color: theme.colorSuccess },
       },
       {
-        color: theme.colors.warning.base,
+        color: theme.colorWarning,
         path: [
           [-121.9764, 37.557355],
           [-122.017867, 37.591208],
@@ -217,7 +217,7 @@ export const payload = theme => ({
           [-122.4683093, 37.705461],
         ],
         __timestamp: null,
-        extraProps: { color: theme.colors.warning.base },
+        extraProps: { color: theme.colorWarning },
       },
     ],
     mapboxApiKey:
diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/superset-ui-style/Theme.stories.tsx b/superset-frontend/packages/superset-ui-demo/storybook/stories/superset-ui-style/Theme.stories.tsx
deleted file mode 100644
index ffc84758cb4..00000000000
--- a/superset-frontend/packages/superset-ui-demo/storybook/stories/superset-ui-style/Theme.stories.tsx
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 { supersetTheme, SupersetTheme } from '@superset-ui/core';
-
-type ColorCategory = keyof SupersetTheme['colors'];
-export default {
-  title: 'Core Packages/@superset-ui-style',
-};
-
-export const ThemeColors = () => {
-  const { colors } = supersetTheme;
-
-  // Define tones to be displayed in columns
-  const tones = [
-    'dark2',
-    'dark1',
-    'base',
-    'light1',
-    'light2',
-    'light3',
-    'light4',
-    'light5',
-  ];
-  const colorTypes = [
-    'primary',
-    'secondary',
-    'grayscale',
-    'error',
-    'warning',
-    'alert',
-    'success',
-    'info',
-  ];
-  return (
-    <div>
-      <h1>Theme Colors</h1>
-      <table
-        style={{ borderCollapse: 'collapse', width: '100%', textAlign: 'left' }}
-      >
-        <thead>
-          <tr>
-            <th style={{ border: '1px solid #ddd', padding: '8px' }}>
-              Category
-            </th>
-            {tones.map(tone => (
-              <th
-                key={tone}
-                style={{ border: '1px solid #ddd', padding: '8px' }}
-              >
-                {tone}
-              </th>
-            ))}
-          </tr>
-        </thead>
-        <tbody>
-          {colorTypes.map(category => (
-            <tr key={category}>
-              <td style={{ border: '1px solid #ddd', padding: '8px' }}>
-                <strong>{category}</strong>
-              </td>
-              {tones.map(tone => {
-                const categoryColors = colors[category as ColorCategory];
-                const color =
-                  typeof categoryColors === 'object' &&
-                  categoryColors !== null &&
-                  tone in categoryColors
-                    ? (categoryColors as Record<string, string>)[tone]
-                    : undefined;
-                return (
-                  <td
-                    key={tone}
-                    style={{
-                      border: '1px solid #ddd',
-                      padding: '8px',
-                      backgroundColor: color || '#fff',
-                    }}
-                  >
-                    {color ? <code>{color}</code> : '-'}
-                  </td>
-                );
-              })}
-            </tr>
-          ))}
-        </tbody>
-      </table>
-      <h3>
-        text.label: <code>{colors.text.label}</code>
-      </h3>
-      <div style={{ color: `#${colors.text.label}` }}>
-        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod
-        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim
-        veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
-        commodo consequat.
-      </div>
-      <h3>
-        text.help: <code>{colors.text.help}</code>
-      </h3>
-      <div style={{ color: `#${colors.text.help}` }}>
-        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod
-        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim
-        veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
-        commodo consequat.
-      </div>
-      <h3>The supersetTheme object</h3>
-      <code>
-        <pre>{JSON.stringify(supersetTheme, null, 2)}</pre>
-      </code>
-    </div>
-  );
-};
diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/superset-ui-theme/Theme.stories.tsx b/superset-frontend/packages/superset-ui-demo/storybook/stories/superset-ui-theme/Theme.stories.tsx
new file mode 100644
index 00000000000..05040756d81
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-demo/storybook/stories/superset-ui-theme/Theme.stories.tsx
@@ -0,0 +1,170 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { supersetTheme, themeObject } from '@superset-ui/core';
+
+const colorTypes = [
+  'primary',
+  'error',
+  'warning',
+  'success',
+  'info',
+  'grayscale',
+];
+
+const AntDFunctionalColors = () => {
+  // Define color types and variants dynamically
+  const variants = [
+    'active',
+    'textActive',
+    'text',
+    'textHover',
+    'hover',
+    'borderHover',
+    'border',
+    'bgHover',
+    'bg',
+  ];
+
+  return (
+    <table
+      style={{ borderCollapse: 'collapse', width: '100%', textAlign: 'left' }}
+    >
+      <thead>
+        <tr>
+          <th style={{ border: '1px solid #ddd', padding: '8px' }}>Type</th>
+          {variants.map(variant => (
+            <th
+              key={variant}
+              style={{ border: '1px solid #ddd', padding: '8px' }}
+            >
+              {variant}
+            </th>
+          ))}
+        </tr>
+      </thead>
+      <tbody>
+        {colorTypes.map(type => (
+          <tr key={type}>
+            <td style={{ border: '1px solid #ddd', padding: '8px' }}>
+              <strong>{type}</strong>
+            </td>
+            {variants.map(variant => {
+              const color = themeObject.getColorVariants(type)[variant];
+              return (
+                <td
+                  key={variant}
+                  style={{
+                    border: '1px solid #ddd',
+                    padding: '8px',
+                    backgroundColor: color || 'transparent',
+                    color: `color${type}${variant}`,
+                  }}
+                >
+                  {color ? <code>{color}</code> : '-'}
+                </td>
+              );
+            })}
+          </tr>
+        ))}
+      </tbody>
+    </table>
+  );
+};
+
+export const ThemeColors = () => {
+  const { colors } = supersetTheme;
+
+  // Define tones to be displayed in columns
+  const tones = [
+    'dark5',
+    'dark4',
+    'dark3',
+    'dark1',
+    'base',
+    'light1',
+    'light2',
+    'light3',
+    'light4',
+    'light5',
+  ];
+  return (
+    <div>
+      <h1>Theme Colors</h1>
+      <h2>Legacy Theme Colors</h2>
+      <table
+        style={{ borderCollapse: 'collapse', width: '100%', textAlign: 'left' }}
+      >
+        <thead>
+          <tr>
+            <th style={{ border: '1px solid #ddd', padding: '8px' }}>
+              Category
+            </th>
+            {tones.map(tone => (
+              <th
+                key={tone}
+                style={{ border: '1px solid #ddd', padding: '8px' }}
+              >
+                {tone}
+              </th>
+            ))}
+          </tr>
+        </thead>
+        <tbody>
+          {colorTypes.map(category => (
+            <tr key={category}>
+              <td style={{ border: '1px solid #ddd', padding: '8px' }}>
+                <strong>{category}</strong>
+              </td>
+              {tones.map(tone => {
+                const color = colors[category][tone];
+                return (
+                  <td
+                    key={tone}
+                    style={{
+                      border: '1px solid #ddd',
+                      padding: '8px',
+                      backgroundColor: color || '#fff',
+                    }}
+                  >
+                    {color ? <code>{color}</code> : '-'}
+                  </td>
+                );
+              })}
+            </tr>
+          ))}
+        </tbody>
+      </table>
+      <h2>Ant Design Theme Colors</h2>
+      <h3>Functional Colors</h3>
+      <AntDFunctionalColors />
+      <h2>The supersetTheme object</h2>
+      <pre>
+        <code>{JSON.stringify(supersetTheme, null, 2)}</code>
+      </pre>
+    </div>
+  );
+};
+/*
+ * */
+export default {
+  title: 'Core Packages/@superset-ui-theme',
+};
+
+export const Default = () => <ThemeColors />;
diff --git a/superset-frontend/plugins/legacy-plugin-chart-calendar/src/ReactCalendar.jsx b/superset-frontend/plugins/legacy-plugin-chart-calendar/src/ReactCalendar.jsx
index 46cb1de852a..8c8edd1a5e9 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-calendar/src/ReactCalendar.jsx
+++ b/superset-frontend/plugins/legacy-plugin-chart-calendar/src/ReactCalendar.jsx
@@ -31,19 +31,19 @@ const Calendar = ({ className, ...otherProps }) => {
         styles={css`
           .d3-tip {
             line-height: 1;
-            padding: ${theme.gridUnit * 3}px;
+            padding: ${theme.sizeUnit * 3}px;
             background: ${theme.colors.grayscale.dark2};
             color: ${theme.colors.grayscale.light5};
             border-radius: 4px;
             pointer-events: none;
             z-index: 1000;
-            font-size: ${theme.typography.sizes.s}px;
+            font-size: ${theme.fontSizeSM}px;
           }
           /* Creates a small triangle extender for the tooltip */
           .d3-tip:after {
             box-sizing: border-box;
             display: inline;
-            font-size: ${theme.typography.sizes.xs};
+            font-size: ${theme.fontSizeXS};
             width: 100%;
             line-height: 1;
             color: ${theme.colors.grayscale.dark2};
@@ -53,7 +53,7 @@ const Calendar = ({ className, ...otherProps }) => {
           /* Northward tooltips */
           .d3-tip.n:after {
             content: '\\25BC';
-            margin: -${theme.gridUnit}px 0 0 0;
+            margin: -${theme.sizeUnit}px 0 0 0;
             top: 100%;
             left: 0;
             text-align: center;
@@ -61,22 +61,22 @@ const Calendar = ({ className, ...otherProps }) => {
           /* Eastward tooltips */
           .d3-tip.e:after {
             content: '\\25C0';
-            margin: -${theme.gridUnit}px 0 0 0;
+            margin: -${theme.sizeUnit}px 0 0 0;
             top: 50%;
-            left: -${theme.gridUnit * 2}px;
+            left: -${theme.sizeUnit * 2}px;
           }
           /* Southward tooltips */
           .d3-tip.s:after {
             content: '\\25B2';
             margin: 0;
-            top: -${theme.gridUnit * 2}px;
+            top: -${theme.sizeUnit * 2}px;
             left: 0;
             text-align: center;
           }
           /* Westward tooltips */
           .d3-tip.w:after {
             content: '\\25B6';
-            margin: -${theme.gridUnit}px 0 0 0px;
+            margin: -${theme.sizeUnit}px 0 0 0px;
             top: 50%;
             left: 100%;
           }
@@ -99,19 +99,19 @@ Calendar.propTypes = {
 export default styled(Calendar)`
   ${({ theme }) => `
     .superset-legacy-chart-calendar {
-      padding: ${theme.gridUnit * 3}px;
+      padding: ${theme.sizeUnit * 3}px;
       position: static !important;
       overflow: auto !important;
     }
 
     .superset-legacy-chart-calendar .ch-tooltip {
-      margin-left: ${theme.gridUnit * 5}px;
-      margin-top: ${theme.gridUnit}px;
+      margin-left: ${theme.sizeUnit * 5}px;
+      margin-top: ${theme.sizeUnit}px;
     }
 
     .superset-legacy-chart-calendar .d3-tip {
       line-height: 1;
-      padding: ${theme.gridUnit * 3}px;
+      padding: ${theme.sizeUnit * 3}px;
       background: ${theme.colors.grayscale.dark2};
       color: ${theme.colors.grayscale.light5};
       border-radius: ${theme.borderRadius}px;
@@ -125,7 +125,7 @@ export default styled(Calendar)`
 
     .cal-heatmap-container .graph-label {
       fill: ${theme.colors.grayscale.base};
-      font-size: ${theme.typography.sizes.xs}px;
+      font-size: ${theme.fontSizeXS}px;
     }
 
     .cal-heatmap-container .graph,
@@ -143,7 +143,7 @@ export default styled(Calendar)`
     }
 
     .cal-heatmap-container .subdomain-text {
-      font-size: ${theme.typography.sizes.xs}px;
+      font-size: ${theme.fontSizeXS}px;
       pointer-events: none;
     }
 
@@ -172,8 +172,8 @@ export default styled(Calendar)`
     }
 
     .cal-heatmap-container .q4 {
-      background-color: ${theme.colors.success.base};
-      fill: ${theme.colors.success.base};
+      background-color: ${theme.colorSuccess};
+      fill: ${theme.colorSuccess};
     }
 
     .cal-heatmap-container .q5 {
@@ -182,21 +182,21 @@ export default styled(Calendar)`
     }
 
     .cal-heatmap-container rect.highlight {
-      stroke: ${theme.colors.grayscale.dark1};
+      stroke: ${theme.colorText};
       stroke-width: 1;
     }
 
     .cal-heatmap-container text.highlight {
-      fill: ${theme.colors.grayscale.dark1};
+      fill: ${theme.colorText};
     }
 
     .cal-heatmap-container rect.highlight-now {
-      stroke: ${theme.colors.error.base};
+      stroke: ${theme.colorError};
     }
 
     .cal-heatmap-container text.highlight-now {
-      fill: ${theme.colors.error.base};
-      font-weight: ${theme.typography.weights.bold};
+      fill: ${theme.colorError};
+      font-weight: ${theme.fontWeightStrong};
     }
 
     .cal-heatmap-container .domain-background {
@@ -205,10 +205,10 @@ export default styled(Calendar)`
     }
 
     .ch-tooltip {
-      padding: ${theme.gridUnit * 2}px;
-      background: ${theme.colors.grayscale.dark1};
+      padding: ${theme.sizeUnit * 2}px;
+      background: ${theme.colorText};
       color: ${theme.colors.grayscale.light1};
-      font-size: ${theme.typography.sizes.s}px;
+      font-size: ${theme.fontSizeSM}px;
       line-height: 1.4;
       width: 140px;
       position: absolute;
@@ -229,11 +229,11 @@ export default styled(Calendar)`
       content: '';
       padding: 0;
       display: block;
-      bottom: -${theme.gridUnit}px;
+      bottom: -${theme.sizeUnit}px;
       left: 50%;
-      margin-left: -${theme.gridUnit}px;
-      border-width: ${theme.gridUnit}px ${theme.gridUnit}px 0;
-      border-top-color: ${theme.colors.grayscale.dark1};
+      margin-left: -${theme.sizeUnit}px;
+      border-width: ${theme.sizeUnit}px ${theme.sizeUnit}px 0;
+      border-top-color: ${theme.colorSplit};
     }
   `}
 `;
diff --git a/superset-frontend/plugins/legacy-plugin-chart-calendar/tsconfig.json b/superset-frontend/plugins/legacy-plugin-chart-calendar/tsconfig.json
index b6bfaa2d984..b3af9a1d193 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-calendar/tsconfig.json
+++ b/superset-frontend/plugins/legacy-plugin-chart-calendar/tsconfig.json
@@ -1,25 +1,15 @@
 {
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "declarationDir": "lib",
+    "composite": true,
+    "rootDir": "src",
     "outDir": "lib",
-    "rootDir": "src"
+    "baseUrl": "."
   },
-  "exclude": [
-    "lib",
-    "test"
-  ],
-  "extends": "../../tsconfig.json",
-  "include": [
-    "src/**/*",
-    "types/**/*",
-    "../../types/**/*"
-  ],
+  "include": ["src/**/*", "types/**/*"],
+  "exclude": ["lib", "test"],
   "references": [
-    {
-      "path": "../../packages/superset-ui-chart-controls"
-    },
-    {
-      "path": "../../packages/superset-ui-core"
-    }
+    { "path": "../../packages/superset-ui-core" },
+    { "path": "../../packages/superset-ui-chart-controls" }
   ]
 }
diff --git a/superset-frontend/plugins/legacy-plugin-chart-chord/package.json b/superset-frontend/plugins/legacy-plugin-chart-chord/package.json
index ea57b89e25b..9ae341c69a1 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-chord/package.json
+++ b/superset-frontend/plugins/legacy-plugin-chart-chord/package.json
@@ -31,7 +31,7 @@
   "dependencies": {
     "d3": "^3.5.17",
     "prop-types": "^15.8.1",
-    "react": "^18.2.0"
+    "react": "^19.1.0"
   },
   "peerDependencies": {
     "@superset-ui/chart-controls": "*",
diff --git a/superset-frontend/plugins/legacy-plugin-chart-chord/src/ReactChord.jsx b/superset-frontend/plugins/legacy-plugin-chart-chord/src/ReactChord.jsx
index 7de87414cc2..d413a795370 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-chord/src/ReactChord.jsx
+++ b/superset-frontend/plugins/legacy-plugin-chart-chord/src/ReactChord.jsx
@@ -44,14 +44,14 @@ export default styled(Chord)`
       pointer-events: all;
     }
     .superset-legacy-chart-chord svg .group path {
-      fill-opacity: ${theme.opacity.mediumHeavy};
+      fill-opacity: 60%;
     }
     .superset-legacy-chart-chord svg path.chord {
-      stroke: ${theme.colors.grayscale.dark2};
+      stroke: ${theme.colorText};
       stroke-width: 0.25px;
     }
     .superset-legacy-chart-chord svg #circle:hover path.fade {
-      opacity:  ${theme.opacity.light};
+      opacity: 10%;
     }
   `}
 `;
diff --git a/superset-frontend/plugins/legacy-plugin-chart-chord/tsconfig.json b/superset-frontend/plugins/legacy-plugin-chart-chord/tsconfig.json
index b6bfaa2d984..b3af9a1d193 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-chord/tsconfig.json
+++ b/superset-frontend/plugins/legacy-plugin-chart-chord/tsconfig.json
@@ -1,25 +1,15 @@
 {
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "declarationDir": "lib",
+    "composite": true,
+    "rootDir": "src",
     "outDir": "lib",
-    "rootDir": "src"
+    "baseUrl": "."
   },
-  "exclude": [
-    "lib",
-    "test"
-  ],
-  "extends": "../../tsconfig.json",
-  "include": [
-    "src/**/*",
-    "types/**/*",
-    "../../types/**/*"
-  ],
+  "include": ["src/**/*", "types/**/*"],
+  "exclude": ["lib", "test"],
   "references": [
-    {
-      "path": "../../packages/superset-ui-chart-controls"
-    },
-    {
-      "path": "../../packages/superset-ui-core"
-    }
+    { "path": "../../packages/superset-ui-core" },
+    { "path": "../../packages/superset-ui-chart-controls" }
   ]
 }
diff --git a/superset-frontend/plugins/legacy-plugin-chart-country-map/src/ReactCountryMap.jsx b/superset-frontend/plugins/legacy-plugin-chart-country-map/src/ReactCountryMap.jsx
index ea6a936b5aa..b857b360408 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-country-map/src/ReactCountryMap.jsx
+++ b/superset-frontend/plugins/legacy-plugin-chart-country-map/src/ReactCountryMap.jsx
@@ -52,19 +52,19 @@ export default styled(CountryMap)`
     }
 
     .superset-legacy-chart-country-map .text-layer {
-      color: ${theme.colors.grayscale.dark1};
+      color: ${theme.colorText};
       text-anchor: middle;
       pointer-events: none;
     }
 
     .superset-legacy-chart-country-map text.result-text {
-      font-weight: ${theme.typography.weights.light};
-      font-size: ${theme.typography.sizes.xl}px;
+      font-weight: ${theme.fontWeightLight};
+      font-size: ${theme.fontSizeXL}px;
     }
 
     .superset-legacy-chart-country-map text.big-text {
-      font-weight: ${theme.typography.weights.bold};
-      font-size: ${theme.typography.sizes.l}px;
+      font-weight: ${theme.fontWeightStrong};
+      font-size: ${theme.fontSizeLG}px;
     }
 
     .superset-legacy-chart-country-map path.region {
diff --git a/superset-frontend/plugins/legacy-plugin-chart-country-map/tsconfig.json b/superset-frontend/plugins/legacy-plugin-chart-country-map/tsconfig.json
index b6bfaa2d984..b3af9a1d193 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-country-map/tsconfig.json
+++ b/superset-frontend/plugins/legacy-plugin-chart-country-map/tsconfig.json
@@ -1,25 +1,15 @@
 {
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "declarationDir": "lib",
+    "composite": true,
+    "rootDir": "src",
     "outDir": "lib",
-    "rootDir": "src"
+    "baseUrl": "."
   },
-  "exclude": [
-    "lib",
-    "test"
-  ],
-  "extends": "../../tsconfig.json",
-  "include": [
-    "src/**/*",
-    "types/**/*",
-    "../../types/**/*"
-  ],
+  "include": ["src/**/*", "types/**/*"],
+  "exclude": ["lib", "test"],
   "references": [
-    {
-      "path": "../../packages/superset-ui-chart-controls"
-    },
-    {
-      "path": "../../packages/superset-ui-core"
-    }
+    { "path": "../../packages/superset-ui-core" },
+    { "path": "../../packages/superset-ui-chart-controls" }
   ]
 }
diff --git a/superset-frontend/plugins/legacy-plugin-chart-horizon/src/HorizonChart.jsx b/superset-frontend/plugins/legacy-plugin-chart-horizon/src/HorizonChart.jsx
index dc72cb664ad..05b4b6e9aac 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-horizon/src/HorizonChart.jsx
+++ b/superset-frontend/plugins/legacy-plugin-chart-horizon/src/HorizonChart.jsx
@@ -73,8 +73,8 @@ const StyledDiv = styled.div`
 
     .superset-legacy-chart-horizon .horizon-row span.title {
       position: absolute;
-      color: ${theme.colors.grayscale.dark1};
-      font-size: ${theme.typography.sizes.s}px;
+      color: ${theme.colorText};
+      font-size: ${theme.fontSizeSM}px;
       margin: 0;
     }
   `}
diff --git a/superset-frontend/plugins/legacy-plugin-chart-horizon/tsconfig.json b/superset-frontend/plugins/legacy-plugin-chart-horizon/tsconfig.json
index b6bfaa2d984..b3af9a1d193 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-horizon/tsconfig.json
+++ b/superset-frontend/plugins/legacy-plugin-chart-horizon/tsconfig.json
@@ -1,25 +1,15 @@
 {
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "declarationDir": "lib",
+    "composite": true,
+    "rootDir": "src",
     "outDir": "lib",
-    "rootDir": "src"
+    "baseUrl": "."
   },
-  "exclude": [
-    "lib",
-    "test"
-  ],
-  "extends": "../../tsconfig.json",
-  "include": [
-    "src/**/*",
-    "types/**/*",
-    "../../types/**/*"
-  ],
+  "include": ["src/**/*", "types/**/*"],
+  "exclude": ["lib", "test"],
   "references": [
-    {
-      "path": "../../packages/superset-ui-chart-controls"
-    },
-    {
-      "path": "../../packages/superset-ui-core"
-    }
+    { "path": "../../packages/superset-ui-core" },
+    { "path": "../../packages/superset-ui-chart-controls" }
   ]
 }
diff --git a/superset-frontend/plugins/legacy-plugin-chart-map-box/tsconfig.json b/superset-frontend/plugins/legacy-plugin-chart-map-box/tsconfig.json
index b6bfaa2d984..b3af9a1d193 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-map-box/tsconfig.json
+++ b/superset-frontend/plugins/legacy-plugin-chart-map-box/tsconfig.json
@@ -1,25 +1,15 @@
 {
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "declarationDir": "lib",
+    "composite": true,
+    "rootDir": "src",
     "outDir": "lib",
-    "rootDir": "src"
+    "baseUrl": "."
   },
-  "exclude": [
-    "lib",
-    "test"
-  ],
-  "extends": "../../tsconfig.json",
-  "include": [
-    "src/**/*",
-    "types/**/*",
-    "../../types/**/*"
-  ],
+  "include": ["src/**/*", "types/**/*"],
+  "exclude": ["lib", "test"],
   "references": [
-    {
-      "path": "../../packages/superset-ui-chart-controls"
-    },
-    {
-      "path": "../../packages/superset-ui-core"
-    }
+    { "path": "../../packages/superset-ui-core" },
+    { "path": "../../packages/superset-ui-chart-controls" }
   ]
 }
diff --git a/superset-frontend/plugins/legacy-plugin-chart-paired-t-test/src/PairedTTest.jsx b/superset-frontend/plugins/legacy-plugin-chart-paired-t-test/src/PairedTTest.jsx
index 27b2f7239ea..f15a85f4476 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-paired-t-test/src/PairedTTest.jsx
+++ b/superset-frontend/plugins/legacy-plugin-chart-paired-t-test/src/PairedTTest.jsx
@@ -46,8 +46,8 @@ const StyledDiv = styled.div`
     }
 
     .paired-ttest-table .scrollbar-content {
-      padding-left: ${theme.gridUnit}px;
-      padding-right: ${theme.gridUnit}px;
+      padding-left: ${theme.sizeUnit}px;
+      padding-right: ${theme.sizeUnit}px;
       margin-bottom: 0;
     }
 
@@ -56,7 +56,7 @@ const StyledDiv = styled.div`
     }
 
     .paired-ttest-table h1 {
-      margin-left: ${theme.gridUnit}px;
+      margin-left: ${theme.sizeUnit}px;
     }
 
     .reactable-data tr {
@@ -74,19 +74,19 @@ const StyledDiv = styled.div`
     }
 
     .reactable-data tr .false {
-      color: ${theme.colors.error.base};
+      color: ${theme.colorError};
     }
 
     .reactable-data tr .true {
-      color: ${theme.colors.success.base};
+      color: ${theme.colorSuccess};
     }
 
     .reactable-data tr .control {
-      color: ${theme.colors.primary.base};
+      color: ${theme.colorPrimary};
     }
 
     .reactable-data tr .invalid {
-      color: ${theme.colors.warning.base};
+      color: ${theme.colorWarning};
     }
 
     .reactable-data .control td {
@@ -104,13 +104,13 @@ const StyledDiv = styled.div`
     .reactable-header-sort-asc:after {
       content: '\\25bc';
       position: absolute;
-      right: ${theme.gridUnit * 3}px;
+      right: ${theme.sizeUnit * 3}px;
     }
 
     .reactable-header-sort-desc:after {
       content: '\\25b2';
       position: absolute;
-      right: ${theme.gridUnit * 3}px;
+      right: ${theme.sizeUnit * 3}px;
     }
   `}
 `;
diff --git a/superset-frontend/plugins/legacy-plugin-chart-paired-t-test/tsconfig.json b/superset-frontend/plugins/legacy-plugin-chart-paired-t-test/tsconfig.json
index b6bfaa2d984..b3af9a1d193 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-paired-t-test/tsconfig.json
+++ b/superset-frontend/plugins/legacy-plugin-chart-paired-t-test/tsconfig.json
@@ -1,25 +1,15 @@
 {
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "declarationDir": "lib",
+    "composite": true,
+    "rootDir": "src",
     "outDir": "lib",
-    "rootDir": "src"
+    "baseUrl": "."
   },
-  "exclude": [
-    "lib",
-    "test"
-  ],
-  "extends": "../../tsconfig.json",
-  "include": [
-    "src/**/*",
-    "types/**/*",
-    "../../types/**/*"
-  ],
+  "include": ["src/**/*", "types/**/*"],
+  "exclude": ["lib", "test"],
   "references": [
-    {
-      "path": "../../packages/superset-ui-chart-controls"
-    },
-    {
-      "path": "../../packages/superset-ui-core"
-    }
+    { "path": "../../packages/superset-ui-core" },
+    { "path": "../../packages/superset-ui-chart-controls" }
   ]
 }
diff --git a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/package.json b/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/package.json
index b4a4badcd23..9bb04876992 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/package.json
+++ b/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/package.json
@@ -29,7 +29,7 @@
     "access": "public"
   },
   "dependencies": {
-    "d3": "^3.5.17",
+    "d3v3": "npm:d3@3.5.17",
     "prop-types": "^15.8.1"
   },
   "peerDependencies": {
diff --git a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/ParallelCoordinates.js b/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/ParallelCoordinates.js
index 0529c86aff1..c2970979eb7 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/ParallelCoordinates.js
+++ b/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/ParallelCoordinates.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 /* eslint-disable react/sort-prop-types */
-import d3 from 'd3';
+import * as d3 from 'd3v3';
 import PropTypes from 'prop-types';
 import { getSequentialSchemeRegistry } from '@superset-ui/core';
 
diff --git a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/ReactParallelCoordinates.jsx b/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/ReactParallelCoordinates.jsx
index e9e03af1d3b..740d4043df6 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/ReactParallelCoordinates.jsx
+++ b/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/ReactParallelCoordinates.jsx
@@ -46,7 +46,7 @@ export default styled(ParallelCoordinates)`
     }
     .parcoords svg,
     .parcoords canvas {
-      font-size: ${theme.typography.sizes.s}px;
+      font-size: ${theme.fontSizeSM}px;
       position: absolute;
     }
     .parcoords > canvas {
@@ -55,7 +55,7 @@ export default styled(ParallelCoordinates)`
 
     .parcoords text.label {
       font: 100%;
-      font-size: ${theme.typography.sizes.s}px;
+      font-size: ${theme.fontSizeSM}px;
       cursor: drag;
     }
     .parcoords rect.background {
@@ -74,7 +74,7 @@ export default styled(ParallelCoordinates)`
     .parcoords .axis line,
     .parcoords .axis path {
       fill: none;
-      stroke: ${theme.colors.grayscale.dark1};
+      stroke: ${theme.colorText};
       shape-rendering: crispEdges;
     }
     .parcoords canvas {
@@ -84,7 +84,7 @@ export default styled(ParallelCoordinates)`
       -o-transition: opacity 0.3s;
     }
     .parcoords canvas.faded {
-      opacity: ${theme.opacity.mediumLight};
+      opacity: 35%;
     }
     .parcoords {
       -webkit-touch-callout: none;
@@ -100,7 +100,7 @@ export default styled(ParallelCoordinates)`
     .parcoords .row,
     .parcoords .header {
       clear: left;
-      font-size: ${theme.typography.sizes.s}px;
+      font-size: ${theme.fontSizeSM}px;
       line-height: 18px;
       height: 18px;
       margin: 0px;
@@ -109,7 +109,7 @@ export default styled(ParallelCoordinates)`
       background: ${addAlpha(theme.colors.grayscale.dark2, 0.05)};
     }
     .parcoords .header {
-      font-weight: ${theme.typography.weights.bold};
+      font-weight: ${theme.fontWeightStrong};
     }
     .parcoords .cell {
       float: left;
diff --git a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/tsconfig.json b/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/tsconfig.json
index 7e74154150e..e7088b6c760 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/tsconfig.json
+++ b/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/tsconfig.json
@@ -1,26 +1,20 @@
 {
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "declarationDir": "lib",
-    "outDir": "lib",
+    "composite": true,
     "rootDir": "src",
-    "allowJs": false
-  },
-  "exclude": [
-    "lib",
-    "test"
-  ],
-  "extends": "../../tsconfig.json",
-  "include": [
-    "src/**/*",
-    "types/**/*",
-    "../../types/**/*"
-  ],
-  "references": [
-    {
-      "path": "../../packages/superset-ui-chart-controls"
-    },
-    {
-      "path": "../../packages/superset-ui-core"
+    "outDir": "lib",
+    "baseUrl": ".",
+	"paths": {
+      "d3v3": ["./types/d3v3"]
     }
+
+
+  },
+  "include": ["src/**/*", "types/**/*"],
+  "exclude": ["lib", "test"],
+  "references": [
+    { "path": "../../packages/superset-ui-core" },
+    { "path": "../../packages/superset-ui-chart-controls" }
   ]
 }
diff --git a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/types/d3-parcoords.d.ts b/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/types/d3-parcoords.d.ts
new file mode 100644
index 00000000000..e8026f2e2ac
--- /dev/null
+++ b/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/types/d3-parcoords.d.ts
@@ -0,0 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+declare module 'src/vendor/parcoords/d3.parcoords' {
+  const parcoords: any;
+  export default parcoords;
+}
diff --git a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/types/d3.d.ts b/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/types/d3.d.ts
new file mode 100644
index 00000000000..34a150e873e
--- /dev/null
+++ b/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/types/d3.d.ts
@@ -0,0 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+declare module 'd3' {
+  const d3: any;
+  export = d3;
+}
diff --git a/superset-frontend/plugins/legacy-plugin-chart-partition/src/OptionDescription.tsx b/superset-frontend/plugins/legacy-plugin-chart-partition/src/OptionDescription.tsx
index 7a45cbea5ec..4b5a68c3028 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-partition/src/OptionDescription.tsx
+++ b/superset-frontend/plugins/legacy-plugin-chart-partition/src/OptionDescription.tsx
@@ -19,10 +19,8 @@
 
 import PropTypes from 'prop-types';
 
-import {
-  ColumnMeta,
-  InfoTooltipWithTrigger,
-} from '@superset-ui/chart-controls';
+import { ColumnMeta } from '@superset-ui/chart-controls';
+import { InfoTooltip } from '@superset-ui/core/components';
 
 const propTypes = {
   option: PropTypes.object.isRequired,
@@ -30,14 +28,16 @@ const propTypes = {
 
 // This component provides a general tooltip for options
 // in a SelectControl
+// TODO use theme.sizeUnit once theme can be imported in plugins
 export default function OptionDescription({ option }: { option: ColumnMeta }) {
   return (
     <span>
-      <span className="m-r-5 option-label">{option.label}</span>
+      <span className="option-label" style={{ marginRight: 4 }}>
+        {option.label}
+      </span>
       {option.description && (
-        <InfoTooltipWithTrigger
-          className="m-r-5 text-muted"
-          icon="question-circle-o"
+        <InfoTooltip
+          type="question"
           tooltip={option.description}
           label={`descr-${option.label}`}
         />
diff --git a/superset-frontend/plugins/legacy-plugin-chart-partition/src/ReactPartition.jsx b/superset-frontend/plugins/legacy-plugin-chart-partition/src/ReactPartition.jsx
index bfb1340fd70..538c67fa9eb 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-partition/src/ReactPartition.jsx
+++ b/superset-frontend/plugins/legacy-plugin-chart-partition/src/ReactPartition.jsx
@@ -36,13 +36,13 @@ export default styled(Partition)`
     .superset-legacy-chart-partition .chart {
       display: block;
       margin: auto;
-      font-size: ${theme.typography.sizes.s}px;
+      font-size: ${theme.fontSizeSM}px;
     }
 
     .superset-legacy-chart-partition rect {
       stroke: ${theme.colors.grayscale.light2};
       fill: ${theme.colors.grayscale.light1};
-      fill-opacity: ${theme.opacity.heavy};
+      fill-opacity: 80%;
       transition: fill-opacity 180ms linear;
       cursor: pointer;
     }
@@ -52,8 +52,8 @@ export default styled(Partition)`
     }
 
     .superset-legacy-chart-partition g text {
-      font-weight: ${theme.typography.weights.bold};
-      fill: ${theme.colors.grayscale.dark1};
+      font-weight: ${theme.fontWeightStrong};
+      fill: ${theme.colorText};
     }
 
     .superset-legacy-chart-partition g:hover text {
@@ -65,15 +65,15 @@ export default styled(Partition)`
       top: 0;
       left: 0;
       opacity: 0;
-      padding: ${theme.gridUnit}px;
+      padding: ${theme.sizeUnit}px;
       pointer-events: none;
       background-color: ${theme.colors.grayscale.dark2};
-      border-radius: ${theme.gridUnit}px;
+      border-radius: ${theme.borderRadius}px;
     }
 
     .partition-tooltip td {
-      padding-left: ${theme.gridUnit}px;
-      font-size: ${theme.typography.sizes.s}px;
+      padding-left: ${theme.sizeUnit}px;
+      font-size: ${theme.fontSizeSM}px;
       color: ${theme.colors.grayscale.light5};
     }
   `}
diff --git a/superset-frontend/plugins/legacy-plugin-chart-partition/test/OptionDescription.test.jsx b/superset-frontend/plugins/legacy-plugin-chart-partition/test/OptionDescription.test.jsx
index 84c5d39f04e..0b93f3e476e 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-partition/test/OptionDescription.test.jsx
+++ b/superset-frontend/plugins/legacy-plugin-chart-partition/test/OptionDescription.test.jsx
@@ -17,8 +17,7 @@
  * under the License.
  */
 import '@testing-library/jest-dom';
-import { screen, render, fireEvent, act } from '@testing-library/react';
-import { ThemeProvider, supersetTheme } from '@superset-ui/core';
+import { screen, render, fireEvent, act } from '@superset-ui/core/spec';
 import OptionDescription from '../src/OptionDescription';
 
 const defaultProps = {
@@ -39,14 +38,10 @@ afterEach(() => {
 describe('OptionDescription', () => {
   beforeEach(() => {
     const props = { option: { ...defaultProps.option } };
-    render(
-      <ThemeProvider theme={supersetTheme}>
-        <OptionDescription {...props} />
-      </ThemeProvider>,
-    );
+    render(<OptionDescription {...props} />);
   });
 
-  it('renders an InfoTooltipWithTrigger', () => {
+  it('renders an InfoTooltip', () => {
     const tooltipTrigger = screen.getByLabelText('Show info tooltip');
     expect(tooltipTrigger).toBeInTheDocument();
 
diff --git a/superset-frontend/plugins/legacy-plugin-chart-partition/tsconfig.json b/superset-frontend/plugins/legacy-plugin-chart-partition/tsconfig.json
index b6bfaa2d984..b5b28fc6189 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-partition/tsconfig.json
+++ b/superset-frontend/plugins/legacy-plugin-chart-partition/tsconfig.json
@@ -1,25 +1,18 @@
 {
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "declarationDir": "lib",
+    "composite": true,
+    "rootDir": "src",
     "outDir": "lib",
-    "rootDir": "src"
-  },
-  "exclude": [
-    "lib",
-    "test"
-  ],
-  "extends": "../../tsconfig.json",
-  "include": [
-    "src/**/*",
-    "types/**/*",
-    "../../types/**/*"
-  ],
-  "references": [
-    {
-      "path": "../../packages/superset-ui-chart-controls"
-    },
-    {
-      "path": "../../packages/superset-ui-core"
+    "baseUrl": ".",
+    "paths": {
+      "@superset-ui/core/components": ["../../packages/superset-ui-core/src/components"]
     }
+  },
+  "include": ["src/**/*", "types/**/*"],
+  "exclude": ["lib", "test"],
+  "references": [
+    { "path": "../../packages/superset-ui-core" },
+    { "path": "../../packages/superset-ui-chart-controls" }
   ]
 }
diff --git a/superset-frontend/plugins/legacy-plugin-chart-rose/src/ReactRose.jsx b/superset-frontend/plugins/legacy-plugin-chart-rose/src/ReactRose.jsx
index efd9b59aef6..b7a2c0c800b 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-rose/src/ReactRose.jsx
+++ b/superset-frontend/plugins/legacy-plugin-chart-rose/src/ReactRose.jsx
@@ -28,13 +28,13 @@ const Rose = ({ className, ...otherProps }) => (
       styles={theme => css`
         .tooltip {
           line-height: 1;
-          padding: ${theme.gridUnit * 3}px;
+          padding: ${theme.sizeUnit * 3}px;
           background: ${theme.colors.grayscale.dark2};
           color: ${theme.colors.grayscale.light5};
           border-radius: 4px;
           pointer-events: none;
           z-index: 1000;
-          font-size: ${theme.typography.sizes.s}px;
+          font-size: ${theme.fontSizeSM}px;
         }
       `}
     />
@@ -53,9 +53,8 @@ export default styled(Rose)`
     }
 
     .superset-legacy-chart-rose text {
-        font-weight: ${theme.typography.weights.normal};
-        font-size: ${theme.typography.sizes.s}px;
-        font-family: ${theme.typography.families.sansSerif};
+        font-size: ${theme.fontSizeSM}px;
+        font-family: ${theme.fontFamily};
         pointer-events: none;
     }
 
diff --git a/superset-frontend/plugins/legacy-plugin-chart-rose/tsconfig.json b/superset-frontend/plugins/legacy-plugin-chart-rose/tsconfig.json
index b6bfaa2d984..b3af9a1d193 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-rose/tsconfig.json
+++ b/superset-frontend/plugins/legacy-plugin-chart-rose/tsconfig.json
@@ -1,25 +1,15 @@
 {
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "declarationDir": "lib",
+    "composite": true,
+    "rootDir": "src",
     "outDir": "lib",
-    "rootDir": "src"
+    "baseUrl": "."
   },
-  "exclude": [
-    "lib",
-    "test"
-  ],
-  "extends": "../../tsconfig.json",
-  "include": [
-    "src/**/*",
-    "types/**/*",
-    "../../types/**/*"
-  ],
+  "include": ["src/**/*", "types/**/*"],
+  "exclude": ["lib", "test"],
   "references": [
-    {
-      "path": "../../packages/superset-ui-chart-controls"
-    },
-    {
-      "path": "../../packages/superset-ui-core"
-    }
+    { "path": "../../packages/superset-ui-core" },
+    { "path": "../../packages/superset-ui-chart-controls" }
   ]
 }
diff --git a/superset-frontend/plugins/legacy-plugin-chart-world-map/src/WorldMap.js b/superset-frontend/plugins/legacy-plugin-chart-world-map/src/WorldMap.js
index 03ea4ea9c78..5e42550f266 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-world-map/src/WorldMap.js
+++ b/superset-frontend/plugins/legacy-plugin-chart-world-map/src/WorldMap.js
@@ -209,7 +209,7 @@ function WorldMap(element, props) {
       popupOnHover: !inContextMenu,
       highlightOnHover: !inContextMenu,
       borderWidth: 1,
-      borderColor: theme.colors.grayscale.light5,
+      borderColor: theme.colorSplit,
       highlightBorderColor: theme.colors.grayscale.light5,
       highlightFillColor: color,
       highlightBorderWidth: 1,
@@ -265,7 +265,7 @@ function WorldMap(element, props) {
         countryFeature =>
           !filterState.selectedValues.includes(countryFeature.id),
       )
-      .style('fill-opacity', theme.opacity.mediumLight);
+      .style('fill-opacity', 0.35);
 
     // hack to ensure that the clicked country's color is preserved
     // sometimes the fill color would get default grey value after applying cross filter
diff --git a/superset-frontend/plugins/legacy-plugin-chart-world-map/tsconfig.json b/superset-frontend/plugins/legacy-plugin-chart-world-map/tsconfig.json
index b6bfaa2d984..b3af9a1d193 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-world-map/tsconfig.json
+++ b/superset-frontend/plugins/legacy-plugin-chart-world-map/tsconfig.json
@@ -1,25 +1,15 @@
 {
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "declarationDir": "lib",
+    "composite": true,
+    "rootDir": "src",
     "outDir": "lib",
-    "rootDir": "src"
+    "baseUrl": "."
   },
-  "exclude": [
-    "lib",
-    "test"
-  ],
-  "extends": "../../tsconfig.json",
-  "include": [
-    "src/**/*",
-    "types/**/*",
-    "../../types/**/*"
-  ],
+  "include": ["src/**/*", "types/**/*"],
+  "exclude": ["lib", "test"],
   "references": [
-    {
-      "path": "../../packages/superset-ui-chart-controls"
-    },
-    {
-      "path": "../../packages/superset-ui-core"
-    }
+    { "path": "../../packages/superset-ui-core" },
+    { "path": "../../packages/superset-ui-chart-controls" }
   ]
 }
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/package.json b/superset-frontend/plugins/legacy-preset-chart-deckgl/package.json
index 0b8e6d14672..d0e3466cea5 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/package.json
+++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/package.json
@@ -24,14 +24,14 @@
     "lib"
   ],
   "dependencies": {
-    "@deck.gl/aggregation-layers": "^9.0.38",
+    "@deck.gl/aggregation-layers": "^9.1.12",
     "@deck.gl/core": "^9.0.37",
     "@deck.gl/layers": "^9.0.38",
     "@deck.gl/react": "^9.1.4",
     "@mapbox/geojson-extent": "^1.0.1",
     "@math.gl/web-mercator": "^4.1.0",
     "@types/d3-array": "^2.0.0",
-    "@types/geojson": "^7946.0.15",
+    "@types/geojson": "^7946.0.16",
     "bootstrap-slider": "^11.0.2",
     "d3-array": "^1.2.4",
     "d3-color": "^1.4.1",
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/CategoricalDeckGLContainer.tsx b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/CategoricalDeckGLContainer.tsx
index 8f3d1dac612..4b49a7ce937 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/CategoricalDeckGLContainer.tsx
+++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/CategoricalDeckGLContainer.tsx
@@ -136,7 +136,7 @@ const CategoricalDeckGLContainer = (props: CategoricalDeckGLContainerProps) => {
     return data.map(d => {
       let color;
       if (fd.dimension) {
-        color = hexToRGB(colorFn(d.cat_color, fd.sliceId), c.a * 255);
+        color = hexToRGB(colorFn(d.cat_color, fd.slice_id), c.a * 255);
 
         return { ...d, color };
       }
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/components/Legend.tsx b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/components/Legend.tsx
index 681b114ff82..9e3eaaec4d4 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/components/Legend.tsx
+++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/components/Legend.tsx
@@ -24,12 +24,12 @@ import { formatNumber, styled } from '@superset-ui/core';
 
 const StyledLegend = styled.div`
   ${({ theme }) => `
-    font-size: ${theme.typography.sizes.s}px;
+    font-size: ${theme.fontSizeSM}px;
     position: absolute;
     background: ${theme.colors.grayscale.light5};
-    box-shadow: 0 0 ${theme.gridUnit}px ${theme.colors.grayscale.light2};
-    margin: ${theme.gridUnit * 6}px;
-    padding: ${theme.gridUnit * 3}px ${theme.gridUnit * 5}px;
+    box-shadow: 0 0 ${theme.sizeUnit}px ${theme.colors.grayscale.light2};
+    margin: ${theme.sizeUnit * 6}px;
+    padding: ${theme.sizeUnit * 3}px ${theme.sizeUnit * 5}px;
     outline: none;
     overflow-y: scroll;
     max-height: 200px;
@@ -43,10 +43,10 @@ const StyledLegend = styled.div`
         display: flex;
         color: ${theme.colors.grayscale.base};
         text-decoration: none;
-        padding: ${theme.gridUnit}px 0;
+        padding: ${theme.sizeUnit}px 0;
 
         & span {
-          margin-right: ${theme.gridUnit}px;
+          margin-right: ${theme.sizeUnit}px;
         }
       }
     }
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/components/Tooltip.tsx b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/components/Tooltip.tsx
index 0e9801c52f3..7b58d087458 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/components/Tooltip.tsx
+++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/components/Tooltip.tsx
@@ -36,12 +36,12 @@ const StyledDiv = styled.div<{ top: number; left: number }>`
     position: absolute;
     top: ${top}px;
     left: ${left}px;
-    padding: ${theme.gridUnit * 2}px;
-    margin: ${theme.gridUnit * 2}px;
+    padding: ${theme.sizeUnit * 2}px;
+    margin: ${theme.sizeUnit * 2}px;
     background: ${theme.colors.grayscale.dark2};
     color: ${theme.colors.grayscale.light5};
     maxWidth: 300px;
-    fontSize: ${theme.typography.sizes.s}px;
+    fontSize: ${theme.fontSizeSM}px;
     zIndex: 9;
     pointerEvents: none;
   `}
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/tsconfig.json b/superset-frontend/plugins/legacy-preset-chart-deckgl/tsconfig.json
index 3e1b196c648..b3af9a1d193 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/tsconfig.json
+++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/tsconfig.json
@@ -1,26 +1,15 @@
 {
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "declarationDir": "lib",
+    "composite": true,
+    "rootDir": "src",
     "outDir": "lib",
-    "rootDir": "src"
+    "baseUrl": "."
   },
-  "exclude": [
-    "lib",
-    "test"
-  ],
-  "extends": "../../tsconfig.json",
-  "include": [
-    "src/**/*",
-    "types/**/*",
-    "test/**/*",
-    "../../types/**/*"
-  ],
+  "include": ["src/**/*", "types/**/*"],
+  "exclude": ["lib", "test"],
   "references": [
-    {
-      "path": "../../packages/superset-ui-chart-controls"
-    },
-    {
-      "path": "../../packages/superset-ui-core"
-    }
+    { "path": "../../packages/superset-ui-core" },
+    { "path": "../../packages/superset-ui-chart-controls" }
   ]
 }
diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/package.json b/superset-frontend/plugins/legacy-preset-chart-nvd3/package.json
index 7d928d3c193..5839535a581 100644
--- a/superset-frontend/plugins/legacy-preset-chart-nvd3/package.json
+++ b/superset-frontend/plugins/legacy-preset-chart-nvd3/package.json
@@ -35,7 +35,7 @@
     "lodash": "^4.17.21",
     "dayjs": "^1.11.13",
     "nvd3-fork": "^2.0.5",
-    "dompurify": "^3.2.4",
+    "dompurify": "^3.2.6",
     "prop-types": "^15.8.1",
     "urijs": "^1.19.11"
   },
diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/ReactNVD3.jsx b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/ReactNVD3.jsx
index dfb2124ef03..35cada7e4dd 100644
--- a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/ReactNVD3.jsx
+++ b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/ReactNVD3.jsx
@@ -49,23 +49,28 @@ export default styled(NVD3)`
     svg {
       &.nvd3-svg {
         width: auto;
-        font-size: ${({ theme }) => theme.typography.sizes.m};
+        font-size: ${({ theme }) => theme.fontSize};
       }
     }
   }
   .superset-legacy-chart-nvd3 {
     nv-x text {
-      font-size: ${({ theme }) => theme.typography.sizes.m};
+      font-size: ${({ theme }) => theme.fontSize};
     }
     g.superset path {
       stroke-dasharray: 5, 5;
     }
+    .nvtooltip {
+      table td {
+        font-size: @font-size-s !important;
+      }
+    }
     .nvtooltip tr.highlight td {
-      font-weight: ${({ theme }) => theme.typography.weights.bold};
-      font-size: ${({ theme }) => theme.typography.sizes.m}px !important;
+      font-weight: ${({ theme }) => theme.fontWeightStrong};
+      font-size: ${({ theme }) => theme.fontSize}px !important;
     }
     text.nv-axislabel {
-      font-size: ${({ theme }) => theme.typography.sizes.m} !important;
+      font-size: ${({ theme }) => theme.fontSize} !important;
     }
     g.solid path,
     line.solid {
@@ -134,22 +139,22 @@ export default styled(NVD3)`
       stroke-dasharray: 5, 5, 1, 5;
     }
     .nv-noData.body {
-      font-size: ${({ theme }) => theme.typography.sizes.m};
-      font-weight: ${({ theme }) => theme.typography.weights.normal};
+      font-size: ${({ theme }) => theme.fontSize};
+      font-weight: ${({ theme }) => theme.fontWeightNormal};
     }
   }
   .superset-legacy-chart-nvd3-tr-highlight {
     border-top: 1px solid;
     border-bottom: 1px solid;
-    font-weight: ${({ theme }) => theme.typography.weights.bold};
+    font-weight: ${({ theme }) => theme.fontWeightStrong};
   }
   .superset-legacy-chart-nvd3-tr-total {
-    font-weight: ${({ theme }) => theme.typography.weights.bold};
+    font-weight: ${({ theme }) => theme.fontWeightStrong};
   }
   .nvtooltip {
     .tooltip-header {
       white-space: nowrap;
-      font-weight: ${({ theme }) => theme.typography.weights.bold};
+      font-weight: ${({ theme }) => theme.fontWeightStrong};
     }
     tbody tr:not(.tooltip-header) td:nth-of-type(2) {
       word-break: break-word;
@@ -161,12 +166,12 @@ export default styled(NVD3)`
     border-radius: 2px;
     background-color: ${({ theme }) => theme.colors.grayscale.base};
     fill-opacity: 0.6;
-    margin: ${({ theme }) => theme.gridUnit * 2}px;
-    padding: ${({ theme }) => theme.gridUnit * 2}px;
+    margin: ${({ theme }) => theme.sizeUnit * 2}px;
+    padding: ${({ theme }) => theme.sizeUnit * 2}px;
     color: ${({ theme }) => theme.colors.grayscale.light5};
     &:after {
       content: '\\25BC';
-      font-size: ${({ theme }) => theme.typography.sizes.m};
+      font-size: ${({ theme }) => theme.fontSize};
       color: ${({ theme }) => theme.colors.grayscale.base};
       position: absolute;
       bottom: -14px;
diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/tsconfig.json b/superset-frontend/plugins/legacy-preset-chart-nvd3/tsconfig.json
index b6bfaa2d984..b3af9a1d193 100644
--- a/superset-frontend/plugins/legacy-preset-chart-nvd3/tsconfig.json
+++ b/superset-frontend/plugins/legacy-preset-chart-nvd3/tsconfig.json
@@ -1,25 +1,15 @@
 {
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "declarationDir": "lib",
+    "composite": true,
+    "rootDir": "src",
     "outDir": "lib",
-    "rootDir": "src"
+    "baseUrl": "."
   },
-  "exclude": [
-    "lib",
-    "test"
-  ],
-  "extends": "../../tsconfig.json",
-  "include": [
-    "src/**/*",
-    "types/**/*",
-    "../../types/**/*"
-  ],
+  "include": ["src/**/*", "types/**/*"],
+  "exclude": ["lib", "test"],
   "references": [
-    {
-      "path": "../../packages/superset-ui-chart-controls"
-    },
-    {
-      "path": "../../packages/superset-ui-core"
-    }
+    { "path": "../../packages/superset-ui-core" },
+    { "path": "../../packages/superset-ui-chart-controls" }
   ]
 }
diff --git a/superset-frontend/plugins/plugin-chart-cartodiagram/package.json b/superset-frontend/plugins/plugin-chart-cartodiagram/package.json
index 8fca153f965..ca9ce365d7a 100644
--- a/superset-frontend/plugins/plugin-chart-cartodiagram/package.json
+++ b/superset-frontend/plugins/plugin-chart-cartodiagram/package.json
@@ -37,8 +37,7 @@
     "@ant-design/icons": "^5.2.6",
     "@superset-ui/chart-controls": "*",
     "@superset-ui/core": "*",
-    "antd": "^4.10.3",
-    "geostyler": "^12.0.0",
+    "geostyler": "^14.1.3",
     "geostyler-data": "^1.0.0",
     "geostyler-openlayers-parser": "^4.0.0",
     "geostyler-style": "^7.2.0",
diff --git a/superset-frontend/plugins/plugin-chart-cartodiagram/src/util/controlPanelUtil.tsx b/superset-frontend/plugins/plugin-chart-cartodiagram/src/util/controlPanelUtil.tsx
index 96aaf7ef3c1..567aecf530a 100644
--- a/superset-frontend/plugins/plugin-chart-cartodiagram/src/util/controlPanelUtil.tsx
+++ b/superset-frontend/plugins/plugin-chart-cartodiagram/src/util/controlPanelUtil.tsx
@@ -17,7 +17,6 @@
  * under the License.
  */
 import { t } from '@superset-ui/core';
-import { SelectValue } from 'antd/lib/select';
 import { ControlPanelConfig } from '@superset-ui/chart-controls';
 
 /**
@@ -26,6 +25,7 @@ import { ControlPanelConfig } from '@superset-ui/chart-controls';
  * @param controlPanel The control panel
  * @returns The layer configuration object or undefined if not found
  */
+
 export const getLayerConfig = (controlPanel: ControlPanelConfig) => {
   let layerConfig: any;
   controlPanel.controlPanelSections.forEach(section => {
@@ -57,7 +57,7 @@ export const getLayerConfig = (controlPanel: ControlPanelConfig) => {
  */
 export const selectedChartMutator = (
   response: Record<string, any>,
-  value: SelectValue | undefined,
+  value: any,
 ) => {
   if (!response?.result) {
     if (value && typeof value === 'string') {
diff --git a/superset-frontend/plugins/plugin-chart-cartodiagram/tsconfig.json b/superset-frontend/plugins/plugin-chart-cartodiagram/tsconfig.json
index 019b367ef9e..b3af9a1d193 100644
--- a/superset-frontend/plugins/plugin-chart-cartodiagram/tsconfig.json
+++ b/superset-frontend/plugins/plugin-chart-cartodiagram/tsconfig.json
@@ -1,25 +1,15 @@
 {
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "declarationDir": "lib",
+    "composite": true,
+    "rootDir": "src",
     "outDir": "lib",
-    "rootDir": "src"
+    "baseUrl": "."
   },
-  "exclude": [
-    "lib",
-    "test"
-  ],
-  "extends": "../../tsconfig.json",
-  "include": [
-    "src/**/*",
-    "types/**/*",
-    "../../types/**/*"
-  ],
+  "include": ["src/**/*", "types/**/*"],
+  "exclude": ["lib", "test"],
   "references": [
-    {
-      "path": "../../packages/superset-ui-chart-controls"
-    },
-    {
-      "path": "../../packages/superset-ui-core"
-    },
+    { "path": "../../packages/superset-ui-core" },
+    { "path": "../../packages/superset-ui-chart-controls" }
   ]
 }
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/PopKPI.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/PopKPI.tsx
index 6037fd6b06a..56a47a2315b 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/PopKPI.tsx
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/PopKPI.tsx
@@ -26,7 +26,8 @@ import {
   t,
   useTheme,
 } from '@superset-ui/core';
-import { DEFAULT_DATE_PATTERN, Tooltip } from '@superset-ui/chart-controls';
+import { Tooltip } from '@superset-ui/core/components';
+import { DEFAULT_DATE_PATTERN } from '@superset-ui/chart-controls';
 import { isEmpty } from 'lodash';
 import {
   ColorSchemeEnum,
@@ -38,11 +39,11 @@ import { useOverflowDetection } from './useOverflowDetection';
 
 const MetricNameText = styled.div<{ metricNameFontSize?: number }>`
   ${({ theme, metricNameFontSize }) => `
-    font-family: ${theme.typography.families.sansSerif};
-    font-weight: ${theme.typography.weights.normal};
-    font-size: ${metricNameFontSize || theme.typography.sizes.s * 2}px;
+    font-family: ${theme.fontFamily};
+    font-weight: ${theme.fontWeightNormal};
+    font-size: ${metricNameFontSize || theme.fontSizeSM * 2}px;
     text-align: center;
-    margin-bottom: ${theme.gridUnit * 3}px;
+    margin-bottom: ${theme.sizeUnit * 3}px;
   `}
 `;
 
@@ -59,10 +60,10 @@ const NumbersContainer = styled.div`
 
 const ComparisonValue = styled.div<PopKPIComparisonValueStyleProps>`
   ${({ theme, subheaderFontSize }) => `
-    font-weight: ${theme.typography.weights.light};
+    font-weight: ${theme.fontWeightLight};
     display: flex;
     justify-content: center;
-    font-size: ${subheaderFontSize || 20}px;
+    font-size: ${String(subheaderFontSize) || 20}px;
     flex: 1 1 0px;
   `}
 `;
@@ -71,9 +72,9 @@ const SymbolWrapper = styled.span<PopKPIComparisonSymbolStyleProps>`
   ${({ theme, backgroundColor, textColor }) => `
     background-color: ${backgroundColor};
     color: ${textColor};
-    padding: ${theme.gridUnit}px ${theme.gridUnit * 2}px;
-    border-radius: ${theme.gridUnit * 2}px;
-    margin-right: ${theme.gridUnit}px;
+    padding: ${theme.sizeUnit}px ${theme.sizeUnit * 2}px;
+    border-radius: ${theme.borderRadius}px;
+    margin-right: ${theme.sizeUnit}px;
   `}
 `;
 
@@ -138,9 +139,9 @@ export default function PopKPI(props: PopKPIProps) {
   }, [currentTimeRangeFilter, shift, startDateOffset, dashboardTimeRange]);
 
   const theme = useTheme();
-  const flexGap = theme.gridUnit * 5;
+  const flexGap = theme.sizeUnit * 5;
   const wrapperDivStyles = css`
-    font-family: ${theme.typography.families.sansSerif};
+    font-family: ${theme.fontFamily};
     display: flex;
     justify-content: center;
     align-items: center;
@@ -150,19 +151,19 @@ export default function PopKPI(props: PopKPIProps) {
   `;
 
   const bigValueContainerStyles = css`
-    font-size: ${headerFontSize || 60}px;
-    font-weight: ${theme.typography.weights.normal};
+    font-size: ${String(headerFontSize) || 60}px;
+    font-weight: ${theme.fontWeightNormal};
     text-align: center;
-    margin-bottom: ${theme.gridUnit * 4}px;
+    margin-bottom: ${theme.sizeUnit * 4}px;
   `;
 
   const SubtitleText = styled.div`
     ${({ theme }) => `
-    font-family: ${theme.typography.families.sansSerif};
-    font-weight: ${theme.typography.weights.medium};
+    font-family: ${theme.fontFamily};
+    font-weight: ${theme.fontWeightNormal};
     text-align: center;
     margin-top: -10px;
-    margin-bottom: ${theme.gridUnit * 4}px;
+    margin-bottom: ${theme.sizeUnit * 4}px;
   `}
   `;
 
@@ -174,21 +175,21 @@ export default function PopKPI(props: PopKPIProps) {
     if (percentDifferenceNumber > 0) {
       // Positive difference
       return comparisonColorScheme === ColorSchemeEnum.Green
-        ? theme.colors.success.base
-        : theme.colors.error.base;
+        ? theme.colorSuccess
+        : theme.colorError;
     }
     // Negative difference
     return comparisonColorScheme === ColorSchemeEnum.Red
-      ? theme.colors.success.base
-      : theme.colors.error.base;
+      ? theme.colorSuccess
+      : theme.colorError;
   };
 
   const arrowIndicatorStyle = css`
     color: ${getArrowIndicatorColor()};
-    margin-left: ${theme.gridUnit}px;
+    margin-left: ${theme.sizeUnit}px;
   `;
 
-  const defaultBackgroundColor = theme.colors.grayscale.light4;
+  const defaultBackgroundColor = theme.colorBgContainer;
   const defaultTextColor = theme.colors.grayscale.base;
   const { backgroundColor, textColor } = useMemo(() => {
     let bgColor = defaultBackgroundColor;
@@ -201,12 +202,8 @@ export default function PopKPI(props: PopKPIProps) {
           comparisonColorScheme === ColorSchemeEnum.Red);
 
       // Set background and text colors based on the conditions
-      bgColor = useSuccess
-        ? theme.colors.success.light2
-        : theme.colors.error.light2;
-      txtColor = useSuccess
-        ? theme.colors.success.base
-        : theme.colors.error.base;
+      bgColor = useSuccess ? theme.colorSuccessBg : theme.colorErrorBg;
+      txtColor = useSuccess ? theme.colorSuccessText : theme.colorErrorText;
     }
 
     return {
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/controlPanel.ts b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/controlPanel.ts
index 57ac9dfdd82..fd9f53b4f47 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/controlPanel.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/controlPanel.ts
@@ -23,6 +23,7 @@ import {
   sharedControls,
   sections,
 } from '@superset-ui/chart-controls';
+import { noop } from 'lodash';
 import {
   headerFontSize,
   subheaderFontSize,
@@ -143,6 +144,7 @@ const config: ControlPanelConfig = {
                 return true;
               },
               mapStateToProps(explore, _, chart) {
+                noop(explore, _, chart);
                 return {
                   columnsPropsObject: {
                     colnames: ['Previous value', 'Delta', 'Percent change'],
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/transformProps.ts
index 70189f70faf..5da1a8c65cc 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/transformProps.ts
@@ -18,6 +18,7 @@
  */
 import dayjs from 'dayjs';
 import utc from 'dayjs/plugin/utc';
+import { Metric } from '@superset-ui/chart-controls';
 import {
   ChartProps,
   getMetricLabel,
@@ -113,6 +114,13 @@ export default function transformProps(chartProps: ChartProps) {
       adhoc_filter.operator === 'TEMPORAL_RANGE',
   )?.[0];
 
+  let metricEntry: Metric | undefined;
+  if (chartProps.datasource?.metrics) {
+    metricEntry = chartProps.datasource.metrics.find(
+      metricItem => metricItem.metric_name === metric,
+    );
+  }
+
   const isCustomOrInherit =
     timeComparison === 'custom' || timeComparison === 'inherit';
   let dataOffset: string[] = [];
@@ -153,7 +161,7 @@ export default function transformProps(chartProps: ChartProps) {
     metric,
     currencyFormats,
     columnFormats,
-    yAxisFormat,
+    metricEntry?.d3format || yAxisFormat,
     currencyFormat,
   );
 
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/types.ts b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/types.ts
index f4fa903e852..d2933f236d1 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/types.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/types.ts
@@ -18,17 +18,18 @@
  */
 import {
   QueryFormData,
-  supersetTheme,
   TimeseriesDataRecord,
   Metric,
   SimpleAdhocFilter,
 } from '@superset-ui/core';
 
+export type FontSizeOptions = 'xs' | 's' | 'm' | 'l' | 'xl' | 'xxl';
+
 export interface PopKPIStylesProps {
   height: number;
   width: number;
-  headerFontSize: keyof typeof supersetTheme.typography.sizes;
-  subheaderFontSize: keyof typeof supersetTheme.typography.sizes;
+  headerFontSize: FontSizeOptions;
+  subheaderFontSize: FontSizeOptions;
   boldText: boolean;
   comparisonColorEnabled: boolean;
 }
@@ -44,7 +45,7 @@ interface PopKPICustomizeProps {
 }
 
 export interface PopKPIComparisonValueStyleProps {
-  subheaderFontSize?: keyof typeof supersetTheme.typography.sizes;
+  subheaderFontSize?: FontSizeOptions;
 }
 
 export interface PopKPIComparisonSymbolStyleProps {
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberTotal/transformProps.test.ts b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberTotal/transformProps.test.ts
index aea95effeb6..1e08c28a728 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberTotal/transformProps.test.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberTotal/transformProps.test.ts
@@ -36,7 +36,10 @@ jest.mock('@superset-ui/core', () => ({
 jest.mock('../utils', () => ({
   getDateFormatter: jest.fn(() => (v: any) => `${v}pm`),
   parseMetricValue: jest.fn(val => Number(val)),
-  getOriginalLabel: jest.fn((metric, metrics) => metric),
+  getOriginalLabel: jest.fn((metric, metrics) => {
+    console.log(metrics);
+    return metric;
+  }),
 }));
 
 describe('BigNumberTotal transformProps', () => {
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberTotal/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberTotal/transformProps.ts
index fabac86ef0b..5210e237681 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberTotal/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberTotal/transformProps.ts
@@ -89,7 +89,7 @@ export default function transformProps(
     metric,
     currencyFormats,
     columnFormats,
-    yAxisFormat,
+    metricEntry?.d3format || yAxisFormat,
     currencyFormat,
   );
 
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberViz.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberViz.tsx
index e422ec64028..3fbb302b872 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberViz.tsx
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberViz.tsx
@@ -26,6 +26,7 @@ import {
   BRAND_COLOR,
   styled,
   BinaryQueryObjectFilterClause,
+  themeObject,
 } from '@superset-ui/core';
 import Echart from '../components/Echart';
 import { BigNumberVizProps } from './types';
@@ -212,6 +213,7 @@ class BigNumberVis extends PureComponent<BigNumberVizProps, BigNumberVisState> {
     const hasThresholdColorFormatter =
       Array.isArray(colorThresholdFormatters) &&
       colorThresholdFormatters.length > 0;
+    const { theme } = themeObject;
 
     let numberColor;
     if (hasThresholdColorFormatter) {
@@ -224,7 +226,7 @@ class BigNumberVis extends PureComponent<BigNumberVizProps, BigNumberVisState> {
         }
       });
     } else {
-      numberColor = 'black';
+      numberColor = theme.colorText;
     }
 
     const container = this.createTemporaryContainer();
@@ -394,7 +396,7 @@ class BigNumberVis extends PureComponent<BigNumberVizProps, BigNumberVisState> {
   }
 
   getTotalElementsHeight() {
-    const marginPerElement = 8; // theme.gridUnit = 4, so margin-bottom = 8px
+    const marginPerElement = 8; // theme.sizeUnit = 4, so margin-bottom = 8px
 
     const refs = [
       this.metricNameRef,
@@ -517,7 +519,7 @@ class BigNumberVis extends PureComponent<BigNumberVizProps, BigNumberVisState> {
 
 export default styled(BigNumberVis)`
   ${({ theme }) => `
-    font-family: ${theme.typography.families.sansSerif};
+    font-family: ${theme.fontFamily};
     position: relative;
     display: flex;
     flex-direction: column;
@@ -534,29 +536,29 @@ export default styled(BigNumberVis)`
       justify-content: center;
       align-items: flex-start;
       .alert {
-        font-size: ${theme.typography.sizes.s};
+        font-size: ${theme.fontSizeSM};
         margin: -0.5em 0 0.4em;
         line-height: 1;
-        padding: ${theme.gridUnit}px;
-        border-radius: ${theme.gridUnit}px;
+        padding: ${theme.sizeUnit}px;
+        border-radius: ${theme.borderRadius}px;
       }
     }
 
     .kicker {
       line-height: 1em;
-      margin-bottom: ${theme.gridUnit * 2}px;
+      margin-bottom: ${theme.sizeUnit * 2}px;
     }
 
     .metric-name {
       line-height: 1em;
-      margin-bottom: ${theme.gridUnit * 2}px;
+      margin-bottom: ${theme.sizeUnit * 2}px;
     }
 
     .header-line {
       position: relative;
       line-height: 1em;
       white-space: nowrap;
-      margin-bottom:${theme.gridUnit * 2}px;
+      margin-bottom:${theme.sizeUnit * 2}px;
       span {
         position: absolute;
         bottom: 0;
@@ -565,19 +567,19 @@ export default styled(BigNumberVis)`
 
     .subheader-line {
       line-height: 1em;
-      margin-bottom: ${theme.gridUnit * 2}px;
+      margin-bottom: ${theme.sizeUnit * 2}px;
     }
 
     .subtitle-line {
       line-height: 1em;
-      margin-bottom: ${theme.gridUnit * 2}px;
+      margin-bottom: ${theme.sizeUnit * 2}px;
     }
 
     &.is-fallback-value {
       .kicker,
       .header-line,
       .subheader-line {
-        opacity: ${theme.opacity.mediumHeavy};
+        opacity: 60%;
       }
     }
   `}
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberWithTrendline/transformProps.test.ts b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberWithTrendline/transformProps.test.ts
index c07a8b9477b..f7dc9da6dbd 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberWithTrendline/transformProps.test.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberWithTrendline/transformProps.test.ts
@@ -39,7 +39,10 @@ jest.mock('@superset-ui/core', () => ({
 jest.mock('../utils', () => ({
   getDateFormatter: jest.fn(() => (v: any) => `${v}pm`),
   parseMetricValue: jest.fn(val => Number(val)),
-  getOriginalLabel: jest.fn((metric, metrics) => metric),
+  getOriginalLabel: jest.fn((metric, metrics) => {
+    console.log(metrics);
+    return metric;
+  }),
 }));
 
 jest.mock('../../utils/tooltip', () => ({
@@ -194,4 +197,38 @@ describe('BigNumberWithTrendline transformProps', () => {
     );
     expect(result.headerFormatter.format(500)).toBe('$500');
   });
+
+  it('should use last data point for comparison when big number comes from aggregated data', () => {
+    const chartProps = {
+      width: 500,
+      height: 400,
+      queriesData: [
+        {
+          data: [
+            { __timestamp: 3, value: 150 },
+            { __timestamp: 2, value: 100 },
+            { __timestamp: 1, value: 110 },
+          ] as unknown as BigNumberDatum[],
+          colnames: ['__timestamp', 'value'],
+          coltypes: ['TEMPORAL', 'NUMERIC'],
+        },
+        {
+          data: [{ value: 360 }],
+          colnames: ['value'],
+          coltypes: ['NUMERIC'],
+        },
+      ],
+      formData: { ...baseFormData, aggregation: 'SUM' },
+      rawFormData: baseRawFormData,
+      hooks: baseHooks,
+      datasource: baseDatasource,
+      theme: { colors: { grayscale: { light5: '#eee' } } },
+    };
+
+    const result = transformProps(
+      chartProps as unknown as BigNumberWithTrendlineChartProps,
+    );
+    expect(result.bigNumber).toBe(360);
+    expect(result.subheader).toBe('50.0% WoW');
+  });
 });
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberWithTrendline/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberWithTrendline/transformProps.ts
index 79c5b992b34..b59e2803c36 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberWithTrendline/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberWithTrendline/transformProps.ts
@@ -157,11 +157,13 @@ export default function transformProps(
   if (compareLag > 0 && sortedData.length > 0) {
     const compareIndex = compareLag;
     if (compareIndex < sortedData.length) {
-      const compareValue = sortedData[compareIndex][1];
+      const compareFromValue = sortedData[compareIndex][1];
+      const compareToValue = sortedData[0][1];
       // compare values must both be non-nulls
-      if (bigNumber !== null && compareValue !== null) {
-        percentChange = compareValue
-          ? (Number(bigNumber) - compareValue) / Math.abs(compareValue)
+      if (compareToValue !== null && compareFromValue !== null) {
+        percentChange = compareFromValue
+          ? (Number(compareToValue) - compareFromValue) /
+            Math.abs(compareFromValue)
           : 0;
         formattedSubheader = `${formatPercentChange(
           percentChange,
@@ -204,7 +206,7 @@ export default function transformProps(
     metric,
     currencyFormats,
     columnFormats,
-    yAxisFormat,
+    metricEntry?.d3format || yAxisFormat,
     currencyFormat,
   );
 
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/BoxPlot/controlPanel.ts b/superset-frontend/plugins/plugin-chart-echarts/src/BoxPlot/controlPanel.ts
index 518a5587e19..72ea077a8bd 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/BoxPlot/controlPanel.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/BoxPlot/controlPanel.ts
@@ -78,6 +78,7 @@ const config: ControlPanelConfig = {
         ['adhoc_filters'],
         ['series_limit'],
         ['series_limit_metric'],
+        ['row_limit'],
         [
           {
             name: 'whiskerOptions',
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Bubble/constants.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Bubble/constants.ts
index 1c70e872e6f..12e928b1396 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Bubble/constants.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Bubble/constants.ts
@@ -32,6 +32,7 @@ export const DEFAULT_FORM_DATA: Partial<EchartsBubbleFormData> = {
   xAxisBounds: [null, null],
   yAxisBounds: [null, null],
   xAxisLabelRotation: defaultXAxis.xAxisLabelRotation,
+  xAxisLabelInterval: defaultXAxis.xAxisLabelInterval,
   opacity: 0.6,
 };
 
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Bubble/controlPanel.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/Bubble/controlPanel.tsx
index 521ae98130d..3c58e0aecff 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Bubble/controlPanel.tsx
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Bubble/controlPanel.tsx
@@ -31,6 +31,7 @@ import {
   truncateXAxis,
   xAxisBounds,
   xAxisLabelRotation,
+  xAxisLabelInterval,
 } from '../controls';
 import { defaultYAxis } from '../defaults';
 
@@ -133,6 +134,7 @@ const config: ControlPanelConfig = {
           },
         ],
         [xAxisLabelRotation],
+        [xAxisLabelInterval],
         [
           {
             name: 'x_axis_title_margin',
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Bubble/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Bubble/transformProps.ts
index 49e51f511b3..68c152d07d4 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Bubble/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Bubble/transformProps.ts
@@ -120,6 +120,7 @@ export default function transformProps(chartProps: EchartsBubbleChartProps) {
     truncateXAxis,
     truncateYAxis,
     xAxisLabelRotation,
+    xAxisLabelInterval,
     yAxisLabelRotation,
     tooltipSizeFormat,
     opacity,
@@ -197,6 +198,7 @@ export default function transformProps(chartProps: EchartsBubbleChartProps) {
         },
       },
       nameRotate: xAxisLabelRotation,
+      interval: xAxisLabelInterval,
       scale: true,
       name: bubbleXAxisTitle,
       nameLocation: 'middle',
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Funnel/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Funnel/transformProps.ts
index b2ba862e6ae..ff5a97c348f 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Funnel/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Funnel/transformProps.ts
@@ -227,7 +227,9 @@ export default function transformProps(
   const defaultLabel = {
     formatter,
     show: showLabels,
-    color: theme.colors.grayscale.dark2,
+    color: theme.colorText,
+    textBorderColor: theme.colorBgBase,
+    textBorderWidth: 1,
   };
 
   const series: FunnelSeriesOption[] = [
@@ -245,7 +247,6 @@ export default function transformProps(
       label: {
         ...defaultLabel,
         position: labelLine ? 'outer' : 'inner',
-        textBorderColor: 'transparent',
       },
       emphasis: {
         label: {
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Gantt/EchartsGantt.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/Gantt/EchartsGantt.tsx
new file mode 100644
index 00000000000..adf51b47b88
--- /dev/null
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Gantt/EchartsGantt.tsx
@@ -0,0 +1,89 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { useEffect, useRef, useState } from 'react';
+import { sharedControlComponents } from '@superset-ui/chart-controls';
+import { t } from '@superset-ui/core';
+import Echart from '../components/Echart';
+import { EchartsGanttChartTransformedProps } from './types';
+import { EventHandlers } from '../types';
+
+const { RadioButtonControl } = sharedControlComponents;
+
+export default function EchartsGantt(props: EchartsGanttChartTransformedProps) {
+  const {
+    height,
+    width,
+    echartOptions,
+    selectedValues,
+    refs,
+    formData,
+    setControlValue,
+    onLegendStateChanged,
+  } = props;
+  const extraControlRef = useRef<HTMLDivElement>(null);
+  const [extraHeight, setExtraHeight] = useState(0);
+
+  useEffect(() => {
+    const updatedHeight = extraControlRef.current?.offsetHeight ?? 0;
+    setExtraHeight(updatedHeight);
+  }, [formData.showExtraControls]);
+
+  const eventHandlers: EventHandlers = {
+    legendselectchanged: payload => {
+      requestAnimationFrame(() => {
+        onLegendStateChanged?.(payload.selected);
+      });
+    },
+    legendselectall: payload => {
+      requestAnimationFrame(() => {
+        onLegendStateChanged?.(payload.selected);
+      });
+    },
+    legendinverseselect: payload => {
+      requestAnimationFrame(() => {
+        onLegendStateChanged?.(payload.selected);
+      });
+    },
+  };
+
+  return (
+    <>
+      <div ref={extraControlRef} css={{ textAlign: 'center' }}>
+        {formData.showExtraControls ? (
+          <RadioButtonControl
+            options={[
+              [false, t('Plain')],
+              [true, t('Subcategories')],
+            ]}
+            value={formData.subcategories}
+            onChange={v => setControlValue?.('subcategories', v)}
+          />
+        ) : null}
+      </div>
+      <Echart
+        refs={refs}
+        height={height - extraHeight}
+        width={width}
+        echartOptions={echartOptions}
+        selectedValues={selectedValues}
+        eventHandlers={eventHandlers}
+      />
+    </>
+  );
+}
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Gantt/buildQuery.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Gantt/buildQuery.ts
new file mode 100644
index 00000000000..66153916fe8
--- /dev/null
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Gantt/buildQuery.ts
@@ -0,0 +1,61 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 {
+  QueryFormData,
+  QueryObject,
+  buildQueryContext,
+  ensureIsArray,
+} from '@superset-ui/core';
+
+export default function buildQuery(formData: QueryFormData) {
+  const {
+    start_time,
+    end_time,
+    y_axis,
+    series,
+    tooltip_columns,
+    tooltip_metrics,
+    order_by_cols,
+  } = formData;
+
+  const groupBy = ensureIsArray(series);
+  const orderby = ensureIsArray(order_by_cols).map(
+    expr => JSON.parse(expr) as [string, boolean],
+  );
+  const columns = Array.from(
+    new Set([
+      start_time,
+      end_time,
+      y_axis,
+      ...groupBy,
+      ...ensureIsArray(tooltip_columns),
+      ...orderby.map(v => v[0]),
+    ]),
+  );
+
+  return buildQueryContext(formData, (baseQueryObject: QueryObject) => [
+    {
+      ...baseQueryObject,
+      columns,
+      metrics: ensureIsArray(tooltip_metrics),
+      orderby,
+      series_columns: groupBy,
+    },
+  ]);
+}
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Gantt/constants.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Gantt/constants.ts
new file mode 100644
index 00000000000..e4023f22201
--- /dev/null
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Gantt/constants.ts
@@ -0,0 +1,26 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+export const ELEMENT_HEIGHT_SCALE = 0.85 as const;
+
+export enum Dimension {
+  StartTime = 'startTime',
+  EndTime = 'endTime',
+  Index = 'index',
+  SeriesCount = 'seriesCount',
+}
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Gantt/controlPanel.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/Gantt/controlPanel.tsx
new file mode 100644
index 00000000000..cdc406f48ff
--- /dev/null
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Gantt/controlPanel.tsx
@@ -0,0 +1,136 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 {
+  ControlPanelConfig,
+  ControlSubSectionHeader,
+  sections,
+  sharedControls,
+} from '@superset-ui/chart-controls';
+import { GenericDataType, t } from '@superset-ui/core';
+import {
+  legendSection,
+  showExtraControls,
+  tooltipTimeFormatControl,
+  tooltipValuesFormatControl,
+} from '../controls';
+
+const config: ControlPanelConfig = {
+  controlPanelSections: [
+    {
+      label: t('Query'),
+      expanded: true,
+      controlSetRows: [
+        [
+          {
+            name: 'start_time',
+            config: {
+              ...sharedControls.entity,
+              label: t('Start Time'),
+              description: undefined,
+              allowedDataTypes: [GenericDataType.Temporal],
+            },
+          },
+        ],
+        [
+          {
+            name: 'end_time',
+            config: {
+              ...sharedControls.entity,
+              label: t('End Time'),
+              description: undefined,
+              allowedDataTypes: [GenericDataType.Temporal],
+            },
+          },
+        ],
+        [
+          {
+            name: 'y_axis',
+            config: {
+              ...sharedControls.x_axis,
+              label: t('Y-axis'),
+              description: t('Dimension to use on y-axis.'),
+              initialValue: () => undefined,
+            },
+          },
+        ],
+        ['series'],
+        [
+          {
+            name: 'subcategories',
+            config: {
+              type: 'CheckboxControl',
+              label: t('Subcategories'),
+              description: t(
+                'Divides each category into subcategories based on the values in ' +
+                  'the dimension. It can be used to exclude intersections.',
+              ),
+              renderTrigger: true,
+              default: false,
+              visibility: ({ controls }) => !!controls?.series?.value,
+            },
+          },
+        ],
+        ['tooltip_metrics'],
+        ['tooltip_columns'],
+        ['adhoc_filters'],
+        ['order_by_cols'],
+        ['row_limit'],
+      ],
+    },
+    {
+      ...sections.titleControls,
+      controlSetRows: [...sections.titleControls.controlSetRows.slice(0, -1)],
+    },
+    {
+      label: t('Chart Options'),
+      expanded: true,
+      tabOverride: 'customize',
+      controlSetRows: [
+        ['color_scheme'],
+        ...legendSection,
+        ['zoomable'],
+        [showExtraControls],
+        [<ControlSubSectionHeader>{t('X Axis')}</ControlSubSectionHeader>],
+        [
+          {
+            name: 'x_axis_time_bounds',
+            config: {
+              type: 'TimeRangeControl',
+              label: t('Bounds'),
+              description: t(
+                'Bounds for the X-axis. Selected time merges with ' +
+                  'min/max date of the data. When left empty, bounds ' +
+                  'dynamically defined based on the min/max of the data.',
+              ),
+              renderTrigger: true,
+              allowClear: true,
+              allowEmpty: [true, true],
+            },
+          },
+        ],
+        ['x_axis_time_format'],
+        [<ControlSubSectionHeader>{t('Tooltip')}</ControlSubSectionHeader>],
+        [tooltipTimeFormatControl],
+        [tooltipValuesFormatControl],
+      ],
+    },
+  ],
+};
+
+export default config;
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Gantt/images/example1.png b/superset-frontend/plugins/plugin-chart-echarts/src/Gantt/images/example1.png
new file mode 100644
index 00000000000..d147bdc8558
Binary files /dev/null and b/superset-frontend/plugins/plugin-chart-echarts/src/Gantt/images/example1.png differ
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Gantt/images/example2.png b/superset-frontend/plugins/plugin-chart-echarts/src/Gantt/images/example2.png
new file mode 100644
index 00000000000..a92a82825ba
Binary files /dev/null and b/superset-frontend/plugins/plugin-chart-echarts/src/Gantt/images/example2.png differ
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Gantt/images/thumbnail.png b/superset-frontend/plugins/plugin-chart-echarts/src/Gantt/images/thumbnail.png
new file mode 100644
index 00000000000..cc7313ce39b
Binary files /dev/null and b/superset-frontend/plugins/plugin-chart-echarts/src/Gantt/images/thumbnail.png differ
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Gantt/index.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Gantt/index.ts
new file mode 100644
index 00000000000..a474ceb35cb
--- /dev/null
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Gantt/index.ts
@@ -0,0 +1,54 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { Behavior, t } from '@superset-ui/core';
+import transformProps from './transformProps';
+import controlPanel from './controlPanel';
+import buildQuery from './buildQuery';
+import { EchartsChartPlugin } from '../types';
+import thumbnail from './images/thumbnail.png';
+import example1 from './images/example1.png';
+import example2 from './images/example2.png';
+
+export default class EchartsGanttChartPlugin extends EchartsChartPlugin {
+  constructor() {
+    super({
+      buildQuery,
+      controlPanel,
+      loadChart: () => import('./EchartsGantt'),
+      metadata: {
+        behaviors: [
+          Behavior.InteractiveChart,
+          Behavior.DrillToDetail,
+          Behavior.DrillBy,
+        ],
+        credits: ['https://echarts.apache.org'],
+        name: t('Gantt Chart'),
+        description: t(
+          'Gantt chart visualizes important events over a time span. ' +
+            'Every data point displayed as a separate event along a ' +
+            'horizontal line.',
+        ),
+        tags: [t('ECharts'), t('Featured'), t('Timeline'), t('Time')],
+        thumbnail,
+        exampleGallery: [{ url: example1 }, { url: example2 }],
+      },
+      transformProps,
+    });
+  }
+}
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Gantt/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Gantt/transformProps.ts
new file mode 100644
index 00000000000..907f83f441c
--- /dev/null
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Gantt/transformProps.ts
@@ -0,0 +1,440 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 {
+  CustomSeriesOption,
+  CustomSeriesRenderItem,
+  EChartsCoreOption,
+  LineSeriesOption,
+} from 'echarts';
+import {
+  AxisType,
+  CategoricalColorNamespace,
+  DataRecord,
+  DataRecordValue,
+  GenericDataType,
+  getColumnLabel,
+  getNumberFormatter,
+  t,
+  tooltipHtml,
+} from '@superset-ui/core';
+import { CallbackDataParams } from 'echarts/types/src/util/types';
+import dayjs from 'dayjs';
+import {
+  Cartesian2dCoordSys,
+  EchartsGanttChartProps,
+  EchartsGanttFormData,
+} from './types';
+import { DEFAULT_FORM_DATA, TIMESERIES_CONSTANTS } from '../constants';
+import { Refs } from '../types';
+import { getLegendProps, groupData } from '../utils/series';
+import {
+  getTooltipTimeFormatter,
+  getXAxisFormatter,
+} from '../utils/formatters';
+import { defaultGrid } from '../defaults';
+import { getPadding } from '../Timeseries/transformers';
+import { convertInteger } from '../utils/convertInteger';
+import { getTooltipLabels } from '../utils/tooltip';
+import { Dimension, ELEMENT_HEIGHT_SCALE } from './constants';
+
+const renderItem: CustomSeriesRenderItem = (params, api) => {
+  const startX = api.value(Dimension.StartTime);
+  const endX = api.value(Dimension.EndTime);
+  const index = Number(api.value(Dimension.Index));
+  const seriesCount = Number(api.value(Dimension.SeriesCount));
+
+  if (Number.isNaN(index)) {
+    return null;
+  }
+
+  const startY = seriesCount - 1 - index;
+  const endY = startY - 1;
+
+  const startCoord = api.coord([startX, startY]);
+  const endCoord = api.coord([endX, endY]);
+
+  const baseHeight = endCoord[1] - startCoord[1];
+  const height = baseHeight * ELEMENT_HEIGHT_SCALE;
+
+  const coordSys = params.coordSys as Cartesian2dCoordSys;
+  const bounds = [coordSys.x, coordSys.x + coordSys.width];
+
+  // left bound
+  startCoord[0] = Math.max(startCoord[0], bounds[0]);
+  endCoord[0] = Math.max(startCoord[0], endCoord[0]);
+  // right bound
+  startCoord[0] = Math.min(startCoord[0], bounds[1]);
+  endCoord[0] = Math.min(endCoord[0], bounds[1]);
+
+  const width = endCoord[0] - startCoord[0];
+
+  if (width <= 0 || height <= 0) {
+    return null;
+  }
+
+  return {
+    type: 'rect',
+    transition: ['shape'],
+    shape: {
+      x: startCoord[0],
+      y: startCoord[1] - height - (baseHeight - height) / 2,
+      width,
+      height,
+    },
+    style: api.style(),
+  };
+};
+
+export default function transformProps(chartProps: EchartsGanttChartProps) {
+  const {
+    formData,
+    queriesData,
+    height,
+    hooks,
+    filterState,
+    width,
+    theme,
+    emitCrossFilters,
+    datasource,
+    legendState,
+  } = chartProps;
+
+  const {
+    startTime,
+    endTime,
+    yAxis,
+    series: dimension,
+    tooltipMetrics,
+    tooltipColumns,
+    xAxisTimeFormat,
+    tooltipTimeFormat,
+    tooltipValuesFormat,
+    colorScheme,
+    sliceId,
+    zoomable,
+    legendMargin,
+    legendOrientation,
+    legendType,
+    showLegend,
+    yAxisTitle,
+    yAxisTitleMargin,
+    xAxisTitle,
+    xAxisTitleMargin,
+    xAxisTimeBounds,
+    subcategories,
+  }: EchartsGanttFormData = {
+    ...DEFAULT_FORM_DATA,
+    ...formData,
+  };
+
+  const { setControlValue, onLegendStateChanged } = hooks;
+
+  const { data = [], colnames = [], coltypes = [] } = queriesData[0];
+  const refs: Refs = {};
+
+  const startTimeLabel = getColumnLabel(startTime);
+  const endTimeLabel = getColumnLabel(endTime);
+  const yAxisLabel = getColumnLabel(yAxis);
+  const dimensionLabel = dimension ? getColumnLabel(dimension) : undefined;
+  const tooltipLabels = getTooltipLabels({ tooltipMetrics, tooltipColumns });
+
+  const seriesMap = groupData(data, dimensionLabel);
+
+  const seriesInCategoriesMap = new Map<
+    DataRecordValue | undefined,
+    Map<DataRecordValue | undefined, number>
+  >();
+  data.forEach(datum => {
+    const category = datum[yAxisLabel];
+    let dimensionValue: DataRecordValue | undefined;
+    if (dimensionLabel) {
+      if (legendState && !legendState[String(datum[dimensionLabel])]) {
+        return;
+      }
+      if (subcategories) {
+        dimensionValue = datum[dimensionLabel];
+      }
+    }
+    const seriesMap = seriesInCategoriesMap.get(category);
+    if (seriesMap) {
+      const dimensionMapValue = seriesMap.get(dimensionValue);
+      if (dimensionMapValue === undefined) {
+        seriesMap.set(dimensionValue, seriesMap.size);
+      }
+    } else {
+      seriesInCategoriesMap.set(category, new Map([[dimensionValue, 0]]));
+    }
+  });
+
+  let seriesCount = 0;
+  const categoryAndSeriesToIndexMap: typeof seriesInCategoriesMap = new Map();
+  Array.from(seriesInCategoriesMap.entries()).forEach(([key, map]) => {
+    categoryAndSeriesToIndexMap.set(
+      key,
+      new Map(
+        Array.from(map.entries()).map(([key2, idx]) => [
+          key2,
+          seriesCount + idx,
+        ]),
+      ),
+    );
+    seriesCount += map.size;
+  });
+
+  const borderLines: { yAxis: number }[] = [];
+  const categoryLines: { yAxis: number; name?: string }[] = [];
+  let sum = 0;
+  let prevSum = 0;
+  Array.from(seriesInCategoriesMap.entries()).forEach(([key, map]) => {
+    sum += map.size;
+    categoryLines.push({
+      yAxis: seriesCount - (sum + prevSum) / 2,
+      name: key ? String(key) : undefined,
+    });
+    borderLines.push({ yAxis: seriesCount - sum });
+    prevSum = sum;
+  });
+
+  const xAxisFormatter = getXAxisFormatter(xAxisTimeFormat);
+  const tooltipTimeFormatter = getTooltipTimeFormatter(tooltipTimeFormat);
+  const tooltipValuesFormatter = getNumberFormatter(tooltipValuesFormat);
+
+  const bounds: [number | undefined, number | undefined] = [
+    undefined,
+    undefined,
+  ];
+  if (xAxisTimeBounds?.[0]) {
+    const minDate = Math.min(
+      ...data.map(datum => Number(datum[startTimeLabel] ?? 0)),
+    );
+    const time = dayjs(xAxisTimeBounds[0], 'HH:mm:ss');
+    bounds[0] = +dayjs
+      .utc(minDate)
+      .hour(time.hour())
+      .minute(time.minute())
+      .second(time.second());
+  }
+  if (xAxisTimeBounds?.[1]) {
+    const maxDate = Math.min(
+      ...data.map(datum => Number(datum[endTimeLabel] ?? 0)),
+    );
+    const time = dayjs(xAxisTimeBounds[1], 'HH:mm:ss');
+    bounds[1] = +dayjs
+      .utc(maxDate)
+      .hour(time.hour())
+      .minute(time.minute())
+      .second(time.second());
+  }
+
+  const padding = getPadding(
+    showLegend && seriesMap.size > 1,
+    legendOrientation,
+    false,
+    zoomable,
+    legendMargin,
+    !!xAxisTitle,
+    'Left',
+    convertInteger(yAxisTitleMargin),
+    convertInteger(xAxisTitleMargin),
+  );
+
+  const colorScale = CategoricalColorNamespace.getScale(colorScheme as string);
+
+  const getIndex = (datum: DataRecord) => {
+    const seriesMap = categoryAndSeriesToIndexMap.get(datum[yAxisLabel]);
+    const series =
+      subcategories && dimensionLabel ? datum[dimensionLabel] : undefined;
+    return seriesMap ? seriesMap.get(series) : undefined;
+  };
+
+  const series: (CustomSeriesOption | LineSeriesOption)[] = Array.from(
+    seriesMap.entries(),
+  )
+    .map(([key, data], idx) => ({
+      name: key as string | undefined,
+      // For some reason items can visually disappear if progressive enabled.
+      progressive: 0,
+      itemStyle: {
+        color: colorScale(String(key), sliceId ?? idx),
+      },
+      type: 'custom' as const,
+      renderItem,
+      data: data.map(datum => ({
+        value: [
+          datum[startTimeLabel],
+          datum[endTimeLabel],
+          getIndex(datum),
+          seriesCount,
+          ...Object.values(datum),
+        ],
+      })),
+      dimensions: [...Object.values(Dimension), ...colnames],
+      encode: {
+        x: [0, 1],
+      },
+    }))
+    .sort((a, b) => String(a.name).localeCompare(String(b.name)));
+
+  series.push(
+    {
+      animation: false,
+      type: 'line' as const,
+      markLine: {
+        silent: true,
+        symbol: ['none', 'none'],
+        lineStyle: {
+          type: 'dashed',
+          // eslint-disable-next-line theme-colors/no-literal-colors
+          color: '#dbe0ea',
+        },
+        label: {
+          show: false,
+        },
+        data: borderLines,
+      },
+    },
+    {
+      animation: false,
+      type: 'line',
+      markLine: {
+        silent: true,
+        symbol: ['none', 'none'],
+        lineStyle: {
+          type: 'solid',
+          // eslint-disable-next-line theme-colors/no-literal-colors
+          color: '#00000000',
+        },
+        label: {
+          show: true,
+          position: 'start',
+          formatter: '{b}',
+        },
+        data: categoryLines,
+      },
+    },
+  );
+
+  const tooltipFormatterMap = {
+    [GenericDataType.Numeric]: tooltipValuesFormatter,
+    [GenericDataType.String]: undefined,
+    [GenericDataType.Temporal]: tooltipTimeFormatter,
+    [GenericDataType.Boolean]: undefined,
+  };
+
+  const echartOptions: EChartsCoreOption = {
+    useUTC: true,
+    tooltip: {
+      formatter: (params: CallbackDataParams) =>
+        tooltipHtml(
+          tooltipLabels.map(label => {
+            const offset = Object.keys(Dimension).length;
+            const dimensionNames = params.dimensionNames!.slice(offset);
+            const data = (params.value as any[]).slice(offset);
+
+            const idx = dimensionNames.findIndex(v => v === label)!;
+            const value = data[idx];
+            const type = coltypes[idx];
+
+            return [label, tooltipFormatterMap[type]?.(value) ?? value];
+          }),
+          dimensionLabel ? params.seriesName : undefined,
+        ),
+    },
+    legend: {
+      ...getLegendProps(
+        legendType,
+        legendOrientation,
+        showLegend,
+        theme,
+        zoomable,
+        legendState,
+      ),
+    },
+    grid: {
+      ...defaultGrid,
+      ...padding,
+    },
+    dataZoom: zoomable && [
+      {
+        type: 'slider',
+        filterMode: 'none',
+        start: TIMESERIES_CONSTANTS.dataZoomStart,
+        end: TIMESERIES_CONSTANTS.dataZoomEnd,
+        bottom: TIMESERIES_CONSTANTS.zoomBottom,
+      },
+    ],
+    toolbox: {
+      show: zoomable,
+      top: TIMESERIES_CONSTANTS.toolboxTop,
+      right: TIMESERIES_CONSTANTS.toolboxRight,
+      feature: {
+        dataZoom: {
+          yAxisIndex: false,
+          title: {
+            zoom: t('zoom area'),
+            back: t('restore zoom'),
+          },
+        },
+      },
+    },
+    series,
+    xAxis: {
+      name: xAxisTitle,
+      nameLocation: 'middle',
+      type: AxisType.Time,
+      nameGap: convertInteger(xAxisTitleMargin),
+      axisLabel: {
+        formatter: xAxisFormatter,
+        hideOverlap: true,
+      },
+      min: bounds[0],
+      max: bounds[1],
+    },
+    yAxis: {
+      name: yAxisTitle,
+      nameGap: convertInteger(yAxisTitleMargin),
+      nameLocation: 'middle',
+      axisLabel: {
+        show: false,
+      },
+      splitLine: {
+        show: false,
+      },
+      type: AxisType.Value,
+      min: 0,
+      max: seriesCount,
+    },
+  };
+
+  return {
+    formData,
+    queriesData,
+    echartOptions,
+    height,
+    filterState,
+    width,
+    theme,
+    hooks,
+    emitCrossFilters,
+    datasource,
+    refs,
+    setControlValue,
+    onLegendStateChanged,
+  };
+}
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Gantt/types.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Gantt/types.ts
new file mode 100644
index 00000000000..1ba593ba107
--- /dev/null
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Gantt/types.ts
@@ -0,0 +1,71 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 {
+  ChartDataResponseResult,
+  ChartProps,
+  QueryFormColumn,
+  QueryFormData,
+  QueryFormMetric,
+} from '@superset-ui/core';
+import {
+  BaseTransformedProps,
+  CrossFilterTransformedProps,
+  LegendFormData,
+} from '../types';
+
+export type EchartsGanttChartTransformedProps =
+  BaseTransformedProps<EchartsGanttFormData> & CrossFilterTransformedProps;
+
+export type EchartsGanttFormData = QueryFormData &
+  LegendFormData & {
+    viz_type: 'gantt_chart';
+    startTime: QueryFormColumn;
+    endTime: QueryFormColumn;
+    yAxis: QueryFormColumn;
+    tooltipMetrics: QueryFormMetric[];
+    tooltipColumns: QueryFormColumn[];
+    series?: QueryFormColumn;
+    xAxisTimeFormat?: string;
+    tooltipTimeFormat?: string;
+    tooltipValuesFormat?: string;
+    colorScheme?: string;
+    zoomable?: boolean;
+    xAxisTitle?: string;
+    xAxisTitleMargin?: number;
+    yAxisTitle?: string;
+    yAxisTitleMargin?: number;
+    yAxisTitlePosition?: string;
+    xAxisTimeBounds?: [string | null, string | null];
+    subcategories?: boolean;
+    showExtraControls?: boolean;
+  };
+
+export interface EchartsGanttChartProps
+  extends ChartProps<EchartsGanttFormData> {
+  formData: EchartsGanttFormData;
+  queriesData: ChartDataResponseResult[];
+}
+
+export interface Cartesian2dCoordSys {
+  type: 'cartesian2d';
+  x: number;
+  y: number;
+  width: number;
+  height: number;
+}
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Gauge/constants.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Gauge/constants.ts
index 676b1f08d48..597e0ff9b1b 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Gauge/constants.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Gauge/constants.ts
@@ -24,25 +24,25 @@ export const defaultGaugeSeriesOption = (
 ): GaugeSeriesOption => ({
   splitLine: {
     lineStyle: {
-      color: theme.colors.primary.base,
+      color: theme.colorPrimary,
     },
   },
   axisLine: {
     lineStyle: {
-      color: [[1, theme.colors.primary.light4]],
+      color: [[1, theme.colorSplit]],
     },
   },
   axisLabel: {
-    color: theme.colors.grayscale.dark1,
+    color: theme.colorText,
   },
   axisTick: {
     lineStyle: {
       width: 2,
-      color: theme.colors.primary.base,
+      color: theme.colorPrimary,
     },
   },
   detail: {
-    color: 'auto',
+    color: theme.colorText,
   },
 });
 
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Gauge/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Gauge/transformProps.ts
index e2dd9d48809..29dcafc45b8 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Gauge/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Gauge/transformProps.ts
@@ -183,6 +183,7 @@ export default function transformProps(
             `${index * titleOffsetFromTitle + OFFSETS.titleFromCenter}%`,
           ],
           fontSize,
+          color: theme.colorTextSecondary,
         },
         detail: {
           offsetCenter: [
@@ -194,6 +195,7 @@ export default function transformProps(
             }%`,
           ],
           fontSize: FONT_SIZE_MULTIPLIERS.detailFontSize * fontSize,
+          color: theme.colorText,
         },
       };
       if (
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Graph/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Graph/transformProps.ts
index c98d6160921..6e032f5c17a 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Graph/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Graph/transformProps.ts
@@ -325,7 +325,10 @@ export default function transformProps(
       selectedMode,
       ...getChartPadding(showLegend, legendOrientation, legendMargin),
       animation: DEFAULT_GRAPH_SERIES_OPTION.animation,
-      label: DEFAULT_GRAPH_SERIES_OPTION.label,
+      label: {
+        ...DEFAULT_GRAPH_SERIES_OPTION.label,
+        color: theme.colorText,
+      },
       lineStyle: DEFAULT_GRAPH_SERIES_OPTION.lineStyle,
       emphasis: DEFAULT_GRAPH_SERIES_OPTION.emphasis,
     },
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Histogram/controlPanel.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/Histogram/controlPanel.tsx
index d4e8d4b86db..29cde5bd89a 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Histogram/controlPanel.tsx
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Histogram/controlPanel.tsx
@@ -122,7 +122,6 @@ const config: ControlPanelConfig = {
               label: t('X Axis Title'),
               renderTrigger: true,
               default: '',
-              description: t('Changing this control takes effect instantly'),
             },
           },
         ],
@@ -148,7 +147,6 @@ const config: ControlPanelConfig = {
               label: t('Y Axis Title'),
               renderTrigger: true,
               default: '',
-              description: t('Changing this control takes effect instantly'),
             },
           },
         ],
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx
index 29ce20e9d66..6bc7643c84f 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx
@@ -19,6 +19,7 @@
 import { ensureIsArray, t } from '@superset-ui/core';
 import { cloneDeep } from 'lodash';
 import {
+  ControlPanelsContainerProps,
   ControlPanelConfig,
   ControlPanelSectionConfig,
   ControlSetRow,
@@ -27,6 +28,8 @@ import {
   getStandardizedControls,
   sections,
   sharedControls,
+  DEFAULT_SORT_SERIES_DATA,
+  SORT_SERIES_CHOICES,
 } from '@superset-ui/chart-controls';
 
 import { DEFAULT_FORM_DATA } from './types';
@@ -38,6 +41,7 @@ import {
   truncateXAxis,
   xAxisBounds,
   xAxisLabelRotation,
+  xAxisLabelInterval,
 } from '../controls';
 
 const {
@@ -54,7 +58,6 @@ const {
   stack,
   truncateYAxis,
   yAxisBounds,
-  zoomable,
   yAxisIndex,
 } = DEFAULT_FORM_DATA;
 
@@ -196,6 +199,23 @@ function createCustomizeSection(
         },
       },
     ],
+    [
+      {
+        name: `only_total${controlSuffix}`,
+        config: {
+          type: 'CheckboxControl',
+          label: t('Only Total'),
+          default: true,
+          renderTrigger: true,
+          description: t(
+            'Only show the total value on the stacked chart, and not show on the selected category',
+          ),
+          visibility: ({ controls }: ControlPanelsContainerProps) =>
+            Boolean(controls?.show_value?.value) &&
+            Boolean(controls?.stack?.value),
+        },
+      },
+    ],
     [
       {
         name: `opacity${controlSuffix}`,
@@ -258,6 +278,35 @@ function createCustomizeSection(
         },
       },
     ],
+    [<ControlSubSectionHeader>{t('Series Order')}</ControlSubSectionHeader>],
+    [
+      {
+        name: `sort_series_type${controlSuffix}`,
+        config: {
+          type: 'SelectControl',
+          freeForm: false,
+          label: t('Sort Series By'),
+          choices: SORT_SERIES_CHOICES,
+          default: DEFAULT_SORT_SERIES_DATA.sort_series_type,
+          renderTrigger: true,
+          description: t(
+            'Based on what should series be ordered on the chart and legend',
+          ),
+        },
+      },
+    ],
+    [
+      {
+        name: `sort_series_ascending${controlSuffix}`,
+        config: {
+          type: 'CheckboxControl',
+          label: t('Sort Series Ascending'),
+          default: DEFAULT_SORT_SERIES_DATA.sort_series_ascending,
+          renderTrigger: true,
+          description: t('Sort series in ascending order'),
+        },
+      },
+    ],
   ];
 }
 
@@ -302,23 +351,13 @@ const config: ControlPanelConfig = {
         ['time_shift_color'],
         ...createCustomizeSection(t('Query A'), ''),
         ...createCustomizeSection(t('Query B'), 'B'),
-        [
-          {
-            name: 'zoomable',
-            config: {
-              type: 'CheckboxControl',
-              label: t('Data Zoom'),
-              default: zoomable,
-              renderTrigger: true,
-              description: t('Enable data zooming controls'),
-            },
-          },
-        ],
+        ['zoomable'],
         [minorTicks],
         ...legendSection,
         [<ControlSubSectionHeader>{t('X Axis')}</ControlSubSectionHeader>],
         ['x_axis_time_format'],
         [xAxisLabelRotation],
+        [xAxisLabelInterval],
         ...richTooltipSection,
         // eslint-disable-next-line react/jsx-key
         [<ControlSubSectionHeader>{t('Y Axis')}</ControlSubSectionHeader>],
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts
index 478915cfce1..fc2a6fe4383 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts
@@ -173,6 +173,8 @@ export default function transformProps(
     showLegend,
     showValue,
     showValueB,
+    onlyTotal,
+    onlyTotalB,
     stack,
     stackB,
     truncateXAxis,
@@ -193,6 +195,7 @@ export default function transformProps(
     tooltipSortByMetric,
     xAxisBounds,
     xAxisLabelRotation,
+    xAxisLabelInterval,
     groupby,
     groupbyB,
     xAxis: xAxisOrig,
@@ -203,6 +206,10 @@ export default function transformProps(
     yAxisTitleMargin,
     yAxisTitlePosition,
     sliceId,
+    sortSeriesType,
+    sortSeriesTypeB,
+    sortSeriesAscending,
+    sortSeriesAscendingB,
     timeGrainSqla,
     percentageThreshold,
     metrics = [],
@@ -223,18 +230,42 @@ export default function transformProps(
   }
 
   const rebasedDataA = rebaseForecastDatum(data1, verboseMap);
+  const { totalStackedValues, thresholdValues } = extractDataTotalValues(
+    rebasedDataA,
+    {
+      stack,
+      percentageThreshold,
+      xAxisCol: xAxisLabel,
+    },
+  );
 
   const MetricDisplayNameA = getMetricDisplayName(metrics[0], verboseMap);
   const MetricDisplayNameB = getMetricDisplayName(metricsB[0], verboseMap);
 
-  const [rawSeriesA] = extractSeries(rebasedDataA, {
+  const [rawSeriesA, sortedTotalValuesA] = extractSeries(rebasedDataA, {
     fillNeighborValue: stack ? 0 : undefined,
     xAxis: xAxisLabel,
+    sortSeriesType,
+    sortSeriesAscending,
+    stack,
+    totalStackedValues,
   });
   const rebasedDataB = rebaseForecastDatum(data2, verboseMap);
-  const [rawSeriesB] = extractSeries(rebasedDataB, {
+  const {
+    totalStackedValues: totalStackedValuesB,
+    thresholdValues: thresholdValuesB,
+  } = extractDataTotalValues(rebasedDataB, {
+    stack: Boolean(stackB),
+    percentageThreshold,
+    xAxisCol: xAxisLabel,
+  });
+  const [rawSeriesB, sortedTotalValuesB] = extractSeries(rebasedDataB, {
     fillNeighborValue: stackB ? 0 : undefined,
     xAxis: xAxisLabel,
+    sortSeriesType: sortSeriesTypeB,
+    sortSeriesAscending: sortSeriesAscendingB,
+    stack: Boolean(stackB),
+    totalStackedValues: totalStackedValuesB,
   });
 
   const dataTypes = getColtypesMapping(queriesData[0]);
@@ -292,25 +323,11 @@ export default function transformProps(
   );
   const showValueIndexesA = extractShowValueIndexes(rawSeriesA, {
     stack,
+    onlyTotal,
   });
   const showValueIndexesB = extractShowValueIndexes(rawSeriesB, {
     stack,
-  });
-  const { totalStackedValues, thresholdValues } = extractDataTotalValues(
-    rebasedDataA,
-    {
-      stack,
-      percentageThreshold,
-      xAxisCol: xAxisLabel,
-    },
-  );
-  const {
-    totalStackedValues: totalStackedValuesB,
-    thresholdValues: thresholdValuesB,
-  } = extractDataTotalValues(rebasedDataB, {
-    stack: Boolean(stackB),
-    percentageThreshold,
-    xAxisCol: xAxisLabel,
+    onlyTotal,
   });
 
   annotationLayers
@@ -406,6 +423,7 @@ export default function transformProps(
         areaOpacity: opacity,
         seriesType,
         showValue,
+        onlyTotal,
         stack: Boolean(stack),
         stackIdSuffix: '\na',
         yAxisIndex,
@@ -420,8 +438,8 @@ export default function transformProps(
                 formatter: seriesFormatter,
               })
             : seriesFormatter,
+        totalStackedValues: sortedTotalValuesA,
         showValueIndexes: showValueIndexesA,
-        totalStackedValues,
         thresholdValues,
         timeShiftColor,
       },
@@ -464,6 +482,7 @@ export default function transformProps(
         areaOpacity: opacityB,
         seriesType: seriesTypeB,
         showValue: showValueB,
+        onlyTotal: onlyTotalB,
         stack: Boolean(stackB),
         stackIdSuffix: '\nb',
         yAxisIndex: yAxisIndexB,
@@ -478,8 +497,8 @@ export default function transformProps(
                 formatter: seriesFormatter,
               })
             : seriesFormatter,
+        totalStackedValues: sortedTotalValuesB,
         showValueIndexes: showValueIndexesB,
-        totalStackedValues: totalStackedValuesB,
         thresholdValues: thresholdValuesB,
         timeShiftColor,
       },
@@ -536,6 +555,7 @@ export default function transformProps(
       axisLabel: {
         formatter: xAxisFormatter,
         rotate: xAxisLabelRotation,
+        interval: xAxisLabelInterval,
       },
       minorTick: { show: minorTicks },
       minInterval:
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/types.ts b/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/types.ts
index e79523d176d..a8a2bac65d6 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/types.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/types.ts
@@ -61,6 +61,7 @@ export type EchartsMixedTimeseriesFormData = QueryFormData & {
   zoomable: boolean;
   richTooltip: boolean;
   xAxisLabelRotation: number;
+  xAxisLabelInterval?: number | string;
   colorScheme?: string;
   // types specific to Query A and Query B
   area: boolean;
@@ -133,6 +134,7 @@ export const DEFAULT_FORM_DATA: EchartsMixedTimeseriesFormData = {
   zoomable: TIMESERIES_DEFAULTS.zoomable,
   richTooltip: TIMESERIES_DEFAULTS.richTooltip,
   xAxisLabelRotation: TIMESERIES_DEFAULTS.xAxisLabelRotation,
+  xAxisLabelInterval: TIMESERIES_DEFAULTS.xAxisLabelInterval,
   ...DEFAULT_TITLE_FORM_DATA,
 };
 
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Radar/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Radar/transformProps.ts
index 2831aa7d455..690fabc7ad3 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Radar/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Radar/transformProps.ts
@@ -322,7 +322,6 @@ export default function transformProps(
         label: {
           show: true,
           fontWeight: 'bold',
-          backgroundColor: theme.colors.grayscale.light5,
         },
       },
       data: normalizedTransformedData,
@@ -361,6 +360,23 @@ export default function transformProps(
     radar: {
       shape: isCircle ? 'circle' : 'polygon',
       indicator,
+      splitLine: {
+        show: true,
+        lineStyle: {
+          color: theme.colorSplit,
+        },
+      },
+      splitArea: {
+        show: true,
+        areaStyle: {
+          color: [theme.colorBgLayout, theme.colorBgContainer],
+        },
+      },
+      axisLine: {
+        lineStyle: {
+          color: theme.colorSplit,
+        },
+      },
     },
   };
 
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Sankey/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Sankey/transformProps.ts
index 9ef7389660a..e9f912d1af7 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Sankey/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Sankey/transformProps.ts
@@ -26,6 +26,7 @@ import {
   getMetricLabel,
   getNumberFormatter,
   tooltipHtml,
+  themeObject,
 } from '@superset-ui/core';
 import { SankeyChartProps, SankeyTransformedProps } from './types';
 import { Refs } from '../types';
@@ -62,6 +63,7 @@ export default function transformProps(
       value,
     });
   });
+  const { theme } = themeObject;
 
   const seriesData: NonNullable<SankeySeriesOption['data']> = Array.from(
     set,
@@ -70,6 +72,10 @@ export default function transformProps(
     itemStyle: {
       color: colorFn(name, sliceId),
     },
+    label: {
+      color: theme.colorText,
+      textShadow: theme.colorBgBase,
+    },
   }));
 
   // stores a map with the total values for each node considering the links
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Sunburst/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Sunburst/transformProps.ts
index 853721b2926..22da9e02ce7 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Sunburst/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Sunburst/transformProps.ts
@@ -220,10 +220,10 @@ export default function transformProps(
     });
   const minShowLabelAngle = (showLabelsThreshold || 0) * 3.6;
   const padding = {
-    top: theme.gridUnit * 3,
-    right: theme.gridUnit,
-    bottom: theme.gridUnit * 3,
-    left: theme.gridUnit,
+    top: theme.sizeUnit * 3,
+    right: theme.sizeUnit,
+    bottom: theme.sizeUnit * 3,
+    left: theme.sizeUnit,
   };
   const containerWidth = width;
   const containerHeight = height;
@@ -274,7 +274,11 @@ export default function transformProps(
   } else {
     linearColorScale(totalSecondaryValue / totalValue);
   }
-
+  const labelProps = {
+    color: theme.colorText,
+    textBorderColor: theme.colorBgBase,
+    textBorderWidth: 1,
+  };
   const traverse = (
     treeNodes: TreeNode[],
     path: string[],
@@ -316,7 +320,7 @@ export default function transformProps(
             opacity: OpacityEnum.SemiTransparent,
           },
           label: {
-            color: `rgba(0, 0, 0, ${OpacityEnum.SemiTransparent})`,
+            ...labelProps,
           },
         };
       }
@@ -356,10 +360,10 @@ export default function transformProps(
           },
         },
         label: {
+          ...labelProps,
           width: (radius * 0.6) / (columns.length || 1),
           show: showLabels,
           formatter,
-          color: theme.colors.grayscale.dark2,
           minAngle: minShowLabelAngle,
           overflow: 'breakAll',
         },
@@ -381,7 +385,6 @@ export default function transformProps(
         }
       : null,
   };
-
   return {
     formData,
     width,
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Area/controlPanel.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Area/controlPanel.tsx
index daf42f6228a..f3e40cb1dc7 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Area/controlPanel.tsx
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Area/controlPanel.tsx
@@ -37,6 +37,7 @@ import {
   seriesOrderSection,
   percentageThresholdControl,
   xAxisLabelRotation,
+  xAxisLabelInterval,
   truncateXAxis,
   xAxisBounds,
   minorTicks,
@@ -53,7 +54,6 @@ const {
   seriesType,
   truncateYAxis,
   yAxisBounds,
-  zoomable,
 } = DEFAULT_FORM_DATA;
 const config: ControlPanelConfig = {
   controlPanelSections: [
@@ -170,18 +170,7 @@ const config: ControlPanelConfig = {
           },
         ],
         [minorTicks],
-        [
-          {
-            name: 'zoomable',
-            config: {
-              type: 'CheckboxControl',
-              label: t('Data Zoom'),
-              default: zoomable,
-              renderTrigger: true,
-              description: t('Enable data zooming controls'),
-            },
-          },
-        ],
+        ['zoomable'],
         ...legendSection,
         [<ControlSubSectionHeader>{t('X Axis')}</ControlSubSectionHeader>],
         [
@@ -195,6 +184,7 @@ const config: ControlPanelConfig = {
           },
         ],
         [xAxisLabelRotation],
+        [xAxisLabelInterval],
         ...richTooltipSection,
         // eslint-disable-next-line react/jsx-key
         [<ControlSubSectionHeader>{t('Y Axis')}</ControlSubSectionHeader>],
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/EchartsTimeseries.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/EchartsTimeseries.tsx
index b91db0b4c1b..7bfab8e3ef8 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/EchartsTimeseries.tsx
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/EchartsTimeseries.tsx
@@ -57,6 +57,7 @@ export default function EchartsTimeseries({
   refs,
   emitCrossFilters,
   coltypeMapping,
+  onLegendScroll,
 }: TimeseriesChartTransformedProps) {
   const { stack } = formData;
   const echartRef = useRef<EchartsHandler | null>(null);
@@ -159,6 +160,9 @@ export default function EchartsTimeseries({
     mouseover: params => {
       onFocusedSeries(params.seriesName);
     },
+    legendscroll: payload => {
+      onLegendScroll?.(payload.scrollDataIndex);
+    },
     legendselectchanged: payload => {
       onLegendStateChanged?.(payload.selected);
     },
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Bar/controlPanel.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Bar/controlPanel.tsx
index 3c61cab8093..b83844abfe0 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Bar/controlPanel.tsx
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Bar/controlPanel.tsx
@@ -38,6 +38,7 @@ import {
   truncateXAxis,
   xAxisBounds,
   xAxisLabelRotation,
+  xAxisLabelInterval,
 } from '../../../controls';
 
 import { OrientationType } from '../../types';
@@ -47,14 +48,8 @@ import {
 } from '../../constants';
 import { StackControlsValue } from '../../../constants';
 
-const {
-  logAxis,
-  minorSplitLine,
-  truncateYAxis,
-  yAxisBounds,
-  zoomable,
-  orientation,
-} = DEFAULT_FORM_DATA;
+const { logAxis, minorSplitLine, truncateYAxis, yAxisBounds, orientation } =
+  DEFAULT_FORM_DATA;
 
 function createAxisTitleControl(axis: 'x' | 'y'): ControlSetRow[] {
   const isXAxis = axis === 'x';
@@ -71,7 +66,6 @@ function createAxisTitleControl(axis: 'x' | 'y'): ControlSetRow[] {
           label: t('Axis Title'),
           renderTrigger: true,
           default: '',
-          description: t('Changing this control takes effect instantly'),
           visibility: ({ controls }: ControlPanelsContainerProps) =>
             isXAxis ? isVertical(controls) : isHorizontal(controls),
           disableStash: true,
@@ -90,7 +84,6 @@ function createAxisTitleControl(axis: 'x' | 'y'): ControlSetRow[] {
           renderTrigger: true,
           default: sections.TITLE_MARGIN_OPTIONS[0],
           choices: formatSelectOptions(sections.TITLE_MARGIN_OPTIONS),
-          description: t('Changing this control takes effect instantly'),
           visibility: ({ controls }: ControlPanelsContainerProps) =>
             isXAxis ? isVertical(controls) : isHorizontal(controls),
           disableStash: true,
@@ -106,7 +99,6 @@ function createAxisTitleControl(axis: 'x' | 'y'): ControlSetRow[] {
           label: t('Axis Title'),
           renderTrigger: true,
           default: '',
-          description: t('Changing this control takes effect instantly'),
           visibility: ({ controls }: ControlPanelsContainerProps) =>
             isXAxis ? isHorizontal(controls) : isVertical(controls),
           disableStash: true,
@@ -125,7 +117,6 @@ function createAxisTitleControl(axis: 'x' | 'y'): ControlSetRow[] {
           renderTrigger: true,
           default: sections.TITLE_MARGIN_OPTIONS[1],
           choices: formatSelectOptions(sections.TITLE_MARGIN_OPTIONS),
-          description: t('Changing this control takes effect instantly'),
           visibility: ({ controls }: ControlPanelsContainerProps) =>
             isXAxis ? isHorizontal(controls) : isVertical(controls),
           disableStash: true,
@@ -144,7 +135,6 @@ function createAxisTitleControl(axis: 'x' | 'y'): ControlSetRow[] {
           renderTrigger: true,
           default: sections.TITLE_POSITION_OPTIONS[0][0],
           choices: sections.TITLE_POSITION_OPTIONS,
-          description: t('Changing this control takes effect instantly'),
           visibility: ({ controls }: ControlPanelsContainerProps) =>
             isXAxis ? isHorizontal(controls) : isVertical(controls),
           disableStash: true,
@@ -188,6 +178,18 @@ function createAxisControl(axis: 'x' | 'y'): ControlSetRow[] {
         },
       },
     ],
+    [
+      {
+        name: xAxisLabelInterval.name,
+        config: {
+          ...xAxisLabelInterval.config,
+          visibility: ({ controls }: ControlPanelsContainerProps) =>
+            isXAxis ? isVertical(controls) : isHorizontal(controls),
+          disableStash: true,
+          resetOnHide: false,
+        },
+      },
+    ],
     [
       {
         name: 'y_axis_format',
@@ -355,18 +357,7 @@ const config: ControlPanelConfig = {
           },
         ],
         [minorTicks],
-        [
-          {
-            name: 'zoomable',
-            config: {
-              type: 'CheckboxControl',
-              label: t('Data Zoom'),
-              default: zoomable,
-              renderTrigger: true,
-              description: t('Enable data zooming controls'),
-            },
-          },
-        ],
+        ['zoomable'],
         ...legendSection,
         [<ControlSubSectionHeader>{t('X Axis')}</ControlSubSectionHeader>],
         ...createAxisControl('x'),
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Line/controlPanel.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Line/controlPanel.tsx
index 8bf40c06c82..2553fe48d39 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Line/controlPanel.tsx
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Line/controlPanel.tsx
@@ -41,6 +41,7 @@ import {
   truncateXAxis,
   xAxisBounds,
   xAxisLabelRotation,
+  xAxisLabelInterval,
 } from '../../../controls';
 
 const {
@@ -54,7 +55,6 @@ const {
   seriesType,
   truncateYAxis,
   yAxisBounds,
-  zoomable,
 } = DEFAULT_FORM_DATA;
 const config: ControlPanelConfig = {
   controlPanelSections: [
@@ -157,18 +157,7 @@ const config: ControlPanelConfig = {
             },
           },
         ],
-        [
-          {
-            name: 'zoomable',
-            config: {
-              type: 'CheckboxControl',
-              label: t('Data Zoom'),
-              default: zoomable,
-              renderTrigger: true,
-              description: t('Enable data zooming controls'),
-            },
-          },
-        ],
+        ['zoomable'],
         [minorTicks],
         ...legendSection,
         [<ControlSubSectionHeader>{t('X Axis')}</ControlSubSectionHeader>],
@@ -183,6 +172,7 @@ const config: ControlPanelConfig = {
           },
         ],
         [xAxisLabelRotation],
+        [xAxisLabelInterval],
         ...richTooltipSection,
         // eslint-disable-next-line react/jsx-key
         [<ControlSubSectionHeader>{t('Y Axis')}</ControlSubSectionHeader>],
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/controlPanel.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/controlPanel.tsx
index c5bbe03ffb9..b9bca7ca5c5 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/controlPanel.tsx
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/controlPanel.tsx
@@ -40,6 +40,7 @@ import {
   truncateXAxis,
   xAxisBounds,
   xAxisLabelRotation,
+  xAxisLabelInterval,
 } from '../../../controls';
 
 const {
@@ -50,7 +51,6 @@ const {
   rowLimit,
   truncateYAxis,
   yAxisBounds,
-  zoomable,
 } = DEFAULT_FORM_DATA;
 const config: ControlPanelConfig = {
   controlPanelSections: [
@@ -99,18 +99,7 @@ const config: ControlPanelConfig = {
             },
           },
         ],
-        [
-          {
-            name: 'zoomable',
-            config: {
-              type: 'CheckboxControl',
-              label: t('Data Zoom'),
-              default: zoomable,
-              renderTrigger: true,
-              description: t('Enable data zooming controls'),
-            },
-          },
-        ],
+        ['zoomable'],
         [minorTicks],
         ...legendSection,
         [<ControlSubSectionHeader>{t('X Axis')}</ControlSubSectionHeader>],
@@ -126,6 +115,7 @@ const config: ControlPanelConfig = {
           },
         ],
         [xAxisLabelRotation],
+        [xAxisLabelInterval],
         // eslint-disable-next-line react/jsx-key
         ...richTooltipSection,
         // eslint-disable-next-line react/jsx-key
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/SmoothLine/controlPanel.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/SmoothLine/controlPanel.tsx
index 3275fad1587..d25fbbd5669 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/SmoothLine/controlPanel.tsx
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/SmoothLine/controlPanel.tsx
@@ -40,6 +40,7 @@ import {
   truncateXAxis,
   xAxisBounds,
   xAxisLabelRotation,
+  xAxisLabelInterval,
 } from '../../../controls';
 
 const {
@@ -50,7 +51,6 @@ const {
   rowLimit,
   truncateYAxis,
   yAxisBounds,
-  zoomable,
 } = DEFAULT_FORM_DATA;
 const config: ControlPanelConfig = {
   controlPanelSections: [
@@ -99,18 +99,7 @@ const config: ControlPanelConfig = {
             },
           },
         ],
-        [
-          {
-            name: 'zoomable',
-            config: {
-              type: 'CheckboxControl',
-              label: t('Data Zoom'),
-              default: zoomable,
-              renderTrigger: true,
-              description: t('Enable data zooming controls'),
-            },
-          },
-        ],
+        ['zoomable'],
         [minorTicks],
         ...legendSection,
         [<ControlSubSectionHeader>{t('X Axis')}</ControlSubSectionHeader>],
@@ -125,6 +114,7 @@ const config: ControlPanelConfig = {
           },
         ],
         [xAxisLabelRotation],
+        [xAxisLabelInterval],
         // eslint-disable-next-line react/jsx-key
         ...richTooltipSection,
         // eslint-disable-next-line react/jsx-key
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/controlPanel.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/controlPanel.tsx
index 5956d2efe19..a59ec06b34d 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/controlPanel.tsx
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/controlPanel.tsx
@@ -38,6 +38,7 @@ import {
   truncateXAxis,
   xAxisBounds,
   xAxisLabelRotation,
+  xAxisLabelInterval,
 } from '../../controls';
 
 const {
@@ -50,7 +51,6 @@ const {
   rowLimit,
   truncateYAxis,
   yAxisBounds,
-  zoomable,
 } = DEFAULT_FORM_DATA;
 const config: ControlPanelConfig = {
   controlPanelSections: [
@@ -151,18 +151,7 @@ const config: ControlPanelConfig = {
             },
           },
         ],
-        [
-          {
-            name: 'zoomable',
-            config: {
-              type: 'CheckboxControl',
-              label: t('Data Zoom'),
-              default: zoomable,
-              renderTrigger: true,
-              description: t('Enable data zooming controls'),
-            },
-          },
-        ],
+        ['zoomable'],
         [minorTicks],
         ...legendSection,
         [<ControlSubSectionHeader>{t('X Axis')}</ControlSubSectionHeader>],
@@ -177,6 +166,7 @@ const config: ControlPanelConfig = {
           },
         ],
         [xAxisLabelRotation],
+        [xAxisLabelInterval],
         ...richTooltipSection,
         // eslint-disable-next-line react/jsx-key
         [<ControlSubSectionHeader>{t('Y Axis')}</ControlSubSectionHeader>],
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts
index fcdbc52468b..99d2c57101a 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts
@@ -17,10 +17,7 @@
  * under the License.
  */
 import { AnnotationType, Behavior, t } from '@superset-ui/core';
-import {
-  EchartsTimeseriesChartProps,
-  EchartsTimeseriesFormData,
-} from '@superset-ui/plugin-chart-echarts';
+import { EchartsTimeseriesChartProps, EchartsTimeseriesFormData } from '../..';
 import buildQuery from '../buildQuery';
 import controlPanel from './controlPanel';
 import transformProps from '../transformProps';
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/constants.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/constants.ts
index 32e8d876aa5..e7e3034a5f1 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/constants.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/constants.ts
@@ -78,6 +78,7 @@ export const DEFAULT_FORM_DATA: EchartsTimeseriesFormData = {
   richTooltip: true,
   xAxisForceCategorical: false,
   xAxisLabelRotation: defaultXAxis.xAxisLabelRotation,
+  xAxisLabelInterval: defaultXAxis.xAxisLabelInterval,
   groupby: [],
   showValue: false,
   onlyTotal: false,
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts
index ac39507964d..8aa294106fb 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts
@@ -122,6 +122,7 @@ export default function transformProps(
     theme,
     inContextMenu,
     emitCrossFilters,
+    legendIndex,
   } = chartProps;
 
   let focusedSeries: string | null = null;
@@ -179,6 +180,7 @@ export default function transformProps(
     xAxisBounds,
     xAxisForceCategorical,
     xAxisLabelRotation,
+    xAxisLabelInterval,
     xAxisSort,
     xAxisSortAsc,
     xAxisTimeFormat,
@@ -466,6 +468,7 @@ export default function transformProps(
     setControlValue = () => {},
     onContextMenu,
     onLegendStateChanged,
+    onLegendScroll,
   } = hooks;
 
   const addYAxisLabelOffset = !!yAxisTitle;
@@ -501,6 +504,7 @@ export default function transformProps(
       hideOverlap: true,
       formatter: xAxisFormatter,
       rotate: xAxisLabelRotation,
+      interval: xAxisLabelInterval,
     },
     minorTick: { show: minorTicks },
     minInterval:
@@ -640,6 +644,7 @@ export default function transformProps(
         legendState,
         padding,
       ),
+      scrollDataIndex: legendIndex || 0,
       data: legendData as string[],
     },
     series: dedupSeries(reorderForecastSeries(series) as SeriesOption[]),
@@ -685,7 +690,6 @@ export default function transformProps(
   const onFocusedSeries = (seriesName: string | null) => {
     focusedSeries = seriesName;
   };
-
   return {
     echartOptions,
     emitCrossFilters,
@@ -708,5 +712,6 @@ export default function transformProps(
     },
     refs,
     coltypeMapping: dataTypes,
+    onLegendScroll,
   };
 }
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformers.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformers.ts
index 0abefc95e3d..01acf1ff7af 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformers.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformers.ts
@@ -171,7 +171,7 @@ export function transformSeries(
     timeShiftColor?: boolean;
   },
 ): SeriesOption | undefined {
-  const { name } = series;
+  const { name, data } = series;
   const {
     area,
     connectNulls,
@@ -290,6 +290,9 @@ export function transformSeries(
       : { ...opts.lineStyle, opacity };
   return {
     ...series,
+    ...(Array.isArray(data) && seriesType === 'bar' && !stack
+      ? { data: transformNegativeLabelsPosition(series, isHorizontal) }
+      : null),
     connectNulls,
     queryIndex,
     yAxisIndex,
@@ -627,3 +630,30 @@ export function getPadding(
     isHorizontal,
   );
 }
+
+export function transformNegativeLabelsPosition(
+  series: SeriesOption,
+  isHorizontal: boolean,
+): TimeseriesDataRecord[] {
+  /*
+   * Adjusts label position for negative values in bar series
+   * @param series - Array of series options
+   * @param isHorizontal - Whether chart is horizontal
+   * @returns data with adjusted label positions for negative values
+   */
+  const transformValue = (value: any) => {
+    const [xValue, yValue] = Array.isArray(value) ? value : [null, null];
+    const axisValue = isHorizontal ? xValue : yValue;
+
+    return axisValue < 0
+      ? {
+          value,
+          label: {
+            position: 'outside',
+          },
+        }
+      : value;
+  };
+
+  return (series.data as TimeseriesDataRecord[]).map(transformValue);
+}
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/types.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/types.ts
index bdcb736956c..76f8b6387f9 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/types.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/types.ts
@@ -90,6 +90,7 @@ export type EchartsTimeseriesFormData = QueryFormData & {
   zoomable: boolean;
   richTooltip: boolean;
   xAxisLabelRotation: number;
+  xAxisLabelInterval: number | string;
   showValue: boolean;
   onlyTotal: boolean;
   showExtraControls: boolean;
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Tree/constants.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Tree/constants.ts
index 79cea342a2c..38c3eb94984 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Tree/constants.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Tree/constants.ts
@@ -27,7 +27,6 @@ export const DEFAULT_TREE_SERIES_OPTION: TreeSeriesOption = {
   animation: true,
   animationDuration: 500,
   animationEasing: 'cubicOut',
-  lineStyle: { color: 'source', width: 1.5 },
 };
 
 export const DEFAULT_FORM_DATA: Partial<EchartsTreeFormData> = {
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Tree/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Tree/transformProps.ts
index e0dc20ff542..7b8aefee52f 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Tree/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Tree/transformProps.ts
@@ -20,6 +20,7 @@ import {
   getMetricLabel,
   DataRecordValue,
   tooltipHtml,
+  themeObject,
 } from '@superset-ui/core';
 import type { EChartsCoreOption } from 'echarts/core';
 import type { TreeSeriesOption } from 'echarts/charts';
@@ -181,7 +182,7 @@ export default function transformProps(
       }
     });
   }
-
+  const { theme } = themeObject;
   const series: TreeSeriesOption[] = [
     {
       type: 'tree',
@@ -189,6 +190,7 @@ export default function transformProps(
       label: {
         ...DEFAULT_TREE_SERIES_OPTION.label,
         position: nodeLabelPosition,
+        color: theme.colorText,
       },
       emphasis: { focus: emphasis },
       animation: DEFAULT_TREE_SERIES_OPTION.animation,
@@ -197,7 +199,10 @@ export default function transformProps(
       symbol,
       roam,
       symbolSize,
-      lineStyle: DEFAULT_TREE_SERIES_OPTION.lineStyle,
+      lineStyle: {
+        color: theme.colorText,
+        width: 1.5,
+      },
       select: DEFAULT_TREE_SERIES_OPTION.select,
       leaves: { label: { position: childLabelPosition } },
     },
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Treemap/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Treemap/transformProps.ts
index 70755574fba..5ed0c565c3c 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Treemap/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Treemap/transformProps.ts
@@ -45,7 +45,6 @@ import {
   GAP_WIDTH,
   LABEL_FONTSIZE,
   extractTreePathInfo,
-  BORDER_COLOR,
 } from './constants';
 import { OpacityEnum } from '../constants';
 import { getDefaultTooltip } from '../utils/tooltip';
@@ -124,6 +123,7 @@ export default function transformProps(
   const { columnFormats = {}, currencyFormats = {} } = datasource;
   const { setDataMask = () => {}, onContextMenu } = hooks;
   const coltypeMapping = getColtypesMapping(queriesData[0]);
+  const BORDER_COLOR = theme.colorBgBase;
 
   const {
     colorScheme,
@@ -163,6 +163,11 @@ export default function transformProps(
   const metricLabel = getMetricLabel(metric);
   const groupbyLabels = groupby.map(getColumnLabel);
   const treeData = treeBuilder(data, groupbyLabels, metricLabel);
+  const labelProps = {
+    color: theme.colorText,
+    borderColor: theme.colorBgBase,
+    borderWidth: 1,
+  };
   const traverse = (treeNodes: TreeNode[], path: string[]) =>
     treeNodes.map(treeNode => {
       const { name: nodeName, value, groupBy } = treeNode;
@@ -201,9 +206,12 @@ export default function transformProps(
             ...item,
             itemStyle: {
               colorAlpha: OpacityEnum.SemiTransparent,
+              color: theme.colorText,
+              borderColor: theme.colorBgBase,
+              borderWidth: 2,
             },
             label: {
-              color: `rgba(0, 0, 0, ${OpacityEnum.SemiTransparent})`,
+              ...labelProps,
             },
           };
         }
@@ -238,7 +246,7 @@ export default function transformProps(
         show: false,
       },
       itemStyle: {
-        color: theme.colors.primary.base,
+        color: theme.colorPrimary,
       },
     },
   ];
@@ -256,18 +264,20 @@ export default function transformProps(
       },
       emphasis: {
         label: {
+          ...labelProps,
           show: true,
         },
       },
       levels,
       label: {
+        ...labelProps,
         show: showLabels,
         position: labelPosition,
         formatter,
-        color: theme.colors.grayscale.dark2,
         fontSize: LABEL_FONTSIZE,
       },
       upperLabel: {
+        ...labelProps,
         show: showUpperLabels,
         formatter,
         textBorderColor: 'transparent',
@@ -290,7 +300,6 @@ export default function transformProps(
     },
     series,
   };
-
   return {
     formData,
     width,
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Waterfall/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Waterfall/transformProps.ts
index ab21e7b37cc..e2fc17e2398 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Waterfall/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Waterfall/transformProps.ts
@@ -355,7 +355,13 @@ export default function transformProps(
       disabled: true,
     },
   };
-
+  const labelProps = {
+    show: showValue,
+    formatter: seriesformatter,
+    color: theme.colorText,
+    borderColor: theme.colorBgBase,
+    borderWidth: 1,
+  };
   const barSeries: BarSeriesOption[] = [
     {
       ...seriesProps,
@@ -366,9 +372,8 @@ export default function transformProps(
       ...seriesProps,
       name: LEGEND.INCREASE,
       label: {
-        show: showValue,
+        ...labelProps,
         position: 'top',
-        formatter: seriesformatter,
       },
       itemStyle: {
         color: rgbToHex(increaseColor.r, increaseColor.g, increaseColor.b),
@@ -379,9 +384,8 @@ export default function transformProps(
       ...seriesProps,
       name: LEGEND.DECREASE,
       label: {
-        show: showValue,
+        ...labelProps,
         position: 'bottom',
-        formatter: seriesformatter,
       },
       itemStyle: {
         color: rgbToHex(decreaseColor.r, decreaseColor.g, decreaseColor.b),
@@ -392,9 +396,8 @@ export default function transformProps(
       ...seriesProps,
       name: LEGEND.TOTAL,
       label: {
-        show: showValue,
+        ...labelProps,
         position: 'top',
-        formatter: seriesformatter,
       },
       itemStyle: {
         color: rgbToHex(totalColor.r, totalColor.g, totalColor.b),
@@ -406,10 +409,10 @@ export default function transformProps(
   const echartOptions: EChartsOption = {
     grid: {
       ...defaultGrid,
-      top: theme.gridUnit * 7,
-      bottom: theme.gridUnit * 7,
-      left: theme.gridUnit * 5,
-      right: theme.gridUnit * 7,
+      top: theme.sizeUnit * 7,
+      bottom: theme.sizeUnit * 7,
+      left: theme.sizeUnit * 5,
+      right: theme.sizeUnit * 7,
     },
     legend: {
       show: showLegend,
@@ -421,7 +424,7 @@ export default function transformProps(
       type: 'category',
       name: xAxisLabel,
       nameTextStyle: {
-        padding: [theme.gridUnit * 4, 0, 0, 0],
+        padding: [theme.sizeUnit * 4, 0, 0, 0],
       },
       nameLocation: 'middle',
       axisLabel,
@@ -430,7 +433,7 @@ export default function transformProps(
       ...defaultYAxis,
       type: 'value',
       nameTextStyle: {
-        padding: [0, 0, theme.gridUnit * 5, 0],
+        padding: [0, 0, theme.sizeUnit * 5, 0],
       },
       nameLocation: 'middle',
       name: yAxisLabel,
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/components/Echart.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/components/Echart.tsx
index e93327a696f..e05975ac497 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/components/Echart.tsx
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/components/Echart.tsx
@@ -27,10 +27,11 @@ import {
   Ref,
   useState,
 } from 'react';
+import { merge } from 'lodash';
 
 import { useSelector } from 'react-redux';
 
-import { styled } from '@superset-ui/core';
+import { styled, themeObject } from '@superset-ui/core';
 import { use, init, EChartsType, registerLocale } from 'echarts/core';
 import {
   SankeyChart,
@@ -47,10 +48,12 @@ import {
   TreemapChart,
   HeatmapChart,
   SunburstChart,
+  CustomChart,
 } from 'echarts/charts';
 import { CanvasRenderer } from 'echarts/renderers';
 import {
   TooltipComponent,
+  TitleComponent,
   GridComponent,
   VisualMapComponent,
   LegendComponent,
@@ -82,6 +85,7 @@ use([
   CanvasRenderer,
   BarChart,
   BoxplotChart,
+  CustomChart,
   FunnelChart,
   GaugeChart,
   GraphChart,
@@ -103,6 +107,7 @@ use([
   LegendComponent,
   ToolboxComponent,
   TooltipComponent,
+  TitleComponent,
   VisualMapComponent,
   LabelLayout,
 ]);
@@ -117,6 +122,45 @@ const loadLocale = async (locale: string) => {
   return lang?.default;
 };
 
+const getTheme = (options: any) => {
+  const token = themeObject.theme;
+  const theme = {
+    textStyle: {
+      color: token.colorText,
+      fontFamily: token.fontFamily,
+    },
+    title: {
+      textStyle: { color: token.colorText },
+    },
+    legend: {
+      textStyle: { color: token.colorTextSecondary },
+    },
+    tooltip: {
+      backgroundColor: token.colorBgContainer,
+      textStyle: { color: token.colorText },
+    },
+    axisPointer: {
+      lineStyle: { color: token.colorPrimary },
+      label: { color: token.colorText },
+    },
+  } as any;
+  if (options?.xAxis) {
+    theme.xAxis = {
+      axisLine: { lineStyle: { color: token.colorSplit } },
+      axisLabel: { color: token.colorTextSecondary },
+      splitLine: { lineStyle: { color: token.colorSplit } },
+    };
+  }
+  if (options?.yAxis) {
+    theme.yAxis = {
+      axisLine: { lineStyle: { color: token.colorSplit } },
+      axisLabel: { color: token.colorTextSecondary },
+      splitLine: { lineStyle: { color: token.colorSplit } },
+    };
+  }
+  return theme;
+};
+
 function Echart(
   {
     width,
@@ -184,7 +228,12 @@ function Echart(
         chartRef.current?.getZr().on(name, handler);
       });
 
-      chartRef.current?.setOption(echartOptions, true);
+      const themedEchartOptions = merge(
+        {},
+        getTheme(echartOptions),
+        echartOptions,
+      );
+      chartRef.current?.setOption(themedEchartOptions, true);
 
       // did mount
       handleSizeChange({ width, height });
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/controls.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/controls.tsx
index 5c52bb1762c..088d5b7ba06 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/controls.tsx
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/controls.tsx
@@ -22,6 +22,7 @@ import {
   ControlSetItem,
   ControlSetRow,
   ControlSubSectionHeader,
+  CustomControlItem,
   DEFAULT_SORT_SERIES_DATA,
   SORT_SERIES_CHOICES,
   sharedControls,
@@ -185,7 +186,7 @@ const richTooltipControl: ControlSetItem = {
   },
 };
 
-const tooltipTimeFormatControl: ControlSetItem = {
+export const tooltipTimeFormatControl: ControlSetItem = {
   name: 'tooltipTimeFormat',
   config: {
     ...sharedControls.x_axis_time_format,
@@ -195,6 +196,15 @@ const tooltipTimeFormatControl: ControlSetItem = {
   },
 };
 
+export const tooltipValuesFormatControl: CustomControlItem = {
+  name: 'tooltipValuesFormat',
+  config: {
+    ...sharedControls.y_axis_format,
+    label: t('Number format'),
+    clearable: false,
+  },
+};
+
 const tooltipSortByMetricControl: ControlSetItem = {
   name: 'tooltipSortByMetric',
   config: {
@@ -292,6 +302,23 @@ export const xAxisLabelRotation = {
   },
 };
 
+export const xAxisLabelInterval = {
+  name: 'xAxisLabelInterval',
+  config: {
+    type: 'SelectControl',
+    freeForm: false,
+    clearable: false,
+    label: t('X Axis Label Interval'),
+    choices: [
+      ['auto', t('Auto')],
+      ['0', t('All')],
+    ],
+    default: defaultXAxis.xAxisLabelInterval,
+    renderTrigger: true,
+    description: t('Choose how many X-Axis labels to show'),
+  },
+};
+
 export const seriesOrderSection: ControlSetRow[] = [
   [<ControlSubSectionHeader>{t('Series Order')}</ControlSubSectionHeader>],
   [sortSeriesType],
@@ -350,3 +377,13 @@ export const forceCategorical: ControlSetItem = {
     description: t('Make the x-axis categorical'),
   },
 };
+
+export const showExtraControls: CustomControlItem = {
+  name: 'show_extra_controls',
+  config: {
+    type: 'CheckboxControl',
+    label: t('Extra Controls'),
+    renderTrigger: true,
+    default: false,
+  },
+};
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/defaults.ts b/superset-frontend/plugins/plugin-chart-echarts/src/defaults.ts
index be37d6fcbf7..798e785f059 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/defaults.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/defaults.ts
@@ -29,6 +29,7 @@ export const defaultYAxis = {
 
 export const defaultXAxis = {
   xAxisLabelRotation: 0,
+  xAxisLabelInterval: 'auto',
 };
 
 export const defaultLegendPadding = {
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/index.ts b/superset-frontend/plugins/plugin-chart-echarts/src/index.ts
index 5c3c3e4c7f1..14fcb1eb450 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/index.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/index.ts
@@ -43,6 +43,7 @@ export { default as EchartsSunburstChartPlugin } from './Sunburst';
 export { default as EchartsBubbleChartPlugin } from './Bubble';
 export { default as EchartsSankeyChartPlugin } from './Sankey';
 export { default as EchartsWaterfallChartPlugin } from './Waterfall';
+export { default as EchartsGanttChartPlugin } from './Gantt';
 
 export { default as BoxPlotTransformProps } from './BoxPlot/transformProps';
 export { default as FunnelTransformProps } from './Funnel/transformProps';
@@ -60,6 +61,7 @@ export { default as BubbleTransformProps } from './Bubble/transformProps';
 export { default as WaterfallTransformProps } from './Waterfall/transformProps';
 export { default as HistogramTransformProps } from './Histogram/transformProps';
 export { default as SankeyTransformProps } from './Sankey/transformProps';
+export { default as GanttTransformProps } from './Gantt/transformProps';
 
 export { DEFAULT_FORM_DATA as TimeseriesDefaultFormData } from './Timeseries/constants';
 
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/types.ts b/superset-frontend/plugins/plugin-chart-echarts/src/types.ts
index 294437c7454..1a45714b3c8 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/types.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/types.ts
@@ -138,6 +138,7 @@ export interface BaseTransformedProps<F> {
   width: number;
   emitCrossFilters?: boolean;
   coltypeMapping?: Record<string, number>;
+  onLegendScroll?: (currentIndex: number) => void;
 }
 
 export type CrossFilterTransformedProps = {
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/utils/series.ts b/superset-frontend/plugins/plugin-chart-echarts/src/utils/series.ts
index 157ab46f483..4e3a1bd74e2 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/utils/series.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/utils/series.ts
@@ -444,10 +444,10 @@ export function getLegendProps(
     selected: legendState,
     selector: ['all', 'inverse'],
     selectorLabel: {
-      fontFamily: theme.typography.families.sansSerif,
-      fontSize: theme.typography.sizes.s,
-      color: theme.colors.grayscale.base,
-      borderColor: theme.colors.grayscale.base,
+      fontFamily: theme.fontFamily,
+      fontSize: theme.fontSizeSM,
+      color: theme.colorText,
+      borderColor: theme.colorBorder,
     },
   };
   const MIN_LEGEND_WIDTH = 0;
@@ -685,3 +685,20 @@ export function extractTooltipKeys(
   }
   return [forecastValue[0][TOOLTIP_SERIES_KEY]];
 }
+
+export function groupData(data: DataRecord[], by?: string | null) {
+  const seriesMap: Map<DataRecordValue | undefined, DataRecord[]> = new Map();
+  if (by) {
+    data.forEach(datum => {
+      const value = seriesMap.get(datum[by]);
+      if (value) {
+        value.push(datum);
+      } else {
+        seriesMap.set(datum[by], [datum]);
+      }
+    });
+  } else {
+    seriesMap.set(undefined, data);
+  }
+  return seriesMap;
+}
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/utils/tooltip.ts b/superset-frontend/plugins/plugin-chart-echarts/src/utils/tooltip.ts
index e630f1142ff..f3de48b16e9 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/utils/tooltip.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/utils/tooltip.ts
@@ -18,6 +18,12 @@
  */
 
 import type { CallbackDataParams } from 'echarts/types/src/util/types';
+import {
+  QueryFormColumn,
+  QueryFormMetric,
+  getColumnLabel,
+  getMetricLabel,
+} from '@superset-ui/core';
 import { TOOLTIP_OVERFLOW_MARGIN, TOOLTIP_POINTER_MARGIN } from '../constants';
 import { Refs } from '../types';
 
@@ -80,3 +86,16 @@ export function getDefaultTooltip(refs: Refs) {
     },
   };
 }
+
+export function getTooltipLabels({
+  tooltipMetrics,
+  tooltipColumns,
+}: {
+  tooltipMetrics?: QueryFormMetric[];
+  tooltipColumns?: QueryFormColumn[];
+}) {
+  return [
+    ...(tooltipMetrics ?? []).map(v => getMetricLabel(v)),
+    ...(tooltipColumns ?? []).map(v => getColumnLabel(v)),
+  ];
+}
diff --git a/superset-frontend/plugins/plugin-chart-echarts/test/Gantt/buildQuery.test.ts b/superset-frontend/plugins/plugin-chart-echarts/test/Gantt/buildQuery.test.ts
new file mode 100644
index 00000000000..cae9de79bb8
--- /dev/null
+++ b/superset-frontend/plugins/plugin-chart-echarts/test/Gantt/buildQuery.test.ts
@@ -0,0 +1,64 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { QueryFormData } from '@superset-ui/core';
+import buildQuery from '../../src/Gantt/buildQuery';
+
+describe('Gantt buildQuery', () => {
+  const formData: QueryFormData = {
+    datasource: '1__table',
+    viz_type: 'gantt_chart',
+    start_time: 'start_time',
+    end_time: 'end_time',
+    y_axis: {
+      label: 'Y Axis',
+      sqlExpression: 'SELECT 1',
+      expressionType: 'SQL',
+    },
+    series: 'series',
+    tooltip_metrics: ['tooltip_metric'],
+    tooltip_columns: ['tooltip_column'],
+    order_by_cols: [
+      JSON.stringify(['start_time', true]),
+      JSON.stringify(['order_col', false]),
+    ],
+  };
+
+  it('should build query', () => {
+    const queryContext = buildQuery(formData);
+    const [query] = queryContext.queries;
+    expect(query.metrics).toStrictEqual(['tooltip_metric']);
+    expect(query.columns).toStrictEqual([
+      'start_time',
+      'end_time',
+      {
+        label: 'Y Axis',
+        sqlExpression: 'SELECT 1',
+        expressionType: 'SQL',
+      },
+      'series',
+      'tooltip_column',
+      'order_col',
+    ]);
+    expect(query.series_columns).toStrictEqual(['series']);
+    expect(query.orderby).toStrictEqual([
+      ['start_time', true],
+      ['order_col', false],
+    ]);
+  });
+});
diff --git a/superset-frontend/plugins/plugin-chart-echarts/test/Gantt/transformProps.test.ts b/superset-frontend/plugins/plugin-chart-echarts/test/Gantt/transformProps.test.ts
new file mode 100644
index 00000000000..47f929f15a2
--- /dev/null
+++ b/superset-frontend/plugins/plugin-chart-echarts/test/Gantt/transformProps.test.ts
@@ -0,0 +1,269 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { AxisType, ChartProps, supersetTheme } from '@superset-ui/core';
+import {
+  LegendOrientation,
+  LegendType,
+} from '@superset-ui/plugin-chart-echarts';
+import transformProps from '../../src/Gantt/transformProps';
+import {
+  EchartsGanttChartProps,
+  EchartsGanttFormData,
+} from '../../src/Gantt/types';
+
+describe('Gantt transformProps', () => {
+  const formData: EchartsGanttFormData = {
+    viz_type: 'gantt_chart',
+    datasource: '1__table',
+
+    startTime: 'startTime',
+    endTime: 'endTime',
+    yAxis: {
+      label: 'Y Axis',
+      sqlExpression: 'y_axis',
+      expressionType: 'SQL',
+    },
+    tooltipMetrics: ['tooltip_metric'],
+    tooltipColumns: ['tooltip_column'],
+    series: 'series',
+    xAxisTimeFormat: '%H:%M',
+    tooltipTimeFormat: '%H:%M',
+    tooltipValuesFormat: 'DURATION_SEC',
+    colorScheme: 'bnbColors',
+    zoomable: true,
+    xAxisTitleMargin: undefined,
+    yAxisTitleMargin: undefined,
+    xAxisTimeBounds: [null, '19:00:00'],
+    subcategories: true,
+    legendMargin: 0,
+    legendOrientation: LegendOrientation.Top,
+    legendType: LegendType.Scroll,
+    showLegend: true,
+    sortSeriesAscending: true,
+  };
+  const queriesData = [
+    {
+      data: [
+        {
+          startTime: Date.UTC(2025, 1, 1, 13, 0, 0),
+          endTime: Date.UTC(2025, 1, 1, 14, 0, 0),
+          'Y Axis': 'first',
+          tooltip_column: 'tooltip value 1',
+          series: 'series value 1',
+        },
+        {
+          startTime: Date.UTC(2025, 1, 1, 18, 0, 0),
+          endTime: Date.UTC(2025, 1, 1, 20, 0, 0),
+          'Y Axis': 'second',
+          tooltip_column: 'tooltip value 2',
+          series: 'series value 2',
+        },
+      ],
+      colnames: ['startTime', 'endTime', 'Y Axis', 'tooltip_column', 'series'],
+    },
+  ];
+  const chartPropsConfig = {
+    formData,
+    queriesData,
+    theme: supersetTheme,
+  };
+
+  it('should transform chart props', () => {
+    const chartProps = new ChartProps(chartPropsConfig);
+    const transformedProps = transformProps(
+      chartProps as EchartsGanttChartProps,
+    );
+
+    expect(transformedProps.echartOptions.series).toHaveLength(4);
+    const series = transformedProps.echartOptions.series as any[];
+    const series0 = series[0];
+    const series1 = series[1];
+
+    // exclude renderItem because it can't be serialized
+    expect(typeof series0.renderItem).toBe('function');
+    delete series0.renderItem;
+    expect(typeof series1.renderItem).toBe('function');
+    delete series1.renderItem;
+    delete transformedProps.echartOptions.series;
+
+    expect(transformedProps).toEqual(
+      expect.objectContaining({
+        echartOptions: expect.objectContaining({
+          useUTC: true,
+          xAxis: {
+            name: '',
+            nameGap: 0,
+            nameLocation: 'middle',
+            max: Date.UTC(2025, 1, 1, 19, 0, 0),
+            min: undefined,
+            type: AxisType.Time,
+            axisLabel: {
+              hideOverlap: true,
+              formatter: expect.anything(),
+            },
+          },
+          yAxis: {
+            name: '',
+            nameGap: 0,
+            nameLocation: 'middle',
+            type: AxisType.Value,
+            // always 0
+            min: 0,
+            // equals unique categories count
+            max: 2,
+            axisLabel: {
+              show: false,
+            },
+            splitLine: {
+              show: false,
+            },
+          },
+          legend: expect.objectContaining({
+            show: true,
+            type: 'scroll',
+            selector: ['all', 'inverse'],
+          }),
+          tooltip: {
+            formatter: expect.anything(),
+          },
+          dataZoom: [
+            expect.objectContaining({
+              type: 'slider',
+              filterMode: 'none',
+            }),
+          ],
+        }),
+      }),
+    );
+
+    expect(series0).toEqual({
+      name: 'series value 1',
+      type: 'custom',
+      progressive: 0,
+      itemStyle: {
+        color: expect.anything(),
+      },
+      data: [
+        {
+          value: [
+            Date.UTC(2025, 1, 1, 13, 0, 0),
+            Date.UTC(2025, 1, 1, 14, 0, 0),
+            0,
+            2,
+            Date.UTC(2025, 1, 1, 13, 0, 0),
+            Date.UTC(2025, 1, 1, 14, 0, 0),
+            'first',
+            'tooltip value 1',
+            'series value 1',
+          ],
+        },
+      ],
+      dimensions: [
+        'startTime',
+        'endTime',
+        'index',
+        'seriesCount',
+        'startTime',
+        'endTime',
+        'Y Axis',
+        'tooltip_column',
+        'series',
+      ],
+      encode: {
+        x: [0, 1],
+      },
+    });
+
+    expect(series1).toEqual({
+      name: 'series value 2',
+      type: 'custom',
+      progressive: 0,
+      itemStyle: {
+        color: expect.anything(),
+      },
+      data: [
+        {
+          value: [
+            Date.UTC(2025, 1, 1, 18, 0, 0),
+            Date.UTC(2025, 1, 1, 20, 0, 0),
+            1,
+            2,
+            Date.UTC(2025, 1, 1, 18, 0, 0),
+            Date.UTC(2025, 1, 1, 20, 0, 0),
+            'second',
+            'tooltip value 2',
+            'series value 2',
+          ],
+        },
+      ],
+      dimensions: [
+        'startTime',
+        'endTime',
+        'index',
+        'seriesCount',
+        'startTime',
+        'endTime',
+        'Y Axis',
+        'tooltip_column',
+        'series',
+      ],
+      encode: {
+        x: [0, 1],
+      },
+    });
+    expect(series[2]).toEqual({
+      // just for markLines
+      type: 'line',
+      animation: false,
+      markLine: {
+        data: [{ yAxis: 1 }, { yAxis: 0 }],
+        label: {
+          show: false,
+        },
+        silent: true,
+        symbol: ['none', 'none'],
+        lineStyle: {
+          type: 'dashed',
+          color: '#dbe0ea',
+        },
+      },
+    });
+    expect(series[3]).toEqual({
+      type: 'line',
+      animation: false,
+      markLine: {
+        data: [
+          { yAxis: 1.5, name: 'first' },
+          { yAxis: 0.5, name: 'second' },
+        ],
+        label: {
+          show: true,
+          position: 'start',
+          formatter: '{b}',
+        },
+        lineStyle: expect.objectContaining({
+          color: '#00000000',
+          type: 'solid',
+        }),
+        silent: true,
+        symbol: ['none', 'none'],
+      },
+    });
+  });
+});
diff --git a/superset-frontend/plugins/plugin-chart-echarts/test/Gauge/transformProps.test.ts b/superset-frontend/plugins/plugin-chart-echarts/test/Gauge/transformProps.test.ts
index a8b12ed8cc2..a07977af66d 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/test/Gauge/transformProps.test.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/test/Gauge/transformProps.test.ts
@@ -75,35 +75,24 @@ describe('Echarts Gauge transformProps', () => {
     };
 
     const chartProps = new ChartProps(chartPropsConfig);
-    expect(transformProps(chartProps as EchartsGaugeChartProps)).toEqual(
-      expect.objectContaining({
-        width: 800,
-        height: 600,
-        echartOptions: expect.objectContaining({
-          series: expect.arrayContaining([
-            expect.objectContaining({
-              data: [
-                {
-                  value: 16595,
-                  name: '',
-                  itemStyle: {
-                    color: '#1f77b4',
-                  },
-                  title: {
-                    offsetCenter: ['0%', '20%'],
-                    fontSize: 14,
-                  },
-                  detail: {
-                    offsetCenter: ['0%', '32.6%'],
-                    fontSize: 16.8,
-                  },
-                },
-              ],
-            }),
-          ]),
-        }),
-      }),
-    );
+    const result = transformProps(chartProps as EchartsGaugeChartProps);
+
+    // Test core properties
+    expect(result.width).toBe(800);
+    expect(result.height).toBe(600);
+
+    // Test series data
+    const seriesData = (result.echartOptions as any).series[0].data;
+    expect(seriesData).toHaveLength(1);
+    expect(seriesData[0].value).toBe(16595);
+    expect(seriesData[0].name).toBe('');
+    expect(seriesData[0].itemStyle.color).toBe('#1f77b4');
+
+    // Test detail and title positions
+    expect(seriesData[0].title.offsetCenter).toEqual(['0%', '20%']);
+    expect(seriesData[0].title.fontSize).toBe(14);
+    expect(seriesData[0].detail.offsetCenter).toEqual(['0%', '32.6%']);
+    expect(seriesData[0].detail.fontSize).toBe(16.8);
   });
 
   it('should transform chart props for single group by column', () => {
@@ -136,50 +125,33 @@ describe('Echarts Gauge transformProps', () => {
     };
 
     const chartProps = new ChartProps(chartPropsConfig);
-    expect(transformProps(chartProps as EchartsGaugeChartProps)).toEqual(
-      expect.objectContaining({
-        width: 800,
-        height: 600,
-        echartOptions: expect.objectContaining({
-          series: expect.arrayContaining([
-            expect.objectContaining({
-              data: [
-                {
-                  value: 15,
-                  name: 'year: 1988',
-                  itemStyle: {
-                    color: '#1f77b4',
-                  },
-                  title: {
-                    offsetCenter: ['0%', '20%'],
-                    fontSize: 14,
-                  },
-                  detail: {
-                    offsetCenter: ['0%', '32.6%'],
-                    fontSize: 16.8,
-                  },
-                },
-                {
-                  value: 219,
-                  name: 'year: 1995',
-                  itemStyle: {
-                    color: '#ff7f0e',
-                  },
-                  title: {
-                    offsetCenter: ['0%', '48%'],
-                    fontSize: 14,
-                  },
-                  detail: {
-                    offsetCenter: ['0%', '60.6%'],
-                    fontSize: 16.8,
-                  },
-                },
-              ],
-            }),
-          ]),
-        }),
-      }),
-    );
+    const result = transformProps(chartProps as EchartsGaugeChartProps);
+
+    // Test core properties
+    expect(result.width).toBe(800);
+    expect(result.height).toBe(600);
+
+    // Test series data
+    const seriesData = (result.echartOptions as any).series[0].data;
+    expect(seriesData).toHaveLength(2);
+
+    // First data point
+    expect(seriesData[0].value).toBe(15);
+    expect(seriesData[0].name).toBe('year: 1988');
+    expect(seriesData[0].itemStyle.color).toBe('#1f77b4');
+    expect(seriesData[0].title.offsetCenter).toEqual(['0%', '20%']);
+    expect(seriesData[0].title.fontSize).toBe(14);
+    expect(seriesData[0].detail.offsetCenter).toEqual(['0%', '32.6%']);
+    expect(seriesData[0].detail.fontSize).toBe(16.8);
+
+    // Second data point
+    expect(seriesData[1].value).toBe(219);
+    expect(seriesData[1].name).toBe('year: 1995');
+    expect(seriesData[1].itemStyle.color).toBe('#ff7f0e');
+    expect(seriesData[1].title.offsetCenter).toEqual(['0%', '48%']);
+    expect(seriesData[1].title.fontSize).toBe(14);
+    expect(seriesData[1].detail.offsetCenter).toEqual(['0%', '60.6%']);
+    expect(seriesData[1].detail.fontSize).toBe(16.8);
   });
 
   it('should transform chart props for multiple group by columns', () => {
@@ -214,50 +186,33 @@ describe('Echarts Gauge transformProps', () => {
     };
 
     const chartProps = new ChartProps(chartPropsConfig);
-    expect(transformProps(chartProps as EchartsGaugeChartProps)).toEqual(
-      expect.objectContaining({
-        width: 800,
-        height: 600,
-        echartOptions: expect.objectContaining({
-          series: expect.arrayContaining([
-            expect.objectContaining({
-              data: [
-                {
-                  value: 140,
-                  name: 'year: 2011, platform: PC',
-                  itemStyle: {
-                    color: '#1f77b4',
-                  },
-                  title: {
-                    offsetCenter: ['0%', '20%'],
-                    fontSize: 14,
-                  },
-                  detail: {
-                    offsetCenter: ['0%', '32.6%'],
-                    fontSize: 16.8,
-                  },
-                },
-                {
-                  value: 76,
-                  name: 'year: 2008, platform: PC',
-                  itemStyle: {
-                    color: '#ff7f0e',
-                  },
-                  title: {
-                    offsetCenter: ['0%', '48%'],
-                    fontSize: 14,
-                  },
-                  detail: {
-                    offsetCenter: ['0%', '60.6%'],
-                    fontSize: 16.8,
-                  },
-                },
-              ],
-            }),
-          ]),
-        }),
-      }),
-    );
+    const result = transformProps(chartProps as EchartsGaugeChartProps);
+
+    // Test core properties
+    expect(result.width).toBe(800);
+    expect(result.height).toBe(600);
+
+    // Test series data
+    const seriesData = (result.echartOptions as any).series[0].data;
+    expect(seriesData).toHaveLength(2);
+
+    // First data point
+    expect(seriesData[0].value).toBe(140);
+    expect(seriesData[0].name).toBe('year: 2011, platform: PC');
+    expect(seriesData[0].itemStyle.color).toBe('#1f77b4');
+    expect(seriesData[0].title.offsetCenter).toEqual(['0%', '20%']);
+    expect(seriesData[0].title.fontSize).toBe(14);
+    expect(seriesData[0].detail.offsetCenter).toEqual(['0%', '32.6%']);
+    expect(seriesData[0].detail.fontSize).toBe(16.8);
+
+    // Second data point
+    expect(seriesData[1].value).toBe(76);
+    expect(seriesData[1].name).toBe('year: 2008, platform: PC');
+    expect(seriesData[1].itemStyle.color).toBe('#ff7f0e');
+    expect(seriesData[1].title.offsetCenter).toEqual(['0%', '48%']);
+    expect(seriesData[1].title.fontSize).toBe(14);
+    expect(seriesData[1].detail.offsetCenter).toEqual(['0%', '60.6%']);
+    expect(seriesData[1].detail.fontSize).toBe(16.8);
   });
 
   it('should transform chart props for intervals', () => {
@@ -295,60 +250,34 @@ describe('Echarts Gauge transformProps', () => {
     };
 
     const chartProps = new ChartProps(chartPropsConfig);
-    expect(transformProps(chartProps as EchartsGaugeChartProps)).toEqual(
-      expect.objectContaining({
-        width: 800,
-        height: 600,
-        echartOptions: expect.objectContaining({
-          series: expect.arrayContaining([
-            expect.objectContaining({
-              axisLine: {
-                lineStyle: {
-                  width: 14,
-                  color: [
-                    [0.5, '#1f77b4'],
-                    [1, '#ff7f0e'],
-                  ],
-                },
-                roundCap: false,
-              },
-              data: [
-                {
-                  value: 140,
-                  name: 'year: 2011, platform: PC',
-                  itemStyle: {
-                    color: '#1f77b4',
-                  },
-                  title: {
-                    offsetCenter: ['0%', '20%'],
-                    fontSize: 14,
-                  },
-                  detail: {
-                    offsetCenter: ['0%', '32.6%'],
-                    fontSize: 16.8,
-                  },
-                },
-                {
-                  value: 76,
-                  name: 'year: 2008, platform: PC',
-                  itemStyle: {
-                    color: '#ff7f0e',
-                  },
-                  title: {
-                    offsetCenter: ['0%', '48%'],
-                    fontSize: 14,
-                  },
-                  detail: {
-                    offsetCenter: ['0%', '60.6%'],
-                    fontSize: 16.8,
-                  },
-                },
-              ],
-            }),
-          ]),
-        }),
-      }),
-    );
+    const result = transformProps(chartProps as EchartsGaugeChartProps);
+
+    // Test core properties
+    expect(result.width).toBe(800);
+    expect(result.height).toBe(600);
+
+    // Test axisLine intervals
+    const { axisLine } = (result.echartOptions as any).series[0];
+    expect(axisLine.roundCap).toBe(false);
+    expect(axisLine.lineStyle.width).toBe(14);
+    expect(axisLine.lineStyle.color).toEqual([
+      [0.5, '#1f77b4'],
+      [1, '#ff7f0e'],
+    ]);
+
+    // Test series data
+    const seriesData = (result.echartOptions.series as any)[0].data;
+    expect(seriesData).toHaveLength(2);
+
+    // First data point
+    expect(seriesData[0].value).toBe(140);
+    expect(seriesData[0].name).toBe('year: 2011, platform: PC');
+    expect(seriesData[0].itemStyle.color).toBe('#1f77b4');
+
+    // Second data point
+    expect(seriesData[1].value).toBe(76);
+    expect(seriesData[1].name).toBe('year: 2008, platform: PC');
+    expect(seriesData[1].itemStyle.color).toBe('#ff7f0e');
   });
 });
 
diff --git a/superset-frontend/plugins/plugin-chart-echarts/test/MixedTimeseries/transformProps.test.ts b/superset-frontend/plugins/plugin-chart-echarts/test/MixedTimeseries/transformProps.test.ts
index 82c39187709..533b1b23b74 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/test/MixedTimeseries/transformProps.test.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/test/MixedTimeseries/transformProps.test.ts
@@ -21,7 +21,7 @@ import {
   LegendOrientation,
   LegendType,
   EchartsTimeseriesSeriesType,
-} from '@superset-ui/plugin-chart-echarts';
+} from '../../src';
 import transformProps from '../../src/MixedTimeseries/transformProps';
 import {
   EchartsMixedTimeseriesFormData,
diff --git a/superset-frontend/plugins/plugin-chart-echarts/test/Timeseries/transformers.test.ts b/superset-frontend/plugins/plugin-chart-echarts/test/Timeseries/transformers.test.ts
index d138ed0c5dc..8f04e1c4031 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/test/Timeseries/transformers.test.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/test/Timeseries/transformers.test.ts
@@ -17,8 +17,12 @@
  * under the License.
  */
 import { CategoricalColorScale } from '@superset-ui/core';
-import { EchartsTimeseriesSeriesType } from '@superset-ui/plugin-chart-echarts';
-import { transformSeries } from '../../src/Timeseries/transformers';
+import type { SeriesOption } from 'echarts';
+import { EchartsTimeseriesSeriesType } from '../../src';
+import {
+  transformSeries,
+  transformNegativeLabelsPosition,
+} from '../../src/Timeseries/transformers';
 
 // Mock the colorScale function
 const mockColorScale = jest.fn(
@@ -82,3 +86,107 @@ describe('transformSeries', () => {
     expect((result as any).itemStyle.borderColor).toBeUndefined();
   });
 });
+
+describe('transformNegativeLabelsPosition', () => {
+  test('label position bottom of negative value no Horizontal', () => {
+    const isHorizontal = false;
+    const series: SeriesOption = {
+      data: [
+        [2020, 1],
+        [2021, 3],
+        [2022, -2],
+        [2023, -5],
+        [2024, 4],
+      ],
+      type: EchartsTimeseriesSeriesType.Bar,
+      stack: undefined,
+    };
+    const result =
+      Array.isArray(series.data) && series.type === 'bar' && !series.stack
+        ? transformNegativeLabelsPosition(series, isHorizontal)
+        : series.data;
+    expect((result as any)[0].label).toBe(undefined);
+    expect((result as any)[1].label).toBe(undefined);
+    expect((result as any)[2].label.position).toBe('outside');
+    expect((result as any)[3].label.position).toBe('outside');
+    expect((result as any)[4].label).toBe(undefined);
+  });
+
+  test('label position left of negative value is Horizontal', () => {
+    const isHorizontal = true;
+    const series: SeriesOption = {
+      data: [
+        [1, 2020],
+        [-3, 2021],
+        [2, 2022],
+        [-4, 2023],
+        [-6, 2024],
+      ],
+      type: EchartsTimeseriesSeriesType.Bar,
+      stack: undefined,
+    };
+
+    const result =
+      Array.isArray(series.data) && series.type === 'bar' && !series.stack
+        ? transformNegativeLabelsPosition(series, isHorizontal)
+        : series.data;
+    expect((result as any)[0].label).toBe(undefined);
+    expect((result as any)[1].label.position).toBe('outside');
+    expect((result as any)[2].label).toBe(undefined);
+    expect((result as any)[3].label.position).toBe('outside');
+    expect((result as any)[4].label.position).toBe('outside');
+  });
+
+  test('label position to line type', () => {
+    const isHorizontal = false;
+    const series: SeriesOption = {
+      data: [
+        [2020, 1],
+        [2021, 3],
+        [2022, -2],
+        [2023, -5],
+        [2024, 4],
+      ],
+      type: EchartsTimeseriesSeriesType.Line,
+      stack: undefined,
+    };
+
+    const result =
+      Array.isArray(series.data) &&
+      !series.stack &&
+      series.type !== 'line' &&
+      series.type === 'bar'
+        ? transformNegativeLabelsPosition(series, isHorizontal)
+        : series.data;
+    expect((result as any)[0].label).toBe(undefined);
+    expect((result as any)[1].label).toBe(undefined);
+    expect((result as any)[2].label).toBe(undefined);
+    expect((result as any)[3].label).toBe(undefined);
+    expect((result as any)[4].label).toBe(undefined);
+  });
+
+  test('label position to bar type and stack', () => {
+    const isHorizontal = false;
+    const series: SeriesOption = {
+      data: [
+        [2020, 1],
+        [2021, 3],
+        [2022, -2],
+        [2023, -5],
+        [2024, 4],
+      ],
+      type: EchartsTimeseriesSeriesType.Bar,
+      stack: 'obs',
+    };
+
+    const result =
+      Array.isArray(series.data) && series.type === 'bar' && !series.stack
+        ? transformNegativeLabelsPosition(series, isHorizontal)
+        : series.data;
+    expect((result as any)[0].label).toBe(undefined);
+    expect((result as any)[1].label).toBe(undefined);
+    expect((result as any)[2].label).toBe(undefined);
+    expect((result as any)[3].label).toBe(undefined);
+    expect((result as any)[4].label).toBe(undefined);
+  });
+});
diff --git a/superset-frontend/plugins/plugin-chart-echarts/test/utils/series.test.ts b/superset-frontend/plugins/plugin-chart-echarts/test/utils/series.test.ts
index 67a0bab9e60..5f54c63f94d 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/test/utils/series.test.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/test/utils/series.test.ts
@@ -53,11 +53,12 @@ import { NULL_STRING } from '../../src/constants';
 
 const expectedThemeProps = {
   selector: ['all', 'inverse'],
+  selected: undefined,
   selectorLabel: {
-    fontFamily: theme.typography.families.sansSerif,
-    fontSize: theme.typography.sizes.s,
-    color: theme.colors.grayscale.base,
-    borderColor: theme.colors.grayscale.base,
+    fontFamily: theme.fontFamily,
+    fontSize: theme.fontSizeSM,
+    color: theme.colorText,
+    borderColor: theme.colorBorder,
   },
 };
 
diff --git a/superset-frontend/plugins/plugin-chart-echarts/test/utils/transformers.test.ts b/superset-frontend/plugins/plugin-chart-echarts/test/utils/transformers.test.ts
index 113b416f9c5..277911e3b83 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/test/utils/transformers.test.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/test/utils/transformers.test.ts
@@ -31,7 +31,7 @@ import {
   TimeseriesAnnotationLayer,
   TimeseriesDataRecord,
 } from '@superset-ui/core';
-import { OrientationType } from '@superset-ui/plugin-chart-echarts';
+import { OrientationType } from '../../src';
 import {
   transformEventAnnotation,
   transformFormulaAnnotation,
diff --git a/superset-frontend/plugins/plugin-chart-echarts/tsconfig.json b/superset-frontend/plugins/plugin-chart-echarts/tsconfig.json
index b6bfaa2d984..b5b28fc6189 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/tsconfig.json
+++ b/superset-frontend/plugins/plugin-chart-echarts/tsconfig.json
@@ -1,25 +1,18 @@
 {
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "declarationDir": "lib",
+    "composite": true,
+    "rootDir": "src",
     "outDir": "lib",
-    "rootDir": "src"
-  },
-  "exclude": [
-    "lib",
-    "test"
-  ],
-  "extends": "../../tsconfig.json",
-  "include": [
-    "src/**/*",
-    "types/**/*",
-    "../../types/**/*"
-  ],
-  "references": [
-    {
-      "path": "../../packages/superset-ui-chart-controls"
-    },
-    {
-      "path": "../../packages/superset-ui-core"
+    "baseUrl": ".",
+    "paths": {
+      "@superset-ui/core/components": ["../../packages/superset-ui-core/src/components"]
     }
+  },
+  "include": ["src/**/*", "types/**/*"],
+  "exclude": ["lib", "test"],
+  "references": [
+    { "path": "../../packages/superset-ui-core" },
+    { "path": "../../packages/superset-ui-chart-controls" }
   ]
 }
diff --git a/superset-frontend/plugins/plugin-chart-handlebars/package.json b/superset-frontend/plugins/plugin-chart-handlebars/package.json
index 7b34c01e726..57d99ce7881 100644
--- a/superset-frontend/plugins/plugin-chart-handlebars/package.json
+++ b/superset-frontend/plugins/plugin-chart-handlebars/package.json
@@ -42,8 +42,8 @@
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@types/jest": "^29.5.14",
-    "@types/lodash": "^4.17.16",
-    "jest": "^29.7.0"
+    "@types/jest": "^30.0.0",
+    "@types/lodash": "^4.17.20",
+    "jest": "^30.0.4"
   }
 }
diff --git a/superset-frontend/plugins/plugin-chart-handlebars/src/Handlebars.tsx b/superset-frontend/plugins/plugin-chart-handlebars/src/Handlebars.tsx
index c4305a2a8c8..2e7e27ae1eb 100644
--- a/superset-frontend/plugins/plugin-chart-handlebars/src/Handlebars.tsx
+++ b/superset-frontend/plugins/plugin-chart-handlebars/src/Handlebars.tsx
@@ -22,8 +22,8 @@ import { HandlebarsViewer } from './components/Handlebars/HandlebarsViewer';
 import { HandlebarsProps, HandlebarsStylesProps } from './types';
 
 const Styles = styled.div<HandlebarsStylesProps>`
-  padding: ${({ theme }) => theme.gridUnit * 4}px;
-  border-radius: ${({ theme }) => theme.gridUnit * 2}px;
+  padding: ${({ theme }) => theme.sizeUnit * 4}px;
+  border-radius: ${({ theme }) => theme.borderRadius}px;
   height: ${({ height }) => height}px;
   width: ${({ width }) => width}px;
   overflow: auto;
diff --git a/superset-frontend/plugins/plugin-chart-handlebars/src/components/Handlebars/HandlebarsViewer.tsx b/superset-frontend/plugins/plugin-chart-handlebars/src/components/Handlebars/HandlebarsViewer.tsx
index 8e1a1aab9d4..701d8949b67 100644
--- a/superset-frontend/plugins/plugin-chart-handlebars/src/components/Handlebars/HandlebarsViewer.tsx
+++ b/superset-frontend/plugins/plugin-chart-handlebars/src/components/Handlebars/HandlebarsViewer.tsx
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { SafeMarkdown, styled, t } from '@superset-ui/core';
+import { styled, t } from '@superset-ui/core';
+import { SafeMarkdown } from '@superset-ui/core/components';
 import Handlebars from 'handlebars';
 import dayjs from 'dayjs';
 import { useMemo, useState } from 'react';
diff --git a/superset-frontend/plugins/plugin-chart-handlebars/src/consts.ts b/superset-frontend/plugins/plugin-chart-handlebars/src/consts.ts
index e566fd66b27..f474eb67b34 100644
--- a/superset-frontend/plugins/plugin-chart-handlebars/src/consts.ts
+++ b/superset-frontend/plugins/plugin-chart-handlebars/src/consts.ts
@@ -18,7 +18,8 @@
  */
 import { debounce } from 'lodash';
 import { formatSelectOptions } from '@superset-ui/chart-controls';
-import { SLOW_DEBOUNCE, t } from '@superset-ui/core';
+import { Constants } from '@superset-ui/core/components';
+import { t } from '@superset-ui/core';
 
 export const PAGE_SIZE_OPTIONS = formatSelectOptions<number>([
   [0, t('page_size.all')],
@@ -36,5 +37,5 @@ export const PAGE_SIZE_OPTIONS = formatSelectOptions<number>([
 
 export const debounceFunc = debounce(
   (func: (val: string) => void, source: string) => func(source),
-  SLOW_DEBOUNCE,
+  Constants.SLOW_DEBOUNCE,
 );
diff --git a/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controlPanel.tsx b/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controlPanel.tsx
index 6314525a931..f4bf43092d3 100644
--- a/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controlPanel.tsx
+++ b/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controlPanel.tsx
@@ -38,10 +38,6 @@ import {
   orderByControlSetItem,
   orderDescendingControlSetItem,
 } from './controls/orderBy';
-import {
-  serverPageLengthControlSetItem,
-  serverPaginationControlSetRow,
-} from './controls/pagination';
 import { queryModeControlSetItem } from './controls/queryMode';
 import { styleControlSetItem } from './controls/style';
 
@@ -57,8 +53,7 @@ const config: ControlPanelConfig = {
         [percentMetricsControlSetItem],
         [timeSeriesLimitMetricControlSetItem, orderByControlSetItem],
         [orderDescendingControlSetItem],
-        serverPaginationControlSetRow,
-        [rowLimitControlSetItem, serverPageLengthControlSetItem],
+        [rowLimitControlSetItem],
         [includeTimeControlSetItem],
         [showTotalsControlSetItem],
         ['adhoc_filters'],
diff --git a/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/handlebarTemplate.tsx b/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/handlebarTemplate.tsx
index 6f21892e0c4..e09f7f5aba9 100644
--- a/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/handlebarTemplate.tsx
+++ b/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/handlebarTemplate.tsx
@@ -20,9 +20,9 @@ import {
   ControlSetItem,
   CustomControlConfig,
   sharedControls,
-  InfoTooltipWithTrigger,
 } from '@superset-ui/chart-controls';
-import { t, validateNonEmpty, useTheme, SafeMarkdown } from '@superset-ui/core';
+import { t, validateNonEmpty, useTheme } from '@superset-ui/core';
+import { InfoTooltip, SafeMarkdown } from '@superset-ui/core/components';
 import { CodeEditor } from '../../components/CodeEditor/CodeEditor';
 import { ControlHeader } from '../../components/ControlHeader/controlHeader';
 import { debounceFunc } from '../../consts';
@@ -70,8 +70,8 @@ ${helperDescriptions
       <ControlHeader>
         <div>
           {props.label}
-          <InfoTooltipWithTrigger
-            iconsStyle={{ marginLeft: theme.gridUnit }}
+          <InfoTooltip
+            iconStyle={{ marginLeft: theme.sizeUnit }}
             tooltip={<SafeMarkdown source={helpersTooltipContent} />}
           />
         </div>
diff --git a/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/pagination.tsx b/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/pagination.tsx
deleted file mode 100644
index 97a8206a113..00000000000
--- a/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/pagination.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 {
-  ControlPanelsContainerProps,
-  ControlSetItem,
-  ControlSetRow,
-} from '@superset-ui/chart-controls';
-import { t } from '@superset-ui/core';
-import { PAGE_SIZE_OPTIONS } from '../../consts';
-
-export const serverPaginationControlSetRow: ControlSetRow = [
-  {
-    name: 'server_pagination',
-    config: {
-      type: 'CheckboxControl',
-      label: t('Server pagination'),
-      description: t(
-        'Enable server side pagination of results (experimental feature)',
-      ),
-      default: false,
-    },
-  },
-];
-
-export const serverPageLengthControlSetItem: ControlSetItem = {
-  name: 'server_page_length',
-  config: {
-    type: 'SelectControl',
-    freeForm: true,
-    label: t('Server Page Length'),
-    default: 10,
-    choices: PAGE_SIZE_OPTIONS,
-    description: t('Rows per page, 0 means no pagination'),
-    visibility: ({ controls }: ControlPanelsContainerProps) =>
-      Boolean(controls?.server_pagination?.value),
-  },
-};
diff --git a/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/style.tsx b/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/style.tsx
index 9723228146d..b69b2ea0424 100644
--- a/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/style.tsx
+++ b/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/style.tsx
@@ -20,9 +20,9 @@ import {
   ControlSetItem,
   CustomControlConfig,
   sharedControls,
-  InfoTooltipWithTrigger,
 } from '@superset-ui/chart-controls';
 import { t, useTheme } from '@superset-ui/core';
+import { InfoTooltip } from '@superset-ui/core/components';
 import { CodeEditor } from '../../components/CodeEditor/CodeEditor';
 import { ControlHeader } from '../../components/ControlHeader/controlHeader';
 import { debounceFunc } from '../../consts';
@@ -47,8 +47,8 @@ const StyleControl = (props: CustomControlConfig<StyleCustomControlProps>) => {
       <ControlHeader>
         <div>
           {props.label}
-          <InfoTooltipWithTrigger
-            iconsStyle={{ marginLeft: theme.gridUnit }}
+          <InfoTooltip
+            iconStyle={{ marginLeft: theme.sizeUnit }}
             tooltip={t('You need to configure HTML sanitization to use CSS')}
           />
         </div>
diff --git a/superset-frontend/plugins/plugin-chart-handlebars/tsconfig.json b/superset-frontend/plugins/plugin-chart-handlebars/tsconfig.json
index b6bfaa2d984..b5b28fc6189 100644
--- a/superset-frontend/plugins/plugin-chart-handlebars/tsconfig.json
+++ b/superset-frontend/plugins/plugin-chart-handlebars/tsconfig.json
@@ -1,25 +1,18 @@
 {
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "declarationDir": "lib",
+    "composite": true,
+    "rootDir": "src",
     "outDir": "lib",
-    "rootDir": "src"
-  },
-  "exclude": [
-    "lib",
-    "test"
-  ],
-  "extends": "../../tsconfig.json",
-  "include": [
-    "src/**/*",
-    "types/**/*",
-    "../../types/**/*"
-  ],
-  "references": [
-    {
-      "path": "../../packages/superset-ui-chart-controls"
-    },
-    {
-      "path": "../../packages/superset-ui-core"
+    "baseUrl": ".",
+    "paths": {
+      "@superset-ui/core/components": ["../../packages/superset-ui-core/src/components"]
     }
+  },
+  "include": ["src/**/*", "types/**/*"],
+  "exclude": ["lib", "test"],
+  "references": [
+    { "path": "../../packages/superset-ui-core" },
+    { "path": "../../packages/superset-ui-chart-controls" }
   ]
 }
diff --git a/superset-frontend/plugins/plugin-chart-pivot-table/package.json b/superset-frontend/plugins/plugin-chart-pivot-table/package.json
index 87ea25a1c4e..a43e433f0a5 100644
--- a/superset-frontend/plugins/plugin-chart-pivot-table/package.json
+++ b/superset-frontend/plugins/plugin-chart-pivot-table/package.json
@@ -36,8 +36,8 @@
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@babel/types": "^7.26.9",
+    "@babel/types": "^7.28.0",
     "@types/jest": "^29.5.12",
-    "jest": "^29.7.0"
+    "jest": "^30.0.4"
   }
 }
diff --git a/superset-frontend/plugins/plugin-chart-pivot-table/src/PivotTableChart.tsx b/superset-frontend/plugins/plugin-chart-pivot-table/src/PivotTableChart.tsx
index a17bac64aa7..66f0b9429c4 100644
--- a/superset-frontend/plugins/plugin-chart-pivot-table/src/PivotTableChart.tsx
+++ b/superset-frontend/plugins/plugin-chart-pivot-table/src/PivotTableChart.tsx
@@ -538,7 +538,7 @@ export default function PivotTableChart(props: PivotTableProps) {
   );
 
   return (
-    <Styles height={height} width={width} margin={theme.gridUnit * 4}>
+    <Styles height={height} width={width} margin={theme.sizeUnit * 4}>
       <PivotTableWrapper>
         <PivotTable
           data={unpivotedData}
diff --git a/superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/Styles.js b/superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/Styles.js
index 0854620f2b9..2af50216ad7 100644
--- a/superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/Styles.js
+++ b/superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/Styles.js
@@ -23,16 +23,17 @@ export const Styles = styled.div`
   ${({ theme, isDashboardEditMode }) => css`
     table.pvtTable {
       position: ${isDashboardEditMode ? 'inherit' : 'relative'};
-      width: calc(100% - ${theme.gridUnit}px);
-      font-size: ${theme.typography.sizes.s}px;
+      width: calc(100% - ${theme.sizeUnit}px);
+      font-size: ${theme.fontSizeSM}px;
       text-align: left;
-      margin: ${theme.gridUnit}px;
+      margin: ${theme.sizeUnit}px;
       border-collapse: separate;
-      font-family: ${theme.typography.families.sansSerif};
+      font-family: ${theme.fontFamily};
       line-height: 1.4;
     }
 
     table thead {
+      background-color: ${theme.colorBgBase};
       position: ${isDashboardEditMode ? 'inherit' : 'sticky'};
       top: 0;
     }
@@ -43,12 +44,11 @@ export const Styles = styled.div`
 
     table.pvtTable thead tr th,
     table.pvtTable tbody tr th {
-      background-color: ${theme.colors.grayscale.light5};
-      border-top: 1px solid ${theme.colors.grayscale.light2};
-      border-left: 1px solid ${theme.colors.grayscale.light2};
-      font-size: ${theme.typography.sizes.s}px;
-      padding: ${theme.gridUnit}px;
-      font-weight: ${theme.typography.weights.normal};
+      border-top: 1px solid ${theme.colorSplit};
+      border-left: 1px solid ${theme.colorSplit};
+      font-size: ${theme.fontSizeSM}px;
+      padding: ${theme.sizeUnit}px;
+      font-weight: ${theme.fontWeightNormal};
     }
 
     table.pvtTable tbody tr.pvtRowTotals {
@@ -89,21 +89,21 @@ export const Styles = styled.div`
     }
 
     table.pvtTable tr th.active {
-      background-color: ${theme.colors.primary.light3};
+      background-color: ${theme.colorPrimaryBg};
     }
 
     table.pvtTable .pvtTotalLabel {
       text-align: right;
-      font-weight: ${theme.typography.weights.bold};
+      font-weight: ${theme.fontWeightStrong};
     }
 
     table.pvtTable .pvtSubtotalLabel {
-      font-weight: ${theme.typography.weights.bold};
+      font-weight: ${theme.fontWeightStrong};
     }
 
     table.pvtTable tbody tr td {
-      color: ${theme.colors.primary.dark2};
-      padding: ${theme.gridUnit}px;
+      color: ${theme.colorPrimaryText};
+      padding: ${theme.sizeUnit}px;
       background-color: ${theme.colors.grayscale.light5};
       border-top: 1px solid ${theme.colors.grayscale.light2};
       border-left: 1px solid ${theme.colors.grayscale.light2};
@@ -117,7 +117,7 @@ export const Styles = styled.div`
 
     .pvtTotal,
     .pvtGrandTotal {
-      font-weight: ${theme.typography.weights.bold};
+      font-weight: ${theme.fontWeightStrong};
     }
 
     table.pvtTable tbody tr td.pvtRowTotal {
@@ -133,12 +133,12 @@ export const Styles = styled.div`
     }
 
     .toggle {
-      padding-right: ${theme.gridUnit}px;
+      padding-right: ${theme.sizeUnit}px;
       cursor: pointer;
     }
 
     .hoverable:hover {
-      background-color: ${theme.colors.primary.light4};
+      background-color: ${theme.colorPrimaryBgHover};
       cursor: pointer;
     }
   `}
diff --git a/superset-frontend/plugins/plugin-chart-pivot-table/tsconfig.json b/superset-frontend/plugins/plugin-chart-pivot-table/tsconfig.json
index b6bfaa2d984..b3af9a1d193 100644
--- a/superset-frontend/plugins/plugin-chart-pivot-table/tsconfig.json
+++ b/superset-frontend/plugins/plugin-chart-pivot-table/tsconfig.json
@@ -1,25 +1,15 @@
 {
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "declarationDir": "lib",
+    "composite": true,
+    "rootDir": "src",
     "outDir": "lib",
-    "rootDir": "src"
+    "baseUrl": "."
   },
-  "exclude": [
-    "lib",
-    "test"
-  ],
-  "extends": "../../tsconfig.json",
-  "include": [
-    "src/**/*",
-    "types/**/*",
-    "../../types/**/*"
-  ],
+  "include": ["src/**/*", "types/**/*"],
+  "exclude": ["lib", "test"],
   "references": [
-    {
-      "path": "../../packages/superset-ui-chart-controls"
-    },
-    {
-      "path": "../../packages/superset-ui-core"
-    }
+    { "path": "../../packages/superset-ui-core" },
+    { "path": "../../packages/superset-ui-chart-controls" }
   ]
 }
diff --git a/superset-frontend/plugins/plugin-chart-table/src/DataTable/DataTable.tsx b/superset-frontend/plugins/plugin-chart-table/src/DataTable/DataTable.tsx
index 638031d7cd9..ee7b07174c0 100644
--- a/superset-frontend/plugins/plugin-chart-table/src/DataTable/DataTable.tsx
+++ b/superset-frontend/plugins/plugin-chart-table/src/DataTable/DataTable.tsx
@@ -27,7 +27,7 @@ import {
   DragEvent,
   useEffect,
 } from 'react';
-
+import { styled, typedMemo, usePrevious } from '@superset-ui/core';
 import {
   useTable,
   usePagination,
@@ -41,9 +41,8 @@ import {
   Row,
 } from 'react-table';
 import { matchSorter, rankings } from 'match-sorter';
-import { styled, typedMemo, usePrevious } from '@superset-ui/core';
 import { isEqual } from 'lodash';
-import { Space } from 'antd';
+import { Space } from '@superset-ui/core/components';
 import GlobalFilter, { GlobalFilterProps } from './components/GlobalFilter';
 import SelectPageSize, {
   SelectPageSizeProps,
diff --git a/superset-frontend/plugins/plugin-chart-table/src/DataTable/components/GlobalFilter.tsx b/superset-frontend/plugins/plugin-chart-table/src/DataTable/components/GlobalFilter.tsx
index 75d6594cbcd..ef9b8fc8bd8 100644
--- a/superset-frontend/plugins/plugin-chart-table/src/DataTable/components/GlobalFilter.tsx
+++ b/superset-frontend/plugins/plugin-chart-table/src/DataTable/components/GlobalFilter.tsx
@@ -22,8 +22,10 @@ import {
   ChangeEventHandler,
   useRef,
   useEffect,
+  Ref,
 } from 'react';
 import { Row, FilterValue } from 'react-table';
+import { Input, type InputRef, Space } from '@superset-ui/core/components';
 import useAsyncState from '../utils/useAsyncState';
 
 export interface SearchInputProps {
@@ -31,7 +33,7 @@ export interface SearchInputProps {
   value: string;
   onChange: ChangeEventHandler<HTMLInputElement>;
   onBlur?: () => void;
-  inputRef?: React.RefObject<HTMLInputElement>;
+  inputRef?: Ref<InputRef>;
 }
 
 const isSearchFocused = new Map();
@@ -56,17 +58,18 @@ function DefaultSearchInput({
   inputRef,
 }: SearchInputProps) {
   return (
-    <span className="dt-global-filter">
-      Search{' '}
-      <input
+    <Space direction="horizontal" size={4} className="dt-global-filter">
+      Search
+      <Input
+        size="small"
         ref={inputRef}
-        className="form-control input-sm"
         placeholder={`${count} records...`}
         value={value}
         onChange={onChange}
         onBlur={onBlur}
+        className="form-control input-sm"
       />
-    </span>
+    </Space>
   );
 }
 
@@ -82,7 +85,7 @@ export default (memo as <T>(fn: T) => T)(function GlobalFilter<
   rowCount,
 }: GlobalFilterProps<D>) {
   const count = serverPagination ? rowCount : preGlobalFilteredRows.length;
-  const inputRef = useRef<HTMLInputElement>(null);
+  const inputRef = useRef<InputRef>(null);
 
   const [value, setValue] = useAsyncState(
     filterValue,
diff --git a/superset-frontend/plugins/plugin-chart-table/src/DataTable/components/SearchSelectDropdown.tsx b/superset-frontend/plugins/plugin-chart-table/src/DataTable/components/SearchSelectDropdown.tsx
index b58cf2e8a22..d4cc33e6181 100644
--- a/superset-frontend/plugins/plugin-chart-table/src/DataTable/components/SearchSelectDropdown.tsx
+++ b/superset-frontend/plugins/plugin-chart-table/src/DataTable/components/SearchSelectDropdown.tsx
@@ -18,10 +18,10 @@
  */
 /* eslint-disable import/no-extraneous-dependencies */
 import { styled } from '@superset-ui/core';
-import { Select } from 'antd';
+import { RawAntdSelect } from '@superset-ui/core/components';
 import { SearchOption } from '../../types';
 
-const StyledSelect = styled(Select)`
+const StyledSelect = styled(RawAntdSelect)`
   width: 120px;
   margin-right: 8px;
 `;
@@ -29,7 +29,7 @@ const StyledSelect = styled(Select)`
 interface SearchSelectDropdownProps {
   /** The currently selected search column value */
   value?: string;
-  /** Callback triggered when a new search column is selected */
+  /** Function triggered when a new search column is selected */
   onChange: (searchCol: string) => void;
   /** Available search column options to populate the dropdown */
   searchOptions: SearchOption[];
diff --git a/superset-frontend/plugins/plugin-chart-table/src/DataTable/components/SelectPageSize.tsx b/superset-frontend/plugins/plugin-chart-table/src/DataTable/components/SelectPageSize.tsx
index 02052f10304..a3323c2e205 100644
--- a/superset-frontend/plugins/plugin-chart-table/src/DataTable/components/SelectPageSize.tsx
+++ b/superset-frontend/plugins/plugin-chart-table/src/DataTable/components/SelectPageSize.tsx
@@ -17,8 +17,9 @@
  * under the License.
  */
 import { memo } from 'react';
-import { t } from '@superset-ui/core';
+import { css, t } from '@superset-ui/core';
 import { formatSelectOptions } from '@superset-ui/chart-controls';
+import { RawAntdSelect } from '@superset-ui/core/components';
 
 export type SizeOption = [number, string];
 
@@ -33,16 +34,18 @@ function DefaultSelectRenderer({
   options,
   onChange,
 }: SelectPageSizeRendererProps) {
+  const { Option } = RawAntdSelect;
+
   return (
     <span className="dt-select-page-size form-inline">
       {t('Show')}{' '}
-      <select
-        className="form-control input-sm"
+      <RawAntdSelect<number>
         value={current}
-        onBlur={() => {}}
-        onChange={e => {
-          onChange(Number((e.target as HTMLSelectElement).value));
-        }}
+        onChange={value => onChange(value)}
+        size="small"
+        css={theme => css`
+          width: ${theme.sizeUnit * 18}px;
+        `}
       >
         {options.map(option => {
           const [size, text] = Array.isArray(option)
@@ -50,16 +53,16 @@ function DefaultSelectRenderer({
             : [option, option];
           const sizeLabel = size === 0 ? t('all') : size;
           return (
-            <option
-              aria-label={t('Show %s entries', sizeLabel)}
+            <Option
               key={size}
-              value={size}
+              value={Number(size)}
+              aria-label={t('Show %s entries', sizeLabel)}
             >
               {text}
-            </option>
+            </Option>
           );
         })}
-      </select>{' '}
+      </RawAntdSelect>{' '}
       {t('entries')}
     </span>
   );
diff --git a/superset-frontend/plugins/plugin-chart-table/src/Styles.tsx b/superset-frontend/plugins/plugin-chart-table/src/Styles.tsx
index e394d16446e..1f11d551b4b 100644
--- a/superset-frontend/plugins/plugin-chart-table/src/Styles.tsx
+++ b/superset-frontend/plugins/plugin-chart-table/src/Styles.tsx
@@ -16,36 +16,50 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 import { css, styled } from '@superset-ui/core';
 
 export default styled.div`
   ${({ theme }) => css`
+    /* Base table styles */
     table {
       width: 100%;
       min-width: auto;
       max-width: none;
       margin: 0;
+      border-collapse: collapse;
     }
 
+    /* Cell styling */
     th,
     td {
       min-width: 4.3em;
+      padding: 0.75rem;
+      vertical-align: top;
     }
 
+    /* Header styling */
     thead > tr > th {
       padding-right: 0;
       position: relative;
-      background: ${theme.colors.grayscale.light5};
+      background-color: ${theme.colorBgBase};
       text-align: left;
+      border-bottom: 2px solid ${theme.colorSplit};
+      color: ${theme.colorText};
+      vertical-align: bottom;
     }
+
+    /* Icons in header */
     th svg {
-      color: ${theme.colors.grayscale.light2};
-      margin: ${theme.gridUnit / 2}px;
+      margin: 1px ${theme.sizeUnit / 2}px;
+      fill-opacity: 0.2;
     }
+
     th.is-sorted svg {
-      color: ${theme.colors.grayscale.base};
+      color: ${theme.colorText};
+      fill-opacity: 1;
     }
+
+    /* Table body styling */
     .table > tbody > tr:first-of-type > td,
     .table > tbody > tr:first-of-type > th {
       border-top: 0;
@@ -53,58 +67,113 @@ export default styled.div`
 
     .table > tbody tr td {
       font-feature-settings: 'tnum' 1;
+      border-top: 1px solid ${theme.colorSplit};
     }
 
+    /* Bootstrap-like condensed table styles */
+    table.table-condensed,
+    table.table-sm {
+      font-size: ${theme.fontSizeSM}px;
+    }
+
+    table.table-condensed th,
+    table.table-condensed td,
+    table.table-sm th,
+    table.table-sm td {
+      padding: 0.3rem;
+    }
+
+    /* Bootstrap-like bordered table styles */
+    table.table-bordered {
+      border: 1px solid ${theme.colorSplit};
+    }
+
+    table.table-bordered th,
+    table.table-bordered td {
+      border: 1px solid ${theme.colorSplit};
+    }
+
+    /* Bootstrap-like striped table styles */
+    table.table-striped tbody tr:nth-of-type(odd) {
+      background-color: ${theme.colorBgLayout};
+    }
+
+    /* Controls and metrics */
     .dt-controls {
       padding-bottom: 0.65em;
     }
+
     .dt-metric {
       text-align: right;
     }
+
     .dt-totals {
-      font-weight: ${theme.typography.weights.bold};
+      font-weight: ${theme.fontWeightStrong};
     }
+
     .dt-is-null {
-      color: ${theme.colors.grayscale.light1};
+      color: ${theme.colorTextTertiary};
     }
+
     td.dt-is-filter {
       cursor: pointer;
     }
+
     td.dt-is-filter:hover {
-      background-color: ${theme.colors.secondary.light4};
+      background-color: ${theme.colorPrimaryBgHover};
     }
+
     td.dt-is-active-filter,
     td.dt-is-active-filter:hover {
-      background-color: ${theme.colors.secondary.light3};
+      background-color: ${theme.colorPrimaryBgHover};
     }
 
     .dt-global-filter {
       float: right;
     }
 
+    /* Cell truncation */
     .dt-truncate-cell {
       overflow: hidden;
       text-overflow: ellipsis;
       white-space: nowrap;
     }
+
     .dt-truncate-cell:hover {
       overflow: visible;
       white-space: normal;
       height: auto;
     }
 
+    /* Pagination styling */
     .dt-pagination {
       text-align: right;
       /* use padding instead of margin so clientHeight can capture it */
       padding-top: 0.5em;
     }
-    .dt-pagination .pagination {
-      margin: 0;
+
+    .dt-pagination .pagination > li > a,
+    .dt-pagination .pagination > li > span {
+      background-color: ${theme.colorBgBase};
+      color: ${theme.colorText};
+      border-color: ${theme.colorBorderSecondary};
+    }
+
+    .dt-pagination .pagination > li.active > a,
+    .dt-pagination .pagination > li.active > span,
+    .dt-pagination .pagination > li.active > a:focus,
+    .dt-pagination .pagination > li.active > a:hover,
+    .dt-pagination .pagination > li.active > span:focus,
+    .dt-pagination .pagination > li.active > span:hover {
+      background-color: ${theme.colorPrimary};
+      color: ${theme.colorBgContainer};
+      border-color: ${theme.colorBorderSecondary};
     }
 
     .pagination > li > span.dt-pagination-ellipsis:focus,
     .pagination > li > span.dt-pagination-ellipsis:hover {
-      background: ${theme.colors.grayscale.light5};
+      background: ${theme.colorBgLayout};
+      border-color: ${theme.colorBorderSecondary};
     }
 
     .dt-no-results {
@@ -113,8 +182,9 @@ export default styled.div`
     }
 
     .right-border-only {
-      border-right: 2px solid ${theme.colors.grayscale.light2};
+      border-right: 2px solid ${theme.colorSplit};
     }
+
     table .right-border-only:last-child {
       border-right: none;
     }
diff --git a/superset-frontend/plugins/plugin-chart-table/src/TableChart.tsx b/superset-frontend/plugins/plugin-chart-table/src/TableChart.tsx
index 8d921c3d309..ca05cbb3bc3 100644
--- a/superset-frontend/plugins/plugin-chart-table/src/TableChart.tsx
+++ b/superset-frontend/plugins/plugin-chart-table/src/TableChart.tsx
@@ -52,8 +52,16 @@ import {
   t,
   tn,
   useTheme,
+  SupersetTheme,
 } from '@superset-ui/core';
-import { Dropdown, Menu, Tooltip } from '@superset-ui/chart-controls';
+import {
+  Input,
+  Space,
+  RawAntdSelect as Select,
+  Dropdown,
+  Menu,
+  Tooltip,
+} from '@superset-ui/core/components';
 import {
   CheckOutlined,
   InfoCircleOutlined,
@@ -62,7 +70,7 @@ import {
   PlusCircleOutlined,
   TableOutlined,
 } from '@ant-design/icons';
-import { debounce, isEmpty, isEqual } from 'lodash';
+import { isEmpty, debounce, isEqual } from 'lodash';
 import {
   ColorSchemeEnum,
   DataColumnMeta,
@@ -179,49 +187,50 @@ function SortIcon<D extends object>({ column }: { column: ColumnInstance<D> }) {
   return sortIcon;
 }
 
-const SearchInput = ({
+function SearchInput({
   count,
   value,
   onChange,
   onBlur,
   inputRef,
-}: SearchInputProps) => (
-  <span className="dt-global-filter">
-    {t('Search')}{' '}
-    <input
-      ref={inputRef}
-      aria-label={t('Search %s records', count)}
-      className="form-control input-sm"
-      placeholder={tn('search.num_records', count)}
-      value={value}
-      onChange={onChange}
-      onBlur={onBlur}
-    />
-  </span>
-);
+}: SearchInputProps) {
+  return (
+    <Space direction="horizontal" size={4} className="dt-global-filter">
+      {t('Search')}
+      <Input
+        size="small"
+        aria-label={t('Search %s records', count)}
+        placeholder={tn('search.num_records', count)}
+        value={value}
+        onChange={onChange}
+        onBlur={onBlur}
+        ref={inputRef}
+      />
+    </Space>
+  );
+}
 
 function SelectPageSize({
   options,
   current,
   onChange,
 }: SelectPageSizeRendererProps) {
+  const { Option } = Select;
+
   return (
-    <span
-      className="dt-select-page-size form-inline"
-      role="group"
-      aria-label={t('Select page size')}
-    >
+    <>
       <label htmlFor="pageSizeSelect" className="sr-only">
         {t('Select page size')}
       </label>
       {t('Show')}{' '}
-      <select
+      <Select<number>
         id="pageSizeSelect"
-        className="form-control input-sm"
         value={current}
-        onChange={e => {
-          onChange(Number((e.target as HTMLSelectElement).value));
-        }}
+        onChange={value => onChange(value)}
+        size="small"
+        css={(theme: SupersetTheme) => css`
+          width: ${theme.sizeUnit * 18}px;
+        `}
         aria-label={t('Show entries per page')}
       >
         {options.map(option => {
@@ -229,14 +238,14 @@ function SelectPageSize({
             ? option
             : [option, option];
           return (
-            <option key={size} value={size}>
+            <Option key={size} value={Number(size)}>
               {text}
-            </option>
+            </Option>
           );
         })}
-      </select>{' '}
+      </Select>{' '}
       {t('entries per page')}
-    </span>
+    </>
   );
 }
 
@@ -569,9 +578,9 @@ export default function TableChart<D extends DataRecord = DataRecord>(
             <div
               css={css`
                 max-width: 242px;
-                padding: 0 ${theme.gridUnit * 2}px;
-                color: ${theme.colors.grayscale.base};
-                font-size: ${theme.typography.sizes.s}px;
+                padding: 0 ${theme.sizeUnit * 2}px;
+                color: ${theme.colorText};
+                font-size: ${theme.fontSizeSM}px;
               `}
             >
               {t(
@@ -582,7 +591,7 @@ export default function TableChart<D extends DataRecord = DataRecord>(
               <Menu.Item key={column.key}>
                 <span
                   css={css`
-                    color: ${theme.colors.grayscale.dark2};
+                    color: ${theme.colorText};
                   `}
                 >
                   {column.label}
@@ -590,7 +599,7 @@ export default function TableChart<D extends DataRecord = DataRecord>(
                 <span
                   css={css`
                     float: right;
-                    font-size: ${theme.typography.sizes.s}px;
+                    font-size: ${theme.fontSizeSM}px;
                   `}
                 >
                   {selectedComparisonColumns.includes(column.key) && (
@@ -641,7 +650,7 @@ export default function TableChart<D extends DataRecord = DataRecord>(
             css={css`
               float: right;
               & svg {
-                color: ${theme.colors.grayscale.base} !important;
+                color: ${theme.colorIcon} !important;
               }
             `}
           >
@@ -672,7 +681,7 @@ export default function TableChart<D extends DataRecord = DataRecord>(
       <tr
         css={css`
           th {
-            border-right: 2px solid ${theme.colors.grayscale.light2};
+            border-right: 1px solid ${theme.colorSplit};
           }
           th:first-child {
             border-left: none;
@@ -755,7 +764,6 @@ export default function TableChart<D extends DataRecord = DataRecord>(
         isUsingTimeComparison &&
         Array.isArray(basicColorFormatters) &&
         basicColorFormatters.length > 0;
-
       const valueRange =
         !hasBasicColorFormatters &&
         !hasColumnColorFormatters &&
@@ -829,15 +837,15 @@ export default function TableChart<D extends DataRecord = DataRecord>(
                 ? basicColorColumnFormatters[row.index][column.key]?.mainArrow
                 : '';
           }
-
           const StyledCell = styled.td`
+            color: ${theme.colorText};
             text-align: ${sharedStyle.textAlign};
             white-space: ${value instanceof Date ? 'nowrap' : undefined};
             position: relative;
             background: ${backgroundColor || undefined};
             padding-left: ${column.isChildColumn
-              ? `${theme.gridUnit * 5}px`
-              : `${theme.gridUnit}px`};
+              ? `${theme.sizeUnit * 5}px`
+              : `${theme.sizeUnit}px`};
           `;
 
           const cellBarStyles = css`
@@ -868,9 +876,9 @@ export default function TableChart<D extends DataRecord = DataRecord>(
             color: ${basicColorFormatters &&
             basicColorFormatters[row.index][originKey]?.arrowColor ===
               ColorSchemeEnum.Green
-              ? theme.colors.success.base
-              : theme.colors.error.base};
-            margin-right: ${theme.gridUnit}px;
+              ? theme.colorSuccess
+              : theme.colorError};
+            margin-right: ${theme.sizeUnit}px;
           `;
 
           if (
@@ -880,9 +888,9 @@ export default function TableChart<D extends DataRecord = DataRecord>(
             arrowStyles = css`
               color: ${basicColorColumnFormatters[row.index][column.key]
                 ?.arrowColor === ColorSchemeEnum.Green
-                ? theme.colors.success.base
-                : theme.colors.error.base};
-              margin-right: ${theme.gridUnit}px;
+                ? theme.colorSuccess
+                : theme.colorError};
+              margin-right: ${theme.sizeUnit}px;
             `;
           }
 
@@ -971,7 +979,7 @@ export default function TableChart<D extends DataRecord = DataRecord>(
         },
         Header: ({ column: col, onClick, style, onDragStart, onDrop }) => (
           <th
-            id={`header-${column.key}`}
+            id={`header-${column.originalLabel}`}
             title={t('Shift + Click to sort by multiple columns')}
             className={[className, col.isSorted ? 'is-sorted' : ''].join(' ')}
             style={{
@@ -1027,8 +1035,8 @@ export default function TableChart<D extends DataRecord = DataRecord>(
                   display: flex;
                   align-items: center;
                   & svg {
-                    margin-left: ${theme.gridUnit}px;
-                    color: ${theme.colors.grayscale.dark1} !important;
+                    margin-left: ${theme.sizeUnit}px;
+                    color: ${theme.colorBorder} !important;
                   }
                 `}
               >
diff --git a/superset-frontend/plugins/plugin-chart-table/src/buildQuery.ts b/superset-frontend/plugins/plugin-chart-table/src/buildQuery.ts
index 439df369f5a..d5147b20061 100644
--- a/superset-frontend/plugins/plugin-chart-table/src/buildQuery.ts
+++ b/superset-frontend/plugins/plugin-chart-table/src/buildQuery.ts
@@ -18,17 +18,18 @@
  */
 import {
   AdhocColumn,
+  BuildQuery,
+  PostProcessingRule,
+  QueryFormOrderBy,
+  QueryMode,
+  QueryObject,
   buildQueryContext,
   ensureIsArray,
   getMetricLabel,
   isPhysicalColumn,
-  QueryFormOrderBy,
-  QueryMode,
-  QueryObject,
   removeDuplicates,
 } from '@superset-ui/core';
-import { PostProcessingRule } from '@superset-ui/core/src/query/types/PostProcessing';
-import { BuildQuery } from '@superset-ui/core/src/chart/registries/ChartBuildQueryRegistrySingleton';
+
 import {
   isTimeComparison,
   timeCompareOperator,
@@ -84,7 +85,7 @@ const buildQuery: BuildQuery<TableChartFormData> = (
   return buildQueryContext(formDataCopy, baseQueryObject => {
     let { metrics, orderby = [], columns = [] } = baseQueryObject;
     const { extras = {} } = baseQueryObject;
-    let postProcessing: PostProcessingRule[] = [];
+    const postProcessing: PostProcessingRule[] = [];
     const nonCustomNorInheritShifts = ensureIsArray(
       formData.time_compare,
     ).filter((shift: string) => shift !== 'custom' && shift !== 'inherit');
@@ -115,6 +116,13 @@ const buildQuery: BuildQuery<TableChartFormData> = (
       }
     }
 
+    if (
+      extra_form_data?.time_compare &&
+      !timeOffsets.includes(extra_form_data.time_compare)
+    ) {
+      timeOffsets = [extra_form_data.time_compare];
+    }
+
     let temporalColumnAdded = false;
     let temporalColumn = null;
 
@@ -129,6 +137,12 @@ const buildQuery: BuildQuery<TableChartFormData> = (
         orderby = [[metrics[0], false]];
       }
       // add postprocessing for percent metrics only when in aggregation mode
+      type PercentMetricCalculationMode = 'row_limit' | 'all_records';
+
+      const calculationMode: PercentMetricCalculationMode =
+        (formData.percent_metric_calculation as PercentMetricCalculationMode) ||
+        'row_limit';
+
       if (percentMetrics && percentMetrics.length > 0) {
         const percentMetricsLabelsWithTimeComparison = isTimeComparison(
           formData,
@@ -139,6 +153,7 @@ const buildQuery: BuildQuery<TableChartFormData> = (
               timeOffsets,
             )
           : percentMetrics.map(getMetricLabel);
+
         const percentMetricLabels = removeDuplicates(
           percentMetricsLabelsWithTimeComparison,
         );
@@ -146,16 +161,26 @@ const buildQuery: BuildQuery<TableChartFormData> = (
           metrics.concat(percentMetrics),
           getMetricLabel,
         );
-        postProcessing = [
-          {
+
+        if (calculationMode === 'all_records') {
+          postProcessing.push({
             operation: 'contribution',
             options: {
               columns: percentMetricLabels,
-              rename_columns: percentMetricLabels.map(x => `%${x}`),
+              rename_columns: percentMetricLabels.map(m => `%${m}`),
             },
-          },
-        ];
+          });
+        } else {
+          postProcessing.push({
+            operation: 'contribution',
+            options: {
+              columns: percentMetricLabels,
+              rename_columns: percentMetricLabels.map(m => `%${m}`),
+            },
+          });
+        }
       }
+
       // Add the operator for the time comparison if some is selected
       if (!isEmpty(timeOffsets)) {
         postProcessing.push(timeCompareOperator(formData, baseQueryObject));
@@ -252,6 +277,26 @@ const buildQuery: BuildQuery<TableChartFormData> = (
     });
 
     const extraQueries: QueryObject[] = [];
+
+    const calculationMode = formData.percent_metric_calculation || 'row_limit';
+
+    if (
+      calculationMode === 'all_records' &&
+      percentMetrics &&
+      percentMetrics.length > 0
+    ) {
+      extraQueries.push({
+        ...queryObject,
+        columns: [],
+        metrics: percentMetrics,
+        post_processing: [],
+        row_limit: 0,
+        row_offset: 0,
+        orderby: [],
+        is_timeseries: false,
+      });
+    }
+
     if (
       metrics?.length &&
       formData.show_totals &&
@@ -263,8 +308,8 @@ const buildQuery: BuildQuery<TableChartFormData> = (
         row_limit: 0,
         row_offset: 0,
         post_processing: [],
-        order_desc: undefined, // we don't need orderby stuff here,
-        orderby: undefined, // because this query will be used for get total aggregation.
+        order_desc: undefined,
+        orderby: undefined,
       });
     }
 
diff --git a/superset-frontend/plugins/plugin-chart-table/src/controlPanel.tsx b/superset-frontend/plugins/plugin-chart-table/src/controlPanel.tsx
index 1f9425354e5..1c7cb036a23 100644
--- a/superset-frontend/plugins/plugin-chart-table/src/controlPanel.tsx
+++ b/superset-frontend/plugins/plugin-chart-table/src/controlPanel.tsx
@@ -161,12 +161,30 @@ const generateComparisonColumns = (colname: string) => [
   `△ ${colname}`,
   `% ${colname}`,
 ];
+
 /**
  * Generate column types for the comparison columns.
  */
 const generateComparisonColumnTypes = (count: number) =>
   Array(count).fill(GenericDataType.Numeric);
 
+const percentMetricCalculationControl: ControlConfig<'SelectControl'> = {
+  type: 'SelectControl',
+  label: t('Percentage metric calculation'),
+  description: t(
+    'Row Limit: percentages are calculated based on the subset of data retrieved, respecting the row limit. ' +
+      'All Records: Percentages are calculated based on the total dataset, ignoring the row limit.',
+  ),
+  default: 'row_limit',
+  clearable: false,
+  choices: [
+    ['row_limit', t('Row limit')],
+    ['all_records', t('All records')],
+  ],
+  visibility: isAggMode,
+  renderTrigger: false,
+};
+
 const processComparisonColumns = (columns: any[], suffix: string) =>
   columns
     .map(col => {
@@ -433,6 +451,13 @@ const config: ControlPanelConfig = {
             },
           },
         ],
+        [
+          {
+            name: 'percent_metric_calculation',
+            config: percentMetricCalculationControl,
+          },
+        ],
+
         [
           {
             name: 'show_totals',
diff --git a/superset-frontend/plugins/plugin-chart-table/test/TableChart.test.tsx b/superset-frontend/plugins/plugin-chart-table/test/TableChart.test.tsx
index f3a24d24f63..166a88bce0c 100644
--- a/superset-frontend/plugins/plugin-chart-table/test/TableChart.test.tsx
+++ b/superset-frontend/plugins/plugin-chart-table/test/TableChart.test.tsx
@@ -17,8 +17,7 @@
  * under the License.
  */
 import '@testing-library/jest-dom';
-import { render, screen } from '@testing-library/react';
-import { ThemeProvider, supersetTheme } from '@superset-ui/core';
+import { render, screen } from '@superset-ui/core/spec';
 import TableChart from '../src/TableChart';
 import transformProps from '../src/transformProps';
 import DateWithFormatter from '../src/utils/DateWithFormatter';
@@ -268,9 +267,7 @@ describe('plugin-chart-table', () => {
     describe('TableChart', () => {
       it('render basic data', () => {
         render(
-          <ThemeProvider theme={supersetTheme}>
-            <TableChart {...transformProps(testData.basic)} sticky={false} />,
-          </ThemeProvider>,
+          <TableChart {...transformProps(testData.basic)} sticky={false} />,
         );
 
         const firstDataRow = screen.getAllByRole('rowgroup')[1];
@@ -289,10 +286,10 @@ describe('plugin-chart-table', () => {
 
       it('render advanced data', () => {
         render(
-          <ThemeProvider theme={supersetTheme}>
+          <>
             <TableChart {...transformProps(testData.advanced)} sticky={false} />
             ,
-          </ThemeProvider>,
+          </>,
         );
         const secondColumnHeader = screen.getByText('Sum of Num');
         expect(secondColumnHeader).toBeInTheDocument();
@@ -413,9 +410,7 @@ describe('plugin-chart-table', () => {
 
       it('render empty data', () => {
         render(
-          <ThemeProvider theme={supersetTheme}>
-            <TableChart {...transformProps(testData.empty)} sticky={false} />,
-          </ThemeProvider>,
+          <TableChart {...transformProps(testData.empty)} sticky={false} />,
         );
         expect(screen.getByText('No records found')).toBeInTheDocument();
       });
@@ -491,14 +486,10 @@ describe('plugin-chart-table', () => {
         );
         expect(getComputedStyle(screen.getByText('N/A')).background).toBe('');
       });
-      it('should display originalLabel in grouped headers', () => {
+      it('should display original label in grouped headers', () => {
         const props = transformProps(testData.comparison);
 
-        render(
-          <ThemeProvider theme={supersetTheme}>
-            <TableChart {...props} sticky={false} />
-          </ThemeProvider>,
-        );
+        render(<TableChart {...props} sticky={false} />);
         const groupHeaders = screen.getAllByRole('columnheader');
         expect(groupHeaders.length).toBeGreaterThan(0);
         const hasMetricHeaders = groupHeaders.some(
diff --git a/superset-frontend/plugins/plugin-chart-table/test/buildQuery.test.ts b/superset-frontend/plugins/plugin-chart-table/test/buildQuery.test.ts
index 4badcc673ac..200bf7d9e8a 100644
--- a/superset-frontend/plugins/plugin-chart-table/test/buildQuery.test.ts
+++ b/superset-frontend/plugins/plugin-chart-table/test/buildQuery.test.ts
@@ -148,5 +148,92 @@ describe('plugin-chart-table', () => {
       expect(queries[1].extras?.time_grain_sqla).toEqual(TimeGranularity.MONTH);
       expect(queries[1].extras?.where).toEqual("(status IN ('In Process'))");
     });
+
+    describe('Percent Metric Calculation Modes', () => {
+      const baseFormDataWithPercents: TableChartFormData = {
+        ...basicFormData,
+        query_mode: QueryMode.Aggregate,
+        metrics: ['count'],
+        percent_metrics: ['sum_sales'],
+        groupby: ['category'],
+      };
+
+      it('should default to row_limit mode with single query', () => {
+        const { queries } = buildQuery(baseFormDataWithPercents);
+
+        expect(queries).toHaveLength(1);
+        expect(queries[0].metrics).toEqual(['count', 'sum_sales']);
+        expect(queries[0].post_processing).toEqual([
+          {
+            operation: 'contribution',
+            options: {
+              columns: ['sum_sales'],
+              rename_columns: ['%sum_sales'],
+            },
+          },
+        ]);
+      });
+
+      it('should create extra query in all_records mode', () => {
+        const formData = {
+          ...baseFormDataWithPercents,
+          percent_metric_calculation: 'all_records',
+        };
+
+        const { queries } = buildQuery(formData);
+
+        expect(queries).toHaveLength(2);
+
+        expect(queries[0].post_processing).toEqual([
+          {
+            operation: 'contribution',
+            options: {
+              columns: ['sum_sales'],
+              rename_columns: ['%sum_sales'],
+            },
+          },
+        ]);
+
+        expect(queries[1]).toMatchObject({
+          columns: [],
+          metrics: ['sum_sales'],
+          post_processing: [],
+          row_limit: 0,
+          row_offset: 0,
+          orderby: [],
+          is_timeseries: false,
+        });
+      });
+
+      it('should work with show_totals in all_records mode', () => {
+        const formData = {
+          ...baseFormDataWithPercents,
+          percent_metric_calculation: 'all_records',
+          show_totals: true,
+        };
+
+        const { queries } = buildQuery(formData);
+
+        expect(queries).toHaveLength(3);
+        expect(queries[1].metrics).toEqual(['sum_sales']);
+        expect(queries[2].metrics).toEqual(['count', 'sum_sales']);
+      });
+
+      it('should handle empty percent_metrics in all_records mode', () => {
+        const formData = {
+          ...basicFormData,
+          query_mode: QueryMode.Aggregate,
+          metrics: ['count'],
+          percent_metrics: [],
+          percent_metric_calculation: 'all_records',
+          groupby: ['category'],
+        };
+
+        const { queries } = buildQuery(formData);
+
+        expect(queries).toHaveLength(1);
+        expect(queries[0].post_processing).toEqual([]);
+      });
+    });
   });
 });
diff --git a/superset-frontend/plugins/plugin-chart-table/tsconfig.json b/superset-frontend/plugins/plugin-chart-table/tsconfig.json
index f60297e2489..b5b28fc6189 100644
--- a/superset-frontend/plugins/plugin-chart-table/tsconfig.json
+++ b/superset-frontend/plugins/plugin-chart-table/tsconfig.json
@@ -1,18 +1,18 @@
 {
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "declarationDir": "lib",
+    "composite": true,
+    "rootDir": "src",
     "outDir": "lib",
-    "rootDir": "src"
-  },
-  "exclude": ["lib", "test"],
-  "extends": "../../tsconfig.json",
-  "include": ["src/**/*", "types/**/*", "../../types/**/*"],
-  "references": [
-    {
-      "path": "../../packages/superset-ui-chart-controls"
-    },
-    {
-      "path": "../../packages/superset-ui-core"
+    "baseUrl": ".",
+    "paths": {
+      "@superset-ui/core/components": ["../../packages/superset-ui-core/src/components"]
     }
+  },
+  "include": ["src/**/*", "types/**/*"],
+  "exclude": ["lib", "test"],
+  "references": [
+    { "path": "../../packages/superset-ui-core" },
+    { "path": "../../packages/superset-ui-chart-controls" }
   ]
 }
diff --git a/superset-frontend/plugins/plugin-chart-word-cloud/package.json b/superset-frontend/plugins/plugin-chart-word-cloud/package.json
index c8c0d90a35a..5be4874079d 100644
--- a/superset-frontend/plugins/plugin-chart-word-cloud/package.json
+++ b/superset-frontend/plugins/plugin-chart-word-cloud/package.json
@@ -29,7 +29,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@types/d3-scale": "^4.0.8",
+    "@types/d3-scale": "^4.0.9",
     "d3-cloud": "^1.2.7",
     "d3-scale": "^3.0.1",
     "encodable": "^0.7.8"
diff --git a/superset-frontend/plugins/plugin-chart-word-cloud/src/chart/WordCloud.tsx b/superset-frontend/plugins/plugin-chart-word-cloud/src/chart/WordCloud.tsx
index 0e91e93f126..d634e06a594 100644
--- a/superset-frontend/plugins/plugin-chart-word-cloud/src/chart/WordCloud.tsx
+++ b/superset-frontend/plugins/plugin-chart-word-cloud/src/chart/WordCloud.tsx
@@ -16,9 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 import { PureComponent } from 'react';
-import cloudLayout, { Word } from 'd3-cloud';
+import cloudLayout from 'd3-cloud';
 import {
   PlainObject,
   createEncoderFactory,
@@ -26,7 +25,7 @@ import {
   Encoder,
 } from 'encodable';
 import {
-  SupersetThemeProps,
+  SupersetTheme,
   withTheme,
   seed,
   CategoricalColorNamespace,
@@ -34,9 +33,20 @@ import {
 import { isEqual } from 'lodash';
 
 const seedRandom = seed('superset-ui');
+
+// Polyfill Word type since it's not exported from 'd3-cloud'
+export type Word = {
+  text: string;
+  size: number;
+  x?: number;
+  y?: number;
+  rotate?: number;
+  font?: string;
+  weight?: string | number;
+};
+
 export const ROTATION = {
   flat: () => 0,
-  // this calculates a random rotation between -90 and 90 degrees.
   random: () => Math.floor(seedRandom() * 6 - 3) * 30,
   square: () => Math.floor(seedRandom() * 2) * 90,
 };
@@ -53,9 +63,6 @@ type WordCloudEncodingConfig = {
   text: ['Text', string];
 };
 
-/**
- * These props should be stored when saving the chart.
- */
 export interface WordCloudVisualProps {
   encoding?: Partial<WordCloudEncoding>;
   rotation?: RotationType;
@@ -80,20 +87,14 @@ const defaultProps: Required<WordCloudVisualProps> = {
 };
 
 type FullWordCloudProps = WordCloudProps &
-  typeof defaultProps &
-  SupersetThemeProps;
+  typeof defaultProps & { theme: SupersetTheme };
 
 const SCALE_FACTOR_STEP = 0.5;
 const MAX_SCALE_FACTOR = 3;
-// Percentage of top results that will always be displayed.
-// Needed to avoid clutter when shrinking a chart with many records.
 const TOP_RESULTS_PERCENTAGE = 0.1;
-
 class WordCloud extends PureComponent<FullWordCloudProps, WordCloudState> {
   static defaultProps = defaultProps;
 
-  // Cannot name it isMounted because of conflict
-  // with React's component function name
   isComponentMounted = false;
 
   wordCloudEncoderFactory = createEncoderFactory<WordCloudEncodingConfig>({
@@ -106,18 +107,22 @@ class WordCloud extends PureComponent<FullWordCloudProps, WordCloudState> {
     },
     defaultEncoding: {
       color: { value: this.props.theme.colors.grayscale.dark2 },
-      fontFamily: { value: this.props.theme.typography.families.sansSerif },
+      fontFamily: { value: this.props.theme.fontFamily },
       fontSize: { value: 20 },
       fontWeight: { value: 'bold' },
       text: { value: '' },
     },
   });
 
-  createEncoder = (encoding?: Partial<WordCloudEncoding>) => {
-    const selector = this.wordCloudEncoderFactory.createSelector();
+  createEncoder = (
+    encoding?: Partial<WordCloudEncoding>,
+  ): Encoder<WordCloudEncodingConfig> => {
+    const selector: (
+      e: Partial<WordCloudEncoding>,
+    ) => Encoder<WordCloudEncodingConfig> =
+      this.wordCloudEncoderFactory.createSelector();
 
-    // @ts-ignore
-    return selector(encoding as any);
+    return selector(encoding ?? {});
   };
 
   constructor(props: FullWordCloudProps) {
@@ -136,7 +141,6 @@ class WordCloud extends PureComponent<FullWordCloudProps, WordCloudState> {
 
   componentDidUpdate(prevProps: WordCloudProps) {
     const { data, encoding, width, height, rotation } = this.props;
-
     if (
       !isEqual(prevProps.data, data) ||
       !isEqual(prevProps.encoding, encoding) ||
@@ -161,8 +165,7 @@ class WordCloud extends PureComponent<FullWordCloudProps, WordCloudState> {
   update() {
     const { data, encoding } = this.props;
 
-    const encoder: Encoder<WordCloudEncodingConfig> =
-      this.createEncoder(encoding);
+    const encoder = this.createEncoder(encoding);
     encoder.setDomainFromDataset(data);
 
     const sortedData = [...data].sort(
@@ -176,7 +179,6 @@ class WordCloud extends PureComponent<FullWordCloudProps, WordCloudState> {
     );
     const topResults = sortedData.slice(0, topResultsCount);
 
-    // Ensure top results are always included in the final word cloud by scaling chart down if needed
     this.generateCloud(encoder, 1, (words: Word[]) =>
       topResults.every((d: PlainObject) =>
         words.find(
@@ -195,16 +197,12 @@ class WordCloud extends PureComponent<FullWordCloudProps, WordCloudState> {
 
     cloudLayout()
       .size([width * scaleFactor, height * scaleFactor])
-      // clone the data because cloudLayout mutates input
-      .words(data.map(d => ({ ...d })))
+      .words(data.map((d: Word) => ({ ...d })))
       .padding(5)
       .rotate(ROTATION[rotation] || ROTATION.flat)
       .text((d: PlainObject) => encoder.channels.text.getValueFromDatum(d))
       .font((d: PlainObject) =>
-        encoder.channels.fontFamily.encodeDatum(
-          d,
-          this.props.theme.typography.families.sansSerif,
-        ),
+        encoder.channels.fontFamily.encodeDatum(d, this.props.theme.fontFamily),
       )
       .fontWeight((d: PlainObject) =>
         encoder.channels.fontWeight.encodeDatum(d, 'normal'),
@@ -212,9 +210,7 @@ class WordCloud extends PureComponent<FullWordCloudProps, WordCloudState> {
       .fontSize((d: PlainObject) => encoder.channels.fontSize.encodeDatum(d, 0))
       .on('end', (words: Word[]) => {
         if (isValid(words) || scaleFactor > MAX_SCALE_FACTOR) {
-          if (this.isComponentMounted) {
-            this.setState({ words, scaleFactor });
-          }
+          this.setWords(words);
         } else {
           this.generateCloud(encoder, scaleFactor + SCALE_FACTOR_STEP, isValid);
         }
@@ -223,17 +219,13 @@ class WordCloud extends PureComponent<FullWordCloudProps, WordCloudState> {
   }
 
   render() {
-    const { scaleFactor } = this.state;
+    const { scaleFactor, words } = this.state;
     const { width, height, encoding, sliceId, colorScheme } = this.props;
-    const { words } = this.state;
 
-    // @ts-ignore
     const encoder = this.createEncoder(encoding);
     encoder.channels.color.setDomainFromDataset(words);
 
-    const { getValueFromDatum } = encoder.channels.color;
     const colorFn = CategoricalColorNamespace.getScale(colorScheme);
-
     const viewBoxWidth = width * scaleFactor;
     const viewBoxHeight = height * scaleFactor;
 
@@ -241,9 +233,7 @@ class WordCloud extends PureComponent<FullWordCloudProps, WordCloudState> {
       <svg
         width={width}
         height={height}
-        viewBox={`-${viewBoxWidth / 2} -${
-          viewBoxHeight / 2
-        } ${viewBoxWidth} ${viewBoxHeight}`}
+        viewBox={`-${viewBoxWidth / 2} -${viewBoxHeight / 2} ${viewBoxWidth} ${viewBoxHeight}`}
       >
         <g>
           {words.map(w => (
@@ -252,7 +242,10 @@ class WordCloud extends PureComponent<FullWordCloudProps, WordCloudState> {
               fontSize={`${w.size}px`}
               fontWeight={w.weight}
               fontFamily={w.font}
-              fill={colorFn(getValueFromDatum(w) as string, sliceId)}
+              fill={colorFn(
+                encoder.channels.color.getValueFromDatum(w) as string,
+                sliceId,
+              )}
               textAnchor="middle"
               transform={`translate(${w.x}, ${w.y}) rotate(${w.rotate})`}
             >
diff --git a/superset-frontend/plugins/plugin-chart-word-cloud/tsconfig.json b/superset-frontend/plugins/plugin-chart-word-cloud/tsconfig.json
index b6bfaa2d984..b3af9a1d193 100644
--- a/superset-frontend/plugins/plugin-chart-word-cloud/tsconfig.json
+++ b/superset-frontend/plugins/plugin-chart-word-cloud/tsconfig.json
@@ -1,25 +1,15 @@
 {
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "declarationDir": "lib",
+    "composite": true,
+    "rootDir": "src",
     "outDir": "lib",
-    "rootDir": "src"
+    "baseUrl": "."
   },
-  "exclude": [
-    "lib",
-    "test"
-  ],
-  "extends": "../../tsconfig.json",
-  "include": [
-    "src/**/*",
-    "types/**/*",
-    "../../types/**/*"
-  ],
+  "include": ["src/**/*", "types/**/*"],
+  "exclude": ["lib", "test"],
   "references": [
-    {
-      "path": "../../packages/superset-ui-chart-controls"
-    },
-    {
-      "path": "../../packages/superset-ui-core"
-    }
+    { "path": "../../packages/superset-ui-core" },
+    { "path": "../../packages/superset-ui-chart-controls" }
   ]
 }
diff --git a/superset-frontend/scripts/build.js b/superset-frontend/scripts/build.js
index 5d73aaadc59..2cabf466ecf 100644
--- a/superset-frontend/scripts/build.js
+++ b/superset-frontend/scripts/build.js
@@ -25,39 +25,11 @@
  */
 process.env.PATH = `./node_modules/.bin:${process.env.PATH}`;
 
-const { sync } = require('rimraf');
 const { spawnSync } = require('child_process');
 const fastGlob = require('fast-glob');
-const { argv } = require('yargs')
-  .option('lint', {
-    describe: 'whether to run ESLint',
-    type: 'boolean',
-    // lint is slow, so not turning it on by default
-    default: false,
-  })
-  .option('babel', {
-    describe: 'Whether to run Babel',
-    type: 'boolean',
-    default: true,
-  })
-  .option('clean', {
-    describe: 'Whether to clean cache',
-    type: 'boolean',
-    default: false,
-  })
-  .option('type', {
-    describe: 'Whether to run tsc',
-    type: 'boolean',
-    default: true,
-  });
+const { argv } = require('yargs');
 
-const {
-  _: globs,
-  lint: shouldLint,
-  babel: shouldRunBabel,
-  clean: shouldCleanup,
-  type: shouldRunTyping,
-} = argv;
+const { _: globs } = argv;
 const glob = globs.length > 1 ? `{${globs.join(',')}}` : globs[0] || '*';
 
 const BABEL_CONFIG = '--config-file=../../babel.config.js';
@@ -105,35 +77,19 @@ function getPackages(packagePattern, tsOnly = false) {
 
 let scope = getPackages(glob);
 
-if (shouldLint) {
-  run(`npm run eslint -- . --fix {packages,plugins}/${scope}/{src,test}`);
-}
+console.log('--- Run babel --------');
+const babelCommand = `lerna exec --stream --concurrency 10 --scope ${scope}
+        -- babel ${BABEL_CONFIG} src --extensions ".ts,.tsx,.js,.jsx" --copy-files`;
+run(`${babelCommand} --out-dir lib`);
 
-if (shouldCleanup) {
-  // these modules will be installed by `npm link` but not useful for actual build
-  const dirtyModules = 'node_modules/@types/react,node_modules/@superset-ui';
-  const cachePath = `./node_modules/${scope}/{lib,esm,tsconfig.tsbuildinfo,${dirtyModules}}`;
-  console.log(`\n>> Cleaning up ${cachePath}`);
-  sync(cachePath);
-}
+console.log('--- Run babel esm ---');
+// run again with
+run(`${babelCommand} --out-dir esm`, {
+  env: { ...process.env, NODE_ENV: 'production', BABEL_OUTPUT: 'esm' },
+});
 
-if (shouldRunBabel) {
-  console.log('--- Run babel --------');
-  const babelCommand = `lerna exec --stream --concurrency 10 --scope ${scope}
-         -- babel ${BABEL_CONFIG} src --extensions ".ts,.tsx,.js,.jsx" --copy-files`;
-  run(`${babelCommand} --out-dir lib`);
-
-  console.log('--- Run babel esm ---');
-  // run again with
-  run(`${babelCommand} --out-dir esm`, {
-    env: { ...process.env, NODE_ENV: 'production', BABEL_OUTPUT: 'esm' },
-  });
-}
-
-if (shouldRunTyping) {
-  console.log('--- Run tsc ---');
-  // only run tsc for packages with ts files
-  scope = getPackages(glob, true);
-  run(`lerna exec --stream --concurrency 3 --scope ${scope} \
-       -- ../../scripts/tsc.sh --build`);
-}
+console.log('--- Run tsc ---');
+// only run tsc for packages with ts files
+scope = getPackages(glob, true);
+run(`lerna exec --stream --concurrency 3 --scope ${scope} \
+      -- ../../scripts/tsc.sh --build`);
diff --git a/superset-frontend/spec/helpers/jsDomWithFetchAPI.ts b/superset-frontend/spec/helpers/jsDomWithFetchAPI.ts
new file mode 100644
index 00000000000..c1c1238e76e
--- /dev/null
+++ b/superset-frontend/spec/helpers/jsDomWithFetchAPI.ts
@@ -0,0 +1,35 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 JSDOMEnvironment from 'jest-environment-jsdom';
+
+// https://github.com/facebook/jest/blob/v29.4.3/website/versioned_docs/version-29.4/Configuration.md#testenvironment-string
+export default class FixJSDOMEnvironment extends JSDOMEnvironment {
+  constructor(...args: ConstructorParameters<typeof JSDOMEnvironment>) {
+    super(...args);
+
+    // FIXME https://github.com/jsdom/jsdom/issues/1724
+    this.global.fetch = fetch;
+    this.global.Headers = Headers;
+    this.global.Request = Request;
+    this.global.Response = Response;
+    this.global.AbortSignal = AbortSignal;
+    this.global.AbortController = AbortController;
+  }
+}
diff --git a/superset-frontend/spec/helpers/shim.tsx b/superset-frontend/spec/helpers/shim.tsx
index c8c19a56613..001af25cc79 100644
--- a/superset-frontend/spec/helpers/shim.tsx
+++ b/superset-frontend/spec/helpers/shim.tsx
@@ -19,7 +19,6 @@
 import { AriaAttributes } from 'react';
 import 'core-js/stable';
 import 'regenerator-runtime/runtime';
-import 'abortcontroller-polyfill/dist/abortcontroller-polyfill-only';
 import jQuery from 'jquery';
 // https://jestjs.io/docs/jest-object#jestmockmodulename-factory-options
 // in order to mock modules in test case, so avoid absolute import module
@@ -87,7 +86,7 @@ jest.mock('rehype-raw', () => () => jest.fn());
 
 // Mocks the Icon component due to its async nature
 // Tests should override this when needed
-jest.mock('src/components/Icons/AsyncIcon', () => ({
+jest.mock('@superset-ui/core/components/Icons/AsyncIcon', () => ({
   __esModule: true,
   default: ({
     fileName,
diff --git a/superset-frontend/spec/helpers/testing-library.tsx b/superset-frontend/spec/helpers/testing-library.tsx
index 07347967710..2734d881546 100644
--- a/superset-frontend/spec/helpers/testing-library.tsx
+++ b/superset-frontend/spec/helpers/testing-library.tsx
@@ -26,8 +26,14 @@ import {
   waitFor,
   within,
 } from '@testing-library/react';
-// eslint-disable-next-line no-restricted-imports
-import { ThemeProvider, supersetTheme } from '@superset-ui/core';
+import {
+  ThemeProvider,
+  // eslint-disable-next-line no-restricted-imports
+  supersetTheme,
+  themeObject,
+} from '@superset-ui/core';
+import { SupersetThemeProvider } from 'src/theme/ThemeProvider';
+import { ThemeController } from 'src/theme/ThemeController';
 import { BrowserRouter } from 'react-router-dom';
 import { Provider } from 'react-redux';
 import { DndProvider } from 'react-dnd';
@@ -43,11 +49,14 @@ type Options = Omit<RenderOptions, 'queries'> & {
   useDnd?: boolean;
   useQueryParams?: boolean;
   useRouter?: boolean;
+  useTheme?: boolean;
   initialState?: {};
   reducers?: {};
   store?: Store;
 };
 
+const themeController = new ThemeController({ themeObject });
+
 export const createStore = (initialState: object = {}, reducers: object = {}) =>
   configureStore({
     preloadedState: initialState,
@@ -68,6 +77,7 @@ export function createWrapper(options?: Options) {
     useRedux,
     useQueryParams,
     useRouter,
+    useTheme,
     initialState,
     reducers,
     store,
@@ -78,6 +88,14 @@ export function createWrapper(options?: Options) {
       <ThemeProvider theme={supersetTheme}>{children}</ThemeProvider>
     );
 
+    if (useTheme) {
+      result = (
+        <SupersetThemeProvider themeController={themeController}>
+          {result}
+        </SupersetThemeProvider>
+      );
+    }
+
     if (useDnd) {
       result = <DndProvider backend={HTML5Backend}>{result}</DndProvider>;
     }
diff --git a/superset-frontend/src/GlobalStyles.tsx b/superset-frontend/src/GlobalStyles.tsx
deleted file mode 100644
index e80d32e7ec4..00000000000
--- a/superset-frontend/src/GlobalStyles.tsx
+++ /dev/null
@@ -1,112 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 { css } from '@superset-ui/core';
-import { Global } from '@emotion/react';
-import { mix } from 'polished';
-import 'react-js-cron/dist/styles.css';
-
-export const GlobalStyles = () => (
-  <Global
-    styles={theme => css`
-      h1,
-      h2,
-      h3,
-      h4,
-      h5,
-      h6,
-      strong,
-      th {
-        font-weight: ${theme.typography.weights.bold};
-      }
-      // CSS hack to resolve the issue caused by the invisible echart tooltip on
-      // https://github.com/apache/superset/issues/30058
-      .echarts-tooltip[style*='visibility: hidden'] {
-        display: none !important;
-      }
-
-      // Ant Design is applying inline z-index styles causing troubles
-      // TODO: Remove z-indexes when Ant Design is fully upgraded to v5
-      // Prefer vanilla Ant Design z-indexes that should work out of the box
-      .antd5-dropdown,
-      .ant-dropdown,
-      .ant-select-dropdown,
-      .antd5-modal-wrap,
-      .antd5-modal-mask,
-      .antd5-picker-dropdown,
-      .ant-popover,
-      .antd5-popover {
-        z-index: ${theme.zIndex.max} !important;
-      }
-
-      // TODO: Remove when buttons have been upgraded to Ant Design 5.
-      // Check src/components/Modal for more info.
-      .ant-modal-confirm {
-        button {
-          border: none;
-          border-radius: ${theme.borderRadius}px;
-          line-height: 1.5715;
-          font-size: ${theme.typography.sizes.s}px;
-          font-weight: ${theme.typography.weights.bold};
-        }
-        .ant-btn-primary:not(.btn-danger) {
-          background: ${theme.colors.primary.base};
-          color: ${theme.colors.grayscale.light5};
-          &:hover {
-            background: ${theme.colors.primary.dark1};
-          }
-        }
-        .ant-btn-default:not(.btn-danger) {
-          background: ${theme.colors.primary.light4};
-          color: ${theme.colors.primary.dark1};
-          &:hover {
-            background: ${mix(
-              0.1,
-              theme.colors.primary.base,
-              theme.colors.primary.light4,
-            )};
-          }
-        }
-      }
-      .column-config-popover {
-        & .antd5-input-number {
-          width: 100%;
-        }
-        && .btn-group svg {
-          line-height: 0;
-          top: 0;
-        }
-        & .btn-group > .btn {
-          padding: 5px 10px 6px;
-        }
-        && .ant-tabs {
-          margin-top: ${theme.gridUnit * -3}px;
-        }
-        & .ant-tabs-nav {
-          margin-left: ${theme.gridUnit * -4}px;
-          margin-right: ${theme.gridUnit * -4}px;
-          margin-bottom: ${theme.gridUnit * 2}px;
-        }
-        && .ant-tabs-tab {
-          flex: 1;
-          margin-right: 0;
-        }
-      }
-    `}
-  />
-);
diff --git a/superset-frontend/src/SqlLab/SqlLabGlobalStyles.tsx b/superset-frontend/src/SqlLab/SqlLabGlobalStyles.tsx
index ef9fb8be62b..5fa75de1bfd 100644
--- a/superset-frontend/src/SqlLab/SqlLabGlobalStyles.tsx
+++ b/superset-frontend/src/SqlLab/SqlLabGlobalStyles.tsx
@@ -26,7 +26,7 @@ export const SqlLabGlobalStyles = () => (
       body {
         min-height: max(
           100vh,
-          ${theme.gridUnit * 125}px
+          ${theme.sizeUnit * 125}px
         ); // Set a min height so the gutter is always visible when resizing
         overflow: hidden;
       }
diff --git a/superset-frontend/src/SqlLab/actions/sqlLab.js b/superset-frontend/src/SqlLab/actions/sqlLab.js
index 35b497468a3..82d103ed745 100644
--- a/superset-frontend/src/SqlLab/actions/sqlLab.js
+++ b/superset-frontend/src/SqlLab/actions/sqlLab.js
@@ -28,7 +28,7 @@ import {
 } from '@superset-ui/core';
 import { invert, mapKeys } from 'lodash';
 
-import { now } from 'src/utils/dates';
+import { now } from '@superset-ui/core/utils/dates';
 import {
   addDangerToast as addDangerToastAction,
   addInfoToast as addInfoToastAction,
diff --git a/superset-frontend/src/SqlLab/components/AceEditorWrapper/AceEditorWrapper.test.tsx b/superset-frontend/src/SqlLab/components/AceEditorWrapper/AceEditorWrapper.test.tsx
index 82a79103fe2..a46f60c5d4e 100644
--- a/superset-frontend/src/SqlLab/components/AceEditorWrapper/AceEditorWrapper.test.tsx
+++ b/superset-frontend/src/SqlLab/components/AceEditorWrapper/AceEditorWrapper.test.tsx
@@ -23,9 +23,9 @@ import { Store } from 'redux';
 import { initialState, defaultQueryEditor } from 'src/SqlLab/fixtures';
 import AceEditorWrapper from 'src/SqlLab/components/AceEditorWrapper';
 import {
-  AsyncAceEditorProps,
   FullSQLEditor,
-} from 'src/components/AsyncAceEditor';
+  type AsyncAceEditorProps,
+} from '@superset-ui/core/components';
 import {
   queryEditorSetCursorPosition,
   queryEditorSetDb,
@@ -36,14 +36,14 @@ fetchMock.get('glob:*/api/v1/database/*/function_names/', {
   function_names: [],
 });
 
-jest.mock('src/components/Select/Select', () => () => (
+jest.mock('@superset-ui/core/components/Select/Select', () => () => (
   <div data-test="mock-deprecated-select-select" />
 ));
-jest.mock('src/components/Select/AsyncSelect', () => () => (
+jest.mock('@superset-ui/core/components/Select/AsyncSelect', () => () => (
   <div data-test="mock-deprecated-async-select" />
 ));
 
-jest.mock('src/components/AsyncAceEditor', () => ({
+jest.mock('@superset-ui/core/components/AsyncAceEditor', () => ({
   FullSQLEditor: jest
     .fn()
     .mockImplementation((props: AsyncAceEditorProps) => (
diff --git a/superset-frontend/src/SqlLab/components/AceEditorWrapper/index.tsx b/superset-frontend/src/SqlLab/components/AceEditorWrapper/index.tsx
index 06e67fb4043..bfa615765b6 100644
--- a/superset-frontend/src/SqlLab/components/AceEditorWrapper/index.tsx
+++ b/superset-frontend/src/SqlLab/components/AceEditorWrapper/index.tsx
@@ -19,12 +19,12 @@
 import { useState, useEffect, useRef } from 'react';
 import type { IAceEditor } from 'react-ace/lib/types';
 import { shallowEqual, useDispatch, useSelector } from 'react-redux';
-import { css, styled, usePrevious, useTheme } from '@superset-ui/core';
+import { css, usePrevious, useTheme } from '@superset-ui/core';
 import { Global } from '@emotion/react';
 
 import { SQL_EDITOR_LEFTBAR_WIDTH } from 'src/SqlLab/constants';
 import { queryEditorSetSelectedText } from 'src/SqlLab/actions/sqlLab';
-import { FullSQLEditor as AceEditor } from 'src/components/AsyncAceEditor';
+import { FullSQLEditor as AceEditor } from '@superset-ui/core/components';
 import type { KeyboardShortcut } from 'src/SqlLab/components/KeyboardShortcutButton';
 import useQueryEditor from 'src/SqlLab/hooks/useQueryEditor';
 import { SqlLabRootState, type CursorPosition } from 'src/SqlLab/types';
@@ -48,18 +48,6 @@ type AceEditorWrapperProps = {
   hotkeys: HotKey[];
 };
 
-const StyledAceEditor = styled(AceEditor)`
-  ${({ theme }) => css`
-    && {
-      // double class is better than !important
-      border: 1px solid ${theme.colors.grayscale.light2};
-      font-feature-settings:
-        'liga' off,
-        'calt' off;
-    }
-  `}
-`;
-
 const AceEditorWrapper = ({
   autocomplete,
   onBlur = () => {},
@@ -200,7 +188,7 @@ const AceEditorWrapper = ({
           .ace_autocomplete {
             // Use !important because Ace Editor applies extra CSS at the last second
             // when opening the autocomplete.
-            width: ${theme.gridUnit * 130}px !important;
+            width: ${theme.sizeUnit * 130}px !important;
           }
 
           .ace_tooltip {
@@ -208,11 +196,11 @@ const AceEditorWrapper = ({
           }
 
           .ace_scroller {
-            background-color: ${theme.colors.grayscale.light4};
+            background-color: ${theme.colorBgLayout};
           }
         `}
       />
-      <StyledAceEditor
+      <AceEditor
         keywords={keywords}
         onLoad={onEditorLoad}
         onBlur={onBlurSql}
diff --git a/superset-frontend/src/SqlLab/components/AceEditorWrapper/useKeywords.ts b/superset-frontend/src/SqlLab/components/AceEditorWrapper/useKeywords.ts
index e02145f963a..99e99125133 100644
--- a/superset-frontend/src/SqlLab/components/AceEditorWrapper/useKeywords.ts
+++ b/superset-frontend/src/SqlLab/components/AceEditorWrapper/useKeywords.ts
@@ -20,7 +20,7 @@ import { useEffect, useMemo, useRef } from 'react';
 import { useSelector, useDispatch, shallowEqual, useStore } from 'react-redux';
 import { getExtensionsRegistry, t } from '@superset-ui/core';
 
-import { Editor } from 'src/components/AsyncAceEditor';
+import type { Editor } from '@superset-ui/core/components';
 import sqlKeywords from 'src/SqlLab/utils/sqlKeywords';
 import { addTable, addDangerToast } from 'src/SqlLab/actions/sqlLab';
 import {
diff --git a/superset-frontend/src/SqlLab/components/App/index.tsx b/superset-frontend/src/SqlLab/components/App/index.tsx
index 8b9c2790834..643768570b1 100644
--- a/superset-frontend/src/SqlLab/components/App/index.tsx
+++ b/superset-frontend/src/SqlLab/components/App/index.tsx
@@ -45,13 +45,13 @@ const SqlLabStyles = styled.div`
       right: 0;
       bottom: 0;
       left: 0;
-      padding: 0 ${theme.gridUnit * 2}px;
+      padding: 0 ${theme.sizeUnit * 2}px;
 
       pre:not(.code) {
         padding: 0 !important;
         margin: 0;
         border: none;
-        font-size: ${theme.typography.sizes.s}px;
+        font-size: ${theme.fontSizeSM}px;
         background: transparent !important;
       }
 
@@ -76,7 +76,7 @@ const SqlLabStyles = styled.div`
       .ant-tabs-content {
         height: 100%;
         position: relative;
-        background-color: ${theme.colors.grayscale.light5};
+        background-color: ${theme.colorBgContainer};
         overflow-x: auto;
         overflow-y: auto;
 
@@ -89,11 +89,11 @@ const SqlLabStyles = styled.div`
         }
       }
 
-      .ResultsModal .antd5-modal-body {
-        min-height: ${theme.gridUnit * 140}px;
+      .ResultsModal .ant-modal-body {
+        min-height: ${theme.sizeUnit * 140}px;
       }
 
-      .antd5-modal-body {
+      .ant-modal-body {
         overflow: auto;
       }
     }
diff --git a/superset-frontend/src/SqlLab/components/ColumnElement/ColumnElement.test.tsx b/superset-frontend/src/SqlLab/components/ColumnElement/ColumnElement.test.tsx
index 09105bb5fa2..437be27504a 100644
--- a/superset-frontend/src/SqlLab/components/ColumnElement/ColumnElement.test.tsx
+++ b/superset-frontend/src/SqlLab/components/ColumnElement/ColumnElement.test.tsx
@@ -32,23 +32,23 @@ describe('ColumnElement', () => {
   it('renders a proper primary key', () => {
     const { container } = render(<ColumnElement column={table.columns[0]} />);
     expect(container.querySelector('i.fa-key')).toBeInTheDocument();
-    expect(container.querySelector('.col-name')?.firstChild).toHaveTextContent(
-      'id',
-    );
+    expect(
+      container.querySelector('[data-test="col-name"]')?.firstChild,
+    ).toHaveTextContent('id');
   });
   it('renders a multi-key column', () => {
     const { container } = render(<ColumnElement column={table.columns[1]} />);
     expect(container.querySelector('i.fa-link')).toBeInTheDocument();
     expect(container.querySelector('i.fa-bookmark')).toBeInTheDocument();
-    expect(container.querySelector('.col-name')?.firstChild).toHaveTextContent(
-      'first_name',
-    );
+    expect(
+      container.querySelector('[data-test="col-name"]')?.firstChild,
+    ).toHaveTextContent('first_name');
   });
   it('renders a column with no keys', () => {
     const { container } = render(<ColumnElement column={table.columns[2]} />);
     expect(container.querySelector('i')).not.toBeInTheDocument();
-    expect(container.querySelector('.col-name')?.firstChild).toHaveTextContent(
-      'last_name',
-    );
+    expect(
+      container.querySelector('[data-test="col-name"]')?.firstChild,
+    ).toHaveTextContent('last_name');
   });
 });
diff --git a/superset-frontend/src/SqlLab/components/ColumnElement/index.tsx b/superset-frontend/src/SqlLab/components/ColumnElement/index.tsx
index 613fa5dbea0..6150c6e3a79 100644
--- a/superset-frontend/src/SqlLab/components/ColumnElement/index.tsx
+++ b/superset-frontend/src/SqlLab/components/ColumnElement/index.tsx
@@ -19,7 +19,7 @@
 import { ReactNode } from 'react';
 import { ClassNames } from '@emotion/react';
 import { styled, useTheme, t } from '@superset-ui/core';
-import { Tooltip } from 'src/components/Tooltip';
+import { Flex, Tooltip } from '@superset-ui/core/components';
 
 const StyledTooltip = (props: any) => {
   const theme = useTheme();
@@ -28,8 +28,8 @@ const StyledTooltip = (props: any) => {
       {({ css }) => (
         <Tooltip
           overlayClassName={css`
-            .antd5-tooltip-inner {
-              max-width: ${theme.gridUnit * 125}px;
+            .ant-tooltip-inner {
+              max-width: ${theme.sizeUnit * 125}px;
               word-wrap: break-word;
               text-align: center;
 
@@ -37,8 +37,8 @@ const StyledTooltip = (props: any) => {
                 background: transparent;
                 border: none;
                 text-align: left;
-                color: ${theme.colors.grayscale.light5};
-                font-size: ${theme.typography.sizes.xs}px;
+                color: ${theme.colorBgLayout};
+                font-size: ${theme.fontSizeXS}px;
               }
             }
           `}
@@ -50,7 +50,7 @@ const StyledTooltip = (props: any) => {
 };
 
 const Hr = styled.hr`
-  margin-top: ${({ theme }) => theme.gridUnit * 1.5}px;
+  margin-top: ${({ theme }) => theme.sizeUnit * 1.5}px;
 `;
 
 const iconMap = {
@@ -98,21 +98,22 @@ const ColumnElement = ({ column }: ColumnElementProps) => {
             </>
           }
         >
-          <i className={`fa text-muted m-l-2 ${iconMap[key.type]}`} />
+          {' '}
+          <i className={`fa text-muted ${iconMap[key.type]}`} />
         </StyledTooltip>
       </span>
     ));
   }
   return (
-    <div className="clearfix table-column">
-      <div className="pull-left m-l-10 col-name">
+    <Flex align="center" justify="space-between">
+      <div data-test="col-name">
         {columnName}
         {icons}
       </div>
-      <NowrapDiv className="pull-right text-muted">
+      <NowrapDiv className="text-muted">
         <small> {column.type}</small>
       </NowrapDiv>
-    </div>
+    </Flex>
   );
 };
 
diff --git a/superset-frontend/src/SqlLab/components/EstimateQueryCostButton/EstimateQueryCostButton.test.tsx b/superset-frontend/src/SqlLab/components/EstimateQueryCostButton/EstimateQueryCostButton.test.tsx
index 7668020cd35..a989d02f702 100644
--- a/superset-frontend/src/SqlLab/components/EstimateQueryCostButton/EstimateQueryCostButton.test.tsx
+++ b/superset-frontend/src/SqlLab/components/EstimateQueryCostButton/EstimateQueryCostButton.test.tsx
@@ -33,10 +33,10 @@ import EstimateQueryCostButton, {
 const middlewares = [thunk];
 const mockStore = configureStore(middlewares);
 
-jest.mock('src/components/Select/Select', () => () => (
+jest.mock('@superset-ui/core/components/Select/Select', () => () => (
   <div data-test="mock-deprecated-select-select" />
 ));
-jest.mock('src/components/Select/AsyncSelect', () => () => (
+jest.mock('@superset-ui/core/components/Select/AsyncSelect', () => () => (
   <div data-test="mock-deprecated-async-select" />
 ));
 
diff --git a/superset-frontend/src/SqlLab/components/EstimateQueryCostButton/index.tsx b/superset-frontend/src/SqlLab/components/EstimateQueryCostButton/index.tsx
index 4c50541afd5..88fca28e97a 100644
--- a/superset-frontend/src/SqlLab/components/EstimateQueryCostButton/index.tsx
+++ b/superset-frontend/src/SqlLab/components/EstimateQueryCostButton/index.tsx
@@ -20,12 +20,14 @@ import { useMemo } from 'react';
 import { useSelector } from 'react-redux';
 import { css, styled, t } from '@superset-ui/core';
 
-import Alert from 'src/components/Alert';
-import TableView from 'src/components/TableView';
-import Button from 'src/components/Button';
-import Loading from 'src/components/Loading';
-import ModalTrigger from 'src/components/ModalTrigger';
-import { EmptyWrapperType } from 'src/components/TableView/TableView';
+import {
+  Alert,
+  Button,
+  Loading,
+  ModalTrigger,
+  TableView,
+  EmptyWrapperType,
+} from '@superset-ui/core/components';
 import useQueryEditor from 'src/SqlLab/hooks/useQueryEditor';
 import { SqlLabRootState, QueryCostEstimate } from 'src/SqlLab/types';
 
@@ -38,7 +40,7 @@ export interface EstimateQueryCostButtonProps {
 
 const CostEstimateModalStyles = styled.div`
   ${({ theme }) => css`
-    font-size: ${theme.typography.sizes.s};
+    font-size: ${theme.fontSizeSM};
   `}
 `;
 
@@ -59,7 +61,11 @@ const EstimateQueryCostButton = ({
   const columns = useMemo(
     () =>
       Array.isArray(cost) && cost.length
-        ? Object.keys(cost[0]).map(key => ({ accessor: key, Header: key }))
+        ? Object.keys(cost[0]).map(key => ({
+            accessor: key,
+            Header: key,
+            id: key,
+          }))
         : [],
     [cost],
   );
diff --git a/superset-frontend/src/SqlLab/components/ExploreCtasResultsButton/index.tsx b/superset-frontend/src/SqlLab/components/ExploreCtasResultsButton/index.tsx
index df19befadb7..8d8bc7b1cb4 100644
--- a/superset-frontend/src/SqlLab/components/ExploreCtasResultsButton/index.tsx
+++ b/superset-frontend/src/SqlLab/components/ExploreCtasResultsButton/index.tsx
@@ -23,8 +23,8 @@ import {
   addInfoToast,
   addDangerToast,
 } from 'src/SqlLab/actions/sqlLab';
-import { InfoTooltipWithTrigger } from '@superset-ui/chart-controls';
-import Button from 'src/components/Button';
+import { Button, IconTooltip } from '@superset-ui/core/components';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { exploreChart } from 'src/explore/exploreUtils';
 import { SqlLabRootState } from 'src/SqlLab/types';
 
@@ -82,11 +82,8 @@ const ExploreCtasResultsButton = ({
       onClick={visualize}
       tooltip={t('Explore the result set in the data exploration view')}
     >
-      <InfoTooltipWithTrigger
-        icon="line-chart"
-        placement="top"
-        label={t('explore')}
-      />{' '}
+      <IconTooltip placement="top" tooltip={t('Explore')} />
+      <Icons.LineChartOutlined iconSize="m" />
       {t('Explore')}
     </Button>
   );
diff --git a/superset-frontend/src/SqlLab/components/ExploreResultsButton/ExploreResultsButton.test.tsx b/superset-frontend/src/SqlLab/components/ExploreResultsButton/ExploreResultsButton.test.tsx
index a8eaaf5da74..0b119946138 100644
--- a/superset-frontend/src/SqlLab/components/ExploreResultsButton/ExploreResultsButton.test.tsx
+++ b/superset-frontend/src/SqlLab/components/ExploreResultsButton/ExploreResultsButton.test.tsx
@@ -21,7 +21,7 @@ import { render, screen } from 'spec/helpers/testing-library';
 import ExploreResultsButton, {
   ExploreResultsButtonProps,
 } from 'src/SqlLab/components/ExploreResultsButton';
-import { OnClickHandler } from 'src/components/Button';
+import type { OnClickHandler } from '@superset-ui/core/components';
 
 const setup = (
   onClickFn: OnClickHandler,
@@ -36,15 +36,17 @@ describe('ExploreResultsButton', () => {
     const { queryByText } = setup(jest.fn(), {
       database: { allows_subquery: true },
     });
-
     expect(queryByText('Create Chart')).toBeInTheDocument();
-    expect(screen.getByRole('button', { name: 'Create Chart' })).toBeEnabled();
+    // Updated line to match the actual button name that includes the icon
+    expect(screen.getByRole('button', { name: /Create Chart/i })).toBeEnabled();
   });
 
   it('renders disabled if subquery not allowed', async () => {
     const { queryByText } = setup(jest.fn());
-
     expect(queryByText('Create Chart')).toBeInTheDocument();
-    expect(screen.getByRole('button', { name: 'Create Chart' })).toBeDisabled();
+    // Updated line to match the actual button name that includes the icon
+    expect(
+      screen.getByRole('button', { name: /Create Chart/i }),
+    ).toBeDisabled();
   });
 });
diff --git a/superset-frontend/src/SqlLab/components/ExploreResultsButton/index.tsx b/superset-frontend/src/SqlLab/components/ExploreResultsButton/index.tsx
index 5594479f5bd..53f9cdc2b0f 100644
--- a/superset-frontend/src/SqlLab/components/ExploreResultsButton/index.tsx
+++ b/superset-frontend/src/SqlLab/components/ExploreResultsButton/index.tsx
@@ -17,8 +17,11 @@
  * under the License.
  */
 import { t } from '@superset-ui/core';
-import { InfoTooltipWithTrigger } from '@superset-ui/chart-controls';
-import Button, { OnClickHandler } from 'src/components/Button';
+import {
+  Button,
+  type OnClickHandler,
+  Icons,
+} from '@superset-ui/core/components';
 
 export interface ExploreResultsButtonProps {
   database?: {
@@ -35,16 +38,14 @@ const ExploreResultsButton = ({
   return (
     <Button
       buttonSize="small"
+      buttonStyle="secondary"
+      icon={<Icons.LineChartOutlined />}
       onClick={onClick}
       disabled={!allowsSubquery}
+      role="button"
       tooltip={t('Explore the result set in the data exploration view')}
       data-test="explore-results-button"
     >
-      <InfoTooltipWithTrigger
-        icon="line-chart"
-        placement="top"
-        label={t('explore')}
-      />{' '}
       {t('Create Chart')}
     </Button>
   );
diff --git a/superset-frontend/src/SqlLab/components/HighlightedSql/index.tsx b/superset-frontend/src/SqlLab/components/HighlightedSql/index.tsx
index ff0b472a218..b0c864927bc 100644
--- a/superset-frontend/src/SqlLab/components/HighlightedSql/index.tsx
+++ b/superset-frontend/src/SqlLab/components/HighlightedSql/index.tsx
@@ -16,13 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import SyntaxHighlighter from 'react-syntax-highlighter/dist/cjs/light';
-import sql from 'react-syntax-highlighter/dist/cjs/languages/hljs/sql';
-import github from 'react-syntax-highlighter/dist/cjs/styles/hljs/github';
 import { t } from '@superset-ui/core';
-import ModalTrigger from 'src/components/ModalTrigger';
-
-SyntaxHighlighter.registerLanguage('sql', sql);
+import { ModalTrigger } from '@superset-ui/core/components';
+import CodeSyntaxHighlighter from '@superset-ui/core/components/CodeSyntaxHighlighter';
 
 export interface HighlightedSqlProps {
   sql: string;
@@ -52,20 +48,17 @@ const shrinkSql = (sql: string, maxLines: number, maxWidth: number) => {
     lines.push('{...}');
   }
   return lines
-    .map(line => {
-      if (line.length > maxWidth) {
-        return `${line.slice(0, maxWidth)}{...}`;
-      }
-      return line;
-    })
+    .map(line =>
+      line.length > maxWidth ? `${line.slice(0, maxWidth)}{...}` : line,
+    )
     .join('\n');
 };
 
 function TriggerNode({ shrink, sql, maxLines, maxWidth }: TriggerNodeProps) {
   return (
-    <SyntaxHighlighter language="sql" style={github}>
+    <CodeSyntaxHighlighter language="sql">
       {shrink ? shrinkSql(sql, maxLines, maxWidth) : sql}
-    </SyntaxHighlighter>
+    </CodeSyntaxHighlighter>
   );
 }
 
@@ -73,15 +66,11 @@ function HighlightSqlModal({ rawSql, sql }: HighlightedSqlModalTypes) {
   return (
     <div>
       <h4>{t('Source SQL')}</h4>
-      <SyntaxHighlighter language="sql" style={github}>
-        {sql}
-      </SyntaxHighlighter>
+      <CodeSyntaxHighlighter language="sql">{sql}</CodeSyntaxHighlighter>
       {rawSql && rawSql !== sql && (
         <div>
           <h4>{t('Executed SQL')}</h4>
-          <SyntaxHighlighter language="sql" style={github}>
-            {rawSql}
-          </SyntaxHighlighter>
+          <CodeSyntaxHighlighter language="sql">{rawSql}</CodeSyntaxHighlighter>
         </div>
       )}
     </div>
diff --git a/superset-frontend/src/SqlLab/components/KeyboardShortcutButton/index.tsx b/superset-frontend/src/SqlLab/components/KeyboardShortcutButton/index.tsx
index 05c4ea8ba1b..e9749a56187 100644
--- a/superset-frontend/src/SqlLab/components/KeyboardShortcutButton/index.tsx
+++ b/superset-frontend/src/SqlLab/components/KeyboardShortcutButton/index.tsx
@@ -18,7 +18,7 @@
  */
 import { FC } from 'react';
 import { styled, t, css } from '@superset-ui/core';
-import ModalTrigger from 'src/components/ModalTrigger';
+import { ModalTrigger } from '@superset-ui/core/components';
 import { detectOS } from 'src/utils/common';
 
 const userOS = detectOS();
@@ -72,23 +72,23 @@ const KeyMapByCommand = Object.entries(KEY_MAP).reduce<
 }, {});
 
 const ShortcutDescription = styled.span`
-  font-size: ${({ theme }) => theme.typography.sizes.m}px;
-  color: ${({ theme }) => theme.colors.text.help};
-  padding-left: ${({ theme }) => theme.gridUnit * 2}px;
+  font-size: ${({ theme }) => theme.fontSize}px;
+  color: ${({ theme }) => theme.colorTextLabel};
+  padding-left: ${({ theme }) => theme.sizeUnit * 2}px;
 `;
 
 const ShortcutWrapper = styled.div`
   display: flex;
   flex-wrap: wrap;
-  gap: ${({ theme }) => theme.gridUnit}px;
-  padding: ${({ theme }) => theme.gridUnit * 2}px;
+  gap: ${({ theme }) => theme.sizeUnit}px;
+  padding: ${({ theme }) => theme.sizeUnit * 2}px;
 `;
 
 const ShortcutCode = styled.code`
-  font-size: ${({ theme }) => theme.typography.sizes.s}px;
-  color: ${({ theme }) => theme.colors.grayscale.dark1};
+  font-size: ${({ theme }) => theme.fontSizeSM}px;
+  color: ${({ theme }) => theme.colorText};
   border-radius: ${({ theme }) => theme.borderRadius}px;
-  padding: ${({ theme }) => `${theme.gridUnit}px ${theme.gridUnit * 2}px`};
+  padding: ${({ theme }) => `${theme.sizeUnit}px ${theme.sizeUnit * 2}px`};
 `;
 
 const KeyboardShortcutButton: FC<{}> = ({ children }) => (
diff --git a/superset-frontend/src/SqlLab/components/QueryAutoRefresh/QueryAutoRefresh.test.tsx b/superset-frontend/src/SqlLab/components/QueryAutoRefresh/QueryAutoRefresh.test.tsx
index 7a35adccc40..2e26087296e 100644
--- a/superset-frontend/src/SqlLab/components/QueryAutoRefresh/QueryAutoRefresh.test.tsx
+++ b/superset-frontend/src/SqlLab/components/QueryAutoRefresh/QueryAutoRefresh.test.tsx
@@ -16,11 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import { act } from 'react-dom/test-utils';
 import { QueryState } from '@superset-ui/core';
 import fetchMock from 'fetch-mock';
 import configureStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 import { render, waitFor } from 'spec/helpers/testing-library';
+import { cleanup } from '@testing-library/react';
 import { LOG_ACTIONS_SQLLAB_FETCH_FAILED_QUERY } from 'src/logger/LogUtils';
 import {
   CLEAR_INACTIVE_QUERIES,
@@ -41,46 +43,42 @@ const mockState = {
   databases: mockDatabases,
 };
 
-// NOTE: The uses of @ts-ignore in this file is to enable testing of bad inputs to verify the
-// function / component handles bad data elegantly
 describe('QueryAutoRefresh', () => {
-  const runningQueries: QueryDictionary = {};
-  runningQueries[runningQuery.id] = runningQuery;
-
-  const successfulQueries: QueryDictionary = {};
-  successfulQueries[successfulQuery.id] = successfulQuery;
-
+  const runningQueries: QueryDictionary = { [runningQuery.id]: runningQuery };
+  const successfulQueries: QueryDictionary = {
+    [successfulQuery.id]: successfulQuery,
+  };
   const queriesLastUpdate = Date.now();
-
   const refreshApi = 'glob:*/api/v1/query/updated_since?*';
 
+  beforeEach(() => {
+    jest.useFakeTimers();
+  });
+
   afterEach(() => {
     fetchMock.reset();
+    cleanup();
+    jest.runOnlyPendingTimers();
+    jest.useRealTimers();
   });
 
   it('isQueryRunning returns true for valid running query', () => {
-    const running = isQueryRunning(runningQuery);
-    expect(running).toBe(true);
+    expect(isQueryRunning(runningQuery)).toBe(true);
   });
 
   it('isQueryRunning returns false for valid not-running query', () => {
-    const running = isQueryRunning(successfulQuery);
-    expect(running).toBe(false);
+    expect(isQueryRunning(successfulQuery)).toBe(false);
   });
 
   it('isQueryRunning returns false for invalid query', () => {
     // @ts-ignore
-    let running = isQueryRunning(null);
-    expect(running).toBe(false);
+    expect(isQueryRunning(null)).toBe(false);
     // @ts-ignore
-    running = isQueryRunning(undefined);
-    expect(running).toBe(false);
+    expect(isQueryRunning(undefined)).toBe(false);
     // @ts-ignore
-    running = isQueryRunning('I Should Be An Object');
-    expect(running).toBe(false);
+    expect(isQueryRunning('I Should Be An Object')).toBe(false);
     // @ts-ignore
-    running = isQueryRunning({ state: { badFormat: true } });
-    expect(running).toBe(false);
+    expect(isQueryRunning({ state: { badFormat: true } })).toBe(false);
   });
 
   it('shouldCheckForQueries is true for valid running query', () => {
@@ -112,16 +110,10 @@ describe('QueryAutoRefresh', () => {
   });
 
   it('Attempts to refresh when given pending query', async () => {
-    const store = mockStore({
-      sqlLab: { ...mockState },
-    });
+    const store = mockStore({ sqlLab: { ...mockState } });
+
     fetchMock.get(refreshApi, {
-      result: [
-        {
-          id: runningQuery.id,
-          status: 'success',
-        },
-      ],
+      result: [{ id: runningQuery.id, status: 'success' }],
     });
 
     render(
@@ -131,22 +123,22 @@ describe('QueryAutoRefresh', () => {
       />,
       { useRedux: true, store },
     );
-    await waitFor(
-      () =>
-        expect(store.getActions()).toContainEqual(
-          expect.objectContaining({
-            type: REFRESH_QUERIES,
-          }),
-        ),
-      { timeout: QUERY_UPDATE_FREQ + 100 },
+
+    await act(async () => {
+      jest.advanceTimersByTime(QUERY_UPDATE_FREQ + 100);
+    });
+
+    await waitFor(() =>
+      expect(store.getActions()).toContainEqual(
+        expect.objectContaining({ type: REFRESH_QUERIES }),
+      ),
     );
   });
 
   it('Attempts to clear inactive queries when updated queries are empty', async () => {
     const store = mockStore({ sqlLab: { ...mockState } });
-    fetchMock.get(refreshApi, {
-      result: [],
-    });
+
+    fetchMock.get(refreshApi, { result: [] });
 
     render(
       <QueryAutoRefresh
@@ -155,30 +147,28 @@ describe('QueryAutoRefresh', () => {
       />,
       { useRedux: true, store },
     );
-    await waitFor(
-      () =>
-        expect(store.getActions()).toContainEqual(
-          expect.objectContaining({
-            type: CLEAR_INACTIVE_QUERIES,
-          }),
-        ),
-      { timeout: QUERY_UPDATE_FREQ + 100 },
+
+    await act(async () => {
+      jest.advanceTimersByTime(QUERY_UPDATE_FREQ + 100);
+    });
+
+    await waitFor(() =>
+      expect(store.getActions()).toContainEqual(
+        expect.objectContaining({ type: CLEAR_INACTIVE_QUERIES }),
+      ),
     );
+
     expect(
       store.getActions().filter(({ type }) => type === REFRESH_QUERIES),
     ).toHaveLength(0);
     expect(fetchMock.calls(refreshApi)).toHaveLength(1);
   });
 
-  it('Does not fail and attempts to refresh when given pending query and invalid query', async () => {
+  it('Does not fail and attempts to refresh with mixed valid/invalid queries', async () => {
     const store = mockStore({ sqlLab: { ...mockState } });
+
     fetchMock.get(refreshApi, {
-      result: [
-        {
-          id: runningQuery.id,
-          status: 'success',
-        },
-      ],
+      result: [{ id: runningQuery.id, status: 'success' }],
     });
 
     render(
@@ -189,27 +179,25 @@ describe('QueryAutoRefresh', () => {
       />,
       { useRedux: true, store },
     );
-    await waitFor(
-      () =>
-        expect(store.getActions()).toContainEqual(
-          expect.objectContaining({
-            type: REFRESH_QUERIES,
-          }),
-        ),
-      { timeout: QUERY_UPDATE_FREQ + 100 },
+
+    await act(async () => {
+      jest.advanceTimersByTime(QUERY_UPDATE_FREQ + 100);
+    });
+
+    await waitFor(() =>
+      expect(store.getActions()).toContainEqual(
+        expect.objectContaining({ type: REFRESH_QUERIES }),
+      ),
     );
   });
 
   it('Does NOT Attempt to refresh when given only completed queries', async () => {
     const store = mockStore({ sqlLab: { ...mockState } });
+
     fetchMock.get(refreshApi, {
-      result: [
-        {
-          id: runningQuery.id,
-          status: 'success',
-        },
-      ],
+      result: [{ id: runningQuery.id, status: 'success' }],
     });
+
     render(
       <QueryAutoRefresh
         queries={successfulQueries}
@@ -217,20 +205,23 @@ describe('QueryAutoRefresh', () => {
       />,
       { useRedux: true, store },
     );
-    await waitFor(
-      () =>
-        expect(store.getActions()).toContainEqual(
-          expect.objectContaining({
-            type: CLEAR_INACTIVE_QUERIES,
-          }),
-        ),
-      { timeout: QUERY_UPDATE_FREQ + 100 },
+
+    await act(async () => {
+      jest.advanceTimersByTime(QUERY_UPDATE_FREQ + 100);
+    });
+
+    await waitFor(() =>
+      expect(store.getActions()).toContainEqual(
+        expect.objectContaining({ type: CLEAR_INACTIVE_QUERIES }),
+      ),
     );
+
     expect(fetchMock.calls(refreshApi)).toHaveLength(0);
   });
 
   it('logs the failed error for async queries', async () => {
     const store = mockStore({ sqlLab: { ...mockState } });
+
     fetchMock.get(refreshApi, {
       result: [
         {
@@ -257,6 +248,7 @@ describe('QueryAutoRefresh', () => {
         },
       ],
     });
+
     render(
       <QueryAutoRefresh
         queries={runningQueries}
@@ -264,21 +256,24 @@ describe('QueryAutoRefresh', () => {
       />,
       { useRedux: true, store },
     );
-    await waitFor(
-      () =>
-        expect(store.getActions()).toContainEqual(
-          expect.objectContaining({
-            payload: expect.objectContaining({
-              eventName: LOG_ACTIONS_SQLLAB_FETCH_FAILED_QUERY,
-              eventData: expect.objectContaining({
-                error_type: 'TEST_ERROR',
-                error_details: 'Syntax invalid',
-                issue_codes: [102],
-              }),
+
+    await act(async () => {
+      jest.advanceTimersByTime(QUERY_UPDATE_FREQ + 100);
+    });
+
+    await waitFor(() =>
+      expect(store.getActions()).toContainEqual(
+        expect.objectContaining({
+          payload: expect.objectContaining({
+            eventName: LOG_ACTIONS_SQLLAB_FETCH_FAILED_QUERY,
+            eventData: expect.objectContaining({
+              error_type: 'TEST_ERROR',
+              error_details: 'Syntax invalid',
+              issue_codes: [102],
             }),
           }),
-        ),
-      { timeout: QUERY_UPDATE_FREQ + 100 },
+        }),
+      ),
     );
   });
 });
diff --git a/superset-frontend/src/SqlLab/components/QueryHistory/index.tsx b/superset-frontend/src/SqlLab/components/QueryHistory/index.tsx
index 6916e1e19b1..85cf33ade30 100644
--- a/superset-frontend/src/SqlLab/components/QueryHistory/index.tsx
+++ b/superset-frontend/src/SqlLab/components/QueryHistory/index.tsx
@@ -20,7 +20,7 @@ import { useEffect, useMemo, useState } from 'react';
 import { shallowEqual, useSelector } from 'react-redux';
 import { useInView } from 'react-intersection-observer';
 import { omit } from 'lodash';
-import { EmptyState } from 'src/components/EmptyState';
+import { EmptyState, Skeleton } from '@superset-ui/core/components';
 import {
   t,
   styled,
@@ -31,7 +31,6 @@ import {
 import QueryTable from 'src/SqlLab/components/QueryTable';
 import { SqlLabRootState } from 'src/SqlLab/types';
 import { useEditorQueriesQuery } from 'src/hooks/apiResources/queries';
-import { Skeleton } from 'src/components';
 import useEffectEvent from 'src/hooks/useEffectEvent';
 
 interface QueryHistoryProps {
@@ -42,7 +41,7 @@ interface QueryHistoryProps {
 
 const StyledEmptyStateWrapper = styled.div`
   height: 100%;
-  .antd5-empty-image img {
+  .ant-empty-image img {
     margin-right: 28px;
   }
 
diff --git a/superset-frontend/src/SqlLab/components/QueryLimitSelect/QueryLimitSelect.test.tsx b/superset-frontend/src/SqlLab/components/QueryLimitSelect/QueryLimitSelect.test.tsx
index 8d421f92c92..bbaa76720b0 100644
--- a/superset-frontend/src/SqlLab/components/QueryLimitSelect/QueryLimitSelect.test.tsx
+++ b/superset-frontend/src/SqlLab/components/QueryLimitSelect/QueryLimitSelect.test.tsx
@@ -35,10 +35,10 @@ import QueryLimitSelect, {
 const middlewares = [thunk];
 const mockStore = configureStore(middlewares);
 
-jest.mock('src/components/Select/Select', () => () => (
+jest.mock('@superset-ui/core/components/Select/Select', () => () => (
   <div data-test="mock-deprecated-select-select" />
 ));
-jest.mock('src/components/Select/AsyncSelect', () => () => (
+jest.mock('@superset-ui/core/components/Select/AsyncSelect', () => () => (
   <div data-test="mock-deprecated-async-select" />
 ));
 
diff --git a/superset-frontend/src/SqlLab/components/QueryLimitSelect/index.tsx b/superset-frontend/src/SqlLab/components/QueryLimitSelect/index.tsx
index 9e2e89aad03..c1c2f8718d6 100644
--- a/superset-frontend/src/SqlLab/components/QueryLimitSelect/index.tsx
+++ b/superset-frontend/src/SqlLab/components/QueryLimitSelect/index.tsx
@@ -18,12 +18,11 @@
  */
 import { useDispatch } from 'react-redux';
 import { t } from '@superset-ui/core';
-import { Dropdown } from 'src/components/Dropdown';
-import { Menu } from 'src/components/Menu';
-import { Icons } from 'src/components/Icons';
+import { Dropdown, Button } from '@superset-ui/core/components';
+import { Menu } from '@superset-ui/core/components/Menu';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { queryEditorSetQueryLimit } from 'src/SqlLab/actions/sqlLab';
 import useQueryEditor from 'src/SqlLab/hooks/useQueryEditor';
-import Button from 'src/components/Button';
 
 export interface QueryLimitSelectProps {
   queryEditorId: string;
@@ -48,14 +47,13 @@ function renderQueryLimit(
   limitDropdown.push(maxRow);
 
   return (
-    <Menu>
-      {[...new Set(limitDropdown)].map(limit => (
-        <Menu.Item key={`${limit}`} onClick={() => setQueryLimit(limit)}>
-          {/* // eslint-disable-line no-use-before-define */}
-          {convertToNumWithSpaces(limit)}{' '}
-        </Menu.Item>
-      ))}
-    </Menu>
+    <Menu
+      items={[...new Set(limitDropdown)].map(limit => ({
+        key: `${limit}`,
+        onClick: () => setQueryLimit(limit),
+        label: `${convertToNumWithSpaces(limit)} `,
+      }))}
+    />
   );
 }
 
@@ -73,10 +71,10 @@ const QueryLimitSelect = ({
 
   return (
     <Dropdown
-      dropdownRender={() => renderQueryLimit(maxRow, setQueryLimit)}
+      popupRender={() => renderQueryLimit(maxRow, setQueryLimit)}
       trigger={['click']}
     >
-      <Button size="small" showMarginRight={false} type="link">
+      <Button size="small" showMarginRight={false} buttonStyle="link">
         <span>{t('LIMIT')}:</span>
         <span className="limitDropdown">
           {convertToNumWithSpaces(queryLimit)}
diff --git a/superset-frontend/src/SqlLab/components/QueryStateLabel/QueryStateLabel.test.tsx b/superset-frontend/src/SqlLab/components/QueryStateLabel/QueryStateLabel.test.tsx
index 91ac09dfcc2..d02428bf2d0 100644
--- a/superset-frontend/src/SqlLab/components/QueryStateLabel/QueryStateLabel.test.tsx
+++ b/superset-frontend/src/SqlLab/components/QueryStateLabel/QueryStateLabel.test.tsx
@@ -21,7 +21,10 @@ import type { QueryState } from '@superset-ui/core';
 import { render } from 'spec/helpers/testing-library';
 import QueryStateLabel from '.';
 
-jest.mock('src/components/Label', () => () => <div data-test="mock-label" />);
+jest.mock('@superset-ui/core/components/Label', () => ({
+  __esModule: true,
+  Label: () => <div data-test="mock-label" />,
+}));
 
 const mockedProps = {
   query: {
diff --git a/superset-frontend/src/SqlLab/components/QueryStateLabel/index.tsx b/superset-frontend/src/SqlLab/components/QueryStateLabel/index.tsx
index b11efecdd27..5d2625dbc78 100644
--- a/superset-frontend/src/SqlLab/components/QueryStateLabel/index.tsx
+++ b/superset-frontend/src/SqlLab/components/QueryStateLabel/index.tsx
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import Label from 'src/components/Label';
+import { Label } from '@superset-ui/core/components';
 import { STATE_TYPE_MAP, STATE_TYPE_MAP_LOCALIZED } from 'src/SqlLab/constants';
 import { styled, Query } from '@superset-ui/core';
 
@@ -25,7 +25,7 @@ interface QueryStateLabelProps {
 }
 
 const StyledLabel = styled(Label)`
-  margin-right: ${({ theme }) => theme.gridUnit}px;
+  margin-right: ${({ theme }) => theme.sizeUnit}px;
 `;
 
 export default function QueryStateLabel({ query }: QueryStateLabelProps) {
diff --git a/superset-frontend/src/SqlLab/components/QueryTable/QueryTable.test.tsx b/superset-frontend/src/SqlLab/components/QueryTable/QueryTable.test.tsx
index 9b05e1f8274..b3d33f9e3d2 100644
--- a/superset-frontend/src/SqlLab/components/QueryTable/QueryTable.test.tsx
+++ b/superset-frontend/src/SqlLab/components/QueryTable/QueryTable.test.tsx
@@ -48,7 +48,11 @@ describe('QueryTable', () => {
     expect(screen.getByRole('table')).toBeVisible();
     expect(container.querySelector('.table-condensed')).toBeVisible();
     expect(container.querySelectorAll('table > thead > tr')).toHaveLength(1);
-    expect(container.querySelectorAll('table > tbody > tr')).toHaveLength(2);
+    expect(
+      container.querySelectorAll(
+        'table > tbody > tr:not(.ant-table-measure-row)',
+      ),
+    ).toHaveLength(2);
   });
 
   test('renders empty table when no queries provided', () => {
@@ -59,10 +63,14 @@ describe('QueryTable', () => {
     );
 
     expect(screen.getByTestId('listview-table')).toBeVisible();
-    expect(screen.getByRole('table')).toBeVisible();
+    expect(screen.getAllByRole('table')[0]).toBeVisible();
     expect(container.querySelector('.table-condensed')).toBeVisible();
     expect(container.querySelectorAll('table > thead > tr')).toHaveLength(1);
-    expect(container.querySelectorAll('table > tbody > tr')).toHaveLength(0);
+    expect(
+      container.querySelectorAll(
+        'table > tbody > tr:not(.ant-table-measure-row):not(.ant-table-placeholder)',
+      ),
+    ).toHaveLength(0);
   });
 
   test('renders with custom displayLimit', () => {
@@ -77,6 +85,10 @@ describe('QueryTable', () => {
     });
 
     expect(screen.getByTestId('listview-table')).toBeVisible();
-    expect(container.querySelectorAll('table > tbody > tr')).toHaveLength(1);
+    expect(
+      container.querySelectorAll(
+        'table > tbody > tr:not(.ant-table-measure-row)',
+      ),
+    ).toHaveLength(1);
   });
 });
diff --git a/superset-frontend/src/SqlLab/components/QueryTable/index.tsx b/superset-frontend/src/SqlLab/components/QueryTable/index.tsx
index 547808a7ba1..cc42719032d 100644
--- a/superset-frontend/src/SqlLab/components/QueryTable/index.tsx
+++ b/superset-frontend/src/SqlLab/components/QueryTable/index.tsx
@@ -17,8 +17,16 @@
  * under the License.
  */
 import { useMemo, ReactNode } from 'react';
-import Card from 'src/components/Card';
-import ProgressBar from 'src/components/ProgressBar';
+import {
+  Card,
+  Button,
+  Tooltip,
+  Label,
+  Icons,
+  ModalTrigger,
+  TableView,
+} from '@superset-ui/core/components';
+import ProgressBar from '@superset-ui/core/components/ProgressBar';
 import { t, useTheme, QueryResponse } from '@superset-ui/core';
 import { useDispatch, useSelector } from 'react-redux';
 
@@ -29,14 +37,8 @@ import {
   clearQueryResults,
   removeQuery,
 } from 'src/SqlLab/actions/sqlLab';
-import TableView from 'src/components/TableView';
-import Button from 'src/components/Button';
-import { fDuration, extendedDayjs } from 'src/utils/dates';
-import { Icons } from 'src/components/Icons';
-import Label from 'src/components/Label';
-import { Tooltip } from 'src/components/Tooltip';
+import { fDuration, extendedDayjs } from '@superset-ui/core/utils/dates';
 import { SqlLabRootState } from 'src/SqlLab/types';
-import ModalTrigger from 'src/components/ModalTrigger';
 import { UserWithPermissionsAndRoles as User } from 'src/types/bootstrapTypes';
 import ResultSet from '../ResultSet';
 import HighlightedSql from '../HighlightedSql';
@@ -107,6 +109,7 @@ const QueryTable = ({
             column as keyof typeof QUERY_HISTORY_TABLE_HEADERS_LOCALIZED
           ] || setHeaders(column),
         disableSortBy: true,
+        id: column,
       })),
     [columns],
   );
@@ -132,10 +135,7 @@ const QueryTable = ({
       success: {
         config: {
           icon: (
-            <Icons.CheckOutlined
-              iconColor={theme.colors.success.base}
-              iconSize="m"
-            />
+            <Icons.CheckOutlined iconColor={theme.colorSuccess} iconSize="m" />
           ),
           // icon: <Icons.Edit iconSize="xl" />,
           label: t('Success'),
@@ -144,10 +144,7 @@ const QueryTable = ({
       failed: {
         config: {
           icon: (
-            <Icons.CloseOutlined
-              iconColor={theme.colors.error.base}
-              iconSize="m"
-            />
+            <Icons.CloseOutlined iconColor={theme.colorError} iconSize="m" />
           ),
           label: t('Failed'),
         },
@@ -155,10 +152,7 @@ const QueryTable = ({
       stopped: {
         config: {
           icon: (
-            <Icons.CloseOutlined
-              iconColor={theme.colors.error.base}
-              iconSize="m"
-            />
+            <Icons.CloseOutlined iconColor={theme.colorError} iconSize="m" />
           ),
           label: t('Failed'),
         },
@@ -167,7 +161,7 @@ const QueryTable = ({
         config: {
           icon: (
             <Icons.LoadingOutlined
-              iconColor={theme.colors.primary.base}
+              iconColor={theme.colorPrimary}
               iconSize="m"
             />
           ),
@@ -178,7 +172,7 @@ const QueryTable = ({
         config: {
           icon: (
             <Icons.LoadingOutlined
-              iconColor={theme.colors.primary.base}
+              iconColor={theme.colorPrimary}
               iconSize="m"
             />
           ),
@@ -189,7 +183,7 @@ const QueryTable = ({
         config: {
           icon: (
             <Icons.ClockCircleOutlined
-              iconColor={theme.colors.error.base}
+              iconColor={theme.colorError}
               iconSize="m"
             />
           ),
@@ -200,7 +194,7 @@ const QueryTable = ({
         config: {
           icon: (
             <Icons.LoadingOutlined
-              iconColor={theme.colors.warning.base}
+              iconColor={theme.colorWarning}
               iconSize="m"
             />
           ),
@@ -211,7 +205,7 @@ const QueryTable = ({
         config: {
           icon: (
             <Icons.LoadingOutlined
-              iconColor={theme.colors.warning.base}
+              iconColor={theme.colorWarning}
               iconSize="m"
             />
           ),
@@ -220,9 +214,7 @@ const QueryTable = ({
       },
       error: {
         config: {
-          icon: (
-            <Icons.Error iconColor={theme.colors.error.base} iconSize="m" />
-          ),
+          icon: <Icons.Error iconColor={theme.colorError} iconSize="m" />,
           label: t('Unknown Status'),
         },
       },
@@ -230,7 +222,7 @@ const QueryTable = ({
         config: {
           icon: (
             <Icons.LoadingOutlined
-              iconColor={theme.colors.primary.base}
+              iconColor={theme.colorPrimary}
               iconSize="m"
             />
           ),
@@ -280,7 +272,7 @@ const QueryTable = ({
             buttonStyle="link"
             onClick={() => openQuery(q.queryId)}
           >
-            <Icons.Full iconSize="m" iconColor={theme.colors.primary.dark1} />
+            <Icons.Full iconSize="m" iconColor={theme.colorPrimary} />
             {t('Edit')}
           </Button>
         );
@@ -299,7 +291,7 @@ const QueryTable = ({
             <ModalTrigger
               className="ResultsModal"
               triggerNode={
-                <Button buttonSize="xsmall" buttonStyle="tertiary">
+                <Button buttonSize="xsmall" buttonStyle="secondary">
                   {t('View')}
                 </Button>
               }
diff --git a/superset-frontend/src/SqlLab/components/QueryTable/styles.ts b/superset-frontend/src/SqlLab/components/QueryTable/styles.ts
index 2800f099456..03f0eb3e679 100644
--- a/superset-frontend/src/SqlLab/components/QueryTable/styles.ts
+++ b/superset-frontend/src/SqlLab/components/QueryTable/styles.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { styled, css } from '@superset-ui/core';
-import { IconTooltip } from '../../../components/IconTooltip';
+import { IconTooltip } from '@superset-ui/core/components';
 
 export const StaticPosition = css`
   position: static;
@@ -31,11 +31,11 @@ export const verticalAlign = css`
 `;
 
 export const StyledTooltip = styled(IconTooltip)`
-  padding-right: ${({ theme }) => theme.gridUnit * 2}px;
+  padding-right: ${({ theme }) => theme.sizeUnit * 2}px;
   span {
     color: ${({ theme }) => theme.colors.grayscale.base};
     &: hover {
-      color: ${({ theme }) => theme.colors.primary.base};
+      color: ${({ theme }) => theme.colorPrimary};
     }
   }
 `;
diff --git a/superset-frontend/src/SqlLab/components/ResultSet/ResultSet.test.tsx b/superset-frontend/src/SqlLab/components/ResultSet/ResultSet.test.tsx
index bab53e66a22..3c36850b7a9 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet/ResultSet.test.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet/ResultSet.test.tsx
@@ -41,10 +41,9 @@ import {
   failedQueryWithFrontendTimeoutErrors,
 } from 'src/SqlLab/fixtures';
 
-jest.mock(
-  'src/components/ErrorMessage/ErrorMessageWithStackTrace',
-  () => () => <div data-test="error-message">Error</div>,
-);
+jest.mock('src/components/ErrorMessage', () => ({
+  ErrorMessageWithStackTrace: () => <div data-test="error-message">Error</div>,
+}));
 
 const mockedProps = {
   cache: true,
diff --git a/superset-frontend/src/SqlLab/components/ResultSet/index.tsx b/superset-frontend/src/SqlLab/components/ResultSet/index.tsx
index 9cd7669c3c5..2134281acc0 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet/index.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet/index.tsx
@@ -28,9 +28,22 @@ import {
 import { shallowEqual, useDispatch, useSelector } from 'react-redux';
 import { useHistory } from 'react-router-dom';
 import { pick } from 'lodash';
-import ButtonGroup from 'src/components/ButtonGroup';
-import Alert from 'src/components/Alert';
-import Button from 'src/components/Button';
+import {
+  Alert,
+  Button,
+  ButtonGroup,
+  Tooltip,
+  Card,
+  Modal,
+  Input,
+  Label,
+  Loading,
+} from '@superset-ui/core/components';
+import {
+  CopyToClipboard,
+  FilterableTable,
+  ErrorMessageWithStackTrace,
+} from 'src/components';
 import { nanoid } from 'nanoid';
 import {
   QueryState,
@@ -44,7 +57,6 @@ import {
   getExtensionsRegistry,
   ErrorTypeEnum,
 } from '@superset-ui/core';
-import ErrorMessageWithStackTrace from 'src/components/ErrorMessage/ErrorMessageWithStackTrace';
 import {
   ISaveableDatasource,
   ISimpleColumn,
@@ -53,17 +65,10 @@ import {
 import { EXPLORE_CHART_DEFAULT, SqlLabRootState } from 'src/SqlLab/types';
 import { mountExploreUrl } from 'src/explore/exploreUtils';
 import { postFormData } from 'src/explore/exploreUtils/formData';
-import ProgressBar from 'src/components/ProgressBar';
-import Loading from 'src/components/Loading';
-import Card from 'src/components/Card';
-import Label from 'src/components/Label';
-import { Tooltip } from 'src/components/Tooltip';
-import FilterableTable from 'src/components/FilterableTable';
-import CopyToClipboard from 'src/components/CopyToClipboard';
+import ProgressBar from '@superset-ui/core/components/ProgressBar';
 import { addDangerToast } from 'src/components/MessageToasts/actions';
 import { prepareCopyToClipboardTabularData } from 'src/utils/common';
 import { getItem, LocalStorageKeys } from 'src/utils/localStorageHelpers';
-import Modal from 'src/components/Modal';
 import {
   addQueryEditor,
   clearQueryResults,
@@ -79,7 +84,7 @@ import {
   LOG_ACTIONS_SQLLAB_CREATE_CHART,
   LOG_ACTIONS_SQLLAB_DOWNLOAD_CSV,
 } from 'src/logger/LogUtils';
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { findPermission } from 'src/utils/findPermission';
 import ExploreCtasResultsButton from '../ExploreCtasResultsButton';
 import ExploreResultsButton from '../ExploreResultsButton';
@@ -110,24 +115,24 @@ export interface ResultSetProps {
 const ResultContainer = styled.div`
   display: flex;
   flex-direction: column;
-  row-gap: ${({ theme }) => theme.gridUnit * 2}px;
+  row-gap: ${({ theme }) => theme.sizeUnit * 2}px;
 `;
 
 const ResultlessStyles = styled.div`
   position: relative;
-  min-height: ${({ theme }) => theme.gridUnit * 25}px;
+  min-height: ${({ theme }) => theme.sizeUnit * 25}px;
   [role='alert'] {
-    margin-top: ${({ theme }) => theme.gridUnit * 2}px;
+    margin-top: ${({ theme }) => theme.sizeUnit * 2}px;
   }
   .sql-result-track-job {
-    margin-top: ${({ theme }) => theme.gridUnit * 2}px;
+    margin-top: ${({ theme }) => theme.sizeUnit * 2}px;
   }
 `;
 
 // Making text render line breaks/tabs as is as monospace,
 // but wrapping text too so text doesn't overflow
 const MonospaceDiv = styled.div`
-  font-family: ${({ theme }) => theme.typography.families.monospace};
+  font-family: ${({ theme }) => theme.fontFamilyCode};
   white-space: pre;
   word-break: break-word;
   overflow-x: auto;
@@ -135,7 +140,7 @@ const MonospaceDiv = styled.div`
 `;
 
 const ReturnedRows = styled.div`
-  font-size: ${({ theme }) => theme.typography.sizes.s}px;
+  font-size: ${({ theme }) => theme.fontSizeSM}px;
   line-height: 1;
 `;
 
@@ -147,7 +152,7 @@ const ResultSetControls = styled.div`
 const ResultSetButtons = styled.div`
   display: grid;
   grid-auto-flow: column;
-  padding-right: ${({ theme }) => 2 * theme.gridUnit}px;
+  padding-right: ${({ theme }) => 2 * theme.sizeUnit}px;
 `;
 
 const copyButtonStyles = css`
@@ -353,6 +358,7 @@ const ResultSet = ({
               <Button
                 css={copyButtonStyles}
                 buttonSize="small"
+                buttonStyle="secondary"
                 href={getExportCsvUrl(query.id)}
                 data-test="export-csv-button"
                 onClick={() => {
@@ -371,11 +377,7 @@ const ResultSet = ({
                   }
                 }}
               >
-                <Icons.DownloadOutlined
-                  iconSize="m"
-                  iconColor={theme.colors.primary.dark2}
-                />{' '}
-                {t('Download to CSV')}
+                <Icons.DownloadOutlined iconSize="m" /> {t('Download to CSV')}
               </Button>
             )}
 
@@ -387,13 +389,10 @@ const ResultSet = ({
                   <Button
                     css={copyButtonStyles}
                     buttonSize="small"
+                    buttonStyle="secondary"
                     data-test="copy-to-clipboard-button"
                   >
-                    <Icons.CopyOutlined
-                      iconSize="s"
-                      iconColor={theme.colors.primary.dark2}
-                    />{' '}
-                    {t('Copy to Clipboard')}
+                    <Icons.CopyOutlined iconSize="s" /> {t('Copy to Clipboard')}
                   </Button>
                 }
                 hideTooltip
@@ -404,8 +403,7 @@ const ResultSet = ({
             )}
           </ResultSetButtons>
           {search && (
-            <input
-              type="text"
+            <Input
               onChange={changeSearch}
               value={searchText}
               className="form-control input-sm"
@@ -476,9 +474,8 @@ const ResultSet = ({
             <div ref={calculateAlertRefHeight}>
               <Alert
                 type="warning"
-                message={t('%(rows)d rows returned', { rows })}
                 onClose={() => setAlertIsOpen(false)}
-                description={t(
+                message={t(
                   'The number of rows displayed is limited to %(rows)d by the dropdown.',
                   { rows },
                 )}
@@ -490,8 +487,7 @@ const ResultSet = ({
               <Alert
                 type="warning"
                 onClose={() => setAlertIsOpen(false)}
-                message={t('%(rows)d rows returned', { rows: rowsCount })}
-                description={
+                message={
                   isAdmin
                     ? displayMaxRowsReachedMessage.withAdmin
                     : displayMaxRowsReachedMessage.withoutAdmin
@@ -516,14 +512,14 @@ const ResultSet = ({
             >
               <Label
                 css={css`
-                  line-height: ${theme.typography.sizes.l}px;
+                  line-height: ${theme.fontSizeLG}px;
                 `}
               >
                 {limitMessage && (
                   <Icons.ExclamationCircleOutlined
                     css={css`
-                      font-size: ${theme.typography.sizes.m}px;
-                      margin-right: ${theme.gridUnit}px;
+                      font-size: ${theme.fontSize}px;
+                      margin-right: ${theme.sizeUnit}px;
                     `}
                   />
                 )}
@@ -630,7 +626,7 @@ const ResultSet = ({
               <ButtonGroup>
                 <Button
                   buttonSize="small"
-                  css={{ marginRight: theme.gridUnit }}
+                  css={{ marginRight: theme.sizeUnit }}
                   onClick={() => popSelectStar(tempSchema, tempTable)}
                 >
                   {t('Query in a new tab')}
@@ -684,6 +680,7 @@ const ResultSet = ({
                 css={css`
                   display: flex;
                   justify-content: space-between;
+                  align-items: center;
                   gap: ${GAP}px;
                 `}
               >
diff --git a/superset-frontend/src/SqlLab/components/RunQueryActionButton/RunQueryActionButton.test.tsx b/superset-frontend/src/SqlLab/components/RunQueryActionButton/RunQueryActionButton.test.tsx
index 40df87b68e4..798a98b3ff3 100644
--- a/superset-frontend/src/SqlLab/components/RunQueryActionButton/RunQueryActionButton.test.tsx
+++ b/superset-frontend/src/SqlLab/components/RunQueryActionButton/RunQueryActionButton.test.tsx
@@ -29,10 +29,10 @@ import RunQueryActionButton, {
 const middlewares = [thunk];
 const mockStore = configureStore(middlewares);
 
-jest.mock('src/components/Select/Select', () => () => (
+jest.mock('@superset-ui/core/components/Select/Select', () => () => (
   <div data-test="mock-deprecated-select-select" />
 ));
-jest.mock('src/components/Select/AsyncSelect', () => () => (
+jest.mock('@superset-ui/core/components/Select/AsyncSelect', () => () => (
   <div data-test="mock-deprecated-async-select" />
 ));
 
diff --git a/superset-frontend/src/SqlLab/components/RunQueryActionButton/index.tsx b/superset-frontend/src/SqlLab/components/RunQueryActionButton/index.tsx
index 8086b34747a..242e6bbf19f 100644
--- a/superset-frontend/src/SqlLab/components/RunQueryActionButton/index.tsx
+++ b/superset-frontend/src/SqlLab/components/RunQueryActionButton/index.tsx
@@ -20,9 +20,8 @@ import { useMemo, FC, ReactElement } from 'react';
 
 import { t, styled, useTheme, SupersetTheme } from '@superset-ui/core';
 
-import Button from 'src/components/Button';
-import { Icons } from 'src/components/Icons';
-import { DropdownButton } from 'src/components/DropdownButton';
+import { Button, DropdownButton } from '@superset-ui/core/components';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { detectOS } from 'src/utils/common';
 import { QueryButtonProps } from 'src/SqlLab/types';
 import useQueryEditor from 'src/SqlLab/hooks/useQueryEditor';
@@ -49,7 +48,7 @@ const buildText = (
   if (shouldShowStopButton) {
     return (
       <>
-        <Icons.Square iconSize="xs" iconColor={theme.colors.primary.light5} />
+        <Icons.Square iconSize="xs" iconColor={theme.colorIcon} />
         {t('Stop')}
       </>
     );
@@ -85,11 +84,11 @@ const StyledButton = styled.span`
     // this is to over ride a previous transition built into the component
     transition: background-color 0ms;
     &:last-of-type {
-      margin-right: ${({ theme }) => theme.gridUnit * 2}px;
+      margin-right: ${({ theme }) => theme.sizeUnit * 2}px;
     }
     span[name='caret-down'] {
       display: flex;
-      margin-left: ${({ theme }) => theme.gridUnit * 1}px;
+      margin-left: ${({ theme }) => theme.sizeUnit * 1}px;
     }
   }
 `;
@@ -152,16 +151,14 @@ const RunQueryActionButton = ({
               icon: (
                 <Icons.DownOutlined
                   iconColor={
-                    isDisabled
-                      ? theme.colors.grayscale.base
-                      : theme.colors.grayscale.light5
+                    isDisabled ? theme.colorTextDisabled : theme.colorIcon
                   }
                 />
               ),
               trigger: 'click',
             }
           : {
-              buttonStyle: shouldShowStopBtn ? 'warning' : 'primary',
+              buttonStyle: shouldShowStopBtn ? 'danger' : 'primary',
             })}
       >
         {buildText(shouldShowStopBtn, selectedText, theme)}
diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetActionButton/SaveDatasetActionButton.test.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetActionButton/SaveDatasetActionButton.test.tsx
index f5283dfd1e3..e9f8cbd7b91 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetActionButton/SaveDatasetActionButton.test.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetActionButton/SaveDatasetActionButton.test.tsx
@@ -17,13 +17,11 @@
  * under the License.
  */
 import { render, screen, userEvent } from 'spec/helpers/testing-library';
-import { Menu } from 'src/components/Menu';
+import { Menu } from '@superset-ui/core/components/Menu';
 import SaveDatasetActionButton from 'src/SqlLab/components/SaveDatasetActionButton';
 
 const overlayMenu = (
-  <Menu>
-    <Menu.Item>Save dataset</Menu.Item>
-  </Menu>
+  <Menu items={[{ label: 'Save dataset', key: 'save-dataset' }]} />
 );
 
 describe('SaveDatasetActionButton', () => {
diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetActionButton/index.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetActionButton/index.tsx
index 8ca8eba893e..d65e1f90a76 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetActionButton/index.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetActionButton/index.tsx
@@ -17,9 +17,8 @@
  * under the License.
  */
 import { t, useTheme } from '@superset-ui/core';
-import { Icons } from 'src/components/Icons';
-import { DropdownButton } from 'src/components/DropdownButton';
-import Button from 'src/components/Button';
+import { Icons } from '@superset-ui/core/components/Icons';
+import { Button, DropdownButton } from '@superset-ui/core/components';
 
 interface SaveDatasetActionButtonProps {
   setShowSave: (arg0: boolean) => void;
@@ -39,12 +38,9 @@ const SaveDatasetActionButton = ({
   ) : (
     <DropdownButton
       onClick={() => setShowSave(true)}
-      dropdownRender={() => overlayMenu}
+      popupRender={() => overlayMenu}
       icon={
-        <Icons.DownOutlined
-          iconSize="xs"
-          iconColor={theme.colors.primary.dark2}
-        />
+        <Icons.DownOutlined iconSize="xs" iconColor={theme.colorPrimaryText} />
       }
       trigger={['click']}
     >
diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal/index.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal/index.tsx
index 079566e50ee..f3d34d75c8b 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal/index.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal/index.tsx
@@ -19,12 +19,15 @@
 
 import { useCallback, useState, FormEvent } from 'react';
 
-import { Radio, RadioChangeEvent } from 'src/components/Radio';
-import { AsyncSelect } from 'src/components';
-import { Input } from 'src/components/Input';
-import StyledModal from 'src/components/Modal';
-import Button from 'src/components/Button';
-import Checkbox from 'src/components/Checkbox';
+import { Radio, RadioChangeEvent } from '@superset-ui/core/components/Radio';
+import {
+  AsyncSelect,
+  Button,
+  Checkbox,
+  Modal,
+  Input,
+  type SelectValue,
+} from '@superset-ui/core/components';
 import {
   styled,
   t,
@@ -52,8 +55,6 @@ import {
 import { mountExploreUrl } from 'src/explore/exploreUtils';
 import { postFormData } from 'src/explore/exploreUtils/formData';
 import { URL_PARAMS } from 'src/constants';
-// eslint-disable-next-line no-restricted-imports
-import { SelectValue } from 'antd/lib/select'; // TODO: Remove antd
 import { isEmpty } from 'lodash';
 
 interface QueryDatabase {
@@ -102,16 +103,16 @@ interface SaveDatasetModalProps {
 const Styles = styled.div`
   ${({ theme }) => `
   .sdm-body {
-    margin: 0 ${theme.gridUnit * 2}px;
+    margin: 0 ${theme.sizeUnit * 2}px;
   }
   .sdm-input {
-    margin-left: ${theme.gridUnit * 10}px;
+    margin-left: ${theme.sizeUnit * 10}px;
     width: 401px;
   }
   .sdm-autocomplete {
     width: 401px;
     align-self: center;
-    margin-left: ${theme.gridUnit}px;
+    margin-left: ${theme.sizeUnit}px;
   }
   .sdm-radio {
     height: 30px;
@@ -123,7 +124,7 @@ const Styles = styled.div`
     padding-right: 0px;
   }
   .sdm-overwrite-msg {
-    margin: ${theme.gridUnit * 2}px;
+    margin: ${theme.sizeUnit * 2}px;
   }
   .sdm-overwrite-container {
     flex: 1 1 auto;
@@ -369,7 +370,7 @@ export const SaveDatasetModal = ({
   ) => option.value.toLowerCase().includes(inputValue.toLowerCase());
 
   return (
-    <StyledModal
+    <Modal
       show={visible}
       title={t('Save or Overwrite Dataset')}
       onHide={onHide}
@@ -386,8 +387,8 @@ export const SaveDatasetModal = ({
             <div style={{ display: 'flex', alignItems: 'center' }}>
               <Checkbox
                 checked={includeTemplateParameters}
-                onChange={checked =>
-                  setIncludeTemplateParameters(checked ?? false)
+                onChange={e =>
+                  setIncludeTemplateParameters(e.target.checked ?? false)
                 }
               />
               <span style={{ marginLeft: '5px' }}>
@@ -473,6 +474,6 @@ export const SaveDatasetModal = ({
           </div>
         )}
       </Styles>
-    </StyledModal>
+    </Modal>
   );
 };
diff --git a/superset-frontend/src/SqlLab/components/SaveQuery/index.tsx b/superset-frontend/src/SqlLab/components/SaveQuery/index.tsx
index 91ad7ed4531..c5918d1b7c1 100644
--- a/superset-frontend/src/SqlLab/components/SaveQuery/index.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveQuery/index.tsx
@@ -19,13 +19,17 @@
 import { useState, useEffect, useMemo, ChangeEvent } from 'react';
 
 import type { DatabaseObject } from 'src/features/databases/types';
-import { Row, Col } from 'src/components';
-import { Input, TextArea } from 'src/components/Input';
 import { t, styled } from '@superset-ui/core';
-import Button from 'src/components/Button';
-import { Menu } from 'src/components/Menu';
-import { Form, FormItem } from 'src/components/Form';
-import Modal from 'src/components/Modal';
+import {
+  Input,
+  Button,
+  Form,
+  FormItem,
+  Modal,
+  Row,
+  Col,
+} from '@superset-ui/core/components';
+import { Menu } from '@superset-ui/core/components/Menu';
 import SaveDatasetActionButton from 'src/SqlLab/components/SaveDatasetActionButton';
 import {
   SaveDatasetModal,
@@ -62,7 +66,7 @@ const Styles = styled.span`
     margin: 0;
     color: ${({ theme }) => theme.colors.grayscale.base};
     svg {
-      vertical-align: -${({ theme }) => theme.gridUnit * 1.25}px;
+      vertical-align: -${({ theme }) => theme.sizeUnit * 1.25}px;
       margin: 0;
     }
   }
@@ -111,16 +115,18 @@ const SaveQuery = ({
     database?.allows_virtual_table_explore !== undefined;
 
   const overlayMenu = (
-    <Menu>
-      <Menu.Item
-        onClick={() => {
-          logAction(LOG_ACTIONS_SQLLAB_CREATE_CHART, {});
-          setShowSaveDatasetModal(true);
-        }}
-      >
-        {t('Save dataset')}
-      </Menu.Item>
-    </Menu>
+    <Menu
+      items={[
+        {
+          label: t('Save dataset'),
+          key: 'save-dataset',
+          onClick: () => {
+            logAction(LOG_ACTIONS_SQLLAB_CREATE_CHART, {});
+            setShowSaveDatasetModal(true);
+          },
+        },
+      ]}
+    />
   );
 
   const queryPayload = () => ({
@@ -172,7 +178,7 @@ const SaveQuery = ({
       <Row>
         <Col xs={24}>
           <FormItem label={t('Description')}>
-            <TextArea
+            <Input.TextArea
               rows={4}
               value={description}
               onChange={onDescriptionChange}
@@ -221,24 +227,23 @@ const SaveQuery = ({
         title={<h4>{t('Save query')}</h4>}
         footer={
           <>
-            <Button onClick={close} data-test="cancel-query" cta>
+            <Button
+              onClick={close}
+              data-test="cancel-query"
+              cta
+              buttonStyle="secondary"
+            >
               {t('Cancel')}
             </Button>
             <Button
               buttonStyle={isSaved ? undefined : 'primary'}
               onClick={onSaveWrapper}
-              className="m-r-3"
               cta
             >
               {isSaved ? t('Save as new') : t('Save')}
             </Button>
             {isSaved && (
-              <Button
-                buttonStyle="primary"
-                onClick={onUpdateWrapper}
-                className="m-r-3"
-                cta
-              >
+              <Button buttonStyle="primary" onClick={onUpdateWrapper} cta>
                 {t('Update')}
               </Button>
             )}
diff --git a/superset-frontend/src/SqlLab/components/ScheduleQueryButton/index.tsx b/superset-frontend/src/SqlLab/components/ScheduleQueryButton/index.tsx
index b7faf5d714e..7c68662cf60 100644
--- a/superset-frontend/src/SqlLab/components/ScheduleQueryButton/index.tsx
+++ b/superset-frontend/src/SqlLab/components/ScheduleQueryButton/index.tsx
@@ -21,13 +21,20 @@ import { FunctionComponent, useState, useRef, ChangeEvent } from 'react';
 import SchemaForm, { FormProps } from '@rjsf/core';
 import { FormValidation } from '@rjsf/utils';
 import validator from '@rjsf/validator-ajv8';
-import { Row, Col } from 'src/components';
-import { Input, TextArea } from 'src/components/Input';
 import { t, styled } from '@superset-ui/core';
 import { parseDate } from 'chrono-node';
-import ModalTrigger, { ModalTriggerRef } from 'src/components/ModalTrigger';
-import { Form, FormItem } from 'src/components/Form';
-import Button from 'src/components/Button';
+import {
+  ModalTrigger,
+  ModalTriggerRef,
+} from '@superset-ui/core/components/ModalTrigger';
+import {
+  Input,
+  Button,
+  Form,
+  FormItem,
+  Row,
+  Col,
+} from '@superset-ui/core/components';
 import getBootstrapData from 'src/utils/getBootstrapData';
 
 const bootstrapData = getBootstrapData();
@@ -92,7 +99,7 @@ interface ScheduleQueryButtonProps {
 }
 
 const StyledRow = styled(Row)`
-  padding-bottom: ${({ theme }) => theme.gridUnit * 2}px;
+  padding-bottom: ${({ theme }) => theme.sizeUnit * 2}px;
 `;
 
 export const StyledButtonComponent = styled(Button)`
@@ -100,17 +107,14 @@ export const StyledButtonComponent = styled(Button)`
     background: none;
     text-transform: none;
     padding: 0px;
-    color: ${theme.colors.grayscale.dark2};
     font-size: 14px;
-    font-weight: ${theme.typography.weights.normal};
+    font-weight: ${theme.fontWeightNormal};
     margin-left: 0;
     &:disabled {
       margin-left: 0;
       background: none;
-      color: ${theme.colors.grayscale.dark2};
       &:hover {
         background: none;
-        color: ${theme.colors.grayscale.dark2};
       }
     }
   `}
@@ -185,7 +189,7 @@ const ScheduleQueryButton: FunctionComponent<ScheduleQueryButtonProps> = ({
       <StyledRow>
         <Col xs={24}>
           <FormItem label={t('Description')}>
-            <TextArea
+            <Input.TextArea
               rows={4}
               placeholder={t('Write a description for your query')}
               value={description}
diff --git a/superset-frontend/src/SqlLab/components/ShareSqlLabQuery/ShareSqlLabQuery.test.tsx b/superset-frontend/src/SqlLab/components/ShareSqlLabQuery/ShareSqlLabQuery.test.tsx
index e5cc8034a4b..7326073b77a 100644
--- a/superset-frontend/src/SqlLab/components/ShareSqlLabQuery/ShareSqlLabQuery.test.tsx
+++ b/superset-frontend/src/SqlLab/components/ShareSqlLabQuery/ShareSqlLabQuery.test.tsx
@@ -16,16 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { FC } from 'react';
 import configureStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 import fetchMock from 'fetch-mock';
-import { Provider } from 'react-redux';
-import {
-  supersetTheme,
-  ThemeProvider,
-  isFeatureEnabled,
-} from '@superset-ui/core';
+import { isFeatureEnabled } from '@superset-ui/core';
 import {
   render,
   screen,
@@ -35,6 +29,7 @@ import {
 } from 'spec/helpers/testing-library';
 import ShareSqlLabQuery from 'src/SqlLab/components/ShareSqlLabQuery';
 import { initialState } from 'src/SqlLab/fixtures';
+import { omit } from 'lodash';
 
 const mockStore = configureStore([thunk]);
 const defaultProps = {
@@ -71,12 +66,6 @@ jest.mock('@superset-ui/core', () => ({
 
 const mockedIsFeatureEnabled = isFeatureEnabled as jest.Mock;
 
-const standardProvider: FC = ({ children }) => (
-  <ThemeProvider theme={supersetTheme}>
-    <Provider store={store}>{children}</Provider>
-  </ThemeProvider>
-);
-
 const unsavedQueryEditor = {
   id: defaultProps.queryEditorId,
   dbId: 9888,
@@ -87,22 +76,6 @@ const unsavedQueryEditor = {
   templateParams: '{ "my_value": "foo" }',
 };
 
-const standardProviderWithUnsaved: FC = ({ children }) => (
-  <ThemeProvider theme={supersetTheme}>
-    <Provider
-      store={mockStore({
-        ...initialState,
-        sqlLab: {
-          ...initialState.sqlLab,
-          unsavedQueryEditor,
-        },
-      })}
-    >
-      {children}
-    </Provider>
-  </ThemeProvider>
-);
-
 describe('ShareSqlLabQuery', () => {
   const storeQueryUrl = 'glob:*/api/v1/sqllab/permalink';
   const storeQueryMockId = 'ci39c3';
@@ -133,11 +106,12 @@ describe('ShareSqlLabQuery', () => {
     it('calls storeQuery() with the query when getCopyUrl() is called', async () => {
       await act(async () => {
         render(<ShareSqlLabQuery {...defaultProps} />, {
-          wrapper: standardProvider,
+          useRedux: true,
+          store,
         });
       });
       const button = screen.getByRole('button');
-      const { id: _id, remoteId: _remoteId, ...expected } = mockQueryEditor;
+      const expected = omit(mockQueryEditor, ['id', 'remoteId']);
       userEvent.click(button);
       await waitFor(() =>
         expect(fetchMock.calls(storeQueryUrl)).toHaveLength(1),
@@ -150,11 +124,18 @@ describe('ShareSqlLabQuery', () => {
     it('calls storeQuery() with unsaved changes', async () => {
       await act(async () => {
         render(<ShareSqlLabQuery {...defaultProps} />, {
-          wrapper: standardProviderWithUnsaved,
+          useRedux: true,
+          store: mockStore({
+            ...initialState,
+            sqlLab: {
+              ...initialState.sqlLab,
+              unsavedQueryEditor,
+            },
+          }),
         });
       });
       const button = screen.getByRole('button');
-      const { id: _id, ...expected } = unsavedQueryEditor;
+      const expected = omit(unsavedQueryEditor, ['id']);
       userEvent.click(button);
       await waitFor(() =>
         expect(fetchMock.calls(storeQueryUrl)).toHaveLength(1),
diff --git a/superset-frontend/src/SqlLab/components/ShareSqlLabQuery/index.tsx b/superset-frontend/src/SqlLab/components/ShareSqlLabQuery/index.tsx
index e641c0f349d..7249d5909fb 100644
--- a/superset-frontend/src/SqlLab/components/ShareSqlLabQuery/index.tsx
+++ b/superset-frontend/src/SqlLab/components/ShareSqlLabQuery/index.tsx
@@ -18,15 +18,14 @@
  */
 import {
   t,
-  useTheme,
   getClientErrorObject,
   SupersetClient,
   css,
 } from '@superset-ui/core';
-import Button from 'src/components/Button';
-import { Icons } from 'src/components/Icons';
+import { Button } from '@superset-ui/core/components';
+import { CopyToClipboard } from 'src/components';
+import { Icons } from '@superset-ui/core/components/Icons';
 import withToasts from 'src/components/MessageToasts/withToasts';
-import CopyToClipboard from 'src/components/CopyToClipboard';
 import useQueryEditor from 'src/SqlLab/hooks/useQueryEditor';
 import { LOG_ACTIONS_SQLLAB_COPY_LINK } from 'src/logger/LogUtils';
 import useLogAction from 'src/logger/useLogAction';
@@ -40,7 +39,6 @@ const ShareSqlLabQuery = ({
   queryEditorId,
   addDangerToast,
 }: ShareSqlLabQueryProps) => {
-  const theme = useTheme();
   const logAction = useLogAction({ queryEditorId });
   const { dbId, name, schema, autorun, sql, templateParams } = useQueryEditor(
     queryEditorId,
@@ -77,6 +75,7 @@ const ShareSqlLabQuery = ({
     return (
       <Button
         buttonSize="small"
+        buttonStyle="secondary"
         tooltip={tooltip}
         css={css`
           span > :first-of-type {
@@ -84,10 +83,7 @@ const ShareSqlLabQuery = ({
           }
         `}
       >
-        <Icons.LinkOutlined
-          iconColor={theme.colors.primary.base}
-          iconSize="m"
-        />
+        <Icons.LinkOutlined iconSize="m" />
         {t('Copy link')}
       </Button>
     );
diff --git a/superset-frontend/src/SqlLab/components/ShowSQL/index.tsx b/superset-frontend/src/SqlLab/components/ShowSQL/index.tsx
index 409cd5af464..267f735c507 100644
--- a/superset-frontend/src/SqlLab/components/ShowSQL/index.tsx
+++ b/superset-frontend/src/SqlLab/components/ShowSQL/index.tsx
@@ -16,14 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import SyntaxHighlighter from 'react-syntax-highlighter/dist/cjs/light';
-import sql from 'react-syntax-highlighter/dist/cjs/languages/hljs/sql';
-import github from 'react-syntax-highlighter/dist/cjs/styles/hljs/github';
-import { IconTooltip } from 'src/components/IconTooltip';
-import ModalTrigger from 'src/components/ModalTrigger';
-import { Icons } from 'src/components/Icons';
-
-SyntaxHighlighter.registerLanguage('sql', sql);
+import { useEffect } from 'react';
+import { IconTooltip, ModalTrigger } from '@superset-ui/core/components';
+import { Icons } from '@superset-ui/core/components/Icons';
+import CodeSyntaxHighlighter, {
+  preloadLanguages,
+} from '@superset-ui/core/components/CodeSyntaxHighlighter';
 
 interface ShowSQLProps {
   sql: string;
@@ -38,21 +36,26 @@ export default function ShowSQL({
   sql: sqlString,
   triggerNode,
 }: ShowSQLProps) {
+  // Preload SQL language since this component will definitely use it when modal opens
+  useEffect(() => {
+    preloadLanguages(['sql']);
+  }, []);
+
   return (
     <ModalTrigger
       modalTitle={title}
       triggerNode={
         triggerNode || (
-          <IconTooltip className="pull-left m-l-2" tooltip={tooltipText}>
+          <IconTooltip className="pull-left" tooltip={tooltipText}>
             <Icons.EyeOutlined iconSize="s" />
           </IconTooltip>
         )
       }
       modalBody={
         <div>
-          <SyntaxHighlighter language="sql" style={github}>
+          <CodeSyntaxHighlighter language="sql">
             {sqlString}
-          </SyntaxHighlighter>
+          </CodeSyntaxHighlighter>
         </div>
       }
     />
diff --git a/superset-frontend/src/SqlLab/components/SouthPane/Results.tsx b/superset-frontend/src/SqlLab/components/SouthPane/Results.tsx
index 6a2a60831bf..06b7033c254 100644
--- a/superset-frontend/src/SqlLab/components/SouthPane/Results.tsx
+++ b/superset-frontend/src/SqlLab/components/SouthPane/Results.tsx
@@ -18,8 +18,7 @@
  */
 import { FC } from 'react';
 import { shallowEqual, useSelector } from 'react-redux';
-import Alert from 'src/components/Alert';
-import { EmptyState } from 'src/components/EmptyState';
+import { Alert, EmptyState } from '@superset-ui/core/components';
 import { FeatureFlag, styled, t, isFeatureEnabled } from '@superset-ui/core';
 
 import { SqlLabRootState } from 'src/SqlLab/types';
@@ -37,7 +36,7 @@ type Props = {
 
 const StyledEmptyStateWrapper = styled.div`
   height: 100%;
-  .antd5-empty-image img {
+  .ant-empty-image img {
     margin-right: 28px;
   }
 
diff --git a/superset-frontend/src/SqlLab/components/SouthPane/SouthPane.test.tsx b/superset-frontend/src/SqlLab/components/SouthPane/SouthPane.test.tsx
index 93d37327943..98b2ff45f54 100644
--- a/superset-frontend/src/SqlLab/components/SouthPane/SouthPane.test.tsx
+++ b/superset-frontend/src/SqlLab/components/SouthPane/SouthPane.test.tsx
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { render, waitFor, within } from 'spec/helpers/testing-library';
+import { render, waitFor, screen } from 'spec/helpers/testing-library';
 import SouthPane from 'src/SqlLab/components/SouthPane';
 import { STATUS_OPTIONS } from 'src/SqlLab/constants';
 import { initialState, table, defaultQueryEditor } from 'src/SqlLab/fixtures';
@@ -125,25 +125,25 @@ test('should render offline when the state is offline', async () => {
 });
 
 test('should render empty result state when latestQuery is empty', () => {
-  const { getAllByRole } = render(
-    <SouthPane {...mockedProps} latestQueryId={undefined} />,
-    {
-      useRedux: true,
-      initialState: mockState,
-    },
-  );
-
-  const resultPanel = getAllByRole('tabpanel')[0];
-  expect(resultPanel).toHaveTextContent('Run a query to display results');
-});
-
-test('should render tabs for table metadata view', () => {
-  const { getAllByRole } = render(<SouthPane {...mockedProps} />, {
+  render(<SouthPane {...mockedProps} latestQueryId={undefined} />, {
     useRedux: true,
     initialState: mockState,
   });
 
-  const tabs = getAllByRole('tab');
+  const resultPanel = screen.getByText('Run a query to display results');
+  expect(resultPanel).toBeInTheDocument();
+});
+
+test('should render tabs for table metadata view', () => {
+  const { container } = render(<SouthPane {...mockedProps} />, {
+    useRedux: true,
+    initialState: mockState,
+  });
+
+  const tabs = Array.from(container.querySelectorAll('[role="tab"]')).filter(
+    tab => !tab.classList.contains('ant-tabs-tab-remove'),
+  );
+
   expect(tabs).toHaveLength(mockState.sqlLab.tables.length + 2);
   expect(tabs[0]).toHaveTextContent('Results');
   expect(tabs[1]).toHaveTextContent('Query history');
@@ -151,22 +151,33 @@ test('should render tabs for table metadata view', () => {
     expect(tabs[index + 2]).toHaveTextContent(`${schema}.${name}`);
   });
 });
-
 test('should remove tab', async () => {
-  const { getAllByRole } = await render(<SouthPane {...mockedProps} />, {
+  const { container } = await render(<SouthPane {...mockedProps} />, {
     useRedux: true,
     initialState: mockState,
   });
 
-  const tabs = getAllByRole('tab');
+  let tabs = Array.from(container.querySelectorAll('[role="tab"]')).filter(
+    tab => !tab.classList.contains('ant-tabs-tab-remove'),
+  );
   const totalTabs = mockState.sqlLab.tables.length + 2;
   expect(tabs).toHaveLength(totalTabs);
-  const removeButton = within(tabs[2].parentElement as HTMLElement).getByRole(
-    'button',
-    {
-      name: /remove/,
-    },
+
+  console.log(tabs[2].parentElement?.innerHTML); // debug
+
+  const removeButton = tabs[2].parentElement?.querySelector(
+    'button[aria-label="remove"]',
   );
-  userEvent.click(removeButton);
-  await waitFor(() => expect(getAllByRole('tab')).toHaveLength(totalTabs - 1));
+  expect(removeButton).toBeTruthy();
+
+  if (removeButton) {
+    userEvent.click(removeButton);
+  }
+
+  await waitFor(() => {
+    tabs = Array.from(container.querySelectorAll('[role="tab"]')).filter(
+      tab => !tab.classList.contains('ant-tabs-tab-remove'),
+    );
+    expect(tabs).toHaveLength(totalTabs - 1);
+  });
 });
diff --git a/superset-frontend/src/SqlLab/components/SouthPane/index.tsx b/superset-frontend/src/SqlLab/components/SouthPane/index.tsx
index af91855fb01..7096f4d6328 100644
--- a/superset-frontend/src/SqlLab/components/SouthPane/index.tsx
+++ b/superset-frontend/src/SqlLab/components/SouthPane/index.tsx
@@ -19,13 +19,13 @@
 import { createRef, useCallback, useMemo } from 'react';
 import { shallowEqual, useDispatch, useSelector } from 'react-redux';
 import { nanoid } from 'nanoid';
-import Tabs from 'src/components/Tabs';
+import Tabs from '@superset-ui/core/components/Tabs';
 import { css, styled, t, useTheme } from '@superset-ui/core';
 
 import { removeTables, setActiveSouthPaneTab } from 'src/SqlLab/actions/sqlLab';
 
-import Label from 'src/components/Label';
-import { Icons } from 'src/components/Icons';
+import { Label } from '@superset-ui/core/components';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { SqlLabRootState } from 'src/SqlLab/types';
 import QueryHistory from '../QueryHistory';
 import {
@@ -54,6 +54,11 @@ type StyledPaneProps = {
   height: number;
 };
 
+const TABS_KEYS = {
+  RESULTS: 'Results',
+  HISTORY: 'History',
+};
+
 const StyledPane = styled.div<StyledPaneProps>`
   width: 100%;
   height: ${props => props.height}px;
@@ -75,11 +80,11 @@ const StyledPane = styled.div<StyledPaneProps>`
   }
   .tab-content {
     .alert {
-      margin-top: ${({ theme }) => theme.gridUnit * 2}px;
+      margin-top: ${({ theme }) => theme.sizeUnit * 2}px;
     }
 
     button.fetch {
-      margin-top: ${({ theme }) => theme.gridUnit * 2}px;
+      margin-top: ${({ theme }) => theme.sizeUnit * 2}px;
     }
   }
 `;
@@ -140,11 +145,66 @@ const SouthPane = ({
     [dispatch, pinnedTables],
   );
 
-  return offline ? (
-    <Label className="m-r-3" type={STATE_TYPE_MAP[STATUS_OPTIONS.offline]}>
-      {STATUS_OPTIONS_LOCALIZED.offline}
-    </Label>
-  ) : (
+  if (offline) {
+    return (
+      <Label type={STATE_TYPE_MAP[STATUS_OPTIONS.offline]}>
+        {STATUS_OPTIONS_LOCALIZED.offline}
+      </Label>
+    );
+  }
+
+  const tabItems = [
+    {
+      key: TABS_KEYS.RESULTS,
+      label: t('Results'),
+      children: (
+        <Results
+          height={innerTabContentHeight}
+          latestQueryId={latestQueryId}
+          displayLimit={displayLimit}
+          defaultQueryLimit={defaultQueryLimit}
+        />
+      ),
+      closable: false,
+    },
+    {
+      key: TABS_KEYS.HISTORY,
+      label: t('Query history'),
+      children: (
+        <QueryHistory
+          queryEditorId={queryEditorId}
+          displayLimit={displayLimit}
+          latestQueryId={latestQueryId}
+        />
+      ),
+      closable: false,
+    },
+    ...pinnedTables.map(({ id, dbId, catalog, schema, name }) => ({
+      key: pinnedTableKeys[id],
+      label: (
+        <>
+          <Icons.InsertRowAboveOutlined
+            iconSize="l"
+            css={css`
+              margin-bottom: ${theme.sizeUnit * 0.5}px;
+              margin-right: ${theme.sizeUnit}px;
+            `}
+          />
+          {`${schema}.${decodeURIComponent(name)}`}
+        </>
+      ),
+      children: (
+        <TablePreview
+          dbId={dbId}
+          catalog={catalog}
+          schema={schema}
+          tableName={name}
+        />
+      ),
+    })),
+  ];
+
+  return (
     <StyledPane
       data-test="south-pane"
       className="SouthPane"
@@ -157,51 +217,11 @@ const SouthPane = ({
         className="SouthPaneTabs"
         onChange={switchTab}
         id={nanoid(11)}
-        fullWidth={false}
         animated={false}
         onEdit={removeTable}
         hideAdd
-      >
-        <Tabs.TabPane tab={t('Results')} key="Results" closable={false}>
-          <Results
-            height={innerTabContentHeight}
-            latestQueryId={latestQueryId}
-            displayLimit={displayLimit}
-            defaultQueryLimit={defaultQueryLimit}
-          />
-        </Tabs.TabPane>
-        <Tabs.TabPane tab={t('Query history')} key="History" closable={false}>
-          <QueryHistory
-            queryEditorId={queryEditorId}
-            displayLimit={displayLimit}
-            latestQueryId={latestQueryId}
-          />
-        </Tabs.TabPane>
-        {pinnedTables.map(({ id, dbId, catalog, schema, name }) => (
-          <Tabs.TabPane
-            tab={
-              <>
-                <Icons.InsertRowAboveOutlined
-                  iconSize="l"
-                  css={css`
-                    margin-bottom: ${theme.gridUnit * 0.5}px;
-                    margin-right: ${theme.gridUnit}px;
-                  `}
-                />
-                {`${schema}.${decodeURIComponent(name)}`}
-              </>
-            }
-            key={pinnedTableKeys[id]}
-          >
-            <TablePreview
-              dbId={dbId}
-              catalog={catalog}
-              schema={schema}
-              tableName={name}
-            />
-          </Tabs.TabPane>
-        ))}
-      </Tabs>
+        items={tabItems}
+      />
     </StyledPane>
   );
 };
diff --git a/superset-frontend/src/SqlLab/components/SqlEditor/SqlEditor.test.tsx b/superset-frontend/src/SqlLab/components/SqlEditor/SqlEditor.test.tsx
index f5d0277a894..119021f722b 100644
--- a/superset-frontend/src/SqlLab/components/SqlEditor/SqlEditor.test.tsx
+++ b/superset-frontend/src/SqlLab/components/SqlEditor/SqlEditor.test.tsx
@@ -45,8 +45,8 @@ import setupExtensions from 'src/setup/setupExtensions';
 import type { Action, Middleware, Store } from 'redux';
 import SqlEditor, { Props } from '.';
 
-jest.mock('src/components/AsyncAceEditor', () => ({
-  ...jest.requireActual('src/components/AsyncAceEditor'),
+jest.mock('@superset-ui/core/components/AsyncAceEditor', () => ({
+  ...jest.requireActual('@superset-ui/core/components/AsyncAceEditor'),
   FullSQLEditor: ({
     onChange,
     onBlur,
diff --git a/superset-frontend/src/SqlLab/components/SqlEditor/index.tsx b/superset-frontend/src/SqlLab/components/SqlEditor/index.tsx
index cfa63a541db..debf8d18307 100644
--- a/superset-frontend/src/SqlLab/components/SqlEditor/index.tsx
+++ b/superset-frontend/src/SqlLab/components/SqlEditor/index.tsx
@@ -51,17 +51,21 @@ import type {
 } from 'src/SqlLab/types';
 import type { DatabaseObject } from 'src/features/databases/types';
 import { debounce, throttle, isEmpty } from 'lodash';
-import Modal from 'src/components/Modal';
 import Mousetrap from 'mousetrap';
-import Button from 'src/components/Button';
-import Timer from 'src/components/Timer';
+import {
+  Alert,
+  Button,
+  Dropdown,
+  EmptyState,
+  Input,
+  Modal,
+  Timer,
+} from '@superset-ui/core/components';
 import ResizableSidebar from 'src/components/ResizableSidebar';
-import { Dropdown } from 'src/components/Dropdown';
-import { Skeleton } from 'src/components';
-import { Switch } from 'src/components/Switch';
-import { Input } from 'src/components/Input';
-import { Menu } from 'src/components/Menu';
-import { Icons } from 'src/components/Icons';
+import { Skeleton } from '@superset-ui/core/components/Skeleton';
+import { Switch } from '@superset-ui/core/components/Switch';
+import { Menu, MenuItemType } from '@superset-ui/core/components/Menu';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { detectOS } from 'src/utils/common';
 import {
   addNewQueryEditor,
@@ -101,8 +105,6 @@ import {
   LocalStorageKeys,
   setItem,
 } from 'src/utils/localStorageHelpers';
-import { EmptyState } from 'src/components/EmptyState';
-import Alert from 'src/components/Alert';
 import getBootstrapData from 'src/utils/getBootstrapData';
 import useLogAction from 'src/logger/useLogAction';
 import {
@@ -115,7 +117,7 @@ import {
   LOG_ACTIONS_SQLLAB_STOP_QUERY,
   Logger,
 } from 'src/logger/LogUtils';
-import CopyToClipboard from 'src/components/CopyToClipboard';
+import { CopyToClipboard } from 'src/components';
 import TemplateParamsEditor from '../TemplateParamsEditor';
 import SouthPane from '../SouthPane';
 import SaveQuery, { QueryPayload } from '../SaveQuery';
@@ -135,13 +137,13 @@ const bootstrapData = getBootstrapData();
 const scheduledQueriesConf = bootstrapData?.common?.conf?.SCHEDULED_QUERIES;
 
 const StyledToolbar = styled.div`
-  padding: ${({ theme }) => theme.gridUnit * 2}px;
-  background: ${({ theme }) => theme.colors.grayscale.light5};
+  padding: ${({ theme }) => theme.sizeUnit * 2}px;
+  background: ${({ theme }) => theme.colorBgContainer};
   display: flex;
   justify-content: space-between;
-  border: 1px solid ${({ theme }) => theme.colors.grayscale.light2};
+  border: 1px solid ${({ theme }) => theme.colorBorder};
   border-top: 0;
-  column-gap: ${({ theme }) => theme.gridUnit}px;
+  column-gap: ${({ theme }) => theme.sizeUnit}px;
 
   form {
     margin-block-end: 0;
@@ -152,7 +154,7 @@ const StyledToolbar = styled.div`
     display: flex;
     align-items: center;
     & > span {
-      margin-right: ${({ theme }) => theme.gridUnit * 2}px;
+      margin-right: ${({ theme }) => theme.sizeUnit * 2}px;
       display: inline-block;
 
       &:last-child {
@@ -169,10 +171,9 @@ const StyledToolbar = styled.div`
 const StyledSidebar = styled.div<{ width: number; hide: boolean | undefined }>`
   flex: 0 0 ${({ width }) => width}px;
   width: ${({ width }) => width}px;
-  padding: ${({ theme, hide }) => (hide ? 0 : theme.gridUnit * 2.5)}px;
+  padding: ${({ theme, hide }) => (hide ? 0 : theme.sizeUnit * 2.5)}px;
   border-right: 1px solid
-    ${({ theme, hide }) =>
-      hide ? 'transparent' : theme.colors.grayscale.light2};
+    ${({ theme, hide }) => (hide ? 'transparent' : theme.colorBorder)};
 `;
 
 const StyledSqlEditor = styled.div`
@@ -182,12 +183,12 @@ const StyledSqlEditor = styled.div`
     height: 100%;
 
     .schemaPane {
-      transition: transform ${theme.transitionTiming}s ease-in-out;
+      transition: transform ${theme.motionDurationMid} ease-in-out;
     }
 
     .queryPane {
       flex: 1 1 auto;
-      padding: ${theme.gridUnit * 2}px;
+      padding: ${theme.sizeUnit * 2}px;
       overflow-y: auto;
       overflow-x: scroll;
     }
@@ -204,7 +205,7 @@ const StyledSqlEditor = styled.div`
 
     .schemaPane-enter-active {
       transform: translateX(0);
-      max-width: ${theme.gridUnit * 75}px;
+      max-width: ${theme.sizeUnit * 75}px;
     }
 
     .schemaPane-enter,
@@ -219,8 +220,8 @@ const StyledSqlEditor = styled.div`
     }
 
     .gutter {
-      border-top: 1px solid ${theme.colors.grayscale.light2};
-      border-bottom: 1px solid ${theme.colors.grayscale.light2};
+      border-top: 1px solid ${theme.colorBorder};
+      border-bottom: 1px solid ${theme.colorBorder};
       width: 3%;
       margin: ${SQL_EDITOR_GUTTER_MARGIN}px 47%;
     }
@@ -662,11 +663,11 @@ const SqlEditor: FC<Props> = ({
     southPercent: number,
   ) => ({
     aceEditorHeight:
-      (height * northPercent) / (theme.gridUnit * 25) -
+      (height * northPercent) / (theme.sizeUnit * 25) -
       (SQL_EDITOR_GUTTER_HEIGHT / 2 + SQL_EDITOR_GUTTER_MARGIN) -
       SQL_TOOLBAR_HEIGHT,
     southPaneHeight:
-      (height * southPercent) / (theme.gridUnit * 25) -
+      (height * southPercent) / (theme.sizeUnit * 25) -
       (SQL_EDITOR_GUTTER_HEIGHT / 2 + SQL_EDITOR_GUTTER_MARGIN),
   });
 
@@ -709,59 +710,81 @@ const SqlEditor: FC<Props> = ({
     const scheduleToolTip = successful
       ? t('Schedule the query periodically')
       : t('You must run the query successfully first');
-    return (
-      <Menu css={{ width: theme.gridUnit * 50 }}>
-        <Menu.Item css={{ display: 'flex', justifyContent: 'space-between' }}>
-          {' '}
-          <span>{t('Render HTML')}</span>{' '}
-          <Switch
-            checked={renderHTMLEnabled}
-            onChange={handleToggleRenderHTMLEnabled}
-          />{' '}
-        </Menu.Item>
-        <Menu.Item css={{ display: 'flex', justifyContent: 'space-between' }}>
-          {' '}
-          <span>{t('Autocomplete')}</span>{' '}
-          <Switch
-            checked={autocompleteEnabled}
-            onChange={handleToggleAutocompleteEnabled}
-          />{' '}
-        </Menu.Item>
-        {isFeatureEnabled(FeatureFlag.EnableTemplateProcessing) && (
-          <Menu.Item>
-            <TemplateParamsEditor
-              language="json"
-              onChange={params => {
-                dispatch(queryEditorSetTemplateParams(qe, params));
+
+    const menuItems: MenuItemType[] = [
+      {
+        key: 'render-html',
+        label: (
+          <div css={{ display: 'flex', justifyContent: 'space-between' }}>
+            <span>{t('Render HTML')}</span>{' '}
+            <Switch
+              checked={renderHTMLEnabled}
+              onChange={(checked, event) => {
+                event.stopPropagation();
+                handleToggleRenderHTMLEnabled();
               }}
-              queryEditorId={qe.id}
             />
-          </Menu.Item>
-        )}
-        <Menu.Item onClick={() => formatCurrentQuery()}>
-          {t('Format SQL')}
-        </Menu.Item>
-        {!isEmpty(scheduledQueriesConf) && (
-          <Menu.Item>
-            <ScheduleQueryButton
-              defaultLabel={qe.name}
-              sql={qe.sql}
-              onSchedule={(query: Query) => dispatch(scheduleQuery(query))}
-              schema={qe.schema}
-              dbId={qe.dbId}
-              scheduleQueryWarning={scheduleQueryWarning}
-              tooltip={scheduleToolTip}
-              disabled={!successful}
+          </div>
+        ),
+      },
+      {
+        key: 'autocomplete',
+        label: (
+          <div css={{ display: 'flex', justifyContent: 'space-between' }}>
+            <span>{t('Autocomplete')}</span>
+            <Switch
+              checked={autocompleteEnabled}
+              onChange={(checked, event) => {
+                event.stopPropagation();
+                handleToggleAutocompleteEnabled();
+              }}
             />
-          </Menu.Item>
-        )}
-        <Menu.Item>
+          </div>
+        ),
+      },
+      isFeatureEnabled(FeatureFlag.EnableTemplateProcessing) && {
+        key: 'template-params',
+        label: (
+          <TemplateParamsEditor
+            language="json"
+            onChange={params => {
+              dispatch(queryEditorSetTemplateParams(qe, params));
+            }}
+            queryEditorId={qe.id}
+          />
+        ),
+      },
+      {
+        key: 'format-sql',
+        label: t('Format SQL'),
+        onClick: () => formatCurrentQuery(),
+      },
+      !isEmpty(scheduledQueriesConf) && {
+        key: 'schedule-query',
+        label: (
+          <ScheduleQueryButton
+            defaultLabel={qe.name}
+            sql={qe.sql}
+            onSchedule={(query: Query) => dispatch(scheduleQuery(query))}
+            schema={qe.schema}
+            dbId={qe.dbId}
+            scheduleQueryWarning={scheduleQueryWarning}
+            tooltip={scheduleToolTip}
+            disabled={!successful}
+          />
+        ),
+      },
+      {
+        key: 'keyboard-shortcuts',
+        label: (
           <KeyboardShortcutButton>
             {t('Keyboard shortcuts')}
           </KeyboardShortcutButton>
-        </Menu.Item>
-      </Menu>
-    );
+        ),
+      },
+    ].filter(Boolean) as MenuItemType[];
+
+    return <Menu css={{ width: theme.sizeUnit * 50 }} items={menuItems} />;
   };
 
   const onSaveQuery = async (query: QueryPayload, clientId: string) => {
@@ -773,38 +796,32 @@ const SqlEditor: FC<Props> = ({
     const { allow_ctas: allowCTAS, allow_cvas: allowCVAS } = database || {};
 
     const showMenu = allowCTAS || allowCVAS;
-    const runMenuBtn = (
-      <Menu>
-        {allowCTAS && (
-          <Menu.Item
-            onClick={() => {
-              logAction(LOG_ACTIONS_SQLLAB_CREATE_TABLE_AS, {
-                shortcut: false,
-              });
-              setShowCreateAsModal(true);
-              setCreateAs(CtasEnum.Table);
-            }}
-            key="1"
-          >
-            {t('CREATE TABLE AS')}
-          </Menu.Item>
-        )}
-        {allowCVAS && (
-          <Menu.Item
-            onClick={() => {
-              logAction(LOG_ACTIONS_SQLLAB_CREATE_VIEW_AS, {
-                shortcut: false,
-              });
-              setShowCreateAsModal(true);
-              setCreateAs(CtasEnum.View);
-            }}
-            key="2"
-          >
-            {t('CREATE VIEW AS')}
-          </Menu.Item>
-        )}
-      </Menu>
-    );
+    const menuItems: MenuItemType[] = [
+      allowCTAS && {
+        key: '1',
+        label: t('CREATE TABLE AS'),
+        onClick: () => {
+          logAction(LOG_ACTIONS_SQLLAB_CREATE_TABLE_AS, {
+            shortcut: false,
+          });
+          setShowCreateAsModal(true);
+          setCreateAs(CtasEnum.Table);
+        },
+      },
+      allowCVAS && {
+        key: '2',
+        label: t('CREATE VIEW AS'),
+        onClick: () => {
+          logAction(LOG_ACTIONS_SQLLAB_CREATE_VIEW_AS, {
+            shortcut: false,
+          });
+          setShowCreateAsModal(true);
+          setCreateAs(CtasEnum.View);
+        },
+      },
+    ].filter(Boolean) as MenuItemType[];
+
+    const runMenuBtn = <Menu items={menuItems} />;
 
     return (
       <StyledToolbar className="sql-toolbar" id="js-sql-toolbar">
@@ -875,10 +892,14 @@ const SqlEditor: FC<Props> = ({
                 <ShareSqlLabQuery queryEditorId={queryEditor.id} />
               </span>
               <Dropdown
-                dropdownRender={() => renderDropdown()}
+                popupRender={() => renderDropdown()}
                 trigger={['click']}
               >
-                <Button buttonSize="xsmall" type="link" showMarginRight={false}>
+                <Button
+                  buttonSize="xsmall"
+                  showMarginRight={false}
+                  buttonStyle="link"
+                >
                   <Icons.EllipsisOutlined />
                 </Button>
               </Dropdown>
@@ -903,8 +924,8 @@ const SqlEditor: FC<Props> = ({
   const renderDatasetWarning = () => (
     <Alert
       css={css`
-        margin-bottom: ${theme.gridUnit * 2}px;
-        padding-top: ${theme.gridUnit * 4}px;
+        margin-bottom: ${theme.sizeUnit * 2}px;
+        padding-top: ${theme.sizeUnit * 4}px;
         .antd5-alert-action {
           align-self: center;
         }
@@ -933,9 +954,9 @@ const SqlEditor: FC<Props> = ({
           >
             <p
               css={css`
-                font-size: ${theme.typography.sizes.m}px;
-                font-weight: ${theme.typography.weights.medium};
-                color: ${theme.colors.primary.dark2};
+                font-size: ${theme.fontSize}px;
+                font-weight: ${theme.fontWeightStrong};
+                color: ${theme.colorPrimaryText};
               `}
             >
               {' '}
@@ -944,9 +965,9 @@ const SqlEditor: FC<Props> = ({
             </p>
             <p
               css={css`
-                font-size: ${theme.typography.sizes.m}px;
-                font-weight: ${theme.typography.weights.normal};
-                color: ${theme.colors.primary.dark2};
+                font-size: ${theme.fontSize}px;
+                font-weight: ${theme.fontWeightStrong};
+                color: ${theme.colorPrimaryText};
               `}
             >
               {t(
@@ -1049,7 +1070,7 @@ const SqlEditor: FC<Props> = ({
           data-test="sqlEditor-loading"
           css={css`
             flex: 1;
-            padding: ${theme.gridUnit * 4}px;
+            padding: ${theme.sizeUnit * 4}px;
           `}
         >
           <Skeleton active />
diff --git a/superset-frontend/src/SqlLab/components/SqlEditorLeftBar/SqlEditorLeftBar.test.tsx b/superset-frontend/src/SqlLab/components/SqlEditorLeftBar/SqlEditorLeftBar.test.tsx
index d372c8fb07d..e1aa885f9f2 100644
--- a/superset-frontend/src/SqlLab/components/SqlEditorLeftBar/SqlEditorLeftBar.test.tsx
+++ b/superset-frontend/src/SqlLab/components/SqlEditorLeftBar/SqlEditorLeftBar.test.tsx
@@ -129,7 +129,7 @@ test('table should be visible when expanded is true', async () => {
     name: 'Select database or type to search databases',
   });
   const schemaSelect = getByRole('combobox', {
-    name: 'Select schema or type to search schemas',
+    name: 'Select schema or type to search schemas: main',
   });
   const tableSelect = getAllByLabelText(
     /Select table or type to search tables/i,
@@ -275,7 +275,7 @@ test('When changing database the schema and table list must be updated', async (
     await screen.findByRole('option', { name: 'new_schema' }),
   ).toBeInTheDocument();
 
-  userEvent.click(screen.getAllByText('new_schema')[1]);
+  userEvent.click(screen.getByText('new_schema'));
 
   const updatedTableSelector = await screen.findAllByText(/new_table/i);
   expect(updatedTableSelector[0]).toBeInTheDocument();
diff --git a/superset-frontend/src/SqlLab/components/SqlEditorLeftBar/index.tsx b/superset-frontend/src/SqlLab/components/SqlEditorLeftBar/index.tsx
index d896da2a9f0..a51f312b608 100644
--- a/superset-frontend/src/SqlLab/components/SqlEditorLeftBar/index.tsx
+++ b/superset-frontend/src/SqlLab/components/SqlEditorLeftBar/index.tsx
@@ -18,7 +18,6 @@
  */
 import { useEffect, useCallback, useMemo, useState } from 'react';
 import { shallowEqual, useDispatch, useSelector } from 'react-redux';
-import querystring from 'query-string';
 
 import { SqlLabRootState, Table } from 'src/SqlLab/types';
 import {
@@ -33,20 +32,17 @@ import {
   addDangerToast,
   resetState,
 } from 'src/SqlLab/actions/sqlLab';
-import Button from 'src/components/Button';
-import { t, styled, css, SupersetTheme } from '@superset-ui/core';
-import Collapse from 'src/components/Collapse';
-import { Icons } from 'src/components/Icons';
+import { Button, EmptyState, Icons } from '@superset-ui/core/components';
+import { type DatabaseObject } from 'src/components';
+import { t, styled, css } from '@superset-ui/core';
 import { TableSelectorMultiple } from 'src/components/TableSelector';
-import { IconTooltip } from 'src/components/IconTooltip';
 import useQueryEditor from 'src/SqlLab/hooks/useQueryEditor';
-import type { DatabaseObject } from 'src/components/DatabaseSelector';
-import { EmptyState } from 'src/components/EmptyState';
 import {
   getItem,
   LocalStorageKeys,
   setItem,
 } from 'src/utils/localStorageHelpers';
+import { noop } from 'lodash';
 import TableElement from '../TableElement';
 
 export interface SqlEditorLeftBarProps {
@@ -60,29 +56,6 @@ const StyledScrollbarContainer = styled.div`
   overflow: auto;
 `;
 
-const collapseStyles = (theme: SupersetTheme) => css`
-  .ant-collapse-item {
-    margin-bottom: ${theme.gridUnit * 3}px;
-  }
-  .ant-collapse-header {
-    padding: 0px !important;
-    display: flex;
-    align-items: center;
-  }
-  .ant-collapse-content-box {
-    padding: 0px ${theme.gridUnit * 4}px 0px 0px !important;
-  }
-  .ant-collapse-arrow {
-    padding: 0 !important;
-    bottom: ${theme.gridUnit}px !important;
-    right: ${theme.gridUnit * 4}px !important;
-    color: ${theme.colors.primary.dark1} !important;
-    &:hover {
-      color: ${theme.colors.primary.dark2} !important;
-    }
-  }
-`;
-
 const LeftBarStyles = styled.div`
   ${({ theme }) => css`
     height: 100%;
@@ -90,8 +63,8 @@ const LeftBarStyles = styled.div`
     flex-direction: column;
 
     .divider {
-      border-bottom: 1px solid ${theme.colors.grayscale.light4};
-      margin: ${theme.gridUnit * 4}px 0;
+      border-bottom: 1px solid ${theme.colorSplit};
+      margin: ${theme.sizeUnit * 4}px 0;
     }
   `}
 `;
@@ -126,8 +99,10 @@ const SqlEditorLeftBar = ({
     [allSelectedTables, dbId, schema],
   );
 
+  noop(_emptyResultsWithSearch); // This is to avoid unused variable warning, can be removed if not needed
+
   useEffect(() => {
-    const bool = querystring.parse(window.location.search).db;
+    const bool = new URLSearchParams(window.location.search).get('db');
     const userSelected = getItem(
       LocalStorageKeys.Database,
       null,
@@ -194,25 +169,6 @@ const SqlEditorLeftBar = ({
     });
   };
 
-  const renderExpandIconWithTooltip = ({ isActive }: { isActive: boolean }) => (
-    <IconTooltip
-      css={css`
-        transform: rotate(90deg);
-      `}
-      aria-label="Collapse"
-      tooltip={
-        isActive ? t('Collapse table preview') : t('Expand table preview')
-      }
-    >
-      <Icons.RightOutlined
-        iconSize="s"
-        css={css`
-          transform: ${isActive ? 'rotateY(180deg)' : ''};
-        `}
-      />
-    </IconTooltip>
-  );
-
   const shouldShowReset = window.location.search === '?reset=1';
   const tableMetaDataHeight = height - 130; // 130 is the height of the selects above
 
@@ -276,20 +232,16 @@ const SqlEditorLeftBar = ({
             height: ${tableMetaDataHeight}px;
           `}
         >
-          <Collapse
-            activeKey={tables
-              .filter(({ expanded }) => expanded)
-              .map(({ id }) => id)}
-            css={collapseStyles}
-            expandIconPosition="right"
-            ghost
-            onChange={onToggleTable}
-            expandIcon={renderExpandIconWithTooltip}
-          >
-            {tables.map(table => (
-              <TableElement table={table} key={table.id} />
-            ))}
-          </Collapse>
+          {tables.map(table => (
+            <TableElement
+              table={table}
+              key={table.id}
+              activeKey={tables
+                .filter(({ expanded }) => expanded)
+                .map(({ id }) => id)}
+              onChange={onToggleTable}
+            />
+          ))}
         </div>
       </StyledScrollbarContainer>
       {shouldShowReset && (
@@ -298,9 +250,7 @@ const SqlEditorLeftBar = ({
           buttonStyle="danger"
           onClick={handleResetState}
         >
-          {/* TODO: Remove fa-icon */}
-          {/* eslint-disable-next-line icons/no-fa-icons-usage */}
-          <i className="fa fa-bomb" /> {t('Reset state')}
+          <Icons.ClearOutlined /> {t('Reset state')}
         </Button>
       )}
     </LeftBarStyles>
diff --git a/superset-frontend/src/SqlLab/components/SqlEditorTabHeader/SqlEditorTabHeader.test.tsx b/superset-frontend/src/SqlLab/components/SqlEditorTabHeader/SqlEditorTabHeader.test.tsx
index 3e10def3757..ae79d42ecb4 100644
--- a/superset-frontend/src/SqlLab/components/SqlEditorTabHeader/SqlEditorTabHeader.test.tsx
+++ b/superset-frontend/src/SqlLab/components/SqlEditorTabHeader/SqlEditorTabHeader.test.tsx
@@ -41,10 +41,10 @@ import {
 } from 'src/SqlLab/actions/sqlLab';
 import SqlEditorTabHeader from 'src/SqlLab/components/SqlEditorTabHeader';
 
-jest.mock('src/components/Select/Select', () => () => (
+jest.mock('@superset-ui/core/components/Select/Select', () => () => (
   <div data-test="mock-deprecated-select-select" />
 ));
-jest.mock('src/components/Select/AsyncSelect', () => () => (
+jest.mock('@superset-ui/core/components/Select/AsyncSelect', () => () => (
   <div data-test="mock-async-select" />
 ));
 
diff --git a/superset-frontend/src/SqlLab/components/SqlEditorTabHeader/index.tsx b/superset-frontend/src/SqlLab/components/SqlEditorTabHeader/index.tsx
index fa01b60f428..1f4f5c36912 100644
--- a/superset-frontend/src/SqlLab/components/SqlEditorTabHeader/index.tsx
+++ b/superset-frontend/src/SqlLab/components/SqlEditorTabHeader/index.tsx
@@ -20,8 +20,8 @@ import { useMemo, FC } from 'react';
 
 import { bindActionCreators } from 'redux';
 import { useSelector, useDispatch, shallowEqual } from 'react-redux';
-import { MenuDotsDropdown } from 'src/components/Dropdown';
-import { Menu } from 'src/components/Menu';
+import { MenuDotsDropdown } from '@superset-ui/core/components';
+import { Menu, MenuItemType } from '@superset-ui/core/components/Menu';
 import {
   styled,
   css,
@@ -38,7 +38,7 @@ import {
   toggleLeftBar,
 } from 'src/SqlLab/actions/sqlLab';
 import { QueryEditor, SqlLabRootState } from 'src/SqlLab/types';
-import { Icons, IconType } from 'src/components/Icons';
+import { Icons, type IconType } from '@superset-ui/core/components/Icons';
 
 const TabTitleWrapper = styled.div`
   display: flex;
@@ -50,14 +50,14 @@ const TabTitleWrapper = styled.div`
   }
 `;
 const TabTitle = styled.span`
-  margin-right: ${({ theme }) => theme.gridUnit * 2}px;
+  margin-right: ${({ theme }) => theme.sizeUnit * 2}px;
   text-transform: none;
 `;
 
 const IconContainer = styled.div`
   ${({ theme }) => css`
     display: inline-block;
-    margin: 0 ${theme.gridUnit * 2}px 0 0px;
+    margin: 0 ${theme.sizeUnit * 2}px 0 0px;
   `}
 `;
 interface Props {
@@ -114,15 +114,15 @@ const SqlEditorTabHeader: FC<Props> = ({ queryEditor }) => {
   }
   const getStatusColor = (state: QueryState, theme: SupersetTheme): string => {
     const statusColors: Record<QueryState, string> = {
-      [QueryState.Running]: theme.colors.info.base,
-      [QueryState.Success]: theme.colors.success.base,
-      [QueryState.Failed]: theme.colors.error.base,
-      [QueryState.Started]: theme.colors.primary.base,
-      [QueryState.Stopped]: theme.colors.warning.base,
-      [QueryState.Pending]: theme.colors.grayscale.light1,
-      [QueryState.Scheduled]: theme.colors.grayscale.light2,
-      [QueryState.Fetching]: theme.colors.secondary.base,
-      [QueryState.TimedOut]: theme.colors.error.dark1,
+      [QueryState.Running]: theme.colorInfo,
+      [QueryState.Success]: theme.colorSuccess,
+      [QueryState.Failed]: theme.colorError,
+      [QueryState.Started]: theme.colorPrimary,
+      [QueryState.Stopped]: theme.colorWarning,
+      [QueryState.Pending]: theme.colorIcon,
+      [QueryState.Scheduled]: theme.colorIcon,
+      [QueryState.Fetching]: theme.colorWarning,
+      [QueryState.TimedOut]: theme.colorError,
     };
 
     return statusColors[state] || theme.colors.grayscale.light2;
@@ -132,90 +132,107 @@ const SqlEditorTabHeader: FC<Props> = ({ queryEditor }) => {
       <MenuDotsDropdown
         trigger={['click']}
         overlay={
-          <Menu>
-            <Menu.Item
-              className="close-btn"
-              key="1"
-              onClick={() => actions.removeQueryEditor(qe)}
-              data-test="close-tab-menu-option"
-            >
-              <IconContainer>
-                <Icons.CloseOutlined
-                  iconSize="l"
-                  css={css`
-                    verticalalign: middle;
-                  `}
-                />
-              </IconContainer>
-              {t('Close tab')}
-            </Menu.Item>
-            <Menu.Item
-              key="2"
-              onClick={renameTab}
-              data-test="rename-tab-menu-option"
-            >
-              <IconContainer>
-                <Icons.EditOutlined
-                  css={css`
-                    verticalalign: middle;
-                  `}
-                  iconSize="l"
-                />
-              </IconContainer>
-              {t('Rename tab')}
-            </Menu.Item>
-            <Menu.Item
-              key="3"
-              onClick={() => actions.toggleLeftBar(qe)}
-              data-test="toggle-menu-option"
-            >
-              <IconContainer>
-                <Icons.VerticalAlignBottomOutlined
-                  iconSize="l"
-                  css={css`
-                    rotate: ${qe.hideLeftBar ? '-90deg;' : '90deg;'};
-                  `}
-                />
-              </IconContainer>
-              {qe.hideLeftBar ? t('Expand tool bar') : t('Hide tool bar')}
-            </Menu.Item>
-            <Menu.Item
-              key="4"
-              onClick={() => actions.removeAllOtherQueryEditors(qe)}
-              data-test="close-all-other-menu-option"
-            >
-              <IconContainer>
-                <Icons.CloseOutlined
-                  iconSize="l"
-                  css={css`
-                    vertical-align: middle;
-                  `}
-                />
-              </IconContainer>
-              {t('Close all other tabs')}
-            </Menu.Item>
-            <Menu.Item
-              key="5"
-              onClick={() => actions.cloneQueryToNewTab(qe, false)}
-              data-test="clone-tab-menu-option"
-            >
-              <IconContainer>
-                <Icons.CopyOutlined
-                  iconSize="l"
-                  css={css`
-                    vertical-align: middle;
-                  `}
-                />
-              </IconContainer>
-              {t('Duplicate tab')}
-            </Menu.Item>
-          </Menu>
+          <Menu
+            items={[
+              {
+                className: 'close-btn',
+                key: '1',
+                onClick: () => actions.removeQueryEditor(qe),
+                'data-test': 'close-tab-menu-option',
+                label: (
+                  <>
+                    <IconContainer>
+                      <Icons.CloseOutlined
+                        iconSize="l"
+                        css={css`
+                          verticalalign: middle;
+                        `}
+                      />
+                    </IconContainer>
+                    {t('Close tab')}
+                  </>
+                ),
+              } as MenuItemType,
+              {
+                key: '2',
+                onClick: renameTab,
+                'data-test': 'rename-tab-menu-option',
+                label: (
+                  <>
+                    <IconContainer>
+                      <Icons.EditOutlined
+                        css={css`
+                          verticalalign: middle;
+                        `}
+                        iconSize="l"
+                      />
+                    </IconContainer>
+                    {t('Rename tab')}
+                  </>
+                ),
+              } as MenuItemType,
+              {
+                key: '3',
+                onClick: () => actions.toggleLeftBar(qe),
+                'data-test': 'toggle-menu-option',
+                label: (
+                  <>
+                    <IconContainer>
+                      <Icons.VerticalAlignBottomOutlined
+                        iconSize="l"
+                        css={css`
+                          rotate: ${qe.hideLeftBar ? '-90deg;' : '90deg;'};
+                        `}
+                      />
+                    </IconContainer>
+                    {qe.hideLeftBar ? t('Expand tool bar') : t('Hide tool bar')}
+                  </>
+                ),
+              } as MenuItemType,
+              {
+                key: '4',
+                onClick: () => actions.removeAllOtherQueryEditors(qe),
+                'data-test': 'close-all-other-menu-option',
+                label: (
+                  <>
+                    <IconContainer>
+                      <Icons.CloseOutlined
+                        iconSize="l"
+                        css={css`
+                          vertical-align: middle;
+                        `}
+                      />
+                    </IconContainer>
+                    {t('Close all other tabs')}
+                  </>
+                ),
+              } as MenuItemType,
+              {
+                key: '5',
+                onClick: () => actions.cloneQueryToNewTab(qe, false),
+                'data-test': 'clone-tab-menu-option',
+                label: (
+                  <>
+                    <IconContainer>
+                      <Icons.CopyOutlined
+                        iconSize="l"
+                        css={css`
+                          vertical-align: middle;
+                        `}
+                      />
+                    </IconContainer>
+                    {t('Duplicate tab')}
+                  </>
+                ),
+              } as MenuItemType,
+            ]}
+          />
         }
       />
       <TabTitle>{qe.name}</TabTitle>{' '}
       <StatusIcon
         className="status-icon"
-        iconSize="xs"
+        iconSize="m"
         iconColor={getStatusColor(queryState, theme)}
       />{' '}
     </TabTitleWrapper>
diff --git a/superset-frontend/src/SqlLab/components/TabbedSqlEditors/TabbedSqlEditors.test.tsx b/superset-frontend/src/SqlLab/components/TabbedSqlEditors/TabbedSqlEditors.test.tsx
index 09619abd594..cb720332eb3 100644
--- a/superset-frontend/src/SqlLab/components/TabbedSqlEditors/TabbedSqlEditors.test.tsx
+++ b/superset-frontend/src/SqlLab/components/TabbedSqlEditors/TabbedSqlEditors.test.tsx
@@ -148,38 +148,70 @@ test('should removeQueryEditor', async () => {
     undefined,
     initialState,
   );
-  const tabCount = getAllByRole('tab').length;
+  const tabCount = getAllByRole('tab').filter(
+    tab => !tab.classList.contains('ant-tabs-tab-remove'),
+  ).length;
   const tabList = getByRole('tablist');
   const closeButton = tabList.getElementsByTagName('button')[0];
   expect(closeButton).toBeInTheDocument();
   if (closeButton) {
     fireEvent.click(closeButton);
   }
-  await waitFor(() => expect(getAllByRole('tab').length).toEqual(tabCount - 1));
+  await waitFor(() =>
+    expect(
+      getAllByRole('tab').filter(
+        tab => !tab.classList.contains('ant-tabs-tab-remove'),
+      ).length,
+    ).toEqual(tabCount - 1),
+  );
   expect(
     queryByText(initialState.sqlLab.queryEditors[0].name),
   ).not.toBeInTheDocument();
 });
 test('should add new query editor', async () => {
   const { getAllByLabelText, getAllByRole } = setup(undefined, initialState);
-  const tabCount = getAllByRole('tab').length;
+  const tabCount = getAllByRole('tab').filter(
+    tab => !tab.classList.contains('ant-tabs-tab-remove'),
+  ).length;
   fireEvent.click(getAllByLabelText('Add tab')[0]);
-  await waitFor(() => expect(getAllByRole('tab').length).toEqual(tabCount + 1));
-  expect(getAllByRole('tab')[tabCount]).toHaveTextContent(
-    /Untitled Query (\d+)+/,
+  await waitFor(() =>
+    expect(
+      getAllByRole('tab').filter(
+        tab => !tab.classList.contains('ant-tabs-tab-remove'),
+      ).length,
+    ).toEqual(tabCount + 1),
   );
+  expect(
+    getAllByRole('tab').filter(
+      tab => !tab.classList.contains('ant-tabs-tab-remove'),
+    )[tabCount],
+  ).toHaveTextContent(/Untitled Query (\d+)+/);
 });
 test('should properly increment query tab name', async () => {
   const { getAllByLabelText, getAllByRole } = setup(undefined, initialState);
-  const tabCount = getAllByRole('tab').length;
+  const tabCount = getAllByRole('tab').filter(
+    tab => !tab.classList.contains('ant-tabs-tab-remove'),
+  ).length;
   const newTitle = newQueryTabName(initialState.sqlLab.queryEditors);
   fireEvent.click(getAllByLabelText('Add tab')[0]);
-  await waitFor(() => expect(getAllByRole('tab').length).toEqual(tabCount + 1));
-  expect(getAllByRole('tab')[tabCount]).toHaveTextContent(newTitle);
+  await waitFor(() =>
+    expect(
+      getAllByRole('tab').filter(
+        tab => !tab.classList.contains('ant-tabs-tab-remove'),
+      ).length,
+    ).toEqual(tabCount + 1),
+  );
+  expect(
+    getAllByRole('tab').filter(
+      tab => !tab.classList.contains('ant-tabs-tab-remove'),
+    )[tabCount],
+  ).toHaveTextContent(newTitle);
 });
 test('should handle select', async () => {
   const { getAllByRole } = setup(store);
-  const tabs = getAllByRole('tab');
+  const tabs = getAllByRole('tab').filter(
+    tab => !tab.classList.contains('ant-tabs-tab-remove'),
+  );
   fireEvent.click(tabs[1]);
   await waitFor(() => expect(store.getActions()).toHaveLength(1));
   expect(store.getActions()[0]).toEqual(
@@ -191,7 +223,9 @@ test('should handle select', async () => {
 });
 test('should render', () => {
   const { getAllByRole } = setup(store);
-  const tabs = getAllByRole('tab');
+  const tabs = getAllByRole('tab').filter(
+    tab => !tab.classList.contains('ant-tabs-tab-remove'),
+  );
   expect(tabs).toHaveLength(initialState.sqlLab.queryEditors.length);
 });
 test('should disable new tab when offline', () => {
@@ -215,7 +249,7 @@ test('should have an empty state when query editors is empty', async () => {
   });
 
   // Clear the new tab applied in componentDidMount and check the state of the empty tab
-  const removeTabButton = getByRole('button', { name: 'remove' });
+  const removeTabButton = getByRole('tab', { name: 'remove' });
   fireEvent.click(removeTabButton);
 
   await waitFor(() =>
diff --git a/superset-frontend/src/SqlLab/components/TabbedSqlEditors/index.tsx b/superset-frontend/src/SqlLab/components/TabbedSqlEditors/index.tsx
index 837f892ff69..91f6c5960ef 100644
--- a/superset-frontend/src/SqlLab/components/TabbedSqlEditors/index.tsx
+++ b/superset-frontend/src/SqlLab/components/TabbedSqlEditors/index.tsx
@@ -18,7 +18,7 @@
  */
 import { PureComponent } from 'react';
 import { pick } from 'lodash';
-import { EditableTabs } from 'src/components/Tabs';
+import { EditableTabs } from '@superset-ui/core/components/Tabs';
 import { connect } from 'react-redux';
 import URI from 'urijs';
 import type { QueryEditor, SqlLabRootState } from 'src/SqlLab/types';
@@ -30,14 +30,13 @@ import {
   css,
 } from '@superset-ui/core';
 import { Logger } from 'src/logger/LogUtils';
-import { Tooltip } from 'src/components/Tooltip';
+import { EmptyState, Tooltip } from '@superset-ui/core/components';
 import { detectOS } from 'src/utils/common';
 import * as Actions from 'src/SqlLab/actions/sqlLab';
-import { EmptyState } from 'src/components/EmptyState';
 import getBootstrapData from 'src/utils/getBootstrapData';
 import { locationContext } from 'src/pages/SqlLab/LocationContext';
 import { navigateWithState } from 'src/utils/navigationUtils';
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
 import SqlEditor from '../SqlEditor';
 import SqlEditorTabHeader from '../SqlEditorTabHeader';
 
@@ -59,7 +58,7 @@ const StyledTab = styled.span`
 `;
 
 const TabTitle = styled.span`
-  margin-right: ${({ theme }) => theme.gridUnit * 2}px;
+  margin-right: ${({ theme }) => theme.sizeUnit * 2}px;
   text-transform: none;
 `;
 
@@ -225,13 +224,10 @@ class TabbedSqlEditors extends PureComponent<TabbedSqlEditorsProps> {
   };
 
   render() {
-    const noQueryEditors = this.props.queryEditors?.length === 0;
-    const editors = this.props.queryEditors?.map(qe => (
-      <EditableTabs.TabPane
-        key={qe.id}
-        tab={<SqlEditorTabHeader queryEditor={qe} />}
-        data-key={qe.id}
-      >
+    const editors = this.props.queryEditors?.map(qe => ({
+      key: qe.id,
+      label: <SqlEditorTabHeader queryEditor={qe} />,
+      children: (
         <SqlEditor
           queryEditor={qe}
           defaultQueryLimit={this.props.defaultQueryLimit}
@@ -240,8 +236,8 @@ class TabbedSqlEditors extends PureComponent<TabbedSqlEditorsProps> {
           saveQueryWarning={this.props.saveQueryWarning}
           scheduleQueryWarning={this.props.scheduleQueryWarning}
         />
-      </EditableTabs.TabPane>
-    ));
+      ),
+    }));
 
     const emptyTab = (
       <StyledTab>
@@ -266,20 +262,20 @@ class TabbedSqlEditors extends PureComponent<TabbedSqlEditorsProps> {
       </StyledTab>
     );
 
-    const emptyTabState = (
-      <EditableTabs.TabPane
-        key={0}
-        data-key={0}
-        tab={emptyTab}
-        closable={false}
-      >
+    const emptyTabState = {
+      key: '0',
+      label: emptyTab,
+      children: (
         <EmptyState
           image="empty_sql_chart.svg"
           size="large"
           description={t('Add a new tab to create SQL Query')}
         />
-      </EditableTabs.TabPane>
-    );
+      ),
+    };
+
+    const tabItems =
+      this.props.queryEditors?.length > 0 ? editors : [emptyTabState];
 
     return (
       <StyledEditableTabs
@@ -288,11 +284,10 @@ class TabbedSqlEditors extends PureComponent<TabbedSqlEditorsProps> {
         className="SqlEditorTabs"
         data-test="sql-editor-tabs"
         onChange={this.handleSelect}
-        fullWidth={false}
         hideAdd={this.props.offline}
         onTabClick={this.onTabClicked}
         onEdit={this.handleEdit}
-        type={noQueryEditors ? 'card' : 'editable-card'}
+        type={this.props.queryEditors?.length === 0 ? 'card' : 'editable-card'}
         addIcon={
           <Tooltip
             id="add-tab"
@@ -312,10 +307,8 @@ class TabbedSqlEditors extends PureComponent<TabbedSqlEditorsProps> {
             />
           </Tooltip>
         }
-      >
-        {editors}
-        {noQueryEditors && emptyTabState}
-      </StyledEditableTabs>
+        items={tabItems}
+      />
     );
   }
 }
diff --git a/superset-frontend/src/SqlLab/components/TableElement/TableElement.test.tsx b/superset-frontend/src/SqlLab/components/TableElement/TableElement.test.tsx
index b9cd94e5663..96f68b6666a 100644
--- a/superset-frontend/src/SqlLab/components/TableElement/TableElement.test.tsx
+++ b/superset-frontend/src/SqlLab/components/TableElement/TableElement.test.tsx
@@ -30,10 +30,10 @@ jest.mock('@superset-ui/core', () => ({
 
 const mockedIsFeatureEnabled = isFeatureEnabled as jest.Mock;
 
-jest.mock('src/components/Loading', () => () => (
-  <div data-test="mock-loading" />
-));
-jest.mock('src/components/IconTooltip', () => ({
+jest.mock('@superset-ui/core/components/Loading', () => ({
+  Loading: () => <div data-test="mock-loading" />,
+}));
+jest.mock('@superset-ui/core/components/IconTooltip', () => ({
   IconTooltip: ({
     onClick,
     tooltip,
@@ -76,6 +76,7 @@ const mockedProps = {
     ...table,
     initialized: true,
   },
+  activeKey: [table.id],
 };
 
 test('renders', () => {
diff --git a/superset-frontend/src/SqlLab/components/TableElement/index.tsx b/superset-frontend/src/SqlLab/components/TableElement/index.tsx
index 7768b311820..152cdfceea8 100644
--- a/superset-frontend/src/SqlLab/components/TableElement/index.tsx
+++ b/superset-frontend/src/SqlLab/components/TableElement/index.tsx
@@ -16,15 +16,22 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-// TODO: Remove fa-icon
-/* eslint-disable icons/no-fa-icons-usage */
 import { useState, useRef, useEffect } from 'react';
 import { useDispatch } from 'react-redux';
 import type { Table } from 'src/SqlLab/types';
-import Collapse from 'src/components/Collapse';
-import Card from 'src/components/Card';
-import ButtonGroup from 'src/components/ButtonGroup';
-import { css, t, styled, useTheme } from '@superset-ui/core';
+import {
+  ButtonGroup,
+  Card,
+  Collapse,
+  Tooltip,
+  Flex,
+  IconTooltip,
+  Loading,
+  ModalTrigger,
+  type CollapseProps,
+} from '@superset-ui/core/components';
+import { CopyToClipboard } from 'src/components';
+import { t, styled, useTheme } from '@superset-ui/core';
 import { debounce } from 'lodash';
 
 import {
@@ -38,14 +45,10 @@ import {
   useTableExtendedMetadataQuery,
   useTableMetadataQuery,
 } from 'src/hooks/apiResources';
-import { Tooltip } from 'src/components/Tooltip';
-import CopyToClipboard from 'src/components/CopyToClipboard';
-import { IconTooltip } from 'src/components/IconTooltip';
-import ModalTrigger from 'src/components/ModalTrigger';
-import Loading from 'src/components/Loading';
 import useEffectEvent from 'src/hooks/useEffectEvent';
 import { ActionType } from 'src/types/Action';
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
+import { Space } from '@superset-ui/core/components/Space';
 import ColumnElement, { ColumnKeyTypeType } from '../ColumnElement';
 import ShowSQL from '../ShowSQL';
 
@@ -55,58 +58,21 @@ export interface Column {
   type: string;
 }
 
-export interface TableElementProps {
+export interface TableElementProps extends CollapseProps {
   table: Table;
 }
 
 const StyledSpan = styled.span`
-  color: ${({ theme }) => theme.colors.primary.dark1};
-  &:hover {
-    color: ${({ theme }) => theme.colors.primary.dark2};
-  }
   cursor: pointer;
 `;
 
 const Fade = styled.div`
-  transition: all ${({ theme }) => theme.transitionTiming}s;
+  transition: all ${({ theme }) => theme.motionDurationMid};
   opacity: ${(props: { hovered: boolean }) => (props.hovered ? 1 : 0)};
 `;
 
-const StyledCollapsePanel = styled(Collapse.Panel)`
-  ${({ theme }) => css`
-    & {
-      .ws-el-controls {
-        margin-right: ${-theme.gridUnit}px;
-        display: flex;
-      }
-
-      .header-container {
-        display: flex;
-        flex: 1;
-        align-items: center;
-        width: 100%;
-
-        .table-name {
-          white-space: nowrap;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          font-size: ${theme.typography.sizes.l}px;
-          flex: 1;
-        }
-
-        .header-right-side {
-          margin-left: auto;
-          display: flex;
-          align-items: center;
-          margin-right: ${theme.gridUnit * 8}px;
-        }
-      }
-    }
-  `}
-`;
-
 const TableElement = ({ table, ...props }: TableElementProps) => {
-  const { dbId, catalog, schema, name, expanded } = table;
+  const { dbId, catalog, schema, name, expanded, id } = table;
   const theme = useTheme();
   const dispatch = useDispatch();
   const {
@@ -260,12 +226,12 @@ const TableElement = ({ table, ...props }: TableElementProps) => {
           ))}
           triggerNode={
             <IconTooltip
-              className="pull-left m-l-2"
+              className="pull-left"
               tooltip={t('View keys & indexes (%s)', tableData.indexes.length)}
             >
               <Icons.TableOutlined
                 iconSize="m"
-                iconColor={theme.colors.primary.dark2}
+                iconColor={theme.colorPrimary}
               />
             </IconTooltip>
           }
@@ -273,77 +239,85 @@ const TableElement = ({ table, ...props }: TableElementProps) => {
       );
     }
     return (
-      <ButtonGroup
-        css={css`
-          column-gap: ${theme.gridUnit * 1.5}px;
-          margin-right: ${theme.gridUnit}px;
-          & span {
-            display: flex;
-            justify-content: center;
-            width: ${theme.gridUnit * 4}px;
-          }
-        `}
-      >
-        <IconTooltip
-          className="pull-left m-l-2 pointer"
-          onClick={refreshTableMetadata}
-          tooltip={t('Refresh table schema')}
-        >
-          <Icons.SyncOutlined
-            iconSize="m"
-            iconColor={theme.colors.primary.dark2}
-          />
-        </IconTooltip>
-        {keyLink}
-        <IconTooltip
-          className={
-            `fa fa-sort-${sortColumns ? 'numeric' : 'alpha'}-asc ` +
-            'pull-left sort-cols m-l-2 pointer'
-          }
-          onClick={toggleSortColumns}
-          tooltip={
-            sortColumns
-              ? t('Original table column order')
-              : t('Sort columns alphabetically')
-          }
-        />
-        {tableData.selectStar && (
-          <CopyToClipboard
-            copyNode={
-              <IconTooltip
-                aria-label="Copy"
-                tooltip={t('Copy SELECT statement to the clipboard')}
-              >
-                <Icons.CopyOutlined
-                  iconSize="m"
-                  iconColor={theme.colors.primary.dark2}
-                  aria-hidden
-                />
-              </IconTooltip>
-            }
-            text={tableData.selectStar}
-            shouldShowText={false}
-          />
+      <Flex style={{ height: 22 }} align="center">
+        {isMetadataFetching || isExtraMetadataLoading ? (
+          <Loading position="inline" />
+        ) : (
+          <Fade
+            data-test="fade"
+            hovered={hovered}
+            onClick={e => e.stopPropagation()}
+          >
+            <ButtonGroup>
+              <Space size="small">
+                <IconTooltip
+                  className="pull-left pointer"
+                  onClick={refreshTableMetadata}
+                  tooltip={t('Refresh table schema')}
+                >
+                  <Icons.SyncOutlined
+                    iconSize="m"
+                    iconColor={theme.colorIcon}
+                  />
+                </IconTooltip>
+                {keyLink}
+                <IconTooltip
+                  onClick={toggleSortColumns}
+                  tooltip={
+                    sortColumns
+                      ? t('Original table column order')
+                      : t('Sort columns alphabetically')
+                  }
+                >
+                  <Icons.SortAscendingOutlined
+                    iconSize="m"
+                    aria-hidden
+                    iconColor={
+                      sortColumns ? theme.colorIcon : theme.colorTextDisabled
+                    }
+                  />
+                </IconTooltip>
+                {tableData.selectStar && (
+                  <CopyToClipboard
+                    copyNode={
+                      <IconTooltip
+                        aria-label={t('Copy')}
+                        tooltip={t('Copy SELECT statement to the clipboard')}
+                      >
+                        <Icons.CopyOutlined
+                          iconSize="m"
+                          aria-hidden
+                          iconColor={theme.colorIcon}
+                        />
+                      </IconTooltip>
+                    }
+                    text={tableData.selectStar}
+                    shouldShowText={false}
+                  />
+                )}
+                {tableData.view && (
+                  <ShowSQL
+                    sql={tableData.view}
+                    tooltipText={t('Show CREATE VIEW statement')}
+                    title={t('CREATE VIEW statement')}
+                  />
+                )}
+                <IconTooltip
+                  className=" table-remove pull-left pointer"
+                  onClick={removeTable}
+                  tooltip={t('Remove table preview')}
+                >
+                  <Icons.CloseOutlined
+                    iconSize="m"
+                    aria-hidden
+                    iconColor={theme.colorIcon}
+                  />
+                </IconTooltip>
+              </Space>
+            </ButtonGroup>
+          </Fade>
         )}
-        {tableData.view && (
-          <ShowSQL
-            sql={tableData.view}
-            tooltipText={t('Show CREATE VIEW statement')}
-            title={t('CREATE VIEW statement')}
-          />
-        )}
-        <IconTooltip
-          className=" table-remove pull-left m-l-2 pointer"
-          onClick={removeTable}
-          tooltip={t('Remove table preview')}
-        >
-          <Icons.CloseOutlined
-            iconSize="m"
-            iconColor={theme.colors.primary.dark2}
-            aria-hidden
-          />
-        </IconTooltip>
-      </ButtonGroup>
+      </Flex>
     );
   };
 
@@ -358,8 +332,6 @@ const TableElement = ({ table, ...props }: TableElementProps) => {
       <div
         data-test="table-element-header-container"
         className="clearfix header-container"
-        onMouseEnter={() => setHover(true)}
-        onMouseLeave={() => setHover(false)}
       >
         <Tooltip
           id="copy-to-clipboard-tooltip"
@@ -375,20 +347,6 @@ const TableElement = ({ table, ...props }: TableElementProps) => {
             <strong>{name}</strong>
           </StyledSpan>
         </Tooltip>
-
-        <div className="pull-right header-right-side">
-          {isMetadataFetching || isExtraMetadataLoading ? (
-            <Loading position="inline" />
-          ) : (
-            <Fade
-              data-test="fade"
-              hovered={hovered}
-              onClick={e => e.stopPropagation()}
-            >
-              {renderControls()}
-            </Fade>
-          )}
-        </div>
       </div>
     );
   };
@@ -407,12 +365,7 @@ const TableElement = ({ table, ...props }: TableElementProps) => {
     }
 
     const metadata = (
-      <div
-        data-test="table-element"
-        onMouseEnter={() => setHover(true)}
-        onMouseLeave={() => setHover(false)}
-        css={{ paddingTop: 6 }}
-      >
+      <div data-test="table-element" css={{ paddingTop: 6 }}>
         {renderWell()}
         <div>
           {cols?.map(col => <ColumnElement column={col} key={col.name} />)}
@@ -423,15 +376,22 @@ const TableElement = ({ table, ...props }: TableElementProps) => {
   };
 
   return (
-    <StyledCollapsePanel
-      {...props}
-      key={table.id}
-      header={renderHeader()}
-      className="TableElement"
-      forceRender
-    >
-      {renderBody()}
-    </StyledCollapsePanel>
+    <Collapse
+      activeKey={props.activeKey}
+      expandIconPosition="end"
+      onChange={props.onChange}
+      ghost
+      items={[
+        {
+          key: id,
+          label: renderHeader(),
+          children: renderBody(),
+          extra: renderControls(),
+          onMouseEnter: () => setHover(true),
+          onMouseLeave: () => setHover(false),
+        },
+      ]}
+    />
   );
 };
 
diff --git a/superset-frontend/src/SqlLab/components/TablePreview/TablePreview.test.tsx b/superset-frontend/src/SqlLab/components/TablePreview/TablePreview.test.tsx
index b4962c89e60..5f3a7f23c3c 100644
--- a/superset-frontend/src/SqlLab/components/TablePreview/TablePreview.test.tsx
+++ b/superset-frontend/src/SqlLab/components/TablePreview/TablePreview.test.tsx
@@ -27,26 +27,25 @@ import {
 } from 'spec/helpers/testing-library';
 import TablePreview from '.';
 
-jest.mock(
-  'src/components/FilterableTable',
-  () =>
-    ({ data }: { data: Record<string, any>[] }) => (
-      <div>
-        {data.map((record, i) => (
-          <div key={i} data-test="mock-record-row">
-            {JSON.stringify(record)}
-          </div>
-        ))}
-      </div>
-    ),
-);
+jest.mock('src/components/FilterableTable', () => ({
+  __esModule: true,
+  FilterableTable: ({ data }: { data: Record<string, any>[] }) => (
+    <div>
+      {data.map((record, i) => (
+        <div key={i} data-test="mock-record-row">
+          {JSON.stringify(record)}
+        </div>
+      ))}
+    </div>
+  ),
+}));
 jest.mock(
   'react-virtualized-auto-sizer',
   () =>
     ({ children }: { children: (params: { height: number }) => ReactChild }) =>
       children({ height: 500 }),
 );
-jest.mock('src/components/IconTooltip', () => ({
+jest.mock('@superset-ui/core/components/IconTooltip', () => ({
   IconTooltip: ({
     onClick,
     tooltip,
diff --git a/superset-frontend/src/SqlLab/components/TablePreview/index.tsx b/superset-frontend/src/SqlLab/components/TablePreview/index.tsx
index ad224894b0f..cb9e97abcc9 100644
--- a/superset-frontend/src/SqlLab/components/TablePreview/index.tsx
+++ b/superset-frontend/src/SqlLab/components/TablePreview/index.tsx
@@ -16,8 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-// TODO: Remove fa-icon
-/* eslint-disable icons/no-fa-icons-usage */
 import { type FC, useCallback, useMemo, useRef, useState } from 'react';
 import { shallowEqual, useDispatch, useSelector } from 'react-redux';
 import { nanoid } from 'nanoid';
@@ -25,17 +23,23 @@ import {
   ClientErrorObject,
   css,
   getExtensionsRegistry,
-  SafeMarkdown,
   styled,
   t,
 } from '@superset-ui/core';
+import {
+  SafeMarkdown,
+  Alert,
+  Breadcrumb,
+  Button,
+  Card,
+  Dropdown,
+  Skeleton,
+} from '@superset-ui/core/components';
 import AutoSizer from 'react-virtualized-auto-sizer';
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
 import type { SqlLabRootState } from 'src/SqlLab/types';
-import { Skeleton, AntdBreadcrumb as Breadcrumb, Button } from 'src/components';
-import { Dropdown } from 'src/components/Dropdown';
-import FilterableTable from 'src/components/FilterableTable';
-import Tabs from 'src/components/Tabs';
+import { CopyToClipboard, FilterableTable } from 'src/components';
+import Tabs from '@superset-ui/core/components/Tabs';
 import {
   tableApiUtil,
   TableMetaData,
@@ -43,10 +47,7 @@ import {
   useTableMetadataQuery,
 } from 'src/hooks/apiResources';
 import { runTablePreviewQuery } from 'src/SqlLab/actions/sqlLab';
-import Alert from 'src/components/Alert';
-import { Menu } from 'src/components/Menu';
-import Card from 'src/components/Card';
-import CopyToClipboard from 'src/components/CopyToClipboard';
+import { Menu } from '@superset-ui/core/components/Menu';
 import ResultSet from '../ResultSet';
 import ShowSQL from '../ShowSQL';
 
@@ -60,7 +61,13 @@ type Props = {
 const extensionsRegistry = getExtensionsRegistry();
 
 const COLUMN_KEYS = ['column_name', 'column_type', 'keys', 'comment'];
-// TODO: Remove fa-icon
+
+const TABS_KEYS = {
+  COLUMNS: 'columns',
+  METADATA: 'metadata',
+  INDEXES: 'indexes',
+  SAMPLE: 'sample',
+};
 const MENUS = [
   {
     key: 'refresh-table',
@@ -83,14 +90,15 @@ const PREVIEW_TOP_ACTION_HEIGHT = 30;
 const PREVIEW_QUERY_LIMIT = 100;
 
 const Title = styled.div`
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  column-gap: ${({ theme }) => theme.gridUnit}px;
-  font-size: ${({ theme }) => theme.typography.sizes.l}px;
-  font-weight: ${({ theme }) => theme.typography.weights.bold};
+  ${({ theme }) => css`
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    column-gap: ${theme.sizeUnit}px;
+    font-size: ${theme.fontSizeLG}px;
+    font-weight: ${theme.fontWeightStrong};
+  `}
 `;
-
 const renderWell = (partitions: TableMetaData['partitions']) => {
   if (!partitions) {
     return null;
@@ -309,7 +317,7 @@ const TablePreview: FC<Props> = ({ dbId, catalog, schema, tableName }) => {
         <Icons.InsertRowAboveOutlined iconSize="l" />
         {tableName}
         <Dropdown
-          dropdownRender={() => (
+          popupRender={() => (
             <Menu
               onClick={({ key }) => {
                 if (key === 'refresh-table') {
@@ -327,7 +335,7 @@ const TablePreview: FC<Props> = ({ dbId, catalog, schema, tableName }) => {
           )}
           trigger={['click']}
         >
-          <Button buttonSize="xsmall" type="link">
+          <Button buttonSize="xsmall" buttonStyle="link">
             <Icons.DownSquareOutlined
               iconSize="m"
               style={{ marginTop: 2, marginLeft: 4 }}
@@ -348,79 +356,98 @@ const TablePreview: FC<Props> = ({ dbId, catalog, schema, tableName }) => {
             `}
           >
             <AutoSizer disableWidth>
-              {({ height }) => (
-                <Tabs
-                  fullWidth={false}
-                  onTabClick={onTabSwitch}
-                  css={css`
-                    height: ${height}px;
-                  `}
-                >
-                  <Tabs.TabPane
-                    tab={t('Columns (%s)', data.length)}
-                    key="columns"
-                  >
+              {({ height }) => {
+                const tabItems = [];
+
+                tabItems.push({
+                  key: TABS_KEYS.COLUMNS,
+                  label: t('Columns (%s)', data.length),
+                  children: (
                     <ResultTable
                       queryId="table-columns"
                       height={height - TAB_HEADER_HEIGHT}
                       data={data}
                       orderedColumnKeys={columns}
                     />
-                  </Tabs.TabPane>
-                  {tableData?.selectStar && !disableDataPreview && (
-                    <Tabs.TabPane tab={t('Data preview')} key="sample">
-                      {previewQueryId && (
-                        <ResultSet
-                          queryId={previewQueryId}
-                          visualize={false}
-                          csv={false}
-                          cache
-                          height={
-                            height -
-                            TAB_HEADER_HEIGHT -
-                            PREVIEW_TOP_ACTION_HEIGHT
-                          }
-                          displayLimit={PREVIEW_QUERY_LIMIT}
-                          defaultQueryLimit={PREVIEW_QUERY_LIMIT}
-                        />
-                      )}
-                    </Tabs.TabPane>
-                  )}
-                  {tableData?.indexes && tableData.indexes.length > 0 && (
-                    <Tabs.TabPane
-                      tab={t('Indexes (%s)', tableData.indexes.length)}
-                      key="indexes"
-                    >
-                      {tableData.indexes.map((ix, i) => (
-                        <pre className="code" key={i}>
-                          {JSON.stringify(ix, null, '  ')}
-                        </pre>
-                      ))}
-                    </Tabs.TabPane>
-                  )}
-                  {tableData?.metadata && (
-                    <Tabs.TabPane tab={t('Metadata')} key="metadata">
+                  ),
+                });
+
+                if (tableData?.selectStar && !disableDataPreview) {
+                  tabItems.push({
+                    key: TABS_KEYS.SAMPLE,
+                    label: t('Data preview'),
+                    children: previewQueryId && (
+                      <ResultSet
+                        queryId={previewQueryId}
+                        visualize={false}
+                        csv={false}
+                        cache
+                        height={
+                          height - TAB_HEADER_HEIGHT - PREVIEW_TOP_ACTION_HEIGHT
+                        }
+                        displayLimit={PREVIEW_QUERY_LIMIT}
+                        defaultQueryLimit={PREVIEW_QUERY_LIMIT}
+                      />
+                    ),
+                  });
+                }
+
+                if (tableData?.indexes && tableData.indexes.length > 0) {
+                  tabItems.push({
+                    key: TABS_KEYS.INDEXES,
+                    label: t('Indexes (%s)', tableData.indexes.length),
+                    children: tableData.indexes.map((ix, i) => (
+                      <pre className="code" key={i}>
+                        {JSON.stringify(ix, null, '  ')}
+                      </pre>
+                    )),
+                  });
+                }
+
+                if (tableData?.metadata) {
+                  tabItems.push({
+                    key: TABS_KEYS.METADATA,
+                    label: t('Metadata'),
+                    children: (
                       <ResultTable
                         queryId="table-metadata"
                         height={height - TAB_HEADER_HEIGHT}
                         data={Object.entries(tableData.metadata).map(
-                          ([name, value]) => ({ name, value }),
+                          ([name, value]) => ({
+                            name,
+                            value,
+                          }),
                         )}
                         orderedColumnKeys={['name', 'value']}
                       />
-                    </Tabs.TabPane>
-                  )}
-                  {customTabs.map(([title, ExtComponent]) => (
-                    <Tabs.TabPane tab={title} key={title}>
+                    ),
+                  });
+                }
+
+                customTabs.forEach(([title, ExtComponent]) => {
+                  tabItems.push({
+                    key: title,
+                    label: title,
+                    children: (
                       <ExtComponent
                         dbId={Number(dbId)}
                         schema={schema ?? ''}
                         tableName={tableName}
                       />
-                    </Tabs.TabPane>
-                  ))}
-                </Tabs>
-              )}
+                    ),
+                  });
+                });
+
+                return (
+                  <Tabs
+                    onTabClick={onTabSwitch}
+                    css={css`
+                      height: ${height}px;
+                    `}
+                    items={tabItems}
+                  />
+                );
+              }}
             </AutoSizer>
           </div>
         </>
diff --git a/superset-frontend/src/SqlLab/components/TemplateParamsEditor/TemplateParamsEditor.test.tsx b/superset-frontend/src/SqlLab/components/TemplateParamsEditor/TemplateParamsEditor.test.tsx
index cdafc5ba177..acada8b861c 100644
--- a/superset-frontend/src/SqlLab/components/TemplateParamsEditor/TemplateParamsEditor.test.tsx
+++ b/superset-frontend/src/SqlLab/components/TemplateParamsEditor/TemplateParamsEditor.test.tsx
@@ -32,13 +32,13 @@ import TemplateParamsEditor, {
   TemplateParamsEditorProps,
 } from 'src/SqlLab/components/TemplateParamsEditor';
 
-jest.mock('src/components/Select/Select', () => () => (
+jest.mock('@superset-ui/core/components/Select/Select', () => () => (
   <div data-test="mock-deprecated-select-select" />
 ));
-jest.mock('src/components/Select/AsyncSelect', () => () => (
+jest.mock('@superset-ui/core/components/Select/AsyncSelect', () => () => (
   <div data-test="mock-async-select" />
 ));
-jest.mock('src/components/AsyncAceEditor', () => ({
+jest.mock('@superset-ui/core/components/AsyncAceEditor', () => ({
   ConfigEditor: ({ value }: { value: string }) => (
     <div data-test="mock-async-ace-editor">{value}</div>
   ),
diff --git a/superset-frontend/src/SqlLab/components/TemplateParamsEditor/index.tsx b/superset-frontend/src/SqlLab/components/TemplateParamsEditor/index.tsx
index 87d1f07a201..e10e0c78e40 100644
--- a/superset-frontend/src/SqlLab/components/TemplateParamsEditor/index.tsx
+++ b/superset-frontend/src/SqlLab/components/TemplateParamsEditor/index.tsx
@@ -18,19 +18,20 @@
  */
 import { useState, useEffect } from 'react';
 import { t, styled } from '@superset-ui/core';
-import { InfoTooltipWithTrigger } from '@superset-ui/chart-controls';
 import { debounce } from 'lodash';
-
-import Badge from 'src/components/Badge';
-import ModalTrigger from 'src/components/ModalTrigger';
-import { ConfigEditor } from 'src/components/AsyncAceEditor';
-import { FAST_DEBOUNCE } from 'src/constants';
-import { Tooltip } from 'src/components/Tooltip';
+import {
+  Badge,
+  ConfigEditor,
+  InfoTooltip,
+  ModalTrigger,
+  Tooltip,
+  Constants,
+} from '@superset-ui/core/components';
 import useQueryEditor from 'src/SqlLab/hooks/useQueryEditor';
 
 const StyledConfigEditor = styled(ConfigEditor)`
   &.ace_editor {
-    border: 1px solid ${({ theme }) => theme.colors.grayscale.light2};
+    border: 1px solid ${({ theme }) => theme.colorBorder};
   }
 `;
 
@@ -83,7 +84,7 @@ const TemplateParamsEditor = ({
         mode={language}
         minLines={25}
         maxLines={50}
-        onChange={debounce(onChange, FAST_DEBOUNCE)}
+        onChange={debounce(onChange, Constants.FAST_DEBOUNCE)}
         width="100%"
         editorProps={{ $blockScrolling: true }}
         enableLiveAutocompletion
@@ -108,9 +109,8 @@ const TemplateParamsEditor = ({
             {t('Parameters ')}
             <Badge count={paramCount} />
             {!isValid && (
-              <InfoTooltipWithTrigger
-                icon="exclamation-triangle"
-                bsStyle="danger"
+              <InfoTooltip
+                type="error"
                 tooltip={t('Invalid JSON')}
                 label="invalid-json"
               />
diff --git a/superset-frontend/src/SqlLab/constants.ts b/superset-frontend/src/SqlLab/constants.ts
index 263635bb3b4..a2f19c96055 100644
--- a/superset-frontend/src/SqlLab/constants.ts
+++ b/superset-frontend/src/SqlLab/constants.ts
@@ -17,15 +17,15 @@
  * under the License.
  */
 import { t } from '@superset-ui/core';
-import type { Type } from 'src/components/Label';
+import type { LabelType } from '@superset-ui/core/components';
 
-export const STATE_TYPE_MAP: Record<string, Type> = {
-  offline: 'danger',
-  failed: 'danger',
+export const STATE_TYPE_MAP: Record<string, LabelType> = {
+  offline: 'error',
+  failed: 'error',
   pending: 'info',
   fetching: 'info',
   running: 'warning',
-  stopped: 'danger',
+  stopped: 'error',
   success: 'success',
 };
 
diff --git a/superset-frontend/src/SqlLab/reducers/sqlLab.js b/superset-frontend/src/SqlLab/reducers/sqlLab.js
index e0bc4307dcc..c77f708653f 100644
--- a/superset-frontend/src/SqlLab/reducers/sqlLab.js
+++ b/superset-frontend/src/SqlLab/reducers/sqlLab.js
@@ -19,8 +19,8 @@
 import { normalizeTimestamp, QueryState, t } from '@superset-ui/core';
 import { isEqual, omit } from 'lodash';
 import { shallowEqual } from 'react-redux';
+import { now } from '@superset-ui/core/utils/dates';
 import * as actions from '../actions/sqlLab';
-import { now } from '../../utils/dates';
 import {
   addToObject,
   alterInObject,
diff --git a/superset-frontend/src/SqlLab/types.ts b/superset-frontend/src/SqlLab/types.ts
index f4386b99de7..98ee87ff5f0 100644
--- a/superset-frontend/src/SqlLab/types.ts
+++ b/superset-frontend/src/SqlLab/types.ts
@@ -22,8 +22,10 @@ import {
   UserWithPermissionsAndRoles,
 } from 'src/types/bootstrapTypes';
 import { ToastType } from 'src/components/MessageToasts/types';
-import { DropdownButtonProps } from 'src/components/DropdownButton';
-import { ButtonProps } from 'src/components/Button';
+import type {
+  ButtonProps,
+  DropdownButtonProps,
+} from '@superset-ui/core/components';
 import type { TableMetaData } from 'src/hooks/apiResources';
 
 export type QueryButtonProps = DropdownButtonProps | ButtonProps;
diff --git a/superset-frontend/src/assets/branding/.!4592!superset-logo-horiz-apache-dark.png b/superset-frontend/src/assets/branding/.!4592!superset-logo-horiz-apache-dark.png
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/superset-frontend/src/assets/branding/.!4862!superset-logo-horiz-apache-dark.png b/superset-frontend/src/assets/branding/.!4862!superset-logo-horiz-apache-dark.png
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/superset-frontend/src/assets/branding/.!4993!superset-logo-horiz-apache-dark.png b/superset-frontend/src/assets/branding/.!4993!superset-logo-horiz-apache-dark.png
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/superset-frontend/src/assets/images/empty-queries.svg b/superset-frontend/src/assets/images/empty-queries.svg
deleted file mode 100644
index 1d2d8b00f22..00000000000
--- a/superset-frontend/src/assets/images/empty-queries.svg
+++ /dev/null
@@ -1,35 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you 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.
--->
-<svg viewBox="0 0 119 78" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M37 4C37 2.34315 38.3431 1 40 1H70.3431C71.1388 1 71.9019 1.31607 72.4645 1.87868L82.1213 11.5355C82.6839 12.0981 83 12.8612 83 13.6569V60C83 61.6569 81.6569 63 80 63H40C38.3431 63 37 61.6569 37 60V4Z" stroke="currentColor" stroke-width="2"/>
-<path d="M71 0.5V9C71 11.2091 72.7909 13 75 13H83.5" stroke="currentColor" stroke-width="2"/>
-<path d="M71 27V45C71 46.074 70.1033 47.3156 68.0381 48.3482C66.0326 49.3509 63.1921 50 60 50C56.8079 50 53.9674 49.3509 51.9619 48.3482C49.8967 47.3156 49 46.074 49 45V27C49 25.926 49.8967 24.6844 51.9619 23.6518C53.9674 22.6491 56.8079 22 60 22C63.1921 22 66.0326 22.6491 68.0381 23.6518C70.1033 24.6844 71 25.926 71 27Z" stroke="currentColor" stroke-width="2"/>
-<mask id="path-4-inside-1" fill="white">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M48 39C48 42.3137 53.3726 45 60 45C66.6274 45 72 42.3137 72 39H69.913C69.913 39.5358 69.4382 40.5104 67.5199 41.4695C65.7026 42.3781 63.0473 43 60 43C56.9527 43 54.2974 42.3781 52.4801 41.4695C50.5618 40.5104 50.087 39.5358 50.087 39H48Z"/>
-</mask>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M48 39C48 42.3137 53.3726 45 60 45C66.6274 45 72 42.3137 72 39H69.913C69.913 39.5358 69.4382 40.5104 67.5199 41.4695C65.7026 42.3781 63.0473 43 60 43C56.9527 43 54.2974 42.3781 52.4801 41.4695C50.5618 40.5104 50.087 39.5358 50.087 39H48Z" fill="black"/>
-<path d="M48 39V37H46V39H48ZM72 39H74V37H72V39ZM69.913 39V37H67.913V39H69.913ZM52.4801 41.4695L51.5856 43.2583H51.5856L52.4801 41.4695ZM50.087 39H52.087V37H50.087V39ZM46 39C46 41.8225 48.2361 43.8394 50.6203 45.0315C53.1241 46.2834 56.4431 47 60 47V43C56.9295 43 54.2485 42.3735 52.4091 41.4538C50.4502 40.4743 50 39.4912 50 39H46ZM60 47C63.5569 47 66.8759 46.2834 69.3797 45.0315C71.7639 43.8394 74 41.8225 74 39H70C70 39.4912 69.5498 40.4743 67.5909 41.4538C65.7515 42.3735 63.0705 43 60 43V47ZM72 37H69.913V41H72V37ZM68.4144 43.2583C70.5717 42.1796 71.913 40.6831 71.913 39H67.913C67.913 38.6884 68.0386 38.6285 67.8989 38.7962C67.7638 38.9584 67.4125 39.2871 66.6255 39.6806L68.4144 43.2583ZM60 45C63.2906 45 66.2649 44.333 68.4144 43.2583L66.6255 39.6806C65.1403 40.4232 62.804 41 60 41V45ZM51.5856 43.2583C53.7351 44.333 56.7094 45 60 45V41C57.196 41 54.8597 40.4232 53.3745 39.6806L51.5856 43.2583ZM48.087 39C48.087 40.6831 49.4283 42.1796 51.5856 43.2583L53.3745 39.6806C52.5875 39.2871 52.2362 38.9584 52.1011 38.7962C51.9614 38.6285 52.087 38.6884 52.087 39H48.087ZM50.087 37H48V41H50.087V37Z" fill="currentColor" mask="url(#path-4-inside-1)"/>
-<mask id="path-6-inside-2" fill="white">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M48 33C48 36.3137 53.3726 39 60 39C66.6274 39 72 36.3137 72 33H69.913C69.913 33.5358 69.4382 34.5104 67.5199 35.4695C65.7026 36.3781 63.0473 37 60 37C56.9527 37 54.2974 36.3781 52.4801 35.4695C50.5618 34.5104 50.087 33.5358 50.087 33H48Z"/>
-</mask>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M48 33C48 36.3137 53.3726 39 60 39C66.6274 39 72 36.3137 72 33H69.913C69.913 33.5358 69.4382 34.5104 67.5199 35.4695C65.7026 36.3781 63.0473 37 60 37C56.9527 37 54.2974 36.3781 52.4801 35.4695C50.5618 34.5104 50.087 33.5358 50.087 33H48Z" fill="black"/>
-<path d="M48 33V31H46V33H48ZM72 33H74V31H72V33ZM69.913 33V31H67.913V33H69.913ZM52.4801 35.4695L51.5856 37.2583H51.5856L52.4801 35.4695ZM50.087 33H52.087V31H50.087V33ZM46 33C46 35.8225 48.2361 37.8394 50.6203 39.0315C53.1241 40.2834 56.4431 41 60 41V37C56.9295 37 54.2485 36.3735 52.4091 35.4538C50.4502 34.4743 50 33.4912 50 33H46ZM60 41C63.5569 41 66.8759 40.2834 69.3797 39.0315C71.7639 37.8394 74 35.8225 74 33H70C70 33.4912 69.5498 34.4743 67.5909 35.4538C65.7515 36.3735 63.0705 37 60 37V41ZM72 31H69.913V35H72V31ZM68.4144 37.2583C70.5717 36.1796 71.913 34.6831 71.913 33H67.913C67.913 32.6884 68.0386 32.6285 67.8989 32.7962C67.7638 32.9584 67.4125 33.2871 66.6255 33.6806L68.4144 37.2583ZM60 39C63.2906 39 66.2649 38.333 68.4144 37.2583L66.6255 33.6806C65.1403 34.4232 62.804 35 60 35V39ZM51.5856 37.2583C53.7351 38.333 56.7094 39 60 39V35C57.196 35 54.8597 34.4232 53.3745 33.6806L51.5856 37.2583ZM48.087 33C48.087 34.6831 49.4283 36.1796 51.5856 37.2583L53.3745 33.6806C52.5875 33.2871 52.2362 32.9584 52.1011 32.7962C51.9614 32.6285 52.087 32.6884 52.087 33H48.087ZM50.087 31H48V35H50.087V31Z" fill="currentColor" mask="url(#path-6-inside-2)"/>
-<path d="M71 27C71 28.074 70.1033 29.3156 68.0381 30.3482C66.0326 31.3509 63.1921 32 60 32C56.8079 32 53.9674 31.3509 51.9619 30.3482C49.8967 29.3156 49 28.074 49 27C49 25.926 49.8967 24.6844 51.9619 23.6518C53.9674 22.6491 56.8079 22 60 22C63.1921 22 66.0326 22.6491 68.0381 23.6518C70.1033 24.6844 71 25.926 71 27Z" stroke="currentColor" stroke-width="2"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M36 51.1343C14.8256 53.2784 0 58.2318 0 64C0 71.732 26.6391 78 59.5 78C92.3609 78 119 71.732 119 64C119 58.323 104.64 53.4353 84 51.2381V60C84 62.2091 82.2091 64 80 64H40C37.7909 64 36 62.2091 36 60V51.1343Z" fill="currentColor" stroke="currentColor" fill-opacity="0.25" />
-</svg>
diff --git a/superset-frontend/src/assets/images/icons/category.svg b/superset-frontend/src/assets/images/icons/category.svg
index 6392c58b6e3..c922af153d2 100644
--- a/superset-frontend/src/assets/images/icons/category.svg
+++ b/superset-frontend/src/assets/images/icons/category.svg
@@ -18,5 +18,5 @@ under the License.
 -->
 
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.9262 2.3999L5.71569 11.0062H16.1367L10.9262 2.3999ZM10.9262 6.0719L12.7546 9.09365H9.08832L10.9262 6.0719ZM16.1367 12.9187C13.7778 12.9187 11.8736 14.8407 11.8736 17.2218C11.8736 19.6028 13.7778 21.5249 16.1367 21.5249C18.4957 21.5249 20.3999 19.6028 20.3999 17.2218C20.3999 14.8407 18.4957 12.9187 16.1367 12.9187ZM16.1367 19.6124C14.8294 19.6124 13.7683 18.5414 13.7683 17.2218C13.7683 15.9022 14.8294 14.8312 16.1367 14.8312C17.4441 14.8312 18.5052 15.9022 18.5052 17.2218C18.5052 18.5414 17.4441 19.6124 16.1367 19.6124ZM2.3999 21.0468H9.97885V13.3968H2.3999V21.0468ZM4.29464 15.3093H8.08411V19.1343H4.29464V15.3093Z" fill="currentColor" fill-opacity="0.85"/>
+<path d="M10.9262 2.3999L5.71569 11.0062H16.1367L10.9262 2.3999ZM10.9262 6.0719L12.7546 9.09365H9.08832L10.9262 6.0719ZM16.1367 12.9187C13.7778 12.9187 11.8736 14.8407 11.8736 17.2218C11.8736 19.6028 13.7778 21.5249 16.1367 21.5249C18.4957 21.5249 20.3999 19.6028 20.3999 17.2218C20.3999 14.8407 18.4957 12.9187 16.1367 12.9187ZM16.1367 19.6124C14.8294 19.6124 13.7683 18.5414 13.7683 17.2218C13.7683 15.9022 14.8294 14.8312 16.1367 14.8312C17.4441 14.8312 18.5052 15.9022 18.5052 17.2218C18.5052 18.5414 17.4441 19.6124 16.1367 19.6124ZM2.3999 21.0468H9.97885V13.3968H2.3999V21.0468ZM4.29464 15.3093H8.08411V19.1343H4.29464V15.3093Z" fill="currentColor" />
 </svg>
diff --git a/superset-frontend/src/assets/images/rockset.png b/superset-frontend/src/assets/images/rockset.png
deleted file mode 100644
index b94b9e040fd..00000000000
Binary files a/superset-frontend/src/assets/images/rockset.png and /dev/null differ
diff --git a/superset-frontend/src/assets/stylesheets/antd/index.less b/superset-frontend/src/assets/stylesheets/antd/index.less
deleted file mode 100644
index cf51b165eb9..00000000000
--- a/superset-frontend/src/assets/stylesheets/antd/index.less
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 '~antd/lib/style/themes/index';
-@import '~antd/lib/style/mixins/index';
-@import '~antd/lib/style/core/base';
-
-@import '~antd/lib/style/core/iconfont';
-@import '~antd/lib/style/core/motion';
-@import '~antd/lib/style/components.less';
-
-/*
-  Theme variables here: https://github.com/ant-design/ant-design/blob/master/components/style/themes/default.less
-*/
-@primary-color: #20a7c9;
-@info-color: #66bcfe;
-@success-color: #59c189;
-@processing-color: #66bcfe;
-@error-color: #e04355;
-@highlight-color: #e04355;
-@normal-color: #d9d9d9;
-@white: #fff;
-@black: #000;
diff --git a/superset-frontend/src/assets/stylesheets/less/cosmo/bootswatch.less b/superset-frontend/src/assets/stylesheets/less/cosmo/bootswatch.less
deleted file mode 100644
index a5eec135fae..00000000000
--- a/superset-frontend/src/assets/stylesheets/less/cosmo/bootswatch.less
+++ /dev/null
@@ -1,494 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- */
-// Forked Cosmo 3.3.7
-// Bootswatch
-// -----------------------------------------------------
-
-// Navbar =====================================================================
-
-.navbar {
-  border: none;
-
-  li > a:focus {
-    outline: 0;
-  }
-
-  &-inverse {
-    .badge {
-      background-color: @lightest;
-      color: @brand-primary;
-    }
-  }
-
-  .caret {
-    display: inline-block;
-    padding: 0 5px 18px 5px;
-  }
-}
-
-.navbar-inverse {
-  border: none;
-}
-
-.navbar-inverse .navbar-nav > .active > a,
-.navbar-inverse .navbar-nav > .active > a:hover,
-.navbar-inverse .navbar-nav > .active > a:focus {
-  background: transparent;
-}
-
-.navbar-nav > li > a {
-  padding-top: 18px;
-}
-
-// Buttons ====================================================================
-
-.btn:focus,
-.btn:active:focus {
-  outline: none;
-}
-
-.nav-tabs {
-  .dropdown-toggle.btn,
-  .btn-group.open .dropdown-toggle.btn {
-    &,
-    &:hover,
-    &:active,
-    &:focus {
-      border-color: transparent;
-      background-color: transparent;
-      box-shadow: none;
-    }
-  }
-}
-
-// Typography =================================================================
-
-body {
-  -webkit-font-smoothing: antialiased;
-}
-
-.text-primary,
-.text-primary:hover {
-  color: @brand-primary;
-}
-
-.text-success,
-.text-success:hover {
-  color: @success;
-}
-
-.text-danger,
-.text-danger:hover {
-  color: @brand-danger;
-}
-
-.text-warning,
-.text-warning:hover {
-  color: @brand-warning;
-}
-
-.text-info,
-.text-info:hover {
-  color: @brand-info;
-}
-
-// Tables =====================================================================
-
-table,
-.table {
-  .dropdown-menu a {
-    text-decoration: none;
-  }
-
-  .success,
-  .warning,
-  .danger,
-  .info {
-    color: @lightest;
-
-    a {
-      color: @lightest;
-    }
-
-    .btn-default {
-      color: @gray;
-    }
-  }
-}
-
-// Forms ======================================================================
-
-.form-control {
-  box-shadow: none;
-}
-
-.has-warning {
-  .help-block,
-  .control-label,
-  .radio,
-  .checkbox,
-  .radio-inline,
-  .checkbox-inline,
-  &.radio label,
-  &.checkbox label,
-  &.radio-inline label,
-  &.checkbox-inline label,
-  .form-control-feedback {
-    color: @brand-warning;
-  }
-
-  .form-control,
-  .form-control:focus,
-  .input-group-addon {
-    border: 1px solid @brand-warning;
-  }
-}
-
-.has-error {
-  .help-block,
-  .control-label,
-  .radio,
-  .checkbox,
-  .radio-inline,
-  .checkbox-inline,
-  &.radio label,
-  &.checkbox label,
-  &.radio-inline label,
-  &.checkbox-inline label,
-  .form-control-feedback {
-    color: @brand-danger;
-  }
-
-  .form-control,
-  .form-control:focus,
-  .input-group-addon {
-    border: 1px solid @brand-danger;
-  }
-}
-
-.has-success {
-  .help-block,
-  .control-label,
-  .radio,
-  .checkbox,
-  .radio-inline,
-  .checkbox-inline,
-  &.radio label,
-  &.checkbox label,
-  &.radio-inline label,
-  &.checkbox-inline label,
-  .form-control-feedback {
-    color: @brand-success;
-  }
-
-  .form-control,
-  .form-control:focus,
-  .input-group-addon {
-    border: 1px solid @brand-success;
-  }
-}
-
-// Navs =======================================================================
-
-.nav-pills {
-  & > li > a {
-    border-radius: @border-radius-normal;
-  }
-}
-
-.dropdown-menu {
-  & > li > a:hover,
-  & > li > a:focus {
-    background-image: none;
-    text-decoration: none;
-  }
-}
-
-// Indicators =================================================================
-
-.close {
-  text-decoration: none;
-  text-shadow: none;
-  opacity: 0.4;
-
-  &:hover,
-  &:focus {
-    opacity: 1;
-  }
-}
-
-.alert {
-  border: none;
-}
-
-.alert-link {
-  text-decoration: underline;
-}
-
-.alert-info .alert-link {
-  color: @alert-info-text;
-}
-
-.alert-danger .alert-link {
-  color: @alert-danger-text;
-}
-
-.alert-warning .alert-link {
-  color: @alert-warning-text;
-}
-
-.alert-success .alert-link {
-  color: @alert-success-text;
-}
-
-.label {
-  border-radius: 21px;
-  padding: 0.35em 0.8em 0.35em;
-  font-weight: @font-weight-normal;
-  font-size: @font-size-s;
-}
-.label-default:hover {
-  background-color: darken(@label-default-bg, 5%);
-}
-.label-warning:hover {
-  background-color: darken(@label-warning-bg, 5%);
-}
-.label-danger:hover {
-  background-color: darken(@label-danger-bg, 5%);
-}
-.label-primary:hover {
-  background-color: darken(@label-primary-bg, 5%);
-}
-
-label {
-  font-weight: @font-weight-normal;
-  font-size: @font-size-s;
-}
-
-// Progress bars ==============================================================
-
-.progress {
-  height: 14px;
-  .box-shadow(none);
-
-  .progress-bar {
-    font-size: @font-size-s;
-    line-height: @line-height-tight;
-    padding-top: 2px;
-  }
-}
-
-// Containers =================================================================
-
-.panel {
-  border: none;
-
-  &-heading,
-  &-footer {
-    border-top-right-radius: 0;
-    border-top-left-radius: 0;
-  }
-
-  &-default {
-    .panel-heading {
-      padding: 15px 15px 0 15px;
-      background-color: transparent;
-    }
-
-    .panel-title {
-      color: @text-color;
-      padding-bottom: 5px;
-      border-bottom: 1px solid @gray-light;
-
-      h1,
-      h2,
-      h3,
-      h4,
-      h5,
-      h6 {
-        margin: 10px 0 0 0;
-        font-weight: @font-weight-bold;
-      }
-    }
-
-    .close {
-      color: @text-color;
-    }
-  }
-
-  &-primary {
-    .panel-heading {
-      padding: 15px 15px 0 15px;
-      background-color: transparent;
-    }
-
-    .panel-title {
-      color: @text-color;
-      padding-bottom: 5px;
-      border-bottom: 1px solid @gray-light;
-
-      h1,
-      h2,
-      h3,
-      h4,
-      h5,
-      h6 {
-        margin: 10px 0 0 0;
-        font-weight: @font-weight-bold;
-      }
-    }
-
-    .close {
-      color: @text-color;
-    }
-  }
-
-  .accordion-toggle {
-    display: flex;
-    align-items: center;
-    text-decoration: none;
-
-    &:hover {
-      text-decoration: none;
-    }
-
-    .caret {
-      display: flex;
-      width: auto;
-      height: auto;
-      margin-left: 5px;
-
-      &:hover {
-        color: @gray;
-      }
-    }
-  }
-}
-
-.panel-title-large {
-  font-size: 24px;
-}
-
-.list-group-item {
-  padding-top: 5px;
-  padding-bottom: 5px;
-}
-
-a.list-group-item {
-  &-success {
-    &.active {
-      background-color: @state-success-bg;
-    }
-
-    &.active:hover,
-    &.active:focus {
-      background-color: darken(@state-success-bg, 5%);
-    }
-  }
-
-  &-warning {
-    &.active {
-      background-color: @state-warning-bg;
-    }
-
-    &.active:hover,
-    &.active:focus {
-      background-color: darken(@state-warning-bg, 5%);
-    }
-  }
-
-  &-danger {
-    &.active {
-      background-color: @state-danger-bg;
-    }
-
-    &.active:hover,
-    &.active:focus {
-      background-color: darken(@state-danger-bg, 5%);
-    }
-  }
-}
-
-.modal {
-  .close {
-    color: @text-color;
-  }
-}
-
-.popover {
-  color: @text-color;
-}
-
-// Tabs ==============================================================
-
-.nav-tabs > li > a {
-  border-top: 3px solid transparent;
-  color: @text-color;
-}
-
-.nav-tabs > li.active > a,
-.nav-tabs > li.active > a:hover,
-.nav-tabs > li.active > a:focus {
-  background-color: @lightest;
-  font-weight: @font-weight-bold;
-  border-top: 3px solid @brand-primary;
-}
-
-// Tables ==============================================================
-
-.table {
-  .info {
-    color: @state-info-text;
-  }
-
-  .danger {
-    color: @state-danger-text;
-  }
-
-  .warning {
-    color: @state-warning-text;
-  }
-
-  .success {
-    color: @state-success-text;
-  }
-}
-
-// Utils ==============================================================
-hr {
-  margin: 10px 0;
-}
-
-// generate space-n classes for vertical spacing
-.space-loop(@counter) when (@counter > 0) {
-  .space-loop((@counter - 1)); // next iteration
-  .space-@{counter} {
-    margin-bottom: (10px * @counter); // code for each iteration
-  }
-}
-.space-loop(6);
-
-a {
-  cursor: pointer;
-}
-
-.control-label {
-  color: @gray;
-  font-size: @font-size-s;
-}
diff --git a/superset-frontend/src/assets/stylesheets/less/cosmo/cosmoTheme.js b/superset-frontend/src/assets/stylesheets/less/cosmo/cosmoTheme.js
deleted file mode 100644
index 817049da655..00000000000
--- a/superset-frontend/src/assets/stylesheets/less/cosmo/cosmoTheme.js
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- */
-/* eslint-disable */
-(function () {
-  $(window).scroll(function () {
-    var top = $(document).scrollTop();
-    $('.splash').css({
-      'background-position': '0px -' + (top / 3).toFixed(2) + 'px',
-    });
-    if (top > 50) $('#home > .navbar').removeClass('navbar-transparent');
-    else $('#home > .navbar').addClass('navbar-transparent');
-  });
-
-  $("a[href='#']").click(function (e) {
-    e.preventDefault();
-  });
-
-  var $button = $(
-    "<div id='source-button' class='btn btn-primary btn-xs'>&lt; &gt;</div>",
-  ).click(function () {
-    var html = $(this).parent().html();
-    html = cleanSource(html);
-    $('#source-modal pre').text(html);
-    $('#source-modal').modal();
-  });
-
-  $('.bs-component [data-toggle="popover"]').popover();
-  $('.bs-component [data-toggle="tooltip"]').tooltip();
-
-  $('.bs-component').hover(
-    function () {
-      $(this).append($button);
-      $button.show();
-    },
-    function () {
-      $button.hide();
-    },
-  );
-
-  function cleanSource(html) {
-    html = html
-      .replace(/×/g, '&times;')
-      .replace(/«/g, '&laquo;')
-      .replace(/»/g, '&raquo;')
-      .replace(/←/g, '&larr;')
-      .replace(/→/g, '&rarr;');
-
-    var lines = html.split(/\n/);
-
-    lines.shift();
-    lines.splice(-1, 1);
-
-    var indentSize = lines[0].length - lines[0].trim().length,
-      re = new RegExp(' {' + indentSize + '}');
-
-    lines = lines.map(function (line) {
-      if (line.match(re)) {
-        line = line.substring(indentSize);
-      }
-
-      return line;
-    });
-
-    lines = lines.join('\n');
-
-    return lines;
-  }
-})();
diff --git a/superset-frontend/src/assets/stylesheets/less/cosmo/variables.less b/superset-frontend/src/assets/stylesheets/less/cosmo/variables.less
deleted file mode 100644
index a3c74f712cb..00000000000
--- a/superset-frontend/src/assets/stylesheets/less/cosmo/variables.less
+++ /dev/null
@@ -1,851 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- */
-// Forked Cosmo 3.3.7
-// Variables
-// --------------------------------------------------
-
-// == Colors
-//
-// ## Gray and brand colors for use across Bootstrap.
-
-@gray-base: @darkest; // superset-var
-@gray-darker: lighten(@gray-base, 13.5%);
-@gray-dark: lighten(@gray-base, 20%);
-@bs-gray: lighten(@gray-base, 33.5%);
-@bs-gray-light: lighten(@gray-base, 60%);
-@gray-lighter: lighten(@gray-base, 95%);
-
-@brand-primary: @primary-color; // superset-var
-@brand-success: @success; // superset-var
-@brand-info: @info; // superset-var
-@brand-warning: @warning; // superset-var
-@brand-danger: @danger; // superset-var
-
-// == Scaffolding
-//
-// ## Settings for some of the most global styles.
-
-// ** Background color for `<body>`.
-@body-bg: @gray-bg; // superset-var
-// ** Global text color on `<body>`.
-@text-color: @gray-dark;
-
-// ** Global textual link color.
-@link-color: @link;
-// ** Link hover color set via `darken()` function.
-@link-hover-color: @link-hover;
-// ** Link hover decoration.
-@link-hover-decoration: underline;
-
-// == Typography
-//
-// ## Font, line-height, and color for body text, headings, and more.
-
-@font-size-large: ceil((@font-size-base * 1.25)); // ~18px
-@font-size-small: ceil((@font-size-base * 0.85)); // ~12px
-
-@font-size-h1: floor((@font-size-base * 2.6)); // ~36px
-@font-size-h2: floor((@font-size-base * 2.15)); // ~30px
-@font-size-h3: ceil((@font-size-base * 1.7)); // ~24px
-@font-size-h4: ceil((@font-size-base * 1.25)); // ~18px
-@font-size-h5: @font-size-base;
-@font-size-h6: ceil((@font-size-base * 0.85)); // ~12px
-
-// ** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc.
-@line-height-computed: floor((@font-size-base * @line-height-base));
-
-// ** By default, this inherits from the `<body>`.
-@headings-font-family: @font-family-base;
-@headings-font-weight: @font-weight-normal; // superset-var
-@headings-line-height: @line-height-tight;
-@headings-color: inherit;
-
-// == Iconography
-//
-// ## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
-
-// ** Load fonts from this directory.
-@icon-font-path: '../fonts/';
-// ** File name for all font files.
-@icon-font-name: 'glyphicons-halflings-regular';
-// ** Element ID within SVG icon file.
-@icon-font-svg-id: 'glyphicons_halflingsregular';
-
-// == Components
-//
-// ## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
-
-@padding-base-vertical: 6.5px;
-@padding-base-horizontal: 18px;
-
-@padding-large-vertical: 18px;
-@padding-large-horizontal: 30px;
-
-@padding-small-vertical: 5px;
-@padding-small-horizontal: 10px;
-
-@padding-xs-vertical: 1px;
-@padding-xs-horizontal: 5px;
-
-@line-height-large: 1.3333333; // extra decimals for Win 8.1 Chrome
-@line-height-small: 1.5;
-
-@border-radius-base: @border-radius-normal;
-@border-radius-large: 4px;
-@border-radius-small: 4px;
-
-// ** Global color for active items (e.g., navs or dropdowns).
-@component-active-color: @lightest; // superset-var
-// ** Global background color for active items (e.g., navs or dropdowns).
-@component-active-bg: @brand-primary;
-
-// ** Width of the `border` for generating carets that indicate dropdowns.
-@caret-width-base: 4px;
-// ** Carets increase slightly in size for larger components.
-@caret-width-large: 5px;
-
-// == Tables
-//
-// ## Customizes the `.table` component with basic values, each used across all table variations.
-
-// ** Padding for `<th>`s and `<td>`s.
-@table-cell-padding: 8px;
-// ** Padding for cells in `.table-condensed`.
-@table-condensed-cell-padding: 5px;
-
-// ** Default background color used for all tables.
-@table-bg: transparent;
-// ** Background color used for `.table-striped`.
-@table-bg-accent: fade(@gray-bg, @opacity-medium-light); // superset-var
-// ** Background color used for `.table-hover`.
-@table-bg-hover: @gray-bg; // superset-var
-@table-bg-active: @table-bg-hover;
-
-// ** Border color for table and cell borders.
-@table-border-color: @gray-light; // superset-var
-
-// == Buttons
-//
-// ## For each of Bootstrap's buttons, define text, background and border color.
-
-@btn-font-weight: normal;
-
-@btn-primary-color: @lightest;
-@btn-primary-bg: @brand-primary;
-@btn-primary-border: @brand-primary;
-
-@btn-default-color: @bs-gray;
-@btn-default-bg: @lightest;
-@btn-default-border: @gray-light;
-
-@btn-success-color: @btn-primary-color;
-@btn-success-bg: @brand-success;
-@btn-success-border: @btn-success-bg;
-
-@btn-info-color: @btn-primary-color;
-@btn-info-bg: @brand-info;
-@btn-info-border: @btn-info-bg;
-
-@btn-warning-color: @btn-primary-color;
-@btn-warning-bg: @brand-warning;
-@btn-warning-border: @btn-warning-bg;
-
-@btn-danger-color: @btn-primary-color;
-@btn-danger-bg: @brand-danger;
-@btn-danger-border: @btn-danger-bg;
-
-@btn-link-disabled-color: @bs-gray-light;
-
-// Allows for customizing button radius independently from global border radius
-@btn-border-radius-base: @border-radius-base;
-@btn-border-radius-large: @border-radius-large;
-@btn-border-radius-small: @border-radius-small;
-
-// == Forms
-//
-// ##
-
-// ** `<input>` background color
-@input-bg: @lightest; // superset-var
-// ** `<input disabled>` background color
-@input-bg-disabled: @gray-lighter;
-
-// ** Text color for `<input>`s
-@input-color: @text-color;
-// ** `<input>` border color
-@input-border: @gray-light; // superset-var
-
-// TODO: Rename `@input-border-radius` to `@input-border-radius-base` in v4
-// ** Default `.form-control` border radius
-// This has no effect on `<select>`s in some browsers, due to the limited stylability of `<select>`s in CSS.
-@input-border-radius: @border-radius-base;
-// ** Large `.form-control` border radius
-@input-border-radius-large: @border-radius-large;
-// ** Small `.form-control` border radius
-@input-border-radius-small: @border-radius-small;
-
-// ** Border color for inputs on focus
-@input-border-focus: @indicator-color; // superset-var
-
-// ** Placeholder text color
-@input-color-placeholder: @bs-gray-light;
-
-// ** Default `.form-control` height
-@input-height-base: (@line-height-computed + (@padding-base-vertical * 2) + 2);
-// ** Large `.form-control` height
-@input-height-large: (
-  ceil(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) +
-    2
-);
-// ** Small `.form-control` height
-@input-height-small: (
-  floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) +
-    2
-);
-
-// ** `.form-group` margin
-@form-group-margin-bottom: 16px;
-
-@legend-color: @text-color;
-@legend-border-color: @gray-bg;
-
-// ** Background color for textual input addons
-@input-group-addon-bg: @gray-lighter;
-// ** Border color for textual input addons
-@input-group-addon-border-color: @input-border;
-
-// ** Disabled cursor for form controls and buttons.
-@cursor-disabled: not-allowed;
-
-// == Dropdowns
-//
-// ## Dropdown menu container and contents.
-
-// ** Background for the dropdown menu.
-@dropdown-bg: @lightest; // superset-var
-// ** Dropdown menu `border-color`.
-@dropdown-border: fade(@darkest, @opacity-light); // superset-var
-// ** Dropdown menu `border-color` **for IE8**.
-@dropdown-fallback-border: @gray-light; // superset-var
-// ** Divider color for between dropdown items.
-@dropdown-divider-bg: @gray-bg; // superset-var
-
-// ** Dropdown link text color.
-@dropdown-link-color: @gray-dark;
-// ** Hover color for dropdown links.
-@dropdown-link-hover-color: @lightest; // superset-var
-// ** Hover background for dropdown links.
-@dropdown-link-hover-bg: @component-active-bg;
-
-// ** Active dropdown menu item text color.
-@dropdown-link-active-color: @lightest; // superset-var
-// ** Active dropdown menu item background color.
-@dropdown-link-active-bg: @component-active-bg;
-
-// ** Disabled dropdown menu item background color.
-@dropdown-link-disabled-color: @bs-gray-light;
-
-// ** Text color for headers within dropdown menus.
-@dropdown-header-color: @bs-gray-light;
-
-// ** Deprecated `@dropdown-caret-color` as of v3.1.0
-@dropdown-caret-color: @darkest; // superset-var
-
-//-- Z-index master list
-//
-// Warning: Avoid customizing these values. They're used for a bird's eye view
-// of components dependent on the z-axis and are designed to all work together.
-//
-// Note: These variables are not generated into the Customizer.
-
-@zindex-navbar: 1000;
-@zindex-dropdown: 1000;
-@zindex-popover: 1060;
-@zindex-tooltip: 1070;
-@zindex-navbar-fixed: 1030;
-@zindex-modal-background: 1040;
-@zindex-modal: 1050;
-
-// == Media queries breakpoints
-//
-// ## Define the breakpoints at which your layout will change, adapting to different screen sizes.
-
-// Extra small screen / phone
-// ** Deprecated `@screen-xs` as of v3.0.1
-@screen-xs: 480px;
-// ** Deprecated `@screen-xs-min` as of v3.2.0
-@screen-xs-min: @screen-xs;
-// ** Deprecated `@screen-phone` as of v3.0.1
-@screen-phone: @screen-xs-min;
-
-// Small screen / tablet
-// ** Deprecated `@screen-sm` as of v3.0.1
-@screen-sm: 768px;
-@screen-sm-min: @screen-sm;
-// ** Deprecated `@screen-tablet` as of v3.0.1
-@screen-tablet: @screen-sm-min;
-
-// Medium screen / desktop
-// ** Deprecated `@screen-md` as of v3.0.1
-@screen-md: 992px;
-@screen-md-min: @screen-md;
-// ** Deprecated `@screen-desktop` as of v3.0.1
-@screen-desktop: @screen-md-min;
-
-// Large screen / wide desktop
-// ** Deprecated `@screen-lg` as of v3.0.1
-@screen-lg: 1200px;
-@screen-lg-min: @screen-lg;
-// ** Deprecated `@screen-lg-desktop` as of v3.0.1
-@screen-lg-desktop: @screen-lg-min;
-
-// So media queries don't overlap when required, provide a maximum
-@screen-xs-max: (@screen-sm-min - 1);
-@screen-sm-max: (@screen-md-min - 1);
-@screen-md-max: (@screen-lg-min - 1);
-
-// == Grid system
-//
-// ## Define your custom responsive grid.
-
-// ** Number of columns in the grid.
-@grid-columns: 12;
-// ** Padding between columns. Gets divided in half for the left and right.
-@grid-gutter-width: 20px;
-// Navbar collapse
-// ** Point at which the navbar becomes uncollapsed.
-@grid-float-breakpoint: @screen-sm-min;
-// ** Point at which the navbar begins collapsing.
-@grid-float-breakpoint-max: (@grid-float-breakpoint - 1);
-
-// == Container sizes
-//
-// ## Define the maximum width of `.container` for different screen sizes.
-
-// Small screen / tablet
-@container-tablet: (720px + @grid-gutter-width);
-// ** For `@screen-sm-min` and up.
-@container-sm: @container-tablet;
-
-// Medium screen / desktop
-@container-desktop: (940px + @grid-gutter-width);
-// ** For `@screen-md-min` and up.
-@container-md: @container-desktop;
-
-// Large screen / wide desktop
-@container-large-desktop: (1140px + @grid-gutter-width);
-// ** For `@screen-lg-min` and up.
-@container-lg: @container-large-desktop;
-
-// == Navbar
-//
-// ##
-
-// Basics of a navbar
-@navbar-height: 50px;
-@navbar-margin-bottom: @line-height-computed;
-@navbar-border-radius: @border-radius-base;
-@navbar-padding-horizontal: floor((@grid-gutter-width / 2));
-@navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2);
-@navbar-collapse-max-height: 340px;
-
-@navbar-default-color: @lightest; // superset-var
-@navbar-default-bg: @gray-darker;
-@navbar-default-border: darken(@navbar-default-bg, 6.5%);
-
-// Navbar links
-@navbar-default-link-color: @lightest; // superset-var
-@navbar-default-link-hover-color: @lightest; // superset-var
-@navbar-default-link-hover-bg: darken(@navbar-default-bg, 10%);
-@navbar-default-link-active-color: @navbar-default-link-hover-color;
-@navbar-default-link-active-bg: @navbar-default-link-hover-bg;
-@navbar-default-link-disabled-color: @gray-light; // superset-var
-@navbar-default-link-disabled-bg: transparent;
-
-// Navbar brand label
-@navbar-default-brand-color: @navbar-default-link-color;
-@navbar-default-brand-hover-color: @lightest; // superset-var
-@navbar-default-brand-hover-bg: none;
-
-// Navbar toggle
-@navbar-default-toggle-hover-bg: @navbar-default-link-hover-bg;
-@navbar-default-toggle-icon-bar-bg: @lightest; // superset-var
-@navbar-default-toggle-border-color: transparent;
-
-// === Inverted navbar
-// Reset inverted navbar basics
-@navbar-inverse-color: @gray-dark;
-@navbar-inverse-bg: @lightest; // superset-var
-@navbar-inverse-border: transparent;
-
-// Inverted navbar links
-@navbar-inverse-link-color: @gray-dark;
-@navbar-inverse-link-hover-color: @gray-dark;
-@navbar-inverse-link-hover-bg: darken(@navbar-inverse-bg, 10%);
-@navbar-inverse-link-active-color: @navbar-inverse-link-hover-color;
-@navbar-inverse-link-active-bg: @navbar-inverse-link-hover-bg;
-@navbar-inverse-link-disabled-color: @gray-lighter;
-@navbar-inverse-link-disabled-bg: transparent;
-
-// Inverted navbar brand label
-@navbar-inverse-brand-color: @navbar-inverse-link-color;
-@navbar-inverse-brand-hover-color: @gray-darker;
-@navbar-inverse-brand-hover-bg: none;
-
-// Inverted navbar toggle
-@navbar-inverse-toggle-hover-bg: @navbar-inverse-link-hover-bg;
-@navbar-inverse-toggle-icon-bar-bg: @lightest; // superset-var
-@navbar-inverse-toggle-border-color: transparent;
-
-// == Navs
-//
-// ##
-
-// === Shared nav styles
-@nav-link-padding: 10px 15px;
-@nav-link-hover-bg: @gray-lighter;
-
-@nav-disabled-link-color: @bs-gray-light;
-@nav-disabled-link-hover-color: @bs-gray-light;
-
-// == Tabs
-@nav-tabs-border-color: @gray-light; // superset-var
-
-@nav-tabs-link-hover-border-color: @gray-lighter;
-
-@nav-tabs-active-link-hover-bg: @body-bg;
-@nav-tabs-active-link-hover-color: @bs-gray;
-@nav-tabs-active-link-hover-border-color: @gray-light; // superset-var
-
-@nav-tabs-justified-link-border-color: @gray-light; // superset-var
-@nav-tabs-justified-active-link-border-color: @body-bg;
-
-// == Pills
-@nav-pills-border-radius: @border-radius-base;
-@nav-pills-active-link-hover-bg: @component-active-bg;
-@nav-pills-active-link-hover-color: @component-active-color;
-
-// == Pagination
-//
-// ##
-
-@pagination-color: @link-color;
-@pagination-bg: @lightest; // superset-var
-@pagination-border: @gray-light; // superset-var
-
-@pagination-hover-color: @link-hover-color;
-@pagination-hover-bg: @gray-lighter;
-@pagination-hover-border: @gray-light; // superset-var
-
-@pagination-active-color: @bs-gray-light;
-@pagination-active-bg: @gray-bg; // superset-var
-@pagination-active-border: @gray-light; // superset-var
-
-@pagination-disabled-color: @bs-gray-light;
-@pagination-disabled-bg: @lightest; // superset-var
-@pagination-disabled-border: @gray-light; // superset-var
-
-// == Pager
-//
-// ##
-
-@pager-bg: @pagination-bg;
-@pager-border: @pagination-border;
-@pager-border-radius: @border-radius-base;
-
-@pager-hover-bg: @pagination-hover-bg;
-
-@pager-active-bg: @pagination-active-bg;
-@pager-active-color: @pagination-active-color;
-
-@pager-disabled-color: @bs-gray-light;
-
-// == Jumbotron
-//
-// ##
-
-@jumbotron-padding: 30px;
-@jumbotron-color: inherit;
-@jumbotron-bg: @gray-lighter;
-@jumbotron-heading-color: inherit;
-@jumbotron-font-size: ceil((@font-size-base * 1.5));
-@jumbotron-heading-font-size: ceil((@font-size-base * 4.5));
-
-// == Form states and alerts
-//
-// ## Define colors for form feedback states and, by default, alerts.
-
-@state-success-text: @success-dark2;
-@state-success-bg: @success-light2;
-@state-success-border: @success-light2;
-
-@state-info-text: @info-dark2;
-@state-info-bg: @info-light2;
-@state-info-border: @info-light2;
-
-@state-warning-text: @warning-dark2;
-@state-warning-bg: @warning-light2;
-@state-warning-border: @warning-light2;
-
-@state-danger-text: @danger-dark2;
-@state-danger-bg: @danger-light2;
-@state-danger-border: @danger-light2;
-
-// == Tooltips
-//
-// ##
-
-// ** Tooltip max width
-@tooltip-max-width: 200px;
-// ** Tooltip text color
-@tooltip-color: @lightest; // superset-var
-// ** Tooltip background color
-@tooltip-bg: @darkest; // superset-var
-@tooltip-opacity: 0.9;
-
-// ** Tooltip arrow width
-@tooltip-arrow-width: 5px;
-// ** Tooltip arrow color
-@tooltip-arrow-color: @tooltip-bg;
-
-// == Popovers
-//
-// ##
-
-// ** Popover body background color
-@popover-bg: @lightest; // superset-var
-// ** Popover maximum width
-@popover-max-width: 276px;
-// ** Popover border color
-@popover-border-color: fade(@darkest, @opacity-light); // superset-var
-// ** Popover fallback border color
-@popover-fallback-border-color: @gray-light; // superset-var
-
-// ** Popover title background color
-@popover-title-bg: darken(@popover-bg, 3%);
-
-// ** Popover arrow width
-@popover-arrow-width: 10px;
-// ** Popover arrow color
-@popover-arrow-color: @popover-bg;
-
-// ** Popover outer arrow width
-@popover-arrow-outer-width: (@popover-arrow-width + 1);
-// ** Popover outer arrow color
-@popover-arrow-outer-color: fadein(@popover-border-color, 5%);
-// ** Popover outer arrow fallback color
-@popover-arrow-outer-fallback-color: darken(
-  @popover-fallback-border-color,
-  20%
-);
-
-// == Labels
-//
-// ##
-
-// ** Default label background color
-@label-default-bg: @bs-gray-light;
-// ** Primary label background color
-@label-primary-bg: @brand-primary;
-// ** Success label background color
-@label-success-bg: @brand-success;
-// ** Info label background color
-@label-info-bg: @brand-info;
-// ** Warning label background color
-@label-warning-bg: darken(@brand-warning, 6%);
-// ** Danger label background color
-@label-danger-bg: @brand-danger;
-
-// ** Default label text color
-@label-color: @lightest; // superset-var
-// ** Default text color of a linked label
-@label-link-hover-color: @lightest; // superset-var
-
-// == Modals
-//
-// ##
-
-// ** Padding applied to the modal body
-@modal-inner-padding: 20px;
-
-// ** Padding applied to the modal title
-@modal-title-padding: 15px;
-// ** Modal title line-height
-@modal-title-line-height: @line-height-base;
-
-// ** Background color of modal content area
-@modal-content-bg: @lightest; // superset-var
-// ** Modal content border color
-@modal-content-border-color: transparent;
-// ** Modal content border color **for IE8**
-@modal-content-fallback-border-color: @gray; // superset-var
-
-// ** Modal backdrop background color
-@modal-backdrop-bg: @darkest; // superset-var
-// ** Modal backdrop opacity
-@modal-backdrop-opacity: 0.5;
-// ** Modal header border color
-@modal-header-border-color: @gray-bg; // superset-var
-// ** Modal footer border color
-@modal-footer-border-color: @modal-header-border-color;
-
-@modal-lg: 900px;
-@modal-md: 600px;
-@modal-sm: 300px;
-
-// == Alerts
-//
-// ## Define alert colors, border radius, and padding.
-
-@alert-padding: 15px;
-@alert-border-radius: @border-radius-base;
-@alert-link-font-weight: @font-weight-bold;
-
-@alert-success-bg: @state-success-bg;
-@alert-success-text: @state-success-text;
-@alert-success-border: @state-success-border;
-
-@alert-info-bg: @state-info-bg;
-@alert-info-text: @state-info-text;
-@alert-info-border: @state-info-border;
-
-@alert-warning-bg: @state-warning-bg;
-@alert-warning-text: @state-warning-text;
-@alert-warning-border: @state-warning-border;
-
-@alert-danger-bg: @state-danger-bg;
-@alert-danger-text: @state-danger-text;
-@alert-danger-border: @state-danger-border;
-
-// == Progress bars
-//
-// ##
-
-// ** Background color of the whole progress component
-@progress-bg: @gray-light; // superset-var
-// ** Progress bar text color
-@progress-bar-color: @lightest; // superset-var
-// ** Variable for setting rounded corners on progress bar.
-@progress-border-radius: @border-radius-base;
-
-// ** Default progress bar color
-@progress-bar-bg: @brand-primary;
-// ** Success progress bar color
-@progress-bar-success-bg: @brand-success;
-// ** Warning progress bar color
-@progress-bar-warning-bg: @brand-warning;
-// ** Danger progress bar color
-@progress-bar-danger-bg: @brand-danger;
-// ** Info progress bar color
-@progress-bar-info-bg: @brand-info;
-
-// == List group
-//
-// ##
-
-// ** Background color on `.list-group-item`
-@list-group-bg: @lightest; // superset-var
-// ** `.list-group-item` border color
-@list-group-border: @gray-light; // superset-var
-// ** List group border radius
-@list-group-border-radius: @border-radius-base;
-
-// ** Background color of single list items on hover
-@list-group-hover-bg: @gray-bg; // superset-var
-// ** Text color of active list items
-@list-group-active-color: @component-active-color;
-// ** Background color of active list items
-@list-group-active-bg: @component-active-bg;
-// ** Border color of active list elements
-@list-group-active-border: @list-group-border;
-// ** Text color for content within active list items
-@list-group-active-text-color: lighten(@list-group-active-bg, 40%);
-
-// ** Text color of disabled list items
-@list-group-disabled-color: @bs-gray-light;
-// ** Background color of disabled list items
-@list-group-disabled-bg: @gray-lighter;
-// ** Text color for content within disabled list items
-@list-group-disabled-text-color: @list-group-disabled-color;
-
-@list-group-link-color: #555;
-@list-group-link-hover-color: @list-group-link-color;
-@list-group-link-heading-color: @almost-black; // superset-var
-
-// == Panels
-//
-// ##
-
-@panel-bg: @lightest; // superset-var
-@panel-body-padding: 15px;
-@panel-heading-padding: 10px 15px;
-@panel-footer-padding: @panel-heading-padding;
-@panel-border-radius: @border-radius-base;
-
-// ** Border color for elements within panels
-@panel-inner-border: @gray-light; // superset-var
-@panel-footer-bg: @gray-bg; // superset-var
-
-@panel-default-text: @gray-dark;
-@panel-default-border: transparent;
-@panel-default-heading-bg: @lightest; // superset-var
-
-@panel-primary-text: @lightest; // superset-var
-@panel-primary-border: transparent;
-@panel-primary-heading-bg: @brand-primary;
-
-@panel-success-text: @state-success-text;
-@panel-success-border: transparent;
-@panel-success-heading-bg: @state-success-bg;
-
-@panel-info-text: @state-info-text;
-@panel-info-border: transparent;
-@panel-info-heading-bg: @state-info-bg;
-
-@panel-warning-text: @state-warning-text;
-@panel-warning-border: transparent;
-@panel-warning-heading-bg: @state-warning-bg;
-
-@panel-danger-text: @state-danger-text;
-@panel-danger-border: transparent;
-@panel-danger-heading-bg: @state-danger-bg;
-
-// == Thumbnails
-//
-// ##
-
-// ** Padding around the thumbnail image
-@thumbnail-padding: 4px;
-// ** Thumbnail background color
-@thumbnail-bg: @body-bg;
-// ** Thumbnail border color
-@thumbnail-border: @gray-light; // superset-var
-// ** Thumbnail border radius
-@thumbnail-border-radius: @border-radius-base;
-
-// ** Custom text color for thumbnail captions
-@thumbnail-caption-color: @text-color;
-// ** Padding around the thumbnail caption
-@thumbnail-caption-padding: 9px;
-
-// == Wells
-//
-// ##
-
-@well-bg: @gray-bg; // superset-var
-@well-border: darken(@well-bg, 7%);
-
-// == Badges
-//
-// ##
-
-@badge-color: @lightest; // superset-var
-// ** Linked badge text color on hover
-@badge-link-hover-color: @lightest; // superset-var
-@badge-bg: @brand-primary;
-
-// ** Badge text color in active nav link
-@badge-active-color: @link-color;
-// ** Badge background color in active nav link
-@badge-active-bg: @lightest; // superset-var
-
-@badge-font-weight: @font-weight-bold;
-@badge-line-height: 1;
-@badge-border-radius: 10px;
-
-// == Breadcrumbs
-//
-// ##
-
-@breadcrumb-padding-vertical: 8px;
-@breadcrumb-padding-horizontal: 15px;
-// ** Breadcrumb background color
-@breadcrumb-bg: @gray-bg; // superset-var
-// ** Breadcrumb text color
-@breadcrumb-color: @gray-light; // superset-var
-// ** Text color of current page in the breadcrumb
-@breadcrumb-active-color: @bs-gray-light;
-// ** Textual separator for between breadcrumb elements
-@breadcrumb-separator: '/';
-
-// == Carousel
-//
-// ##
-
-@carousel-text-shadow: 0 1px 2px fade(@darkest, @opacity-light); // superset-var
-
-@carousel-control-color: @lightest; // superset-var
-@carousel-control-width: 15%;
-@carousel-control-opacity: 0.5;
-@carousel-control-font-size: 20px;
-
-@carousel-indicator-active-bg: @lightest; // superset-var
-@carousel-indicator-border-color: @lightest; // superset-var
-
-@carousel-caption-color: @lightest; // superset-var
-
-// == Close
-//
-// ##
-
-@close-font-weight: @font-weight-bold;
-@close-color: @lightest; // superset-var
-@close-text-shadow: 0 1px 0 @lightest; // superset-var
-
-// == Code
-//
-// ##
-
-@code-color: darken(@info, @colorstop-one);
-@code-bg: @gray-bg; // superset-var
-
-@kbd-color: @lightest; // superset-var
-@kbd-bg: @almost-black; // superset-var
-
-@pre-bg: @gray-bg; // superset-var
-@pre-color: @gray-dark;
-@pre-border-color: @gray-light; // superset-var
-@pre-scrollable-max-height: 340px;
-
-// == Type
-//
-// ##
-
-// ** Horizontal offset for forms and lists.
-@component-offset-horizontal: 180px;
-// ** Text muted color
-@text-muted: @bs-gray-light;
-// ** Abbreviations and acronyms border color
-@abbr-border-color: @bs-gray-light;
-// ** Headings small color
-@headings-small-color: @bs-gray-light;
-// ** Blockquote small color
-@blockquote-small-color: @bs-gray-light;
-// ** Blockquote font size
-@blockquote-font-size: (@font-size-base * 1.25);
-// ** Blockquote border color
-@blockquote-border-color: @gray-lighter;
-// ** Page header border color
-@page-header-border-color: @gray-lighter;
-// ** Width of horizontal description list titles
-@dl-horizontal-offset: @component-offset-horizontal;
-// ** Point at which .dl-horizontal becomes horizontal
-@dl-horizontal-breakpoint: @grid-float-breakpoint;
-// ** Horizontal line color.
-@hr-border: @gray-lighter;
diff --git a/superset-frontend/src/assets/stylesheets/less/fonts.less b/superset-frontend/src/assets/stylesheets/less/fonts.less
deleted file mode 100644
index 5fb41d832ae..00000000000
--- a/superset-frontend/src/assets/stylesheets/less/fonts.less
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- */
-
-/*************************************************************************/
-/* USAGE NOTES : Add font all licenses to LICENSE.text                   */
-/*************************************************************************/
-
-/******************************* Inter UI ********************************/
-@import '~@fontsource/inter/200.css';
-@import '~@fontsource/inter/400.css';
-@import '~@fontsource/inter/500.css';
-@import '~@fontsource/inter/600.css';
-
-/******************************* Fira Code ********************************/
-@import '~@fontsource/fira-code/400.css';
-@import '~@fontsource/fira-code/500.css';
-@import '~@fontsource/fira-code/600.css';
diff --git a/superset-frontend/src/assets/stylesheets/less/variables.less b/superset-frontend/src/assets/stylesheets/less/variables.less
deleted file mode 100644
index fe9b8987fd0..00000000000
--- a/superset-frontend/src/assets/stylesheets/less/variables.less
+++ /dev/null
@@ -1,212 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- */
-
-/************************************************************************/
-/* COLORS                                                               */
-/* Please attempt to use and standardize on these colors,               */
-/* rather than including specific color values in                       */
-/* component styles. This will allow us to more easily adjust theming   */
-/************************************************************************/
-
-@primary-color: #20a7c9;
-@indicator-color: @primary-color;
-
-@brand-primary-dark1: #1a85a0;
-@brand-primary-dark2: #156378;
-@brand-primary-light1: #79cade;
-@brand-primary-light2: #a5dae9;
-@brand-primary-light3: #d2edf4;
-@brand-primary-light4: #e9f6f9;
-@brand-primary-light5: #f3f8fa;
-
-@brand-secondary: #444e7c;
-@brand-secondary-dark1: #363e63;
-@brand-secondary-dark2: #282e4a;
-@brand-secondary-dark3: #1b1f31;
-@brand-secondary-light1: #8e94b0;
-@brand-secondary-light2: #b4b8ca;
-@brand-secondary-light3: #d9dbe4;
-@brand-secondary-light4: #eceef2;
-@brand-secondary-light5: #f5f5f8;
-
-@almost-black: #263238;
-@gray-dark: #484848;
-@gray-light: #e0e0e0;
-@gray-light5: #666666;
-@gray: #879399;
-@gray-bg: #f7f7f7;
-@gray-heading: #a3a3a3;
-@menu-hover: #f2f3f5;
-@lightest: #ffffff;
-@darkest: #000000;
-
-/**************************** text-specific *****************************/
-@link: #1985a0;
-@link-hover: darken(@link, @colorstop-one);
-
-/***************************** status colors ****************************/
-@info: #66bcfe;
-@info-dark1: #4d8cbe;
-@info-dark2: #315e7e;
-@info-light1: #b3defe;
-@info-light2: #eff8fe;
-
-@danger: #e04355;
-@danger-dark1: #a7323f;
-@danger-dark2: #6f212a;
-@danger-light1: #efa1aa;
-@danger-light2: #faedee;
-
-@success: #5ac189;
-@success-dark1: #439066;
-@success-dark2: #2b6144;
-@success-light1: #ace1c4;
-@success-light2: #eef8f3;
-
-@warning: #fcc700;
-@warning-dark1: #bc9501;
-@warning-dark2: #7d6300;
-@warning-light1: #fde380;
-@warning-light2: #fef9e6;
-
-/* general component effects */
-@shadow-highlight: @primary-color;
-
-/************************************************************************/
-/* OPACITIES                                                            */
-/* Used in LESS filters, e.g. fade(@someColorVar, @someOpacityBelow)    */
-/************************************************************************/
-@opacity-light: 10%;
-@opacity-medium-light: 35%;
-@opacity-medium-heavy: 60%;
-@opacity-heavy: 80%;
-
-/************************************************************************/
-/* SHADES & TINTS                                                       */
-/* Used in LESS filters for shadint/tinting,                            */
-/* e.g. shade(@someColorVar, @colorstop-one) to darken                  */
-/* or tint(@someColorVar, @colorstop-one) to lighten                    */
-/************************************************************************/
-@colorstop-one: 20%;
-@colorstop-two: 40%;
-@colorstop-three: 60%;
-@colorstop-four: 80%;
-
-/************************************************************************/
-/* LAYOUT                                                               */
-/* Widths and heights of things, that might be referred to often        */
-/************************************************************************/
-
-/* builder component pane */
-@builder-pane-width: 374px;
-
-/************************************************************************/
-/* Z-INDEX                                                              */
-/* Think of the site as "layers" rather than an arms race of numbers    */
-/* Keep these to a minimum                                              */
-/* Label semantic "layers" and add comments for usage notes             */
-/* Use double dash modifiers to step up/down from a base layer          */
-/* e.g. z-whatever--modifier                                            */
-/************************************************************************/
-
-/************************ toast messages, popovers **********************/
-@z-index-max: 3000;
-
-/***** filters, dashboard editor widgets, Explore reloading overlay *****/
-@z-index-dropdown: @z-index-above-dashboard-charts + 1;
-@z-index-above-dashboard-charts: 10;
-
-/******************************** charts ********************************/
-@z-index-chart--dragging: @z-index-chart + 1;
-@z-index-chart: 1;
-
-/************************************************************************/
-/* TYPOGRAPHY                                                           */
-/* Commonly used font weights, line heights, etc. These should be the   */
-/* core values used to build more complex styles for headers, etc.      */
-/************************************************************************/
-
-// *************************** Weights **********************************
-@font-weight-light: 200;
-@font-weight-normal: 400;
-@font-weight-bold: 600;
-
-// ***************************** Font Sizes *****************************
-@font-size-base: 14px; // Base `rem` units on this, as needed.
-
-@font-size-xxs: 9px;
-@font-size-xs: 10px;
-@font-size-s: 12px;
-@font-size-m: @font-size-base;
-@font-size-l: 16px;
-@font-size-xl: 21px;
-@font-size-xxl: 28px;
-
-// **************************** Line Heights ****************************
-@line-height-base: 1.4;
-// Ranged Sizes
-@line-height-tight: 1;
-@line-height-normal: @line-height-base;
-@line-height-loose: 2;
-
-// ****************************** Features *******************************
-@use-ligatures: false;
-
-// setting up OTF settings based on @use-ligatures:
-.set-otf-options(@use-ligatures);
-
-.set-otf-options(true) {
-  @font-feature-settings:
-    'liga' on,
-    'calt' on;
-}
-
-.set-otf-options(false) {
-  @font-feature-settings:
-    'liga' off,
-    'calt' off;
-}
-
-// ****************************** Families ******************************
-@font-family-sans-serif: 'Inter', Helvetica, Arial;
-@font-family-serif: Georgia, 'Times New Roman', Times, serif;
-@font-family-monospace: 'Fira Code', 'Courier New', monospace;
-@font-family-base: @font-family-sans-serif;
-
-/************************************************************************/
-/* TRANSITIONS                                                          */
-/* Timing and easings presets used in CSS transitions                   */
-/************************************************************************/
-@timing-normal: 0.3s;
-
-/************************************************************************/
-/* BORDER RADII                                                         */
-/* Standard border-radius settings                                      */
-/************************************************************************/
-@border-radius-normal: 4px;
-@border-radius-large: (@border-radius-normal * 2);
-
-/************************************************************************/
-/* BOOTSTRAP/BOOTSWATCH/COSMO                                           */
-/* These are the legacy Cosmo theme overrides to Bootswatch's           */
-/* overrides to Bootstrap. We should consolidate/deprecate these        */
-/* in favor of custom/reusable CSS wherever possible                    */
-/************************************************************************/
-
-@import '../less/cosmo/variables.less';
diff --git a/superset-frontend/src/assets/stylesheets/reactable-pagination.less b/superset-frontend/src/assets/stylesheets/reactable-pagination.less
deleted file mode 100644
index 9b48d2143ab..00000000000
--- a/superset-frontend/src/assets/stylesheets/reactable-pagination.less
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 './less/variables.less';
-
-.reactable-pagination td {
-  padding: 15px 0 0 0 !important;
-}
-
-.reactable-pagination a:focus {
-  text-decoration: none;
-  color: @gray-dark;
-  outline: 1;
-}
-
-.reactable-page-button,
-.reactable-next-page,
-.reactable-previous-page {
-  background: @lightest;
-  border-radius: @border-radius-normal;
-  border: 1px solid @gray-light;
-  color: @gray-dark;
-  display: inline-block;
-  font-size: @font-size-s;
-  margin-right: 5px;
-  padding: 5px 10px;
-  text-align: center;
-  text-decoration: none;
-  vertical-align: middle;
-  white-space: nowrap;
-
-  &:hover {
-    background-color: @gray-bg;
-    border-color: @gray;
-    color: @gray-dark;
-    text-decoration: none;
-  }
-}
-
-.reactable-current-page {
-  border: 1px solid @gray-light;
-  color: @gray-dark;
-  font-weight: @font-weight-bold;
-  pointer-events: none;
-  opacity: 0.65;
-}
diff --git a/superset-frontend/src/assets/stylesheets/superset.less b/superset-frontend/src/assets/stylesheets/superset.less
deleted file mode 100644
index 7bf8c27fff6..00000000000
--- a/superset-frontend/src/assets/stylesheets/superset.less
+++ /dev/null
@@ -1,552 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 './less/index.less';
-@import './less/variables.less';
-@import './less/index.less';
-
-@datasource-sql-expression-width: 315px;
-
-span,
-div,
-i {
-  &:focus {
-    outline: none;
-  }
-}
-
-.alert.alert-danger > .debugger {
-  color: @danger;
-}
-
-.no-wrap {
-  white-space: nowrap;
-}
-
-input.form-control {
-  background-color: @lightest;
-}
-
-.disabledButton {
-  pointer-events: none;
-}
-
-.col-left-fixed {
-  width: 350px;
-  position: absolute;
-  float: left;
-}
-
-.col-offset {
-  margin-left: 365px;
-}
-
-.slice_description {
-  padding: 8px;
-  margin: 5px 0;
-  border: 1px solid @gray-light;
-  background-color: @gray-bg;
-  border-radius: @border-radius-large;
-  font-size: @font-size-s;
-}
-
-.slice_info {
-  cursor: pointer;
-}
-
-.padded {
-  padding: 10px;
-}
-
-.intable-longtext {
-  max-height: 200px;
-  overflow: auto;
-}
-
-.container-fluid {
-  text-align: left;
-  padding-left: 16px;
-  padding-right: 16px;
-}
-
-input[type='checkbox'] {
-  display: inline-block;
-  width: 16px;
-  height: 16px;
-}
-
-.widget-is-cached {
-  display: none;
-}
-
-.header span.label {
-  margin-left: 5px;
-  margin-right: 5px;
-}
-
-.notbtn {
-  cursor: default;
-  box-shadow: none;
-  border: 1px solid @gray;
-}
-
-hr {
-  margin-top: 15px;
-  margin-bottom: 15px;
-}
-
-span.title-block {
-  background-color: @gray-bg;
-  border-radius: @border-radius-large;
-  padding: 6px 12px;
-  margin: 0px 10px;
-  font-size: @font-size-xl;
-}
-
-.nvtooltip {
-  table td {
-    font-size: @font-size-s !important;
-  }
-}
-
-div.navbar {
-  .dropdown-menu .fineprint {
-    line-height: 1.5rem;
-    padding: 10px 20px 5px 20px;
-    color: @gray-light;
-    font-size: @font-size-m;
-
-    div {
-      white-space: nowrap;
-    }
-  }
-}
-
-.datasource {
-  form {
-    div.form-control,
-    input.form-control {
-      margin-bottom: 5px !important;
-    }
-  }
-
-  .tooltip-inner {
-    max-width: 350px;
-  }
-}
-
-img.viz-thumb-option {
-  width: 100px;
-  border: 1px solid @gray;
-  margin-right: 5px;
-  border-radius: @border-radius-large;
-}
-
-.select2-drop.bigdrop .select2-results {
-  max-height: 700px;
-}
-
-#is_cached {
-  display: none;
-}
-
-.slice_container.faded {
-  opacity: 0.2;
-}
-
-.navbar .alert {
-  padding: 5px 10px;
-  margin-top: 8px;
-  margin-bottom: 0;
-}
-
-.table-condensed {
-  font-size: @font-size-s;
-}
-
-.table-condensed input[type='checkbox'] {
-  float: left;
-}
-
-table.table-no-hover tr:hover {
-  background-color: initial;
-}
-
-.editable-title input {
-  outline: none;
-  background: transparent;
-  border: none;
-  box-shadow: none;
-  padding: 0;
-  cursor: initial;
-}
-
-.editable-title textarea {
-  outline: none;
-  background: transparent;
-  box-shadow: none;
-  cursor: initial;
-  border: 1px solid @gray;
-  border-radius: @border-radius-normal;
-}
-
-.editable-title input[type='text'] {
-  border: 1px solid @gray;
-  border-radius: @border-radius-normal;
-  padding: 2px;
-}
-
-.editable-title.datasource-sql-expression {
-  font-feature-settings: @font-feature-settings;
-  font-family: @font-family-monospace;
-  display: inline-block;
-  min-width: @datasource-sql-expression-width;
-  width: 100%;
-}
-
-.editable-title.datasource-sql-expression input {
-  width: 95%;
-  padding-bottom: 5px;
-}
-
-.editable-title.datasource-sql-expression textarea {
-  min-height: 100px;
-  width: 95%;
-}
-
-.editable-title input[type='button'] {
-  border-color: transparent;
-  background: transparent;
-  font-size: inherit;
-  white-space: normal;
-  text-align: left;
-  cursor: initial;
-}
-
-.editable-title.editable-title--editable input[type='button'] {
-  cursor: pointer;
-}
-
-.editable-title.editable-title--editing input[type='button'] {
-  cursor: text;
-}
-
-.anchor-link-container {
-  position: absolute;
-
-  .btn.btn-sm,
-  .btn.btn-sm:active {
-    border: none;
-    padding-top: 0;
-    padding-bottom: 0;
-    background: none;
-    box-shadow: none;
-  }
-
-  .fa.fa-link {
-    position: relative;
-    top: 2px;
-    right: 0;
-    visibility: hidden;
-    font-size: @font-size-s;
-    text-align: center;
-    vertical-align: middle;
-  }
-}
-
-.dashboard-component.dashboard-component-header .anchor-link-container {
-  .fa.fa-link {
-    font-size: @font-size-l;
-  }
-}
-
-.dashboard-component.dashboard-component-header:hover {
-  .anchor-link-container {
-    cursor: pointer;
-
-    .fa.fa-link {
-      visibility: visible;
-    }
-  }
-}
-
-.m-r-5 {
-  margin-right: 5px;
-}
-
-.m-r-3 {
-  margin-right: 3px;
-}
-
-.m-t-4 {
-  margin-top: 4px;
-}
-
-.m-t-5 {
-  margin-top: 5px;
-}
-
-.m-t-10 {
-  margin-top: 10px;
-}
-
-.m-t-20 {
-  margin-top: 20px;
-}
-
-.m-b-10 {
-  margin-bottom: 10px;
-}
-
-.m-l-2 {
-  margin-left: 2px;
-}
-
-.m-l-4 {
-  margin-left: 4px;
-}
-
-.m-l-5 {
-  margin-left: 5px;
-}
-
-.m-l-10 {
-  margin-left: 10px;
-}
-
-.m-l-25 {
-  margin-left: 25px;
-}
-
-.p-l-0 {
-  padding-left: 0;
-}
-
-.p-t-8 {
-  padding-top: 8;
-}
-
-.p-r-2 {
-  padding-right: 2;
-}
-
-.list-container {
-  position: relative;
-}
-
-.list-search-container {
-  position: relative;
-}
-
-.list-search-container .dropdown-toggle {
-  position: absolute;
-  top: -43px;
-  right: 25px;
-  border: 0;
-  padding: 0 18px;
-}
-
-.list-search-container .fa-filter {
-  position: relative;
-  left: -8px;
-}
-
-.list-search-container .dropdown-menu {
-  top: -19px;
-  right: 0;
-  left: auto;
-  float: none;
-}
-
-.list-container .pagination-container {
-  display: flex;
-  flex-direction: row;
-  flex-wrap: wrap;
-  justify-content: center;
-  align-items: center;
-  padding-bottom: 20px;
-}
-
-.list-container .pagination-container .pagination {
-  margin: 0 15px;
-}
-
-.list-container .pagination-container strong {
-  margin-right: 5px;
-}
-
-.list-container .list-add-action {
-  position: absolute;
-  top: -30px;
-  right: 15px;
-}
-
-.list-container .form-actions-container {
-  padding: 0 0 20px 10px;
-  display: inline;
-}
-
-.form-actions-container button {
-  display: flex;
-
-  .caret {
-    margin: 0 8px;
-  }
-}
-
-.list-container .filter-action {
-  margin: 10px 10px 0 10px;
-  padding-bottom: 15px;
-}
-
-.list-add-action .btn.btn-sm {
-  padding: 6px 6px;
-  font-size: @font-size-xs;
-  line-height: 2px;
-  border-radius: 50%;
-  box-shadow: 2px 2px 4px -1px fade(@darkest, @opacity-light);
-  i {
-    width: 10px;
-  }
-}
-
-iframe {
-  border: none;
-  width: 100%;
-}
-
-.text-transparent {
-  color: transparent;
-}
-
-.pointer {
-  cursor: pointer;
-}
-
-.popover {
-  max-width: 500px;
-}
-
-.float-left {
-  float: left;
-}
-
-.float-right {
-  float: right;
-}
-
-g.annotation-container {
-  line {
-    stroke: @brand-primary;
-  }
-
-  rect.annotation {
-    stroke: @brand-primary;
-    fill-opacity: 0.1;
-    stroke-width: 1;
-  }
-}
-
-.stroke-primary {
-  stroke: @brand-primary;
-}
-
-.reactable-header-sortable {
-  position: relative;
-  padding-right: 40px;
-
-  &::after {
-    font: normal normal normal 14px/1 FontAwesome;
-    content: '\f0dc';
-    margin-left: 10px;
-    color: @brand-primary;
-  }
-}
-
-.reactable-header-sort-asc::after {
-  content: '\f0de';
-  color: @brand-primary;
-}
-
-.reactable-header-sort-desc::after {
-  content: '\f0dd';
-  color: @brand-primary;
-}
-
-tr.reactable-column-header th.reactable-header-sortable {
-  padding-right: 17px;
-}
-
-.align-right {
-  text-align: right;
-}
-
-td.filtered {
-  background-color: lighten(desaturate(@brand-primary, 50%), 50%);
-}
-
-.table-name {
-  font-size: @font-size-l;
-}
-.select2-container-multi {
-  width: 100% !important;
-}
-
-/*
-Hides the logo while loading the page.
-Emotion styles will take care of the correct styling
-*/
-.navbar-brand {
-  display: none;
-}
-
-// Making native radio buttons use brand color
-input[type='radio']:after {
-  width: 15px;
-  height: 15px;
-  border-radius: 15px;
-  top: -2px;
-  left: -1px;
-  position: relative;
-  background-color: #fff;
-  content: '';
-  display: inline-block;
-  visibility: visible;
-  border: 2px solid @gray;
-}
-
-input[type='radio']:checked:after {
-  width: 15px;
-  height: 15px;
-  border-radius: 15px;
-  top: -2px;
-  left: -1px;
-  position: relative;
-  background-color: #fff;
-  content: '';
-  display: inline-block;
-  visibility: visible;
-  border: 5px solid @brand-primary;
-}
-hr {
-  border-top: 1px solid @gray-light;
-}
-.ace_gutter-cell.ace_error {
-  background-image: url('../images/icons/error_solid_small_red.svg') !important;
-  background-position: -2px center !important;
-}
diff --git a/superset-frontend/src/components/Alert/Alert.test.tsx b/superset-frontend/src/components/Alert/Alert.test.tsx
deleted file mode 100644
index 51671a8644c..00000000000
--- a/superset-frontend/src/components/Alert/Alert.test.tsx
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 {
-  render,
-  screen,
-  userEvent,
-  waitFor,
-} from 'spec/helpers/testing-library';
-import Alert, { AlertProps } from 'src/components/Alert';
-
-type AlertType = Pick<AlertProps, 'type'>;
-type AlertTypeValue = AlertType[keyof AlertType];
-
-test('renders with default props', async () => {
-  render(<Alert message="Message" />);
-
-  expect(screen.getByRole('alert')).toHaveTextContent('Message');
-  expect(screen.getByRole('img', { name: 'info-circle' })).toBeInTheDocument();
-});
-
-test('renders message for each alert type', () => {
-  const types: AlertTypeValue[] = ['info', 'error', 'warning', 'success'];
-
-  types.forEach(type => {
-    const { rerender } = render(<Alert type={type} message="Test message" />);
-    expect(screen.getByText('Test message')).toBeInTheDocument();
-    rerender(<></>); // Clean up between renders
-  });
-});
-
-test('renders without close button', async () => {
-  render(<Alert message="Message" closable={false} />);
-  await waitFor(() => {
-    expect(screen.queryByLabelText('close icon')).not.toBeInTheDocument();
-  });
-});
-
-test('disappear when closed', async () => {
-  render(<Alert message="Message" />);
-  userEvent.click(screen.getByRole('img', { name: 'close' }));
-  await waitFor(() => {
-    expect(screen.queryByRole('alert')).not.toBeInTheDocument();
-  });
-});
-
-test('renders without icon', async () => {
-  render(<Alert type="info" message="Message" showIcon={false} />);
-  await waitFor(() => {
-    expect(screen.queryByLabelText('info icon')).not.toBeInTheDocument();
-  });
-});
-
-test('renders message and description', async () => {
-  render(<Alert message="Message" description="Description" />);
-  const alert = await screen.findByRole('alert');
-  expect(alert).toHaveTextContent('Message');
-  expect(alert).toHaveTextContent('Description');
-});
-
-test('calls onClose callback when closed', () => {
-  const onCloseMock = jest.fn();
-  render(<Alert message="Message" onClose={onCloseMock} />);
-  userEvent.click(screen.getByRole('img', { name: 'close' }));
-  expect(onCloseMock).toHaveBeenCalledTimes(1);
-});
diff --git a/superset-frontend/src/components/AlteredSliceTag/AlteredSliceTag.stories.tsx b/superset-frontend/src/components/AlteredSliceTag/AlteredSliceTag.stories.tsx
index 538041abd60..71a64885096 100644
--- a/superset-frontend/src/components/AlteredSliceTag/AlteredSliceTag.stories.tsx
+++ b/superset-frontend/src/components/AlteredSliceTag/AlteredSliceTag.stories.tsx
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import AlteredSliceTag from '.';
+import { AlteredSliceTag } from '.';
 import { defaultProps } from './AlteredSliceTagMocks';
 
 export default {
-  title: 'AlteredSliceTag',
+  title: 'Components/AlteredSliceTag',
 };
 
 export const InteractiveSliceTag = (args: any) => <AlteredSliceTag {...args} />;
diff --git a/superset-frontend/src/components/AlteredSliceTag/AlteredSliceTag.test.jsx b/superset-frontend/src/components/AlteredSliceTag/AlteredSliceTag.test.jsx
deleted file mode 100644
index bd35db103b3..00000000000
--- a/superset-frontend/src/components/AlteredSliceTag/AlteredSliceTag.test.jsx
+++ /dev/null
@@ -1,278 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 { render, screen, userEvent } from 'spec/helpers/testing-library';
-import AlteredSliceTag, {
-  alterForComparison,
-  formatValueHandler,
-  isEqualish,
-} from 'src/components/AlteredSliceTag';
-import { defaultProps } from './AlteredSliceTagMocks';
-
-const controlsMap = {
-  b: { type: 'BoundsControl', label: 'Bounds' },
-  column_collection: { type: 'CollectionControl', label: 'Collection' },
-  metrics: { type: 'MetricsControl', label: 'Metrics' },
-  adhoc_filters: { type: 'AdhocFilterControl', label: 'Adhoc' },
-  other_control: { type: 'OtherControl', label: 'Other' },
-};
-
-test('renders the "Altered" label', () => {
-  render(
-    <AlteredSliceTag
-      origFormData={defaultProps.origFormData}
-      currentFormData={defaultProps.currentFormData}
-    />,
-  );
-
-  const alteredLabel = screen.getByText('Altered');
-  expect(alteredLabel).toBeInTheDocument();
-});
-
-test('opens the modal on click', () => {
-  render(
-    <AlteredSliceTag
-      origFormData={defaultProps.origFormData}
-      currentFormData={defaultProps.currentFormData}
-    />,
-  );
-
-  const alteredLabel = screen.getByText('Altered');
-  userEvent.click(alteredLabel);
-
-  const modalTitle = screen.getByText('Chart changes');
-  expect(modalTitle).toBeInTheDocument();
-});
-
-test('displays the differences in the modal', () => {
-  render(
-    <AlteredSliceTag
-      origFormData={defaultProps.origFormData}
-      currentFormData={defaultProps.currentFormData}
-    />,
-  );
-
-  const alteredLabel = screen.getByText('Altered');
-  userEvent.click(alteredLabel);
-
-  const beforeValue = screen.getByText('1, 2, 3, 4');
-  const afterValue = screen.getByText('a, b, c, d');
-  expect(beforeValue).toBeInTheDocument();
-  expect(afterValue).toBeInTheDocument();
-});
-
-test('does not render anything if there are no differences', () => {
-  render(
-    <AlteredSliceTag
-      origFormData={defaultProps.origFormData}
-      currentFormData={defaultProps.origFormData}
-    />,
-  );
-
-  const alteredLabel = screen.queryByText('Altered');
-  expect(alteredLabel).not.toBeInTheDocument();
-});
-
-test('alterForComparison returns null for undefined value', () => {
-  expect(alterForComparison(undefined)).toBeNull();
-});
-
-test('alterForComparison returns null for null value', () => {
-  expect(alterForComparison(null)).toBeNull();
-});
-
-test('alterForComparison returns null for empty string value', () => {
-  expect(alterForComparison('')).toBeNull();
-});
-
-test('alterForComparison returns null for empty array value', () => {
-  expect(alterForComparison([])).toBeNull();
-});
-
-test('alterForComparison returns null for empty object value', () => {
-  expect(alterForComparison({})).toBeNull();
-});
-
-test('alterForComparison returns value for non-empty array', () => {
-  const value = [1, 2, 3];
-  expect(alterForComparison(value)).toEqual(value);
-});
-
-test('alterForComparison returns value for non-empty object', () => {
-  const value = { key: 'value' };
-  expect(alterForComparison(value)).toEqual(value);
-});
-
-test('formatValueHandler handles undefined value', () => {
-  const value = undefined;
-  const key = 'b';
-  const formattedValue = formatValueHandler(value, key, controlsMap);
-  expect(formattedValue).toBe('N/A');
-});
-
-test('formatValueHandler handles null value', () => {
-  const value = null;
-  const key = 'b';
-  const formattedValue = formatValueHandler(value, key, controlsMap);
-  expect(formattedValue).toBe('null');
-});
-
-test('formatValueHandler returns "[]" for empty filters', () => {
-  const value = [];
-  const key = 'adhoc_filters';
-  const formattedValue = formatValueHandler(value, key, controlsMap);
-  expect(formattedValue).toBe('[]');
-});
-
-test('formatValueHandler formats filters with array values', () => {
-  const filters = [
-    {
-      clause: 'WHERE',
-      comparator: ['1', 'g', '7', 'ho'],
-      expressionType: 'SIMPLE',
-      operator: 'IN',
-      subject: 'a',
-    },
-    {
-      clause: 'WHERE',
-      comparator: ['hu', 'ho', 'ha'],
-      expressionType: 'SIMPLE',
-      operator: 'NOT IN',
-      subject: 'b',
-    },
-  ];
-  const key = 'adhoc_filters';
-  const formattedValue = formatValueHandler(filters, key, controlsMap);
-  const expected = 'a IN [1, g, 7, ho], b NOT IN [hu, ho, ha]';
-  expect(formattedValue).toBe(expected);
-});
-
-test('formatValueHandler formats filters with string values', () => {
-  const filters = [
-    {
-      clause: 'WHERE',
-      comparator: 'gucci',
-      expressionType: 'SIMPLE',
-      operator: '==',
-      subject: 'a',
-    },
-    {
-      clause: 'WHERE',
-      comparator: 'moshi moshi',
-      expressionType: 'SIMPLE',
-      operator: 'LIKE',
-      subject: 'b',
-    },
-  ];
-  const key = 'adhoc_filters';
-  const expected = 'a == gucci, b LIKE moshi moshi';
-  const formattedValue = formatValueHandler(filters, key, controlsMap);
-  expect(formattedValue).toBe(expected);
-});
-
-test('formatValueHandler formats "Min" and "Max" for BoundsControl', () => {
-  const value = [1, 2];
-  const key = 'b';
-  const result = formatValueHandler(value, key, controlsMap);
-  expect(result).toEqual('Min: 1, Max: 2');
-});
-
-test('formatValueHandler formats stringified objects for CollectionControl', () => {
-  const value = [{ a: 1 }, { b: 2 }];
-  const key = 'column_collection';
-  const result = formatValueHandler(value, key, controlsMap);
-  expect(result).toEqual(
-    `${JSON.stringify(value[0])}, ${JSON.stringify(value[1])}`,
-  );
-});
-
-test('formatValueHandler formats MetricsControl values correctly', () => {
-  const value = [{ label: 'SUM(Sales)' }, { label: 'Metric2' }];
-  const key = 'metrics';
-  const result = formatValueHandler(value, key, controlsMap);
-  expect(result).toEqual('SUM(Sales), Metric2');
-});
-
-test('formatValueHandler formats boolean values as string', () => {
-  const value1 = true;
-  const value2 = false;
-  const key = 'b';
-  const formattedValue1 = formatValueHandler(value1, key, controlsMap);
-  const formattedValue2 = formatValueHandler(value2, key, controlsMap);
-  expect(formattedValue1).toBe('true');
-  expect(formattedValue2).toBe('false');
-});
-
-test('formatValueHandler formats array values correctly', () => {
-  const value = [
-    { label: 'Label1' },
-    { label: 'Label2' },
-    5,
-    6,
-    7,
-    8,
-    'hello',
-    'goodbye',
-  ];
-  const result = formatValueHandler(value, undefined, controlsMap);
-  const expected = 'Label1, Label2, 5, 6, 7, 8, hello, goodbye';
-  expect(result).toEqual(expected);
-});
-
-test('formatValueHandler formats string values correctly', () => {
-  const value = 'test';
-  const key = 'other_control';
-  const result = formatValueHandler(value, key, controlsMap);
-  expect(result).toEqual('test');
-});
-
-test('formatValueHandler formats number values correctly', () => {
-  const value = 123;
-  const key = 'other_control';
-  const result = formatValueHandler(value, key, controlsMap);
-  expect(result).toEqual(123);
-});
-
-test('formatValueHandler formats object values correctly', () => {
-  const value = { 1: 2, alpha: 'bravo' };
-  const key = 'other_control';
-  const expected = '{"1":2,"alpha":"bravo"}';
-  const result = formatValueHandler(value, key, controlsMap);
-  expect(result).toEqual(expected);
-});
-
-test('isEqualish considers null, undefined, {} and [] as equal', () => {
-  expect(isEqualish(null, undefined)).toBe(true);
-  expect(isEqualish(null, [])).toBe(true);
-  expect(isEqualish(null, {})).toBe(true);
-  expect(isEqualish(undefined, {})).toBe(true);
-});
-
-test('isEqualish considers empty strings equal to null', () => {
-  expect(isEqualish(undefined, '')).toBe(true);
-  expect(isEqualish(null, '')).toBe(true);
-});
-
-test('isEqualish considers deeply equal objects equal', () => {
-  const obj1 = { a: { b: { c: 1 } } };
-  const obj2 = { a: { b: { c: 1 } } };
-  expect(isEqualish('', '')).toBe(true);
-  expect(isEqualish(obj1, obj2)).toBe(true);
-  // Actually  not equal
-  expect(isEqualish({ a: 1, b: 2, z: 9 }, { a: 1, b: 2, c: 3 })).toBe(false);
-});
diff --git a/superset-frontend/src/components/AlteredSliceTag/AlteredSliceTag.test.tsx b/superset-frontend/src/components/AlteredSliceTag/AlteredSliceTag.test.tsx
new file mode 100644
index 00000000000..515b6d9fc0b
--- /dev/null
+++ b/superset-frontend/src/components/AlteredSliceTag/AlteredSliceTag.test.tsx
@@ -0,0 +1,97 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { render, screen, userEvent } from 'spec/helpers/testing-library';
+import { QueryFormData } from '@superset-ui/core';
+import { AlteredSliceTag } from '.';
+import { defaultProps, expectedDiffs } from './AlteredSliceTagMocks';
+
+test('renders the "Altered" label', () => {
+  render(
+    <AlteredSliceTag
+      origFormData={defaultProps.origFormData}
+      currentFormData={defaultProps.currentFormData}
+      diffs={expectedDiffs}
+    />,
+  );
+
+  const alteredLabel: HTMLElement = screen.getByText('Altered');
+  expect(alteredLabel).toBeInTheDocument();
+});
+
+test('opens the modal on click', () => {
+  render(
+    <AlteredSliceTag
+      origFormData={defaultProps.origFormData}
+      currentFormData={defaultProps.currentFormData}
+      diffs={expectedDiffs}
+    />,
+  );
+
+  const alteredLabel: HTMLElement = screen.getByText('Altered');
+  userEvent.click(alteredLabel);
+
+  const modalTitle: HTMLElement = screen.getByText('Chart changes');
+
+  expect(modalTitle).toBeInTheDocument();
+});
+
+test('displays the differences in the modal', () => {
+  render(
+    <AlteredSliceTag
+      origFormData={defaultProps.origFormData}
+      currentFormData={defaultProps.currentFormData}
+      diffs={expectedDiffs}
+    />,
+  );
+
+  const alteredLabel: HTMLElement = screen.getByText('Altered');
+  userEvent.click(alteredLabel);
+
+  const beforeValue: HTMLElement = screen.getByText('1, 2, 3, 4');
+  const afterValue: HTMLElement = screen.getByText('a, b, c, d');
+
+  expect(beforeValue).toBeInTheDocument();
+  expect(afterValue).toBeInTheDocument();
+});
+
+test('does not render anything if there are no differences', () => {
+  render(
+    <AlteredSliceTag
+      origFormData={defaultProps.origFormData}
+      currentFormData={defaultProps.origFormData}
+      diffs={{}}
+    />,
+  );
+
+  const alteredLabel: HTMLElement | null = screen.queryByText('Altered');
+
+  expect(alteredLabel).not.toBeInTheDocument();
+});
+
+test('does not render the altered label if diffs is empty', () => {
+  render(
+    <AlteredSliceTag
+      origFormData={{ viz_type: 'altered_slice_tag_spec' } as QueryFormData}
+      currentFormData={{ viz_type: 'altered_slice_tag_spec' } as QueryFormData}
+      diffs={{}}
+    />,
+  );
+
+  expect(screen.queryByText('Altered')).not.toBeInTheDocument();
+});
diff --git a/superset-frontend/src/components/AlteredSliceTag/AlteredSliceTagMocks.ts b/superset-frontend/src/components/AlteredSliceTag/AlteredSliceTagMocks.ts
index 6428b503b85..1f54bdfbdea 100644
--- a/superset-frontend/src/components/AlteredSliceTag/AlteredSliceTagMocks.ts
+++ b/superset-frontend/src/components/AlteredSliceTag/AlteredSliceTagMocks.ts
@@ -18,10 +18,16 @@
  */
 import { QueryFormData } from '@superset-ui/core';
 import { ControlPanelConfig } from '@superset-ui/chart-controls';
-import { DiffType, RowType } from './index';
+import type { DiffType } from 'src/types/DiffType';
+import { getChartFormDiffs } from 'src/utils/getChartFormDiffs';
+import type { RowType } from './types';
 
-export const defaultProps: Record<string, Partial<QueryFormData>> = {
+export const defaultProps: {
+  origFormData: QueryFormData;
+  currentFormData: QueryFormData;
+} = {
   origFormData: {
+    datasource: '123__table',
     viz_type: 'altered_slice_tag_spec',
     adhoc_filters: [
       {
@@ -40,7 +46,10 @@ export const defaultProps: Record<string, Partial<QueryFormData>> = {
     never: 5,
     ever: { a: 'b', c: 'd' },
   },
+
   currentFormData: {
+    datasource: '123__table',
+    viz_type: 'altered_slice_tag_spec',
     adhoc_filters: [
       {
         clause: 'WHERE',
@@ -106,6 +115,7 @@ export const expectedDiffs: Record<string, DiffType> = {
     after: { x: 'y', z: 'z' },
   },
 };
+
 export const expectedRows: RowType[] = [
   {
     control: 'Fake Filters',
@@ -131,6 +141,7 @@ export const expectedRows: RowType[] = [
     after: '{"x":"y","z":"z"}',
   },
 ];
+
 export const fakePluginControls: ControlPanelConfig = {
   controlPanelSections: [
     {
@@ -175,3 +186,6 @@ export const fakePluginControls: ControlPanelConfig = {
     },
   ],
 };
+
+export const createDiffs = (original: QueryFormData, current: QueryFormData) =>
+  getChartFormDiffs(original, current);
diff --git a/superset-frontend/src/components/AlteredSliceTag/index.tsx b/superset-frontend/src/components/AlteredSliceTag/index.tsx
index d433fe53267..b9025fd2d26 100644
--- a/superset-frontend/src/components/AlteredSliceTag/index.tsx
+++ b/superset-frontend/src/components/AlteredSliceTag/index.tsx
@@ -16,193 +16,53 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { useCallback, useEffect, useMemo, useState, FC } from 'react';
-
-import { isEqual, isEmpty } from 'lodash';
-import { QueryFormData, t } from '@superset-ui/core';
-import { sanitizeFormData } from 'src/explore/exploreUtils/formData';
+import { useEffect, useMemo, useState, FC } from 'react';
+import { isEmpty } from 'lodash';
+import { t } from '@superset-ui/core';
 import getControlsForVizType from 'src/utils/getControlsForVizType';
-import Label from 'src/components/Label';
-import { Icons } from 'src/components/Icons';
-import { safeStringify } from 'src/utils/safeStringify';
-import { Tooltip } from 'src/components/Tooltip';
-import ModalTrigger from '../ModalTrigger';
-import TableView from '../TableView';
+import {
+  Label,
+  Icons,
+  Tooltip,
+  ModalTrigger,
+  TableView,
+} from '@superset-ui/core/components';
+import type { AlteredSliceTagProps, ControlMap, RowType } from './types';
+import { getRowsFromDiffs } from './utils';
 
-interface AlteredSliceTagProps {
-  origFormData: QueryFormData;
-  currentFormData: QueryFormData;
-}
-
-export interface ControlMap {
-  [key: string]: {
-    label?: string;
-    type?: string;
-  };
-}
-
-type FilterItemType = {
-  comparator?: string | string[];
-  subject: string;
-  operator: string;
-  label?: string;
-};
-
-export type DiffItemType<
-  T = FilterItemType | number | string | Record<string | number, any>,
-> =
-  | T[]
-  | boolean
-  | number
-  | string
-  | Record<string | number, any>
-  | null
-  | undefined;
-
-export type DiffType = {
-  before: DiffItemType;
-  after: DiffItemType;
-};
-
-export type RowType = {
-  before: string | number;
-  after: string | number;
-  control: string;
-};
-
-export const alterForComparison = (
-  value?: string | null | [],
-): string | null => {
-  // Treat `null`, `undefined`, and empty strings as equivalent
-  if (value === undefined || value === null || value === '') {
-    return null;
-  }
-  // Treat empty arrays and objects as equivalent to null
-  if (Array.isArray(value) && value.length === 0) {
-    return null;
-  }
-  if (typeof value === 'object' && Object.keys(value).length === 0) {
-    return null;
-  }
-  return value;
-};
-
-export const formatValueHandler = (
-  value: DiffItemType,
-  key: string,
-  controlsMap: ControlMap,
-): string | number => {
-  if (value === undefined) {
-    return 'N/A';
-  }
-  if (value === null) {
-    return 'null';
-  }
-  if (typeof value === 'boolean') {
-    return value ? 'true' : 'false';
-  }
-  if (controlsMap[key]?.type === 'AdhocFilterControl' && Array.isArray(value)) {
-    if (!value.length) {
-      return '[]';
-    }
-    return value
-      .map((v: FilterItemType) => {
-        const filterVal =
-          v.comparator && v.comparator.constructor === Array
-            ? `[${v.comparator.join(', ')}]`
-            : v.comparator;
-        return `${v.subject} ${v.operator} ${filterVal}`;
-      })
-      .join(', ');
-  }
-  if (controlsMap[key]?.type === 'BoundsControl' && Array.isArray(value)) {
-    return `Min: ${value[0]}, Max: ${value[1]}`;
-  }
-  if (controlsMap[key]?.type === 'CollectionControl' && Array.isArray(value)) {
-    return value.map((v: FilterItemType) => safeStringify(v)).join(', ');
-  }
-  if (
-    controlsMap[key]?.type === 'MetricsControl' &&
-    value.constructor === Array
-  ) {
-    const formattedValue = value.map((v: FilterItemType) => v?.label ?? v);
-    return formattedValue.length ? formattedValue.join(', ') : '[]';
-  }
-  if (Array.isArray(value)) {
-    const formattedValue = value.map((v: FilterItemType) => v?.label ?? v);
-    return formattedValue.length ? formattedValue.join(', ') : '[]';
-  }
-  if (typeof value === 'string' || typeof value === 'number') {
-    return value;
-  }
-  return safeStringify(value);
-};
-
-export const getRowsFromDiffs = (
-  diffs: { [key: string]: DiffType },
-  controlsMap: ControlMap,
-): RowType[] =>
-  Object.entries(diffs).map(([key, diff]) => ({
-    control: controlsMap[key]?.label || key,
-    before: formatValueHandler(diff.before, key, controlsMap),
-    after: formatValueHandler(diff.after, key, controlsMap),
-  }));
-
-export const isEqualish = (val1: string, val2: string): boolean =>
-  isEqual(alterForComparison(val1), alterForComparison(val2));
-
-const AlteredSliceTag: FC<AlteredSliceTagProps> = props => {
+export const AlteredSliceTag: FC<AlteredSliceTagProps> = props => {
   const [rows, setRows] = useState<RowType[]>([]);
   const [hasDiffs, setHasDiffs] = useState<boolean>(false);
 
-  const getDiffs = useCallback(() => {
-    // Returns all properties that differ in the
-    // current form data and the saved form data
-    const ofd = sanitizeFormData(props.origFormData);
-    const cfd = sanitizeFormData(props.currentFormData);
-
-    const fdKeys = Object.keys(cfd);
-    const diffs: { [key: string]: DiffType } = {};
-    fdKeys.forEach(fdKey => {
-      if (!ofd[fdKey] && !cfd[fdKey]) {
-        return;
-      }
-      if (['filters', 'having', 'where'].includes(fdKey)) {
-        return;
-      }
-      if (!isEqualish(ofd[fdKey], cfd[fdKey])) {
-        diffs[fdKey] = { before: ofd[fdKey], after: cfd[fdKey] };
-      }
-    });
-    return diffs;
-  }, [props.currentFormData, props.origFormData]);
-
   useEffect(() => {
-    const diffs = getDiffs();
     const controlsMap = getControlsForVizType(
       props.origFormData?.viz_type,
     ) as ControlMap;
-    setRows(getRowsFromDiffs(diffs, controlsMap));
-    setHasDiffs(!isEmpty(diffs));
-  }, [getDiffs, props.origFormData?.viz_type]);
+
+    setRows(getRowsFromDiffs(props.diffs, controlsMap));
+    setHasDiffs(!isEmpty(props.diffs));
+  }, [props.diffs, props.origFormData?.viz_type]);
 
   const modalBody = useMemo(() => {
     const columns = [
       {
         accessor: 'control',
         Header: t('Control'),
+        id: 'control',
       },
       {
         accessor: 'before',
         Header: t('Before'),
+        id: 'before',
       },
       {
         accessor: 'after',
         Header: t('After'),
+        id: 'after',
       },
     ];
     // set the wrap text in the specific columns.
-    const columnsForWrapText = ['Control', 'Before', 'After'];
+    const columnsForWrapText = ['control', 'before', 'after'];
 
     return (
       <TableView
@@ -245,4 +105,4 @@ const AlteredSliceTag: FC<AlteredSliceTagProps> = props => {
   );
 };
 
-export default AlteredSliceTag;
+export type { AlteredSliceTagProps };
diff --git a/superset-frontend/src/components/IndeterminateCheckbox/IndeterminateCheckbox.stories.tsx b/superset-frontend/src/components/AlteredSliceTag/types.ts
similarity index 64%
rename from superset-frontend/src/components/IndeterminateCheckbox/IndeterminateCheckbox.stories.tsx
rename to superset-frontend/src/components/AlteredSliceTag/types.ts
index d210c255073..44c6796e361 100644
--- a/superset-frontend/src/components/IndeterminateCheckbox/IndeterminateCheckbox.stories.tsx
+++ b/superset-frontend/src/components/AlteredSliceTag/types.ts
@@ -16,21 +16,25 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import IndeterminateCheckbox, { IndeterminateCheckboxProps } from '.';
+import type { QueryFormData } from '@superset-ui/core';
+import { DiffType } from 'src/types/DiffType';
 
-export default {
-  title: 'IndeterminateCheckbox',
-  component: IndeterminateCheckbox,
-};
-
-export const InteractiveIndeterminateCheckbox = (
-  args: IndeterminateCheckboxProps,
-) => <IndeterminateCheckbox {...args} />;
-
-InteractiveIndeterminateCheckbox.args = {
-  checked: false,
-  id: 'checkbox-id',
-  indeterminate: false,
-  title: 'Checkbox title',
-  onChange: () => null,
+export interface AlteredSliceTagProps {
+  className?: string;
+  diffs: Record<string, DiffType>;
+  origFormData: QueryFormData;
+  currentFormData: QueryFormData;
+}
+
+export interface ControlMap {
+  [key: string]: {
+    label?: string;
+    type?: string;
+  };
+}
+
+export type RowType = {
+  before: string | number;
+  after: string | number;
+  control: string;
 };
diff --git a/superset-frontend/src/components/AlteredSliceTag/utils/index.ts b/superset-frontend/src/components/AlteredSliceTag/utils/index.ts
new file mode 100644
index 00000000000..482a4332621
--- /dev/null
+++ b/superset-frontend/src/components/AlteredSliceTag/utils/index.ts
@@ -0,0 +1,107 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { DiffItemType, DiffType, FilterItemType } from 'src/types/DiffType';
+import { safeStringify } from 'src/utils/safeStringify';
+import { ControlMap, RowType } from '../types';
+
+export const alterForComparison = (value?: unknown): unknown => {
+  // Treat `null`, `undefined`, and empty strings as equivalent
+  if (value === undefined || value === null || value === '') return null;
+
+  // Treat empty arrays and objects as equivalent to null
+  if (Array.isArray(value) && value.length === 0) return null;
+
+  if (typeof value === 'object' && Object.keys(value).length === 0) return null;
+
+  return value;
+};
+
+export const formatValueHandler = (
+  value: DiffItemType,
+  key = '',
+  controlsMap: ControlMap,
+): string | number => {
+  if (value === undefined) return 'N/A';
+
+  if (value === null) return 'null';
+
+  if (typeof value === 'boolean') return value ? 'true' : 'false';
+
+  if (controlsMap[key]?.type === 'AdhocFilterControl' && Array.isArray(value)) {
+    if (!value.length) return '[]';
+
+    return value
+      .map((v: FilterItemType): string => {
+        const filterVal: string | string[] | undefined =
+          v.comparator && v.comparator.constructor === Array
+            ? `[${v.comparator.join(', ')}]`
+            : v.comparator;
+        return `${v.subject} ${v.operator} ${filterVal}`;
+      })
+      .join(', ');
+  }
+
+  if (controlsMap[key]?.type === 'BoundsControl' && Array.isArray(value))
+    return `Min: ${value[0]}, Max: ${value[1]}`;
+
+  if (controlsMap[key]?.type === 'CollectionControl' && Array.isArray(value))
+    return value
+      .map((v: FilterItemType): string => safeStringify(v))
+      .join(', ');
+
+  if (
+    controlsMap[key]?.type === 'MetricsControl' &&
+    value.constructor === Array
+  ) {
+    const formattedValue: (string | FilterItemType)[] = value.map(
+      (v: FilterItemType): string | FilterItemType => v?.label ?? v,
+    );
+    return formattedValue.length ? formattedValue.join(', ') : '[]';
+  }
+
+  if (Array.isArray(value)) {
+    const formattedValue = value.map((v: any) => {
+      if (
+        typeof v === 'object' &&
+        v !== null &&
+        'label' in v &&
+        typeof v.label === 'string'
+      )
+        return v.label;
+
+      return String(v);
+    });
+
+    return formattedValue.length ? formattedValue.join(', ') : '[]';
+  }
+
+  if (typeof value === 'string' || typeof value === 'number') return value;
+
+  return safeStringify(value);
+};
+
+export const getRowsFromDiffs = (
+  diffs: { [key: string]: DiffType },
+  controlsMap: ControlMap,
+): RowType[] =>
+  Object.entries(diffs).map(([key, diff]: [string, DiffType]) => ({
+    control: controlsMap[key]?.label || key,
+    before: formatValueHandler(diff.before, key, controlsMap),
+    after: formatValueHandler(diff.after, key, controlsMap),
+  }));
diff --git a/superset-frontend/src/components/AlteredSliceTag/utils/utils.test.ts b/superset-frontend/src/components/AlteredSliceTag/utils/utils.test.ts
new file mode 100644
index 00000000000..861686e7c46
--- /dev/null
+++ b/superset-frontend/src/components/AlteredSliceTag/utils/utils.test.ts
@@ -0,0 +1,291 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { alterForComparison, formatValueHandler, getRowsFromDiffs } from '.';
+import { RowType } from '../types';
+
+describe('alterForComparison', () => {
+  it('returns null for undefined value', () => {
+    expect(alterForComparison(undefined)).toBeNull();
+  });
+
+  it('returns null for null value', () => {
+    expect(alterForComparison(null)).toBeNull();
+  });
+
+  it('returns null for empty string value', () => {
+    expect(alterForComparison('')).toBeNull();
+  });
+
+  it('returns null for empty array value', () => {
+    expect(alterForComparison([])).toBeNull();
+  });
+
+  it('returns null for empty object value', () => {
+    expect(alterForComparison({})).toBeNull();
+  });
+
+  it('returns value for non-empty array', () => {
+    const value = [1, 2, 3];
+    expect(alterForComparison(value)).toEqual(value);
+  });
+
+  it('returns value for non-empty object', () => {
+    const value = { key: 'value' };
+    expect(alterForComparison(value)).toEqual(value);
+  });
+});
+
+describe('formatValueHandler', () => {
+  const controlsMap = {
+    b: { type: 'BoundsControl', label: 'Bounds' },
+    column_collection: { type: 'CollectionControl', label: 'Collection' },
+    metrics: { type: 'MetricsControl', label: 'Metrics' },
+    adhoc_filters: { type: 'AdhocFilterControl', label: 'Adhoc' },
+    other_control: { type: 'OtherControl', label: 'Other' },
+  };
+
+  it('handles undefined value', () => {
+    const value = undefined;
+    const key = 'b';
+
+    const formattedValue: string | number = formatValueHandler(
+      value,
+      key,
+      controlsMap,
+    );
+
+    expect(formattedValue).toBe('N/A');
+  });
+
+  it('handles null value', () => {
+    const value = null;
+    const key = 'b';
+
+    const formattedValue: string | number = formatValueHandler(
+      value,
+      key,
+      controlsMap,
+    );
+
+    expect(formattedValue).toBe('null');
+  });
+
+  it('returns "[]" for empty filters', () => {
+    const value: unknown[] = [];
+    const key = 'adhoc_filters';
+
+    const formattedValue: string | number = formatValueHandler(
+      value,
+      key,
+      controlsMap,
+    );
+
+    expect(formattedValue).toBe('[]');
+  });
+
+  it('formats filters with array values', () => {
+    const filters = [
+      {
+        clause: 'WHERE',
+        comparator: ['1', 'g', '7', 'ho'],
+        expressionType: 'SIMPLE',
+        operator: 'IN',
+        subject: 'a',
+      },
+      {
+        clause: 'WHERE',
+        comparator: ['hu', 'ho', 'ha'],
+        expressionType: 'SIMPLE',
+        operator: 'NOT IN',
+        subject: 'b',
+      },
+    ];
+    const key = 'adhoc_filters';
+
+    const expected = 'a IN [1, g, 7, ho], b NOT IN [hu, ho, ha]';
+    const formattedValue: string | number = formatValueHandler(
+      filters,
+      key,
+      controlsMap,
+    );
+
+    expect(formattedValue).toBe(expected);
+  });
+
+  it('formats filters with string values', () => {
+    const filters = [
+      {
+        clause: 'WHERE',
+        comparator: 'gucci',
+        expressionType: 'SIMPLE',
+        operator: '==',
+        subject: 'a',
+      },
+      {
+        clause: 'WHERE',
+        comparator: 'moshi moshi',
+        expressionType: 'SIMPLE',
+        operator: 'LIKE',
+        subject: 'b',
+      },
+    ];
+
+    const key = 'adhoc_filters';
+    const expected = 'a == gucci, b LIKE moshi moshi';
+    const formattedValue: string | number = formatValueHandler(
+      filters,
+      key,
+      controlsMap,
+    );
+
+    expect(formattedValue).toBe(expected);
+  });
+
+  it('formats "Min" and "Max" for BoundsControl', () => {
+    const value: number[] = [1, 2];
+    const key = 'b';
+
+    const result: string | number = formatValueHandler(value, key, controlsMap);
+
+    expect(result).toEqual('Min: 1, Max: 2');
+  });
+
+  it('formats stringified objects for CollectionControl', () => {
+    const value = [{ a: 1 }, { b: 2 }];
+    const key = 'column_collection';
+
+    const result: string | number = formatValueHandler(value, key, controlsMap);
+
+    expect(result).toEqual(
+      `${JSON.stringify(value[0])}, ${JSON.stringify(value[1])}`,
+    );
+  });
+
+  it('formats MetricsControl values correctly', () => {
+    const value = [{ label: 'SUM(Sales)' }, { label: 'Metric2' }];
+    const key = 'metrics';
+
+    const result: string | number = formatValueHandler(value, key, controlsMap);
+
+    expect(result).toEqual('SUM(Sales), Metric2');
+  });
+
+  it('formats boolean values as string', () => {
+    const value1 = true;
+    const value2 = false;
+    const key = 'b';
+
+    const formattedValue1: string | number = formatValueHandler(
+      value1,
+      key,
+      controlsMap,
+    );
+    const formattedValue2: string | number = formatValueHandler(
+      value2,
+      key,
+      controlsMap,
+    );
+
+    expect(formattedValue1).toBe('true');
+    expect(formattedValue2).toBe('false');
+  });
+
+  it('formats array values correctly', () => {
+    const value = [
+      { label: 'Label1' },
+      { label: 'Label2' },
+      5,
+      6,
+      7,
+      8,
+      'hello',
+      'goodbye',
+    ];
+
+    const expected = 'Label1, Label2, 5, 6, 7, 8, hello, goodbye';
+    const result: string | number = formatValueHandler(
+      value,
+      undefined,
+      controlsMap,
+    );
+
+    expect(result).toEqual(expected);
+  });
+
+  it('formats string values correctly', () => {
+    const value = 'test';
+    const key = 'other_control';
+
+    const result: string | number = formatValueHandler(value, key, controlsMap);
+
+    expect(result).toEqual('test');
+  });
+
+  it('formats number values correctly', () => {
+    const value = 123;
+    const key = 'other_control';
+
+    const result: string | number = formatValueHandler(value, key, controlsMap);
+
+    expect(result).toEqual(123);
+  });
+
+  it('formats object values correctly', () => {
+    const value = { 1: 2, alpha: 'bravo' };
+    const key = 'other_control';
+    const expected = '{"1":2,"alpha":"bravo"}';
+
+    const result: string | number = formatValueHandler(value, key, controlsMap);
+
+    expect(result).toEqual(expected);
+  });
+});
+
+describe('getRowsFromDiffs', () => {
+  it('returns formatted rows for diffs', () => {
+    const diffs = {
+      metric: { before: [{ label: 'old' }], after: [{ label: 'new' }] },
+      limit: { before: 10, after: 20 },
+    };
+
+    const controlsMap = {
+      metric: { label: 'Metric', type: 'MetricsControl' },
+      limit: { label: 'Row Limit', type: 'TextControl' },
+    };
+
+    const rows: RowType[] = getRowsFromDiffs(diffs, controlsMap);
+
+    expect(rows).toEqual([
+      { control: 'Metric', before: 'old', after: 'new' },
+      { control: 'Row Limit', before: 10, after: 20 },
+    ]);
+  });
+
+  it('falls back to key if label is missing', () => {
+    const diffs = {
+      unknown: { before: 'a', after: 'b' },
+    };
+
+    const controlsMap = {};
+    const rows: RowType[] = getRowsFromDiffs(diffs, controlsMap);
+
+    expect(rows).toEqual([{ control: 'unknown', before: 'a', after: 'b' }]);
+  });
+});
diff --git a/superset-frontend/src/components/AuditInfo/ModifiedInfo.test.tsx b/superset-frontend/src/components/AuditInfo/ModifiedInfo.test.tsx
index 11f9e95ca2e..177772b4df6 100644
--- a/superset-frontend/src/components/AuditInfo/ModifiedInfo.test.tsx
+++ b/superset-frontend/src/components/AuditInfo/ModifiedInfo.test.tsx
@@ -39,7 +39,7 @@ test('should render a tooltip when user is provided', async () => {
   expect(dateElement).toBeInTheDocument();
   expect(screen.getByText(TEST_DATE)).toBeInTheDocument();
   expect(screen.queryByText('Modified by: Foo Bar')).not.toBeInTheDocument();
-  userEvent.hover(dateElement);
+  await userEvent.hover(dateElement);
   const tooltip = await screen.findByRole('tooltip');
   expect(tooltip).toBeInTheDocument();
   expect(screen.getByText('Modified by: Foo Bar')).toBeInTheDocument();
@@ -51,7 +51,7 @@ test('should render only the date if username is not provided', async () => {
   const dateElement = screen.getByTestId('audit-info-date');
   expect(dateElement).toBeInTheDocument();
   expect(screen.getByText(TEST_DATE)).toBeInTheDocument();
-  userEvent.hover(dateElement);
+  await userEvent.hover(dateElement);
   await waitFor(
     () => {
       const tooltip = screen.queryByRole('tooltip');
diff --git a/superset-frontend/src/components/AuditInfo/index.tsx b/superset-frontend/src/components/AuditInfo/index.tsx
index ae594fa7d8c..2bb34906e23 100644
--- a/superset-frontend/src/components/AuditInfo/index.tsx
+++ b/superset-frontend/src/components/AuditInfo/index.tsx
@@ -16,15 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import Owner from 'src/types/Owner';
-import { Tooltip } from 'src/components/Tooltip';
 import getOwnerName from 'src/utils/getOwnerName';
 import { t } from '@superset-ui/core';
-
-export type ModifiedInfoProps = {
-  user?: Owner;
-  date: string;
-};
+import { Tooltip } from '@superset-ui/core/components';
+import type { ModifiedInfoProps } from './types';
 
 export const ModifiedInfo = ({ user, date }: ModifiedInfoProps) => {
   const dateSpan = (
@@ -44,3 +39,5 @@ export const ModifiedInfo = ({ user, date }: ModifiedInfoProps) => {
   }
   return dateSpan;
 };
+
+export type { ModifiedInfoProps };
diff --git a/superset-frontend/src/components/AuditInfo/types.ts b/superset-frontend/src/components/AuditInfo/types.ts
new file mode 100644
index 00000000000..06166b78375
--- /dev/null
+++ b/superset-frontend/src/components/AuditInfo/types.ts
@@ -0,0 +1,24 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 type Owner from 'src/types/Owner';
+
+export type ModifiedInfoProps = {
+  user?: Owner;
+  date: string;
+};
diff --git a/superset-frontend/src/components/Button/index.tsx b/superset-frontend/src/components/Button/index.tsx
deleted file mode 100644
index aa447e13bcf..00000000000
--- a/superset-frontend/src/components/Button/index.tsx
+++ /dev/null
@@ -1,262 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 {
-  Children,
-  ReactElement,
-  ReactNode,
-  Fragment,
-  MouseEventHandler,
-} from 'react';
-
-import { mix } from 'polished';
-import cx from 'classnames';
-import { Button as AntdButton } from 'antd-v5';
-import { useTheme } from '@superset-ui/core';
-import { Tooltip, TooltipProps } from 'src/components/Tooltip';
-import { ButtonProps as AntdButtonProps } from 'antd-v5/lib/button';
-
-export type OnClickHandler = MouseEventHandler<HTMLElement>;
-
-export type ButtonStyle =
-  | 'primary'
-  | 'secondary'
-  | 'tertiary'
-  | 'success'
-  | 'warning'
-  | 'danger'
-  | 'default'
-  | 'link'
-  | 'dashed';
-
-export type ButtonSize = 'default' | 'small' | 'xsmall';
-
-export type ButtonProps = Omit<AntdButtonProps, 'css'> &
-  Pick<TooltipProps, 'placement'> & {
-    tooltip?: ReactNode;
-    className?: string;
-    buttonSize?: ButtonSize;
-    buttonStyle?: ButtonStyle;
-    cta?: boolean;
-    showMarginRight?: boolean;
-  };
-
-const decideType = (buttonStyle: ButtonStyle) => {
-  const typeMap: Record<
-    ButtonStyle,
-    'primary' | 'default' | 'dashed' | 'link'
-  > = {
-    primary: 'primary',
-    danger: 'primary',
-    warning: 'primary',
-    success: 'primary',
-    secondary: 'default',
-    default: 'default',
-    tertiary: 'default',
-    dashed: 'dashed',
-    link: 'link',
-  };
-
-  return typeMap[buttonStyle];
-};
-
-export default function Button(props: ButtonProps) {
-  const {
-    tooltip,
-    placement,
-    disabled = false,
-    buttonSize,
-    buttonStyle,
-    className,
-    cta,
-    children,
-    href,
-    showMarginRight = true,
-    ...restProps
-  } = props;
-
-  const theme = useTheme();
-  const { colors, transitionTiming, borderRadius, typography } = theme;
-  const { primary, grayscale, success, warning } = colors;
-
-  let height = 32;
-  let padding = 18;
-  if (buttonSize === 'xsmall') {
-    height = 22;
-    padding = 5;
-  } else if (buttonSize === 'small') {
-    height = 30;
-    padding = 10;
-  }
-
-  let backgroundColor;
-  let backgroundColorHover;
-  let backgroundColorActive;
-  let backgroundColorDisabled = grayscale.light2;
-  let color;
-  let colorHover;
-  let borderWidth = 0;
-  let borderStyle = 'none';
-  let borderColor;
-  let borderColorHover;
-  let borderColorDisabled = 'transparent';
-
-  if (buttonStyle === 'tertiary' || buttonStyle === 'dashed') {
-    backgroundColor = grayscale.light5;
-    backgroundColorHover = grayscale.light5;
-    backgroundColorActive = grayscale.light5;
-    backgroundColorDisabled = grayscale.light5;
-    borderWidth = 1;
-    borderStyle = buttonStyle === 'dashed' ? 'dashed' : 'solid';
-    borderColor = primary.dark1;
-    borderColorHover = primary.light1;
-    borderColorDisabled = grayscale.light2;
-  } else if (buttonStyle === 'danger') {
-    colorHover = color;
-  } else if (buttonStyle === 'warning') {
-    backgroundColor = warning.base;
-    backgroundColorHover = mix(0.1, grayscale.dark2, warning.base);
-    backgroundColorActive = mix(0.2, grayscale.dark2, warning.base);
-    color = grayscale.light5;
-    colorHover = color;
-  } else if (buttonStyle === 'success') {
-    backgroundColor = success.base;
-    backgroundColorHover = mix(0.1, grayscale.light5, success.base);
-    backgroundColorActive = mix(0.2, grayscale.dark2, success.base);
-    color = grayscale.light5;
-    colorHover = color;
-  } else if (buttonStyle === 'link') {
-    backgroundColor = 'transparent';
-    backgroundColorHover = 'transparent';
-    backgroundColorActive = 'transparent';
-    color = primary.dark1;
-  }
-
-  const element = children as ReactElement;
-
-  let renderedChildren = [];
-  if (element && element.type === Fragment) {
-    renderedChildren = Children.toArray(element.props.children);
-  } else {
-    renderedChildren = Children.toArray(children);
-  }
-  const firstChildMargin =
-    showMarginRight && renderedChildren.length > 1 ? theme.gridUnit * 2 : 0;
-
-  const effectiveButtonStyle: ButtonStyle = buttonStyle ?? 'default';
-
-  const button = (
-    <AntdButton
-      href={disabled ? undefined : href}
-      disabled={disabled}
-      type={decideType(effectiveButtonStyle)}
-      danger={effectiveButtonStyle === 'danger'}
-      className={cx(
-        className,
-        'superset-button',
-        // A static class name containing the button style is available to
-        // support customizing button styles in embedded dashboards.
-        `superset-button-${buttonStyle}`,
-        { cta: !!cta },
-      )}
-      css={{
-        display: 'inline-flex',
-        alignItems: 'center',
-        justifyContent: 'center',
-        lineHeight: 1.5715,
-        fontSize: typography.sizes.s,
-        fontWeight: typography.weights.bold,
-        height,
-        padding: `0px ${padding}px`,
-        transition: `all ${transitionTiming}s`,
-        minWidth: cta ? theme.gridUnit * 36 : undefined,
-        minHeight: cta ? theme.gridUnit * 8 : undefined,
-        boxShadow: 'none',
-        borderWidth,
-        borderStyle,
-        borderColor,
-        borderRadius,
-        color,
-        background: backgroundColor,
-        ...(colorHover || backgroundColorHover || borderColorHover
-          ? {
-              [`&.superset-button.superset-button-${buttonStyle}:hover`]: {
-                ...(colorHover && { color: colorHover }),
-                ...(backgroundColorHover && {
-                  background: backgroundColorHover,
-                }),
-                ...(borderColorHover && { borderColor: borderColorHover }),
-              },
-            }
-          : {}),
-        '&:active': {
-          color,
-          backgroundColor: backgroundColorActive,
-        },
-        '&:focus': {
-          color,
-          backgroundColor,
-          borderColor,
-        },
-        '&[disabled], &[disabled]:hover': {
-          color: grayscale.base,
-          backgroundColor:
-            buttonStyle === 'link' ? 'transparent' : backgroundColorDisabled,
-          borderColor:
-            buttonStyle === 'link' ? 'transparent' : borderColorDisabled,
-          pointerEvents: 'none',
-        },
-        marginLeft: 0,
-        '& + .superset-button': {
-          marginLeft: theme.gridUnit * 2,
-        },
-        '& > span > :first-of-type': {
-          marginRight: firstChildMargin,
-        },
-      }}
-      {...restProps}
-    >
-      {children}
-    </AntdButton>
-  );
-
-  if (tooltip) {
-    return (
-      <Tooltip placement={placement} title={tooltip}>
-        {/* wrap the button in a span so that the tooltip shows up
-        when the button is disabled. */}
-        {disabled ? (
-          <span
-            css={{
-              cursor: 'not-allowed',
-              '& > .superset-button': {
-                marginLeft: theme.gridUnit * 2,
-              },
-            }}
-          >
-            {button}
-          </span>
-        ) : (
-          button
-        )}
-      </Tooltip>
-    );
-  }
-
-  return button;
-}
diff --git a/superset-frontend/src/components/Chart/Chart.tsx b/superset-frontend/src/components/Chart/Chart.tsx
index 94f521bcd1f..c4d89b5eb13 100644
--- a/superset-frontend/src/components/Chart/Chart.tsx
+++ b/superset-frontend/src/components/Chart/Chart.tsx
@@ -30,9 +30,8 @@ import {
   ChartDataResponse,
 } from '@superset-ui/core';
 import { PLACEHOLDER_DATASOURCE } from 'src/dashboard/constants';
-import Loading from 'src/components/Loading';
-import { EmptyState } from 'src/components/EmptyState';
-import ErrorBoundary from 'src/components/ErrorBoundary';
+import { EmptyState, Loading } from '@superset-ui/core/components';
+import { ErrorBoundary } from 'src/components';
 import { Logger, LOG_ACTIONS_RENDER_CHART } from 'src/logger/LogUtils';
 import { URL_PARAMS } from 'src/constants';
 import { getUrlParam } from 'src/utils/urlUtils';
@@ -136,7 +135,7 @@ const Styles = styled.div<{ height: number; width?: number }>`
 
   .chart-tooltip {
     opacity: 0.75;
-    font-size: ${({ theme }) => theme.typography.sizes.s}px;
+    font-size: ${({ theme }) => theme.fontSizeSM}px;
   }
 
   .slice_container {
@@ -151,7 +150,7 @@ const Styles = styled.div<{ height: number; width?: number }>`
     }
 
     .alert {
-      margin: ${({ theme }) => theme.gridUnit * 2}px;
+      margin: ${({ theme }) => theme.sizeUnit * 2}px;
     }
   }
 `;
@@ -167,7 +166,7 @@ const LoadingDiv = styled.div`
 const MessageSpan = styled.span`
   display: block;
   text-align: center;
-  margin: ${({ theme }) => theme.gridUnit * 4}px auto;
+  margin: ${({ theme }) => theme.sizeUnit * 4}px auto;
   width: fit-content;
   color: ${({ theme }) => theme.colors.grayscale.base};
 `;
diff --git a/superset-frontend/src/components/Chart/ChartContextMenu/ChartContextMenu.tsx b/superset-frontend/src/components/Chart/ChartContextMenu/ChartContextMenu.tsx
index efea8cc23f8..bda9c13a835 100644
--- a/superset-frontend/src/components/Chart/ChartContextMenu/ChartContextMenu.tsx
+++ b/superset-frontend/src/components/Chart/ChartContextMenu/ChartContextMenu.tsx
@@ -41,9 +41,9 @@ import {
   useTheme,
 } from '@superset-ui/core';
 import { RootState } from 'src/dashboard/types';
-import { Menu } from 'src/components/Menu';
+import { Menu } from '@superset-ui/core/components/Menu';
 import { usePermissions } from 'src/hooks/usePermissions';
-import { Dropdown } from 'src/components/Dropdown';
+import { Dropdown } from '@superset-ui/core/components';
 import { updateDataMask } from 'src/dataMask/actions';
 import DrillByModal from 'src/components/Chart/DrillBy/DrillByModal';
 import { useVerboseMap } from 'src/hooks/apiResources/datasets';
@@ -304,7 +304,7 @@ const ChartContextMenu = (
   return ReactDOM.createPortal(
     <>
       <Dropdown
-        dropdownRender={() => (
+        popupRender={() => (
           <Menu
             className="chart-context-menu"
             data-test="chart-context-menu"
diff --git a/superset-frontend/src/components/Chart/ChartErrorMessage.test.tsx b/superset-frontend/src/components/Chart/ChartErrorMessage.test.tsx
index 6d05a7b9df1..40ce7a86527 100644
--- a/superset-frontend/src/components/Chart/ChartErrorMessage.test.tsx
+++ b/superset-frontend/src/components/Chart/ChartErrorMessage.test.tsx
@@ -22,9 +22,9 @@ import { ChartSource } from 'src/types/ChartSource';
 import { useChartOwnerNames } from 'src/hooks/apiResources';
 import { ResourceStatus } from 'src/hooks/apiResources/apiResources';
 import { ErrorType } from '@superset-ui/core';
+import type { ErrorMessageComponentProps } from 'src/components/ErrorMessage/types';
+import { getErrorMessageComponentRegistry } from 'src/components/ErrorMessage';
 import { ChartErrorMessage } from './ChartErrorMessage';
-import { ErrorMessageComponentProps } from '../ErrorMessage/types';
-import getErrorMessageComponentRegistry from '../ErrorMessage/getErrorMessageComponentRegistry';
 
 // Mock the useChartOwnerNames hook
 jest.mock('src/hooks/apiResources', () => ({
diff --git a/superset-frontend/src/components/Chart/ChartErrorMessage.tsx b/superset-frontend/src/components/Chart/ChartErrorMessage.tsx
index b6d3a851063..3a5d31d3766 100644
--- a/superset-frontend/src/components/Chart/ChartErrorMessage.tsx
+++ b/superset-frontend/src/components/Chart/ChartErrorMessage.tsx
@@ -20,7 +20,7 @@
 import { ClientErrorObject, SupersetError } from '@superset-ui/core';
 import { FC } from 'react';
 import { useChartOwnerNames } from 'src/hooks/apiResources';
-import ErrorMessageWithStackTrace from 'src/components/ErrorMessage/ErrorMessageWithStackTrace';
+import { ErrorMessageWithStackTrace } from 'src/components';
 import { ChartSource } from 'src/types/ChartSource';
 
 export type Props = {
diff --git a/superset-frontend/src/components/Chart/ChartRenderer.jsx b/superset-frontend/src/components/Chart/ChartRenderer.jsx
index 7b641d0eaec..5fd83affa14 100644
--- a/superset-frontend/src/components/Chart/ChartRenderer.jsx
+++ b/superset-frontend/src/components/Chart/ChartRenderer.jsx
@@ -30,7 +30,7 @@ import {
   FeatureFlag,
 } from '@superset-ui/core';
 import { Logger, LOG_ACTIONS_RENDER_CHART } from 'src/logger/LogUtils';
-import { EmptyState } from 'src/components/EmptyState';
+import { EmptyState } from '@superset-ui/core/components';
 import { ChartSource } from 'src/types/ChartSource';
 import ChartContextMenu from './ChartContextMenu/ChartContextMenu';
 
@@ -95,6 +95,7 @@ class ChartRenderer extends Component {
         isFeatureEnabled(FeatureFlag.DrillToDetail),
       inContextMenu: false,
       legendState: undefined,
+      legendIndex: 0,
     };
     this.hasQueryResponseChange = false;
 
@@ -109,6 +110,7 @@ class ChartRenderer extends Component {
     this.handleContextMenuClosed = this.handleContextMenuClosed.bind(this);
     this.handleLegendStateChanged = this.handleLegendStateChanged.bind(this);
     this.onContextMenuFallback = this.onContextMenuFallback.bind(this);
+    this.handleLegendScroll = this.handleLegendScroll.bind(this);
 
     this.hooks = {
       onAddFilter: this.handleAddFilter,
@@ -123,6 +125,7 @@ class ChartRenderer extends Component {
       setDataMask: dataMask => {
         this.props.actions?.updateDataMask(this.props.chartId, dataMask);
       },
+      onLegendScroll: this.handleLegendScroll,
     };
 
     // TODO: queriesResponse comes from Redux store but it's being edited by
@@ -161,6 +164,8 @@ class ChartRenderer extends Component {
         nextProps.labelsColorMap !== this.props.labelsColorMap ||
         nextProps.formData.color_scheme !== this.props.formData.color_scheme ||
         nextProps.formData.stack !== this.props.formData.stack ||
+        nextProps.formData.subcategories !==
+          this.props.formData.subcategories ||
         nextProps.cacheBusterProp !== this.props.cacheBusterProp ||
         nextProps.emitCrossFilters !== this.props.emitCrossFilters
       );
@@ -246,6 +251,10 @@ class ChartRenderer extends Component {
     }
   }
 
+  handleLegendScroll(legendIndex) {
+    this.setState({ legendIndex });
+  }
+
   render() {
     const { chartAlert, chartStatus, chartId, emitCrossFilters } = this.props;
 
@@ -316,7 +325,7 @@ class ChartRenderer extends Component {
       );
     } else {
       noResultsComponent = (
-        <EmptyState size="small" title={noResultTitle} image={noResultImage} />
+        <EmptyState title={noResultTitle} image={noResultImage} size="small" />
       );
     }
 
@@ -372,6 +381,7 @@ class ChartRenderer extends Component {
             emitCrossFilters={emitCrossFilters}
             legendState={this.state.legendState}
             enableNoResults={bypassNoResult}
+            legendIndex={this.state.legendIndex}
             {...drillToDetailProps}
           />
         </div>
diff --git a/superset-frontend/src/components/Chart/DisabledMenuItemTooltip.tsx b/superset-frontend/src/components/Chart/DisabledMenuItemTooltip.tsx
index 89ceddb9ea9..b74ccb7e172 100644
--- a/superset-frontend/src/components/Chart/DisabledMenuItemTooltip.tsx
+++ b/superset-frontend/src/components/Chart/DisabledMenuItemTooltip.tsx
@@ -19,8 +19,8 @@
 
 import { ReactNode } from 'react';
 import { css, SupersetTheme } from '@superset-ui/core';
-import { Icons } from 'src/components/Icons';
-import { Tooltip } from 'src/components/Tooltip';
+import { Icons } from '@superset-ui/core/components/Icons';
+import { Tooltip } from '@superset-ui/core/components';
 
 export const MenuItemTooltip = ({
   title,
@@ -33,8 +33,8 @@ export const MenuItemTooltip = ({
     <Icons.InfoCircleOutlined
       data-test="tooltip-trigger"
       css={(theme: SupersetTheme) => css`
-        color: ${color || theme.colors.text.label};
-        margin-left: ${theme.gridUnit * 2}px;
+        color: ${color || theme.colorTextLabel};
+        margin-left: ${theme.sizeUnit * 2}px;
         &.anticon {
           font-size: unset;
           .anticon {
diff --git a/superset-frontend/src/components/Chart/DrillBy/DrillByMenuItems.test.tsx b/superset-frontend/src/components/Chart/DrillBy/DrillByMenuItems.test.tsx
index ad3da909b2f..fd838f0108c 100644
--- a/superset-frontend/src/components/Chart/DrillBy/DrillByMenuItems.test.tsx
+++ b/superset-frontend/src/components/Chart/DrillBy/DrillByMenuItems.test.tsx
@@ -30,7 +30,7 @@ import {
   waitFor,
 } from 'spec/helpers/testing-library';
 import chartQueries, { sliceId } from 'spec/fixtures/mockChartQueries';
-import { Menu } from 'src/components/Menu';
+import { Menu } from '@superset-ui/core/components/Menu';
 import { supersetGetCache } from 'src/utils/cachedSupersetGet';
 import { DrillByMenuItems, DrillByMenuItemsProps } from './DrillByMenuItems';
 
diff --git a/superset-frontend/src/components/Chart/DrillBy/DrillByMenuItems.tsx b/superset-frontend/src/components/Chart/DrillBy/DrillByMenuItems.tsx
index 73920dfcaab..c0ffc795e26 100644
--- a/superset-frontend/src/components/Chart/DrillBy/DrillByMenuItems.tsx
+++ b/superset-frontend/src/components/Chart/DrillBy/DrillByMenuItems.tsx
@@ -26,13 +26,12 @@ import {
   useRef,
   useState,
 } from 'react';
-import { Menu } from 'src/components/Menu';
+import { Menu } from '@superset-ui/core/components/Menu';
 import {
   BaseFormData,
   Behavior,
   Column,
   ContextMenuFilters,
-  FAST_DEBOUNCE,
   JsonResponse,
   css,
   ensureIsArray,
@@ -42,18 +41,17 @@ import {
   t,
   useTheme,
 } from '@superset-ui/core';
+import { Constants, Input, Loading } from '@superset-ui/core/components';
 import rison from 'rison';
 import { debounce } from 'lodash';
 import { FixedSizeList as List } from 'react-window';
-import { Icons } from 'src/components/Icons';
-import { Input } from 'src/components/Input';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { useToasts } from 'src/components/MessageToasts/withToasts';
-import Loading from 'src/components/Loading';
 import {
   cachedSupersetGet,
   supersetGetCache,
 } from 'src/utils/cachedSupersetGet';
-import { InputRef } from 'antd-v5';
+import { InputRef } from 'antd';
 import { MenuItemTooltip } from '../DisabledMenuItemTooltip';
 import { getSubmenuYOffset } from '../utils';
 import { MenuItemWithTruncation } from '../MenuItemWithTruncation';
@@ -204,7 +202,7 @@ export const DrillByMenuItems = ({
     () =>
       debounce((value: string) => {
         setDebouncedSearchInput(value);
-      }, FAST_DEBOUNCE),
+      }, Constants.FAST_DEBOUNCE),
     [],
   );
 
@@ -294,7 +292,7 @@ export const DrillByMenuItems = ({
               prefix={
                 <Icons.SearchOutlined
                   iconSize="l"
-                  iconColor={theme.colors.grayscale.light1}
+                  iconColor={theme.colorIcon}
                 />
               }
               onChange={e => {
@@ -310,7 +308,7 @@ export const DrillByMenuItems = ({
               css={css`
                 width: auto;
                 max-width: 100%;
-                margin: ${theme.gridUnit * 2}px ${theme.gridUnit * 3}px;
+                margin: ${theme.sizeUnit * 2}px ${theme.sizeUnit * 3}px;
                 box-shadow: none;
               `}
               value={searchInput}
@@ -319,7 +317,7 @@ export const DrillByMenuItems = ({
           {isLoadingColumns ? (
             <div
               css={css`
-                padding: ${theme.gridUnit * 3}px 0;
+                padding: ${theme.sizeUnit * 3}px 0;
               `}
             >
               <Loading position="inline-centered" />
diff --git a/superset-frontend/src/components/Chart/DrillBy/DrillByModal.tsx b/superset-frontend/src/components/Chart/DrillBy/DrillByModal.tsx
index d7b2c91ec2f..0a89aaa29e8 100644
--- a/superset-frontend/src/components/Chart/DrillBy/DrillByModal.tsx
+++ b/superset-frontend/src/components/Chart/DrillBy/DrillByModal.tsx
@@ -19,6 +19,7 @@
 
 import { useCallback, useContext, useEffect, useMemo, useState } from 'react';
 import {
+  BinaryQueryObjectFilterClause,
   BaseFormData,
   Column,
   QueryData,
@@ -32,16 +33,20 @@ import {
 } from '@superset-ui/core';
 import { useDispatch, useSelector } from 'react-redux';
 import { Link } from 'react-router-dom';
-import Modal from 'src/components/Modal';
-import Loading from 'src/components/Loading';
-import Button from 'src/components/Button';
+import {
+  Button,
+  Alert,
+  Modal,
+  Loading,
+  Breadcrumb,
+  Flex,
+} from '@superset-ui/core/components';
 import { RootState } from 'src/dashboard/types';
 import { DashboardPageIdContext } from 'src/dashboard/containers/DashboardPage';
 import { postFormData } from 'src/explore/exploreUtils/formData';
 import { simpleFilterToAdhoc } from 'src/utils/simpleFilterToAdhoc';
 import { useDatasetMetadataBar } from 'src/features/datasets/metadataBar/useDatasetMetadataBar';
 import { useToasts } from 'src/components/MessageToasts/withToasts';
-import Alert from 'src/components/Alert';
 import { logEvent } from 'src/logger/actions';
 import {
   LOG_ACTIONS_DRILL_BY_BREADCRUMB_CLICKED,
@@ -57,10 +62,6 @@ import { ContextMenuItem } from '../ChartContextMenu/ChartContextMenu';
 import { useContextMenu } from '../ChartContextMenu/useContextMenu';
 import { getChartDataRequest, handleChartDataResponse } from '../chartAction';
 import { useDisplayModeToggle } from './useDisplayModeToggle';
-import {
-  DrillByBreadcrumb,
-  useDrillByBreadcrumbs,
-} from './useDrillByBreadcrumbs';
 import { useResultsTableView } from './useResultsTableView';
 
 const DEFAULT_ADHOC_FILTER_FIELD_NAME = 'adhoc_filters';
@@ -68,6 +69,10 @@ interface ModalFooterProps {
   closeModal?: () => void;
   formData: BaseFormData;
 }
+interface DrillByBreadcrumb {
+  groupby: Column | Column[];
+  filters?: BinaryQueryObjectFilterClause[];
+}
 
 const ModalFooter = ({ formData, closeModal }: ModalFooterProps) => {
   const dispatch = useDispatch();
@@ -137,7 +142,7 @@ const ModalFooter = ({ formData, closeModal }: ModalFooterProps) => {
         onClick={closeModal}
         data-test="close-drill-by-modal"
         css={css`
-          margin-left: ${theme.gridUnit * 2}px;
+          margin-left: ${theme.sizeUnit * 2}px;
         `}
       >
         {t('Close')}
@@ -308,8 +313,35 @@ export default function DrillByModal({
     },
     [dispatch, drillByConfigs, formData, getFormDataChangesFromConfigs],
   );
+  const breadcrumbItems = breadcrumbsData
+    .map((breadcrumb, index) => {
+      const isClickable = index < breadcrumbsData.length - 1;
+      const hasGroupBy = ensureIsArray(breadcrumb.groupby).length > 0;
+      const hasFilters = ensureIsArray(breadcrumb.filters).length > 0;
 
-  const breadcrumbs = useDrillByBreadcrumbs(breadcrumbsData, onBreadcrumbClick);
+      if (!hasGroupBy && !hasFilters) {
+        return undefined;
+      }
+
+      const groupbyText = ensureIsArray(breadcrumb.groupby)
+        .map(column => column.verbose_name || column.column_name)
+        .join(', ');
+
+      const filtersText = hasFilters
+        ? `(${ensureIsArray(breadcrumb.filters)
+            .map(filter => filter.formattedVal ?? String(filter.val))
+            .join(', ')})`
+        : '';
+
+      const title = `${groupbyText} ${filtersText}`.trim();
+      return {
+        title,
+        onClick: isClickable
+          ? () => onBreadcrumbClick(breadcrumb, index)
+          : undefined,
+      };
+    })
+    .filter((item): item is NonNullable<typeof item> => item !== undefined);
 
   const drilledFormData = useMemo(() => {
     let updatedFormData = { ...currentFormData };
@@ -429,7 +461,7 @@ export default function DrillByModal({
   return (
     <Modal
       css={css`
-        .antd5-modal-footer {
+        .ant-modal-footer {
           border-top: none;
         }
       `}
@@ -440,26 +472,52 @@ export default function DrillByModal({
       responsive
       resizable
       resizableConfig={{
-        minHeight: theme.gridUnit * 128,
-        minWidth: theme.gridUnit * 128,
+        minHeight: theme.sizeUnit * 128,
+        minWidth: theme.sizeUnit * 128,
         defaultSize: {
           width: 'auto',
           height: '80vh',
         },
       }}
       draggable
-      destroyOnClose
+      destroyOnHidden
       maskClosable={false}
     >
-      <div
+      <Flex
+        vertical
+        gap={theme.sizeUnit}
         css={css`
-          display: flex;
-          flex-direction: column;
           height: 100%;
         `}
       >
         {metadataBar}
-        {breadcrumbs}
+        <Breadcrumb
+          css={css`
+            margin-bottom: ${theme.sizeUnit * 2}px;
+          `}
+          items={breadcrumbItems}
+          itemRender={(route, _, routes, paths) => {
+            const isLastElement = routes.indexOf(route) === routes.length - 1;
+            return isLastElement ? (
+              <span data-test="drill-by-breadcrumb-item">
+                {route.title}
+                {paths}
+              </span>
+            ) : (
+              <span
+                data-test="drill-by-breadcrumb-item"
+                role="button"
+                tabIndex={0}
+                onClick={route.onClick}
+                css={css`
+                  cursor: pointer;
+                `}
+              >
+                {route.title}
+              </span>
+            );
+          }}
+        />
         {displayModeToggle}
         {isChartDataLoading && <Loading />}
         {!isChartDataLoading && !chartDataResult && (
@@ -481,7 +539,7 @@ export default function DrillByModal({
           chartDataResult &&
           resultsTable}
         {contextMenu}
-      </div>
+      </Flex>
     </Modal>
   );
 }
diff --git a/superset-frontend/src/components/Chart/DrillBy/useDisplayModeToggle.tsx b/superset-frontend/src/components/Chart/DrillBy/useDisplayModeToggle.tsx
index 12d186a25f4..e8fb13e0163 100644
--- a/superset-frontend/src/components/Chart/DrillBy/useDisplayModeToggle.tsx
+++ b/superset-frontend/src/components/Chart/DrillBy/useDisplayModeToggle.tsx
@@ -19,7 +19,7 @@
 
 import { useMemo, useState } from 'react';
 import { css, SupersetTheme, t } from '@superset-ui/core';
-import { Radio } from 'src/components/Radio';
+import { Radio } from '@superset-ui/core/components/Radio';
 import { DrillByType } from '../types';
 
 export const useDisplayModeToggle = () => {
@@ -31,7 +31,7 @@ export const useDisplayModeToggle = () => {
     () => (
       <div
         css={(theme: SupersetTheme) => css`
-          margin-bottom: ${theme.gridUnit * 6}px;
+          margin-bottom: ${theme.sizeUnit * 6}px;
         `}
         data-test="drill-by-display-toggle"
       >
diff --git a/superset-frontend/src/components/Chart/DrillBy/useDrillByBreadcrumbs.test.ts b/superset-frontend/src/components/Chart/DrillBy/useDrillByBreadcrumbs.test.ts
deleted file mode 100644
index 1d294749993..00000000000
--- a/superset-frontend/src/components/Chart/DrillBy/useDrillByBreadcrumbs.test.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 { renderHook } from '@testing-library/react-hooks';
-import { render, screen, userEvent } from 'spec/helpers/testing-library';
-import {
-  DrillByBreadcrumb,
-  useDrillByBreadcrumbs,
-} from './useDrillByBreadcrumbs';
-
-const BREADCRUMBS_DATA: DrillByBreadcrumb[] = [
-  {
-    groupby: [{ column_name: 'col1' }, { column_name: 'col2' }],
-    filters: [
-      { col: 'col1', op: '==', val: 'col1 filter' },
-      { col: 'col2', op: '==', val: 'col2 filter' },
-    ],
-  },
-  {
-    groupby: [{ column_name: 'col3', verbose_name: 'Column 3' }],
-    filters: [{ col: 'col3', op: '==', val: 'col3 filter' }],
-  },
-  { groupby: [{ column_name: 'col4' }] },
-];
-
-test('Render breadcrumbs', () => {
-  const { result } = renderHook(() => useDrillByBreadcrumbs(BREADCRUMBS_DATA));
-  render(result.current);
-  expect(screen.getAllByTestId('drill-by-breadcrumb-item')).toHaveLength(3);
-  expect(
-    screen.getByText('col1, col2 (col1 filter, col2 filter)'),
-  ).toBeInTheDocument();
-  expect(screen.getByText('Column 3 (col3 filter)')).toBeInTheDocument();
-  expect(screen.getByText('col4')).toBeInTheDocument();
-});
-
-test('Call click handler with correct arguments when breadcrumb is clicked', () => {
-  const onClick = jest.fn();
-  const { result } = renderHook(() =>
-    useDrillByBreadcrumbs(BREADCRUMBS_DATA, onClick),
-  );
-  render(result.current);
-
-  userEvent.click(screen.getByText('col1, col2 (col1 filter, col2 filter)'));
-  expect(onClick).toHaveBeenCalledWith(BREADCRUMBS_DATA[0], 0);
-  onClick.mockClear();
-
-  userEvent.click(screen.getByText('Column 3 (col3 filter)'));
-  expect(onClick).toHaveBeenCalledWith(BREADCRUMBS_DATA[1], 1);
-  onClick.mockClear();
-
-  userEvent.click(screen.getByText('col4'));
-  expect(onClick).not.toHaveBeenCalled();
-  onClick.mockClear();
-});
diff --git a/superset-frontend/src/components/Chart/DrillBy/useDrillByBreadcrumbs.tsx b/superset-frontend/src/components/Chart/DrillBy/useDrillByBreadcrumbs.tsx
deleted file mode 100644
index c815f4b5653..00000000000
--- a/superset-frontend/src/components/Chart/DrillBy/useDrillByBreadcrumbs.tsx
+++ /dev/null
@@ -1,103 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 { useMemo } from 'react';
-import {
-  BinaryQueryObjectFilterClause,
-  Column,
-  css,
-  ensureIsArray,
-  styled,
-  SupersetTheme,
-} from '@superset-ui/core';
-import { AntdBreadcrumb } from 'src/components/index';
-import { noOp } from 'src/utils/common';
-
-export interface DrillByBreadcrumb {
-  groupby: Column | Column[];
-  filters?: BinaryQueryObjectFilterClause[];
-}
-
-const BreadcrumbItem = styled(AntdBreadcrumb.Item)<{
-  isClickable: boolean;
-  isHidden: boolean;
-}>`
-  ${({ theme, isClickable, isHidden }) => css`
-    cursor: ${isClickable ? 'pointer' : 'auto'};
-    color: ${theme.colors.grayscale.light1};
-    transition: color ease-in ${theme.transitionTiming}s;
-    .ant-breadcrumb > span:last-child > & {
-      color: ${theme.colors.grayscale.dark1};
-    }
-    &:hover {
-      color: ${isClickable ? theme.colors.grayscale.dark1 : 'inherit'};
-    }
-    visibility: ${isHidden ? 'hidden' : 'visible'};
-  `}
-`;
-
-export const useDrillByBreadcrumbs = (
-  breadcrumbsData: DrillByBreadcrumb[],
-  onBreadcrumbClick: (
-    breadcrumb: DrillByBreadcrumb,
-    index: number,
-  ) => void = noOp,
-) =>
-  useMemo(() => {
-    // the last breadcrumb is not clickable
-    const isClickable = (index: number) => index < breadcrumbsData.length - 1;
-    const isHidden = (breadcumb: DrillByBreadcrumb) =>
-      ensureIsArray(breadcumb.groupby).length === 0 &&
-      ensureIsArray(breadcumb.filters).length === 0;
-    const getBreadcrumbText = (breadcrumb: DrillByBreadcrumb) =>
-      `${ensureIsArray(breadcrumb.groupby)
-        .map(column => column.verbose_name || column.column_name)
-        .join(', ')} ${
-        breadcrumb.filters
-          ? `(${breadcrumb.filters
-              .map(filter => filter.formattedVal || filter.val)
-              .join(', ')})`
-          : ''
-      }`;
-    return (
-      <AntdBreadcrumb
-        css={(theme: SupersetTheme) => css`
-          margin: ${theme.gridUnit * 2}px 0 ${theme.gridUnit * 4}px;
-        `}
-      >
-        {breadcrumbsData
-          .map((breadcrumb, index) => (
-            <BreadcrumbItem
-              key={index}
-              isClickable={isClickable(index)}
-              isHidden={isHidden(breadcrumb)}
-              onClick={
-                isClickable(index)
-                  ? () => onBreadcrumbClick(breadcrumb, index)
-                  : noOp
-              }
-              data-test="drill-by-breadcrumb-item"
-            >
-              {getBreadcrumbText(breadcrumb)}
-            </BreadcrumbItem>
-          ))
-          .filter(item => item.props.isHidden === false)}
-      </AntdBreadcrumb>
-    );
-  }, [breadcrumbsData, onBreadcrumbClick]);
diff --git a/superset-frontend/src/components/Chart/DrillBy/useResultsTableView.test.ts b/superset-frontend/src/components/Chart/DrillBy/useResultsTableView.test.ts
index 4ab2ffd9727..3eed3696f52 100644
--- a/superset-frontend/src/components/Chart/DrillBy/useResultsTableView.test.ts
+++ b/superset-frontend/src/components/Chart/DrillBy/useResultsTableView.test.ts
@@ -75,7 +75,7 @@ test('Displays results table for 1 query', () => {
   render(result.current, { useRedux: true });
   expect(screen.queryByRole('tablist')).not.toBeInTheDocument();
   expect(screen.getByRole('table')).toBeInTheDocument();
-  expect(screen.getAllByRole('columnheader')).toHaveLength(2);
+  expect(screen.getAllByTestId('sort-header')).toHaveLength(2);
   expect(screen.getAllByTestId('table-row')).toHaveLength(4);
 });
 
@@ -94,7 +94,7 @@ test('Displays results for 2 queries', async () => {
 
   expect(within(getActiveTabElement()).getByRole('table')).toBeInTheDocument();
   expect(
-    within(getActiveTabElement()).getAllByRole('columnheader'),
+    within(getActiveTabElement()).getAllByTestId('sort-header'),
   ).toHaveLength(2);
   expect(
     within(getActiveTabElement()).getAllByTestId('table-row'),
@@ -104,7 +104,7 @@ test('Displays results for 2 queries', async () => {
 
   await waitFor(() => {
     expect(
-      within(getActiveTabElement()).getAllByRole('columnheader'),
+      within(getActiveTabElement()).getAllByTestId('sort-header'),
     ).toHaveLength(3);
   });
   expect(
diff --git a/superset-frontend/src/components/Chart/DrillBy/useResultsTableView.tsx b/superset-frontend/src/components/Chart/DrillBy/useResultsTableView.tsx
index 4d85f949b29..bda96d35aa8 100644
--- a/superset-frontend/src/components/Chart/DrillBy/useResultsTableView.tsx
+++ b/superset-frontend/src/components/Chart/DrillBy/useResultsTableView.tsx
@@ -18,14 +18,14 @@
  */
 import { css, styled, isDefined, QueryData, t } from '@superset-ui/core';
 import { SingleQueryResultPane } from 'src/explore/components/DataTablesPane/components/SingleQueryResultPane';
-import Tabs from 'src/components/Tabs';
+import Tabs from '@superset-ui/core/components/Tabs';
 
 const DATA_SIZE = 15;
 
 const PaginationContainer = styled.div`
   ${({ theme }) => css`
     & .pagination-container {
-      bottom: ${-theme.gridUnit * 4}px;
+      bottom: ${-theme.sizeUnit * 4}px;
     }
   `}
 `;
@@ -55,9 +55,12 @@ export const useResultsTableView = (
     );
   }
   return (
-    <Tabs fullWidth={false} data-test="drill-by-results-tabs">
-      {chartDataResult.map((res, index) => (
-        <Tabs.TabPane tab={t('Results %s', index + 1)} key={index}>
+    <Tabs
+      defaultActiveKey="result-tab-0"
+      items={chartDataResult.map((res, index) => ({
+        key: `result-tab-${index}`,
+        label: t('Results %s', index + 1),
+        children: (
           <PaginationContainer>
             <SingleQueryResultPane
               colnames={res.colnames}
@@ -70,8 +73,8 @@ export const useResultsTableView = (
               canDownload={canDownload}
             />
           </PaginationContainer>
-        </Tabs.TabPane>
-      ))}
-    </Tabs>
+        ),
+      }))}
+    />
   );
 };
diff --git a/superset-frontend/src/components/Chart/DrillDetail/DrillDetailMenuItems.test.tsx b/superset-frontend/src/components/Chart/DrillDetail/DrillDetailMenuItems.test.tsx
index 1e6bc81df04..db5cd63b986 100644
--- a/superset-frontend/src/components/Chart/DrillDetail/DrillDetailMenuItems.test.tsx
+++ b/superset-frontend/src/components/Chart/DrillDetail/DrillDetailMenuItems.test.tsx
@@ -28,7 +28,7 @@ import setupPlugins from 'src/setup/setupPlugins';
 import { getMockStoreWithNativeFilters } from 'spec/fixtures/mockStore';
 import chartQueries, { sliceId } from 'spec/fixtures/mockChartQueries';
 import { BinaryQueryObjectFilterClause, VizType } from '@superset-ui/core';
-import { Menu } from 'src/components/Menu';
+import { Menu } from '@superset-ui/core/components/Menu';
 import DrillDetailMenuItems, {
   DrillDetailMenuItemsProps,
 } from './DrillDetailMenuItems';
@@ -144,12 +144,13 @@ const setupMenu = (filters: BinaryQueryObjectFilterClause[]) => {
  * Drill to Detail modal should appear with correct initial filters
  */
 const expectDrillToDetailModal = async (
-  buttonName: string,
+  buttonName: string | null,
   filters: BinaryQueryObjectFilterClause[] = [],
 ) => {
-  const button = screen.getByRole('menuitem', { name: buttonName });
-
-  userEvent.click(button);
+  if (buttonName) {
+    const button = screen.getByRole('menuitem', { name: buttonName });
+    userEvent.click(button);
+  }
   const modal = await screen.findByRole('dialog', {
     name: `Drill to detail: ${chartName}`,
   });
@@ -282,13 +283,14 @@ const expectDrillToDetailByAll = async (
     'drill-to-detail-by-submenu',
   );
 
-  const menuItemName = 'Drill to detail by all';
   const drillToDetailBySubmenuItem = await within(
     drillToDetailBySubMenus[1],
-  ).findByRole('menuitem', { name: menuItemName });
+  ).findByText(/all/i);
 
   await expectMenuItemEnabled(drillToDetailBySubmenuItem);
-  await expectDrillToDetailModal(menuItemName, filters);
+
+  userEvent.click(drillToDetailBySubmenuItem);
+  await expectDrillToDetailModal(null, filters);
 };
 
 beforeAll(() => {
diff --git a/superset-frontend/src/components/Chart/DrillDetail/DrillDetailMenuItems.tsx b/superset-frontend/src/components/Chart/DrillDetail/DrillDetailMenuItems.tsx
index aae82d8309c..6fef045ceaa 100644
--- a/superset-frontend/src/components/Chart/DrillDetail/DrillDetailMenuItems.tsx
+++ b/superset-frontend/src/components/Chart/DrillDetail/DrillDetailMenuItems.tsx
@@ -37,7 +37,7 @@ import {
   t,
 } from '@superset-ui/core';
 import { useSelector } from 'react-redux';
-import { Menu } from 'src/components/Menu';
+import { Menu } from '@superset-ui/core/components/Menu';
 import { RootState } from 'src/dashboard/types';
 import { getSubmenuYOffset } from '../utils';
 import { MenuItemTooltip } from '../DisabledMenuItemTooltip';
@@ -96,8 +96,8 @@ const Filter = ({
 
 const StyledFilter = styled(Filter)`
   ${({ theme }) => `
-     font-weight: ${theme.typography.weights.bold};
-     color: ${theme.colors.primary.base};
+     font-weight: ${theme.fontWeightStrong};
+     color: ${theme.colorPrimary};
    `}
 `;
 
diff --git a/superset-frontend/src/components/Chart/DrillDetail/DrillDetailModal.tsx b/superset-frontend/src/components/Chart/DrillDetail/DrillDetailModal.tsx
index fa8f22262cb..9d366f72109 100644
--- a/superset-frontend/src/components/Chart/DrillDetail/DrillDetailModal.tsx
+++ b/superset-frontend/src/components/Chart/DrillDetail/DrillDetailModal.tsx
@@ -26,8 +26,7 @@ import {
   t,
   useTheme,
 } from '@superset-ui/core';
-import Modal from 'src/components/Modal';
-import Button from 'src/components/Button';
+import { Button, Modal } from '@superset-ui/core/components';
 import { useSelector } from 'react-redux';
 import { DashboardPageIdContext } from 'src/dashboard/containers/DashboardPage';
 import { Slice } from 'src/types/Chart';
@@ -69,7 +68,7 @@ const ModalFooter = ({
         onClick={closeModal}
         data-test="close-drilltodetail-modal"
         css={css`
-          margin-left: ${theme.gridUnit * 2}px;
+          margin-left: ${theme.sizeUnit * 2}px;
         `}
       >
         {t('Close')}
@@ -118,7 +117,7 @@ export default function DrillDetailModal({
       show={showModal}
       onHide={onHideModal ?? (() => null)}
       css={css`
-        .antd5-modal-body {
+        .ant-modal-body {
           display: flex;
           flex-direction: column;
         }
@@ -130,15 +129,15 @@ export default function DrillDetailModal({
       responsive
       resizable
       resizableConfig={{
-        minHeight: theme.gridUnit * 128,
-        minWidth: theme.gridUnit * 128,
+        minHeight: theme.sizeUnit * 128,
+        minWidth: theme.sizeUnit * 128,
         defaultSize: {
           width: 'auto',
           height: '75vh',
         },
       }}
       draggable
-      destroyOnClose
+      destroyOnHidden
       maskClosable={false}
     >
       <DrillDetailPane formData={formData} initialFilters={initialFilters} />
diff --git a/superset-frontend/src/components/Chart/DrillDetail/DrillDetailPane.tsx b/superset-frontend/src/components/Chart/DrillDetail/DrillDetailPane.tsx
index 82780e36860..62b82f03e27 100644
--- a/superset-frontend/src/components/Chart/DrillDetail/DrillDetailPane.tsx
+++ b/superset-frontend/src/components/Chart/DrillDetail/DrillDetailPane.tsx
@@ -37,14 +37,16 @@ import {
   useTheme,
 } from '@superset-ui/core';
 import { useResizeDetector } from 'react-resize-detector';
-import Loading from 'src/components/Loading';
-import BooleanCell from 'src/components/Table/cell-renderers/BooleanCell';
-import NullCell from 'src/components/Table/cell-renderers/NullCell';
-import TimeCell from 'src/components/Table/cell-renderers/TimeCell';
-import { EmptyState } from 'src/components/EmptyState';
+import BooleanCell from '@superset-ui/core/components/Table/cell-renderers/BooleanCell';
+import NullCell from '@superset-ui/core/components/Table/cell-renderers/NullCell';
+import TimeCell from '@superset-ui/core/components/Table/cell-renderers/TimeCell';
+import { EmptyState, Loading } from '@superset-ui/core/components';
 import { getDatasourceSamples } from 'src/components/Chart/chartAction';
-import Table, { ColumnsType, TableSize } from 'src/components/Table';
-import HeaderWithRadioGroup from 'src/components/Table/header-renderers/HeaderWithRadioGroup';
+import Table, {
+  ColumnsType,
+  TableSize,
+} from '@superset-ui/core/components/Table';
+import HeaderWithRadioGroup from '@superset-ui/core/components/Table/header-renderers/HeaderWithRadioGroup';
 import { ResourceStatus } from 'src/hooks/apiResources/apiResources';
 import { useDatasetMetadataBar } from 'src/features/datasets/metadataBar/useDatasetMetadataBar';
 import TableControls from './DrillDetailTableControls';
@@ -278,7 +280,7 @@ export default function DrillDetailPane({
     tableContent = (
       <pre
         css={css`
-          margin-top: ${theme.gridUnit * 4}px;
+          margin-top: ${theme.sizeUnit * 4}px;
         `}
       >
         {responseError}
diff --git a/superset-frontend/src/components/Chart/DrillDetail/DrillDetailTableControls.stories.tsx b/superset-frontend/src/components/Chart/DrillDetail/DrillDetailTableControls.stories.tsx
index ff5e1418976..2af6c354f4a 100644
--- a/superset-frontend/src/components/Chart/DrillDetail/DrillDetailTableControls.stories.tsx
+++ b/superset-frontend/src/components/Chart/DrillDetail/DrillDetailTableControls.stories.tsx
@@ -19,7 +19,7 @@
 import TableControls, { TableControlsProps } from './DrillDetailTableControls';
 
 export default {
-  title: 'DrillDetailTableControls',
+  title: 'Components/Chart/DrillDetail/DrillDetailTableControls',
   component: TableControls,
 };
 
diff --git a/superset-frontend/src/components/Chart/DrillDetail/DrillDetailTableControls.test.tsx b/superset-frontend/src/components/Chart/DrillDetail/DrillDetailTableControls.test.tsx
index 99276a5ca81..91ac078ed8e 100644
--- a/superset-frontend/src/components/Chart/DrillDetail/DrillDetailTableControls.test.tsx
+++ b/superset-frontend/src/components/Chart/DrillDetail/DrillDetailTableControls.test.tsx
@@ -101,6 +101,6 @@ test('should remove the filters on close', () => {
   expect(screen.getByText('platform')).toBeInTheDocument();
   expect(screen.getByText('GB')).toBeInTheDocument();
 
-  userEvent.click(screen.getByRole('button', { name: 'close' }));
+  userEvent.click(screen.getByLabelText('Close'));
   expect(setFilters).toHaveBeenCalledWith([]);
 });
diff --git a/superset-frontend/src/components/Chart/DrillDetail/DrillDetailTableControls.tsx b/superset-frontend/src/components/Chart/DrillDetail/DrillDetailTableControls.tsx
index 1c756dd9c56..b507cd6848f 100644
--- a/superset-frontend/src/components/Chart/DrillDetail/DrillDetailTableControls.tsx
+++ b/superset-frontend/src/components/Chart/DrillDetail/DrillDetailTableControls.tsx
@@ -18,7 +18,7 @@
  */
 
 import { useCallback, useMemo } from 'react';
-import { Tag } from 'src/components/Tags';
+import { Tag } from 'src/components/Tag';
 import {
   BinaryQueryObjectFilterClause,
   css,
@@ -26,8 +26,8 @@ import {
   t,
   useTheme,
 } from '@superset-ui/core';
-import RowCountLabel from 'src/explore/components/RowCountLabel';
-import { Icons } from 'src/components/Icons';
+import RowCountLabel from 'src/components/RowCountLabel';
+import { Icons } from '@superset-ui/core/components/Icons';
 
 export type TableControlsProps = {
   filters: BinaryQueryObjectFilterClause[];
@@ -83,8 +83,8 @@ export default function TableControls({
       css={css`
         display: flex;
         justify-content: space-between;
-        padding: ${theme.gridUnit / 2}px 0;
-        margin-bottom: ${theme.gridUnit * 2}px;
+        padding: ${theme.sizeUnit / 2}px 0;
+        margin-bottom: ${theme.sizeUnit * 2}px;
       `}
     >
       <div
@@ -105,7 +105,7 @@ export default function TableControls({
           >
             <span
               css={css`
-                margin-right: ${theme.gridUnit}px;
+                margin-right: ${theme.sizeUnit}px;
               `}
             >
               {colName}
diff --git a/superset-frontend/src/components/Chart/MenuItemWithTruncation.tsx b/superset-frontend/src/components/Chart/MenuItemWithTruncation.tsx
index cf77427cc77..0b0b87e89a0 100644
--- a/superset-frontend/src/components/Chart/MenuItemWithTruncation.tsx
+++ b/superset-frontend/src/components/Chart/MenuItemWithTruncation.tsx
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-import { ReactNode, CSSProperties } from 'react';
+import { ReactNode, CSSProperties, useCallback } from 'react';
 import { css, truncationCSS, useCSSTextTruncation } from '@superset-ui/core';
-import { Menu } from 'src/components/Menu';
-import { Tooltip } from 'src/components/Tooltip';
-import { MenuItemProps } from 'antd-v5';
+import { Menu, type ItemType } from '@superset-ui/core/components/Menu';
+import { Tooltip } from '@superset-ui/core/components';
+import { MenuItemProps } from 'antd';
 
 export type MenuItemWithTruncationProps = {
   tooltipText: ReactNode;
@@ -31,6 +31,69 @@ export type MenuItemWithTruncationProps = {
   menuKey?: string;
 };
 
+export const TruncatedMenuLabel = ({
+  tooltipText,
+  children,
+}: {
+  tooltipText: ReactNode;
+  children: ReactNode;
+}) => {
+  const [ref, isTruncated] = useCSSTextTruncation<HTMLDivElement>();
+
+  return (
+    <Tooltip title={isTruncated ? tooltipText : null}>
+      <div
+        ref={ref}
+        css={css`
+          max-width: 100%;
+          ${truncationCSS};
+        `}
+      >
+        {children}
+      </div>
+    </Tooltip>
+  );
+};
+
+export const useMenuItemWithTruncation = () => {
+  const getMenuItemWithTruncation = useCallback(
+    ({
+      tooltipText,
+      children,
+      onClick,
+      style,
+      key,
+      disabled = false,
+      danger = false,
+      ...restProps
+    }: {
+      tooltipText: ReactNode;
+      children: ReactNode;
+      onClick?: (e: any) => void;
+      style?: CSSProperties;
+      key: string;
+      disabled?: boolean;
+      danger?: boolean;
+      [key: string]: any;
+    }): ItemType => ({
+      key,
+      onClick,
+      style,
+      disabled,
+      danger,
+      label: (
+        <TruncatedMenuLabel tooltipText={tooltipText}>
+          {children}
+        </TruncatedMenuLabel>
+      ),
+      ...restProps,
+    }),
+    [],
+  );
+
+  return getMenuItemWithTruncation;
+};
+
 export const MenuItemWithTruncation = ({
   tooltipText,
   children,
diff --git a/superset-frontend/src/components/Chart/chartAction.js b/superset-frontend/src/components/Chart/chartAction.js
index a12ae44e2b1..575402b525f 100644
--- a/superset-frontend/src/components/Chart/chartAction.js
+++ b/superset-frontend/src/components/Chart/chartAction.js
@@ -43,7 +43,7 @@ import { updateDataMask } from 'src/dataMask/actions';
 import { waitForAsyncData } from 'src/middleware/asyncEvent';
 import { ensureAppRoot } from 'src/utils/pathUtils';
 import { safeStringify } from 'src/utils/safeStringify';
-import { extendedDayjs } from 'src/utils/dates';
+import { extendedDayjs } from '@superset-ui/core/utils/dates';
 
 export const CHART_UPDATE_STARTED = 'CHART_UPDATE_STARTED';
 export function chartUpdateStarted(queryController, latestQueryFormData, key) {
diff --git a/superset-frontend/src/components/Chart/chartReducer.ts b/superset-frontend/src/components/Chart/chartReducer.ts
index 997c5bf7b7c..081bd415472 100644
--- a/superset-frontend/src/components/Chart/chartReducer.ts
+++ b/superset-frontend/src/components/Chart/chartReducer.ts
@@ -24,7 +24,7 @@ import { DatasourcesAction } from 'src/dashboard/actions/datasources';
 import { ChartState } from 'src/explore/types';
 import { getFormDataFromControls } from 'src/explore/controlUtils';
 import { HYDRATE_EXPLORE } from 'src/explore/actions/hydrateExplore';
-import { now } from 'src/utils/dates';
+import { now } from '@superset-ui/core/utils/dates';
 import * as actions from './chartAction';
 
 export const chart: ChartState = {
diff --git a/superset-frontend/src/components/Checkbox/Checkbox.stories.tsx b/superset-frontend/src/components/Checkbox/Checkbox.stories.tsx
deleted file mode 100644
index 6387aa411f3..00000000000
--- a/superset-frontend/src/components/Checkbox/Checkbox.stories.tsx
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 { useArgs } from '@storybook/preview-api';
-import Checkbox, { CheckboxProps } from '.';
-
-export default {
-  title: 'Checkbox',
-  component: Checkbox,
-};
-
-const STATUSES = {
-  checked: true,
-  unchecked: false,
-};
-
-export const CheckboxGallery = () =>
-  Object.keys(STATUSES).map(status => (
-    <div style={{ marginBottom: '16px' }} key={status}>
-      <Checkbox
-        onChange={() => {}}
-        checked={STATUSES[status as keyof typeof STATUSES]}
-        style={{ marginRight: '8px' }}
-      />
-      {`I'm a${STATUSES[status as keyof typeof STATUSES] ? '' : 'n'} ${status} checkbox`}
-    </div>
-  ));
-
-export const InteractiveCheckbox = ({ checked, style }: CheckboxProps) => {
-  const [, updateArgs] = useArgs();
-  const toggleCheckbox = () => {
-    updateArgs({ checked: !checked });
-  };
-
-  return (
-    <>
-      <Checkbox onChange={toggleCheckbox} checked={checked} style={style} />
-      I'm an interactive checkbox
-    </>
-  );
-};
-
-InteractiveCheckbox.args = {
-  checked: false,
-  style: { marginRight: '8px' },
-};
diff --git a/superset-frontend/src/components/Checkbox/Checkbox.test.tsx b/superset-frontend/src/components/Checkbox/Checkbox.test.tsx
deleted file mode 100644
index f16eeae88ad..00000000000
--- a/superset-frontend/src/components/Checkbox/Checkbox.test.tsx
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 { fireEvent, render } from 'spec/helpers/testing-library';
-
-import Checkbox from 'src/components/Checkbox';
-
-jest.mock('src/components/Checkbox/CheckboxIcons', () => ({
-  CheckboxChecked: () => <div data-test="mock-CheckboxChecked" />,
-  CheckboxUnchecked: () => <div data-test="mock-CheckboxUnchecked" />,
-}));
-
-describe('when unchecked', () => {
-  test('renders the unchecked component', () => {
-    const { getByTestId } = render(
-      <Checkbox style={{}} checked={false} onChange={() => true} />,
-    );
-    expect(getByTestId('mock-CheckboxUnchecked')).toBeInTheDocument();
-  });
-});
-
-describe('when checked', () => {
-  test('renders the checked component', () => {
-    const { getByTestId } = render(
-      <Checkbox style={{}} checked onChange={() => true} />,
-    );
-    expect(getByTestId('mock-CheckboxChecked')).toBeInTheDocument();
-  });
-});
-
-test('works with an onChange handler', () => {
-  const mockAction = jest.fn();
-  const { getByRole } = render(
-    <Checkbox style={{}} checked={false} onChange={mockAction} />,
-  );
-  fireEvent.click(getByRole('checkbox'));
-  expect(mockAction).toHaveBeenCalled();
-});
-
-test('renders custom Checkbox styles without melting', () => {
-  const { getByRole } = render(
-    <Checkbox onChange={() => true} checked={false} style={{ opacity: 1 }} />,
-  );
-  expect(getByRole('checkbox')).toBeInTheDocument();
-  expect(getByRole('checkbox')).toHaveStyle({ opacity: 1 });
-});
diff --git a/superset-frontend/src/components/Checkbox/Checkbox.tsx b/superset-frontend/src/components/Checkbox/Checkbox.tsx
deleted file mode 100644
index 931a45fed30..00000000000
--- a/superset-frontend/src/components/Checkbox/Checkbox.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 { CSSProperties } from 'react';
-import { styled } from '@superset-ui/core';
-import { CheckboxChecked, CheckboxUnchecked } from 'src/components/Checkbox';
-
-export interface CheckboxProps {
-  checked?: boolean;
-  onChange: (val?: boolean) => void;
-  style?: CSSProperties;
-  className?: string;
-}
-
-const Styles = styled.span`
-  &,
-  & svg {
-    vertical-align: top;
-  }
-`;
-
-export default function Checkbox({
-  checked = false,
-  onChange,
-  style,
-  className,
-}: CheckboxProps) {
-  return (
-    <Styles
-      style={style}
-      onClick={() => {
-        onChange(!checked);
-      }}
-      role="checkbox"
-      tabIndex={0}
-      aria-checked={checked}
-      aria-label="Checkbox"
-      className={className || ''}
-    >
-      {checked ? <CheckboxChecked /> : <CheckboxUnchecked />}
-    </Styles>
-  );
-}
diff --git a/superset-frontend/src/components/Collapse/Collapse.test.tsx b/superset-frontend/src/components/Collapse/Collapse.test.tsx
deleted file mode 100644
index 2449a4e1905..00000000000
--- a/superset-frontend/src/components/Collapse/Collapse.test.tsx
+++ /dev/null
@@ -1,123 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 {
-  render,
-  screen,
-  cleanup,
-  userEvent,
-  waitFor,
-} from 'spec/helpers/testing-library';
-import Collapse, { CollapseProps } from '.';
-
-describe('Collapse', () => {
-  beforeAll(() => {
-    jest.setTimeout(30000);
-  });
-
-  afterEach(async () => {
-    cleanup();
-    await new Promise(resolve => setTimeout(resolve, 0));
-  });
-
-  function renderCollapse(props?: CollapseProps) {
-    return render(
-      <Collapse {...props}>
-        <Collapse.Panel header="Header 1" key="1">
-          Content 1
-        </Collapse.Panel>
-        <Collapse.Panel header="Header 2" key="2">
-          Content 2
-        </Collapse.Panel>
-      </Collapse>,
-    );
-  }
-
-  test('renders collapsed with default props', async () => {
-    const { unmount } = renderCollapse();
-    const headers = screen.getAllByRole('button');
-
-    expect(headers[0]).toHaveTextContent('Header 1');
-    expect(headers[1]).toHaveTextContent('Header 2');
-    expect(screen.queryByText('Content 1')).not.toBeInTheDocument();
-    expect(screen.queryByText('Content 2')).not.toBeInTheDocument();
-
-    unmount();
-  });
-
-  test('renders with one item expanded by default', async () => {
-    const { unmount } = renderCollapse({ defaultActiveKey: ['1'] });
-    const headers = screen.getAllByRole('button');
-
-    expect(headers[0]).toHaveTextContent('Header 1');
-    expect(headers[1]).toHaveTextContent('Header 2');
-    expect(screen.getByText('Content 1')).toBeInTheDocument();
-    expect(screen.queryByText('Content 2')).not.toBeInTheDocument();
-
-    unmount();
-  });
-
-  test('expands on click without waitFor', async () => {
-    const { unmount } = renderCollapse();
-
-    expect(screen.queryByText('Content 1')).not.toBeInTheDocument();
-    expect(screen.queryByText('Content 2')).not.toBeInTheDocument();
-
-    await userEvent.click(screen.getAllByRole('button')[0]);
-
-    expect(screen.getByText('Content 1')).toBeInTheDocument();
-    expect(screen.queryByText('Content 2')).not.toBeInTheDocument();
-
-    unmount();
-  });
-
-  test('expands on click with waitFor', async () => {
-    const { unmount } = renderCollapse();
-
-    await waitFor(() => {
-      expect(screen.queryByText('Content 1')).not.toBeInTheDocument();
-      expect(screen.queryByText('Content 2')).not.toBeInTheDocument();
-    });
-
-    await userEvent.click(screen.getAllByRole('button')[0]);
-
-    await waitFor(() => {
-      expect(screen.getByText('Content 1')).toBeInTheDocument();
-      expect(screen.queryByText('Content 2')).not.toBeInTheDocument();
-    });
-
-    unmount();
-  });
-
-  // Update other tests similarly with waitFor
-  test('collapses on click', async () => {
-    const { unmount } = renderCollapse({ defaultActiveKey: ['1'] });
-
-    expect(screen.getByText('Content 1')).toBeInTheDocument();
-    expect(screen.queryByText('Content 2')).not.toBeInTheDocument();
-
-    await userEvent.click(screen.getAllByRole('button')[0]);
-
-    expect(screen.getByText('Content 1').parentNode).toHaveClass(
-      'ant-collapse-content-hidden',
-    );
-    expect(screen.queryByText('Content 2')).not.toBeInTheDocument();
-
-    unmount();
-  });
-});
diff --git a/superset-frontend/src/components/Collapse/index.tsx b/superset-frontend/src/components/Collapse/index.tsx
deleted file mode 100644
index 42af995bb9e..00000000000
--- a/superset-frontend/src/components/Collapse/index.tsx
+++ /dev/null
@@ -1,103 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 { styled } from '@superset-ui/core';
-// eslint-disable-next-line no-restricted-imports
-import { Collapse as AntdCollapse } from 'antd'; // TODO: Remove antd
-// eslint-disable-next-line no-restricted-imports
-import { CollapseProps as AntdCollapseProps } from 'antd/lib/collapse'; // TODO: Remove antd
-
-export interface CollapseProps extends AntdCollapseProps {
-  light?: boolean;
-  bigger?: boolean;
-  bold?: boolean;
-  animateArrows?: boolean;
-}
-
-const Collapse = Object.assign(
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  styled(({ light, bigger, bold, animateArrows, ...props }: CollapseProps) => (
-    <AntdCollapse {...props} />
-  ))`
-    .ant-collapse-item {
-      .ant-collapse-header {
-        font-weight: ${({ bold, theme }) =>
-          bold
-            ? theme.typography.weights.bold
-            : theme.typography.weights.normal};
-        font-size: ${({ bigger, theme }) =>
-          bigger ? `${theme.gridUnit * 4}px` : 'inherit'};
-
-        .ant-collapse-arrow svg {
-          transition: ${({ animateArrows }) =>
-            animateArrows ? 'transform 0.24s' : 'none'};
-        }
-
-        ${({ expandIconPosition }) =>
-          expandIconPosition &&
-          expandIconPosition === 'right' &&
-          `
-            .anticon.anticon-right.ant-collapse-arrow > svg {
-              transform: rotate(90deg) !important;
-            }
-          `}
-
-        ${({ light, theme }) =>
-          light &&
-          `
-            color: ${theme.colors.grayscale.light4};
-            .ant-collapse-arrow svg {
-              color: ${theme.colors.grayscale.light4};
-            }
-          `}
-
-        ${({ ghost, bordered, theme }) =>
-          ghost &&
-          bordered &&
-          `
-            border-bottom: 1px solid ${theme.colors.grayscale.light3};
-          `}
-      }
-      .ant-collapse-content {
-        .ant-collapse-content-box {
-          .loading.inline {
-            margin: ${({ theme }) => theme.gridUnit * 12}px auto;
-            display: block;
-          }
-        }
-      }
-    }
-    .ant-collapse-item-active {
-      .ant-collapse-header {
-        ${({ expandIconPosition }) =>
-          expandIconPosition &&
-          expandIconPosition === 'right' &&
-          `
-            .anticon.anticon-right.ant-collapse-arrow > svg {
-              transform: rotate(-90deg) !important;
-            }
-          `}
-      }
-    }
-  `,
-  {
-    Panel: AntdCollapse.Panel,
-  },
-);
-
-export default Collapse;
diff --git a/superset-frontend/src/components/CopyToClipboard/CopyToClipboard.stories.tsx b/superset-frontend/src/components/CopyToClipboard/CopyToClipboard.stories.tsx
index bd82ec84a43..64ea320157a 100644
--- a/superset-frontend/src/components/CopyToClipboard/CopyToClipboard.stories.tsx
+++ b/superset-frontend/src/components/CopyToClipboard/CopyToClipboard.stories.tsx
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import Button from 'src/components/Button';
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
 import ToastContainer from 'src/components/MessageToasts/ToastContainer';
-import CopyToClipboard from '.';
+import { Button } from '@superset-ui/core/components';
+import { CopyToClipboard } from '.';
 
 export default {
-  title: 'CopyToClipboard',
+  title: 'Components/CopyToClipboard',
   component: CopyToClipboard,
 };
 
diff --git a/superset-frontend/src/components/CopyToClipboard/CopyToClipboard.test.tsx b/superset-frontend/src/components/CopyToClipboard/CopyToClipboard.test.tsx
index 7d1542d669b..4164cb45459 100644
--- a/superset-frontend/src/components/CopyToClipboard/CopyToClipboard.test.tsx
+++ b/superset-frontend/src/components/CopyToClipboard/CopyToClipboard.test.tsx
@@ -22,7 +22,7 @@ import {
   userEvent,
   waitFor,
 } from 'spec/helpers/testing-library';
-import CopyToClipboard from '.';
+import { CopyToClipboard } from '.';
 
 test('renders with default props', () => {
   const text = 'Text';
diff --git a/superset-frontend/src/components/CopyToClipboard/index.tsx b/superset-frontend/src/components/CopyToClipboard/index.tsx
index 10f2f750049..92263d261f7 100644
--- a/superset-frontend/src/components/CopyToClipboard/index.tsx
+++ b/superset-frontend/src/components/CopyToClipboard/index.tsx
@@ -16,24 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { Component, cloneElement, ReactNode, ReactElement } from 'react';
+import { Component, cloneElement, ReactElement } from 'react';
 import { t } from '@superset-ui/core';
-import { Tooltip } from 'src/components/Tooltip';
-import withToasts from 'src/components/MessageToasts/withToasts';
 import copyTextToClipboard from 'src/utils/copy';
-
-export interface CopyToClipboardProps {
-  copyNode?: ReactNode;
-  getText?: (callback: (data: string) => void) => void;
-  onCopyEnd?: () => void;
-  shouldShowText?: boolean;
-  text?: string;
-  wrapped?: boolean;
-  tooltipText?: string;
-  addDangerToast: (msg: string) => void;
-  addSuccessToast: (msg: string) => void;
-  hideTooltip?: boolean;
-}
+import { Tooltip } from '@superset-ui/core/components';
+import withToasts from '../MessageToasts/withToasts';
+import type { CopyToClipboardProps } from './types';
 
 const defaultProps: Partial<CopyToClipboardProps> = {
   copyNode: <span>{t('Copy')}</span>,
@@ -44,7 +32,7 @@ const defaultProps: Partial<CopyToClipboardProps> = {
   hideTooltip: false,
 };
 
-class CopyToClipboard extends Component<CopyToClipboardProps> {
+class CopyToClip extends Component<CopyToClipboardProps> {
   static defaultProps = defaultProps;
 
   constructor(props: CopyToClipboardProps) {
@@ -116,9 +104,7 @@ class CopyToClipboard extends Component<CopyToClipboardProps> {
     return (
       <span css={{ display: 'inline-flex', alignItems: 'center' }}>
         {this.props.shouldShowText && this.props.text && (
-          <span className="m-r-5" data-test="short-url">
-            {this.props.text}
-          </span>
+          <span data-test="short-url">{this.props.text}</span>
         )}
         {this.renderTooltip('pointer')}
       </span>
@@ -134,4 +120,5 @@ class CopyToClipboard extends Component<CopyToClipboardProps> {
   }
 }
 
-export default withToasts(CopyToClipboard);
+export const CopyToClipboard = withToasts(CopyToClip);
+export type { CopyToClipboardProps };
diff --git a/superset-frontend/src/components/CopyToClipboard/types.ts b/superset-frontend/src/components/CopyToClipboard/types.ts
new file mode 100644
index 00000000000..10d87e8decf
--- /dev/null
+++ b/superset-frontend/src/components/CopyToClipboard/types.ts
@@ -0,0 +1,32 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 type { ReactNode } from 'react';
+
+export interface CopyToClipboardProps {
+  copyNode?: ReactNode;
+  getText?: (callback: (data: string) => void) => void;
+  onCopyEnd?: () => void;
+  shouldShowText?: boolean;
+  text?: string;
+  wrapped?: boolean;
+  tooltipText?: string;
+  addDangerToast: (msg: string) => void;
+  addSuccessToast: (msg: string) => void;
+  hideTooltip?: boolean;
+}
diff --git a/superset-frontend/src/components/DatabaseSelector/DatabaseSelector.test.tsx b/superset-frontend/src/components/DatabaseSelector/DatabaseSelector.test.tsx
index 1adb20ad807..e24ce99c1ab 100644
--- a/superset-frontend/src/components/DatabaseSelector/DatabaseSelector.test.tsx
+++ b/superset-frontend/src/components/DatabaseSelector/DatabaseSelector.test.tsx
@@ -27,8 +27,9 @@ import {
   waitFor,
 } from 'spec/helpers/testing-library';
 import { api } from 'src/hooks/apiResources/queryApi';
-import DatabaseSelector, { DatabaseSelectorProps } from '.';
-import { EmptyState } from '../EmptyState';
+import { EmptyState } from '@superset-ui/core/components';
+import { DatabaseSelector } from '.';
+import type { DatabaseSelectorProps } from './types';
 
 const createProps = (): DatabaseSelectorProps => ({
   db: {
@@ -211,10 +212,10 @@ test('Refresh should work', async () => {
   expect(fetchMock.calls(schemaApiRoute).length).toBe(0);
 
   const select = screen.getByRole('combobox', {
-    name: 'Select schema or type to search schemas',
+    name: 'Select schema or type to search schemas: public',
   });
 
-  userEvent.click(select);
+  await userEvent.click(select);
 
   await waitFor(() => {
     expect(fetchMock.calls(databaseApiRoute).length).toBe(1);
@@ -225,7 +226,7 @@ test('Refresh should work', async () => {
   });
 
   // click schema reload
-  userEvent.click(screen.getByRole('button', { name: 'sync' }));
+  await userEvent.click(screen.getByRole('button', { name: 'sync' }));
 
   await waitFor(() => {
     expect(fetchMock.calls(databaseApiRoute).length).toBe(1);
@@ -243,7 +244,7 @@ test('Should database select display options', async () => {
     name: 'Select database or type to search databases',
   });
   expect(select).toBeInTheDocument();
-  userEvent.click(select);
+  await userEvent.click(select);
   expect(await screen.findByText('test-mysql')).toBeInTheDocument();
 });
 
@@ -260,7 +261,7 @@ test('should display options in order of the api response', async () => {
     name: 'Select database or type to search databases',
   });
   expect(select).toBeInTheDocument();
-  userEvent.click(select);
+  await userEvent.click(select);
   const options = await screen.findAllByRole('option');
 
   expect(options[0]).toHaveTextContent(
@@ -290,7 +291,7 @@ test('Should fetch the search keyword when total count exceeds initial options',
     expect(fetchMock.calls(databaseApiRoute)).toHaveLength(1),
   );
   expect(select).toBeInTheDocument();
-  userEvent.type(select, 'keywordtest');
+  await userEvent.type(select, 'keywordtest');
   await waitFor(() =>
     expect(fetchMock.calls(databaseApiRoute)).toHaveLength(2),
   );
@@ -314,7 +315,7 @@ test('should show empty state if there are no options', async () => {
   const select = screen.getByRole('combobox', {
     name: 'Select database or type to search databases',
   });
-  userEvent.click(select);
+  await userEvent.click(select);
   const emptystate = await screen.findByText('empty');
   expect(emptystate).toBeInTheDocument();
   expect(screen.queryByText('test-mysql')).not.toBeInTheDocument();
@@ -324,10 +325,10 @@ test('Should schema select display options', async () => {
   const props = createProps();
   render(<DatabaseSelector {...props} />, { useRedux: true, store });
   const select = screen.getByRole('combobox', {
-    name: 'Select schema or type to search schemas',
+    name: 'Select schema or type to search schemas: public',
   });
   expect(select).toBeInTheDocument();
-  userEvent.click(select);
+  await userEvent.click(select);
   await waitFor(() => {
     expect(screen.queryByText('Loading...')).not.toBeInTheDocument();
   });
@@ -347,12 +348,12 @@ test('Sends the correct db when changing the database', async () => {
     name: 'Select database or type to search databases',
   });
   expect(select).toBeInTheDocument();
-  userEvent.click(select);
-  userEvent.click(await screen.findByText('test-mysql'));
+  await userEvent.click(select);
+  await userEvent.click(await screen.findByText('test-mysql'));
   await waitFor(() =>
     expect(props.onDbChange).toHaveBeenCalledWith(
       expect.objectContaining({
-        id: 2,
+        id: `mysql-test-mysql-2`,
         database_name: 'test-mysql',
         backend: 'mysql',
       }),
@@ -370,12 +371,12 @@ test('Sends the correct schema when changing the schema', async () => {
   rerender(<DatabaseSelector {...props} />);
   expect(props.onSchemaChange).toHaveBeenCalledTimes(0);
   const select = screen.getByRole('combobox', {
-    name: 'Select schema or type to search schemas',
+    name: 'Select schema or type to search schemas: public',
   });
   expect(select).toBeInTheDocument();
-  userEvent.click(select);
-  const schemaOption = await screen.findAllByText('information_schema');
-  userEvent.click(schemaOption[1]);
+  await userEvent.click(select);
+  const schemaOption = await screen.findByText('information_schema');
+  await userEvent.click(schemaOption);
   await waitFor(() =>
     expect(props.onSchemaChange).toHaveBeenCalledWith('information_schema'),
   );
diff --git a/superset-frontend/src/components/DatabaseSelector/index.tsx b/superset-frontend/src/components/DatabaseSelector/index.tsx
index ba7f03e41fd..7f7eb792bdb 100644
--- a/superset-frontend/src/components/DatabaseSelector/index.tsx
+++ b/superset-frontend/src/components/DatabaseSelector/index.tsx
@@ -25,13 +25,8 @@ import {
   useCallback,
 } from 'react';
 import { styled, SupersetClient, SupersetError, t } from '@superset-ui/core';
-import type { LabeledValue as AntdLabeledValue } from 'antd-v5/lib/select';
 import rison from 'rison';
-import { AsyncSelect, Select } from 'src/components';
-import ErrorMessageWithStackTrace from 'src/components/ErrorMessage/ErrorMessageWithStackTrace';
-import Label from 'src/components/Label';
-import { FormLabel } from 'src/components/Form';
-import RefreshLabel from 'src/components/RefreshLabel';
+import RefreshLabel from '@superset-ui/core/components/RefreshLabel';
 import { useToasts } from 'src/components/MessageToasts/withToasts';
 import {
   useCatalogs,
@@ -39,6 +34,20 @@ import {
   useSchemas,
   SchemaOption,
 } from 'src/hooks/apiResources';
+import {
+  Select,
+  AsyncSelect,
+  Label,
+  FormLabel,
+  LabeledValue as AntdLabeledValue,
+} from '@superset-ui/core/components';
+
+import { ErrorMessageWithStackTrace } from 'src/components';
+import type {
+  DatabaseSelectorProps,
+  DatabaseValue,
+  DatabaseObject,
+} from './types';
 
 const DatabaseSelectorWrapper = styled.div`
   ${({ theme }) => `
@@ -46,8 +55,8 @@ const DatabaseSelectorWrapper = styled.div`
       display: flex;
       align-items: center;
       width: 30px;
-      margin-left: ${theme.gridUnit}px;
-      margin-top: ${theme.gridUnit * 5}px;
+      margin-left: ${theme.sizeUnit}px;
+      margin-top: ${theme.sizeUnit * 5}px;
     }
 
     .section {
@@ -57,12 +66,12 @@ const DatabaseSelectorWrapper = styled.div`
     }
 
     .select {
-      width: calc(100% - 30px - ${theme.gridUnit}px);
+      width: calc(100% - 30px - ${theme.sizeUnit}px);
       flex: 1;
     }
 
     & > div {
-      margin-bottom: ${theme.gridUnit * 4}px;
+      margin-bottom: ${theme.sizeUnit * 4}px;
     }
   `}
 `;
@@ -71,7 +80,7 @@ const LabelStyle = styled.div`
   display: flex;
   flex-direction: row;
   align-items: center;
-  margin-left: ${({ theme }) => theme.gridUnit - 2}px;
+  margin-left: ${({ theme }) => theme.sizeUnit - 2}px;
 
   .backend {
     overflow: visible;
@@ -83,38 +92,6 @@ const LabelStyle = styled.div`
   }
 `;
 
-type DatabaseValue = {
-  label: ReactNode;
-  value: number;
-  id: number;
-  database_name: string;
-  backend?: string;
-};
-
-export type DatabaseObject = {
-  id: number;
-  database_name: string;
-  backend?: string;
-  allow_multi_catalog?: boolean;
-};
-
-export interface DatabaseSelectorProps {
-  db?: DatabaseObject | null;
-  emptyState?: ReactNode;
-  formMode?: boolean;
-  getDbList?: (arg0: any) => void;
-  handleError: (msg: string) => void;
-  isDatabaseSelectEnabled?: boolean;
-  onDbChange?: (db: DatabaseObject) => void;
-  onEmptyResults?: (searchText?: string) => void;
-  onCatalogChange?: (catalog?: string) => void;
-  catalog?: string | null;
-  onSchemaChange?: (schema?: string) => void;
-  schema?: string;
-  readOnly?: boolean;
-  sqlLabMode?: boolean;
-}
-
 const SelectLabel = ({
   backend,
   databaseName,
@@ -137,7 +114,7 @@ interface AntdLabeledValueWithOrder extends AntdLabeledValue {
   order: number;
 }
 
-export default function DatabaseSelector({
+export function DatabaseSelector({
   db,
   formMode = false,
   emptyState,
@@ -219,7 +196,7 @@ export default function DatabaseSelector({
               />
             ),
             value: row.id,
-            id: row.id,
+            id: `${row.backend}-${row.database_name}-${row.id}`,
             database_name: row.database_name,
             backend: row.backend,
             allow_multi_catalog: row.allow_multi_catalog,
@@ -454,3 +431,5 @@ export default function DatabaseSelector({
     </DatabaseSelectorWrapper>
   );
 }
+
+export type { DatabaseObject };
diff --git a/superset-frontend/src/components/FormRow/FormRow.stories.tsx b/superset-frontend/src/components/DatabaseSelector/types.ts
similarity index 50%
rename from superset-frontend/src/components/FormRow/FormRow.stories.tsx
rename to superset-frontend/src/components/DatabaseSelector/types.ts
index bc10b8684ba..7130a8da1d6 100644
--- a/superset-frontend/src/components/FormRow/FormRow.stories.tsx
+++ b/superset-frontend/src/components/DatabaseSelector/types.ts
@@ -16,39 +16,36 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import TextControl from 'src/explore/components/controls/TextControl';
-import CheckboxControl from 'src/explore/components/controls/CheckboxControl';
-import FormRow from '.';
+import type { ReactNode } from 'react';
 
-export default {
-  title: 'FormRow',
+export type DatabaseValue = {
+  label: ReactNode;
+  value: number;
+  id: number;
+  database_name: string;
+  backend?: string;
 };
 
-export const InteractiveFormRow = ({ isCheckbox, ...rest }: any) => {
-  const control = isCheckbox ? (
-    <CheckboxControl label="Checkbox" />
-  ) : (
-    <TextControl />
-  );
-  return (
-    <div style={{ width: 300 }}>
-      <FormRow {...rest} control={control} isCheckbox={isCheckbox} />
-    </div>
-  );
+export type DatabaseObject = {
+  id: number;
+  database_name: string;
+  backend?: string;
+  allow_multi_catalog?: boolean;
 };
 
-InteractiveFormRow.args = {
-  label: 'Label',
-  tooltip: 'Tooltip',
-  control: <TextControl />,
-  isCheckbox: false,
-};
-
-InteractiveFormRow.argTypes = {
-  control: {
-    defaultValue: <TextControl />,
-    table: {
-      disable: true,
-    },
-  },
-};
+export interface DatabaseSelectorProps {
+  db?: DatabaseObject | null;
+  emptyState?: ReactNode;
+  formMode?: boolean;
+  getDbList?: (arg0: any) => void;
+  handleError: (msg: string) => void;
+  isDatabaseSelectEnabled?: boolean;
+  onDbChange?: (db: DatabaseObject) => void;
+  onEmptyResults?: (searchText?: string) => void;
+  onCatalogChange?: (catalog?: string) => void;
+  catalog?: string | null;
+  onSchemaChange?: (schema?: string) => void;
+  schema?: string;
+  readOnly?: boolean;
+  sqlLabMode?: boolean;
+}
diff --git a/superset-frontend/src/components/Datasource/ChangeDatasourceModal.test.jsx b/superset-frontend/src/components/Datasource/ChangeDatasourceModal.test.jsx
index 64a9716ef42..060f6149a12 100644
--- a/superset-frontend/src/components/Datasource/ChangeDatasourceModal.test.jsx
+++ b/superset-frontend/src/components/Datasource/ChangeDatasourceModal.test.jsx
@@ -21,8 +21,8 @@ import configureStore from 'redux-mock-store';
 import fetchMock from 'fetch-mock';
 import thunk from 'redux-thunk';
 import sinon from 'sinon';
-import { ChangeDatasourceModal } from 'src/components/Datasource';
 import mockDatasource from 'spec/fixtures/mockDatasource';
+import { ChangeDatasourceModal } from '.';
 
 const mockStore = configureStore([thunk]);
 const store = mockStore({});
diff --git a/superset-frontend/src/components/Datasource/ChangeDatasourceModal.tsx b/superset-frontend/src/components/Datasource/ChangeDatasourceModal.tsx
index 1164d083dca..fae0f1932f4 100644
--- a/superset-frontend/src/components/Datasource/ChangeDatasourceModal.tsx
+++ b/superset-frontend/src/components/Datasource/ChangeDatasourceModal.tsx
@@ -25,30 +25,37 @@ import {
   ChangeEvent,
 } from 'react';
 
-import Alert from 'src/components/Alert';
 import {
   SupersetClient,
   t,
   styled,
   getClientErrorObject,
 } from '@superset-ui/core';
-import TableView, { EmptyWrapperType } from 'src/components/TableView';
-import { ServerPagination, SortByType } from 'src/components/TableView/types';
-import StyledModal from 'src/components/Modal';
-import Button from 'src/components/Button';
+import {
+  Alert,
+  Button,
+  Constants,
+  EmptyWrapperType,
+  Input,
+  Loading,
+  Modal,
+  TableView,
+} from '@superset-ui/core/components';
+import {
+  ServerPagination,
+  SortByType,
+} from '@superset-ui/core/components/TableView/types';
+import { FacePile } from 'src/components';
 import { useListViewResource } from 'src/views/CRUD/hooks';
 import Dataset from 'src/types/Dataset';
 import { useDebouncedEffect } from 'src/explore/exploreUtils';
-import { SLOW_DEBOUNCE } from 'src/constants';
-import Loading from 'src/components/Loading';
-import { Input } from 'src/components/Input';
 import {
   PAGE_SIZE as DATASET_PAGE_SIZE,
   SORT_BY as DATASET_SORT_BY,
 } from 'src/features/datasets/constants';
 import withToasts from 'src/components/MessageToasts/withToasts';
-import { InputRef } from 'antd-v5';
-import FacePile from '../FacePile';
+import { InputRef } from 'antd';
+import type { Datasource, ChangeDatasourceModalProps } from './types';
 
 const CONFIRM_WARNING_MESSAGE = t(
   'Warning! Changing the dataset may break the chart if the metadata does not exist.',
@@ -59,23 +66,8 @@ const CHANGE_WARNING_MSG = t(
     'on columns or metadata that does not exist in the target dataset',
 );
 
-interface Datasource {
-  type: string;
-  id: number;
-  uid: string;
-}
-
-interface ChangeDatasourceModalProps {
-  addDangerToast: (msg: string) => void;
-  addSuccessToast: (msg: string) => void;
-  onChange: (uid: string) => void;
-  onDatasourceSave: (datasource: object, errors?: Array<any>) => {};
-  onHide: () => void;
-  show: boolean;
-}
-
-const CustomStyledModal = styled(StyledModal)`
-  .antd5-modal-body {
+const CustomStyledModal = styled(Modal)`
+  .ant-modal-body {
     display: flex;
     flex-direction: column;
   }
@@ -96,9 +88,9 @@ const ConfirmModalStyled = styled.div`
 
 const StyledSpan = styled.span`
   cursor: pointer;
-  color: ${({ theme }) => theme.colors.primary.dark1};
+  color: ${({ theme }) => theme.colorPrimaryText};
   &: hover {
-    color: ${({ theme }) => theme.colors.primary.dark2};
+    color: ${({ theme }) => theme.colorPrimaryTextActive};
   }
 `;
 
@@ -149,7 +141,7 @@ const ChangeDatasourceModal: FunctionComponent<ChangeDatasourceModalProps> = ({
         }),
       });
     },
-    SLOW_DEBOUNCE,
+    Constants.SLOW_DEBOUNCE,
     [filter, pageIndex, sortBy],
   );
 
@@ -219,20 +211,24 @@ const ChangeDatasourceModal: FunctionComponent<ChangeDatasourceModalProps> = ({
       ),
       Header: t('Name'),
       accessor: 'table_name',
+      id: 'table_name',
     },
     {
       Header: t('Type'),
       accessor: 'kind',
       disableSortBy: true,
+      id: 'kind',
     },
     {
       Header: t('Schema'),
       accessor: 'schema',
+      id: 'schema',
     },
     {
       Header: t('Connection'),
       accessor: 'database.database_name',
       disableSortBy: true,
+      id: 'database.database_name',
     },
     {
       Cell: ({
@@ -288,7 +284,7 @@ const ChangeDatasourceModal: FunctionComponent<ChangeDatasourceModalProps> = ({
             <Alert
               roomBelow
               type="warning"
-              css={theme => ({ marginBottom: theme.gridUnit * 4 })}
+              css={theme => ({ marginBottom: theme.sizeUnit * 4 })}
               message={
                 <>
                   <strong>{t('Warning!')}</strong> {CHANGE_WARNING_MSG}
diff --git a/superset-frontend/src/components/Datasource/CollectionTable.test.tsx b/superset-frontend/src/components/Datasource/CollectionTable.test.tsx
index 1ebe7406d91..8736a7e5569 100644
--- a/superset-frontend/src/components/Datasource/CollectionTable.test.tsx
+++ b/superset-frontend/src/components/Datasource/CollectionTable.test.tsx
@@ -28,12 +28,9 @@ const props = {
 };
 
 test('renders a table', () => {
-  const { length } = mockDatasource['7__table'].columns;
-  const { getByRole } = render(<CollectionTable {...props} />);
-  expect(getByRole('table')).toBeInTheDocument();
-  expect(
-    getByRole('table')
-      .getElementsByTagName('tbody')[0]
-      .getElementsByClassName('row'),
-  ).toHaveLength(length);
+  const { container } = render(<CollectionTable {...props} />);
+  const tableBody = container.querySelector('.ant-table-tbody');
+  expect(tableBody).toBeInTheDocument();
+  const rows = tableBody?.getElementsByTagName('tr');
+  expect(rows).toHaveLength(mockDatasource['7__table'].columns.length + 1);
 });
diff --git a/superset-frontend/src/components/Datasource/CollectionTable.tsx b/superset-frontend/src/components/Datasource/CollectionTable.tsx
index 5147a552c83..59f3d07fb46 100644
--- a/superset-frontend/src/components/Datasource/CollectionTable.tsx
+++ b/superset-frontend/src/components/Datasource/CollectionTable.tsx
@@ -16,81 +16,58 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import {
-  ReactNode,
-  DetailedHTMLProps,
-  TdHTMLAttributes,
-  PureComponent,
-} from 'react';
-
+import { PureComponent, ReactNode } from 'react';
 import { nanoid } from 'nanoid';
-
-import { InfoTooltipWithTrigger } from '@superset-ui/chart-controls';
-import { t, styled } from '@superset-ui/core';
-
-import Button from 'src/components/Button';
-import { Icons } from 'src/components/Icons';
+import { t, styled, css, SupersetTheme } from '@superset-ui/core';
+import { Icons, Button, InfoTooltip } from '@superset-ui/core/components';
+import { FilterValue } from 'react-table';
+import Table, {
+  type ColumnsType,
+  type SortOrder,
+  type SorterResult,
+  type TablePaginationConfig,
+  TableSize,
+} from '@superset-ui/core/components/Table';
 import Fieldset from './Fieldset';
 import { recurseReactClone } from './utils';
+import {
+  type CRUDCollectionProps,
+  type CRUDCollectionState,
+  type Sort,
+} from './types';
 
-interface CRUDCollectionProps {
-  allowAddItem?: boolean;
-  allowDeletes?: boolean;
-  collection: Record<PropertyKey, any>[];
-  columnLabels?: Record<PropertyKey, any>;
-  columnLabelTooltips?: Record<PropertyKey, any>;
-  emptyMessage?: ReactNode;
-  expandFieldset?: ReactNode;
-  extraButtons?: ReactNode;
-  itemGenerator?: () => any;
-  itemCellProps?: ((
-    val: unknown,
-    label: string,
-    record: any,
-  ) => DetailedHTMLProps<
-    TdHTMLAttributes<HTMLTableCellElement>,
-    HTMLTableCellElement
-  >)[];
-  itemRenderers?: ((
-    val: unknown,
-    onChange: () => void,
-    label: string,
-    record: any,
-  ) => ReactNode)[];
-  onChange?: (arg0: any) => void;
-  tableColumns: any[];
-  sortColumns: string[];
-  stickyHeader?: boolean;
-}
+const CrudButtonWrapper = styled.div`
+  text-align: right;
+  ${({ theme }) => `margin-bottom: ${theme.sizeUnit * 2}px`}
+`;
 
-type Sort = number | string | boolean | any;
+const StyledButtonWrapper = styled.span`
+  ${({ theme }) => `
+    margin-top: ${theme.sizeUnit * 3}px;
+    margin-left: ${theme.sizeUnit * 3}px;
+    button>span>:first-of-type {
+      margin-right: 0;
+    }
+  `}
+`;
 
-enum SortOrder {
-  Asc = 1,
-  Desc = 2,
-  Unsorted = 0,
-}
-
-interface CRUDCollectionState {
-  collection: Record<PropertyKey, any>;
-  collectionArray: Record<PropertyKey, any>[];
-  expandedColumns: Record<PropertyKey, any>;
-  sortColumn: string;
-  sort: SortOrder;
-}
+type CollectionItem = { id: string | number; [key: string]: any };
 
 function createCollectionArray(collection: Record<PropertyKey, any>) {
-  return Object.keys(collection).map(k => collection[k]);
+  return Object.keys(collection).map(k => collection[k] as CollectionItem);
 }
 
 function createKeyedCollection(arr: Array<object>) {
-  const collectionArray = arr.map((o: any) => ({
-    ...o,
-    id: o.id || nanoid(),
-  }));
+  const collectionArray = arr.map(
+    (o: any) =>
+      ({
+        ...o,
+        id: o.id || nanoid(),
+      }) as CollectionItem,
+  );
 
   const collection: Record<PropertyKey, any> = {};
-  collectionArray.forEach((o: any) => {
+  collectionArray.forEach((o: CollectionItem) => {
     collection[o.id] = o;
   });
 
@@ -100,64 +77,6 @@ function createKeyedCollection(arr: Array<object>) {
   };
 }
 
-const CrudTableWrapper = styled.div<{ stickyHeader?: boolean }>`
-  ${({ stickyHeader }) =>
-    stickyHeader &&
-    `
-      height: 350px;
-      overflow-y: auto;
-      overflow-x: auto;
-
-      .table {
-        min-width: 800px;
-      }
-      thead th {
-        background: #fff;
-        position: sticky;
-        top: 0;
-        z-index: 9;
-        min
-      }
-    `}
-  ${({ theme }) => `
-    th span {
-      vertical-align: ${theme.gridUnit * -2}px;
-    }
-    .text-right {
-      text-align: right;
-    }
-    .empty-collection {
-      padding: ${theme.gridUnit * 2 + 2}px;
-    }
-    .tiny-cell {
-      width: ${theme.gridUnit + 1}px;
-    }
-    i.fa-caret-down,
-    i.fa-caret-up {
-      width: ${theme.gridUnit + 1}px;
-    }
-    td.expanded {
-      border-top: 0;
-      padding: 0;
-    }
-  `}
-`;
-
-const CrudButtonWrapper = styled.div`
-  text-align: right;
-  ${({ theme }) => `margin-bottom: ${theme.gridUnit * 2}px`}
-`;
-
-const StyledButtonWrapper = styled.span`
-  ${({ theme }) => `
-    margin-top: ${theme.gridUnit * 3}px;
-    margin-left: ${theme.gridUnit * 3}px;
-    button>span>:first-of-type {
-      margin-right: 0;
-    }
-  `}
-`;
-
 export default class CRUDCollection extends PureComponent<
   CRUDCollectionProps,
   CRUDCollectionState
@@ -175,15 +94,14 @@ export default class CRUDCollection extends PureComponent<
       sortColumn: '',
       sort: 0,
     };
-    this.renderItem = this.renderItem.bind(this);
     this.onAddItem = this.onAddItem.bind(this);
     this.renderExpandableSection = this.renderExpandableSection.bind(this);
     this.getLabel = this.getLabel.bind(this);
     this.onFieldsetChange = this.onFieldsetChange.bind(this);
-    this.renderTableBody = this.renderTableBody.bind(this);
     this.changeCollection = this.changeCollection.bind(this);
-    this.sortColumn = this.sortColumn.bind(this);
-    this.renderSortIcon = this.renderSortIcon.bind(this);
+    this.handleTableChange = this.handleTableChange.bind(this);
+    this.buildTableColumns = this.buildTableColumns.bind(this);
+    this.toggleExpand = this.toggleExpand.bind(this);
   }
 
   UNSAFE_componentWillReceiveProps(nextProps: CRUDCollectionProps) {
@@ -191,30 +109,69 @@ export default class CRUDCollection extends PureComponent<
       const { collection, collectionArray } = createKeyedCollection(
         nextProps.collection,
       );
-      this.setState({
+      this.setState(prevState => ({
         collection,
         collectionArray,
-      });
+        expandedColumns: prevState.expandedColumns,
+      }));
     }
   }
 
   onCellChange(id: number, col: string, val: boolean) {
-    this.changeCollection({
-      ...this.state.collection,
-      [id]: {
-        ...this.state.collection[id],
-        [col]: val,
-      },
+    this.setState(prevState => {
+      const updatedCollection = {
+        ...prevState.collection,
+        [id]: {
+          ...prevState.collection[id],
+          [col]: val,
+        },
+      };
+      const updatedCollectionArray = prevState.collectionArray.map(item =>
+        item.id === id ? updatedCollection[id] : item,
+      );
+
+      if (this.props.onChange) {
+        this.props.onChange(updatedCollectionArray);
+      }
+      return {
+        collection: updatedCollection,
+        collectionArray: updatedCollectionArray,
+      };
     });
   }
 
   onAddItem() {
     if (this.props.itemGenerator) {
       let newItem = this.props.itemGenerator();
+      const shouldStartExpanded = newItem.expanded === true;
       if (!newItem.id) {
         newItem = { ...newItem, id: nanoid() };
       }
-      this.changeCollection(this.state.collection, newItem);
+      delete newItem.expanded;
+
+      this.setState(
+        prevState => {
+          const newCollection = {
+            ...prevState.collection,
+            [newItem.id]: newItem,
+          };
+          const newExpandedColumns = shouldStartExpanded
+            ? { ...prevState.expandedColumns, [newItem.id]: true }
+            : prevState.expandedColumns;
+          const newCollectionArray = [newItem, ...prevState.collectionArray];
+
+          return {
+            collection: newCollection,
+            collectionArray: newCollectionArray,
+            expandedColumns: newExpandedColumns,
+          };
+        },
+        () => {
+          if (this.props.onChange) {
+            this.props.onChange(this.state.collectionArray);
+          }
+        },
+      );
     }
   }
 
@@ -225,52 +182,36 @@ export default class CRUDCollection extends PureComponent<
     });
   }
 
-  getLabel(col: any) {
+  getLabel(col: any): string {
     const { columnLabels } = this.props;
     let label = columnLabels?.[col] ? columnLabels[col] : col;
     if (label.startsWith('__')) {
-      // special label-free columns (ie: caret for expand, delete cross)
       label = '';
     }
     return label;
   }
 
-  getTooltip(col: string) {
+  getTooltip(col: string): string | undefined {
     const { columnLabelTooltips } = this.props;
     return columnLabelTooltips?.[col];
   }
 
-  changeCollection(collection: any, newItem?: object) {
-    this.setState({ collection });
-    if (this.props.onChange) {
-      const collectionArray = this.state.collectionArray
-        .map((c: { id: number }) => collection[c.id])
-        // filter out removed items
-        .filter(c => c !== undefined);
+  changeCollection(collection: any) {
+    const newCollectionArray = createCollectionArray(collection);
+    this.setState({ collection, collectionArray: newCollectionArray });
 
-      if (newItem) {
-        collectionArray.unshift(newItem);
-      }
-      this.props.onChange(collectionArray);
+    if (this.props.onChange) {
+      this.props.onChange(newCollectionArray);
     }
   }
 
-  deleteItem(id: number) {
+  deleteItem(id: string | number) {
     const newColl = { ...this.state.collection };
     delete newColl[id];
     this.changeCollection(newColl);
   }
 
-  effectiveTableColumns() {
-    const { tableColumns, allowDeletes, expandFieldset } = this.props;
-    const cols = allowDeletes
-      ? tableColumns.concat(['__actions'])
-      : tableColumns;
-    return expandFieldset ? ['__expand'].concat(cols) : cols;
-  }
-
   toggleExpand(id: any) {
-    this.onCellChange(id, '__expanded', false);
     this.setState(prevState => ({
       expandedColumns: {
         ...prevState.expandedColumns,
@@ -279,95 +220,62 @@ export default class CRUDCollection extends PureComponent<
     }));
   }
 
-  sortColumn(col: string, sort = SortOrder.Unsorted) {
+  handleTableChange(
+    _pagination: TablePaginationConfig,
+    _filters: Record<string, FilterValue | null>,
+    sorter: SorterResult<CollectionItem> | SorterResult<CollectionItem>[],
+  ) {
+    const columnSorter = Array.isArray(sorter) ? sorter[0] : sorter;
+    let newSortColumn = '';
+    let newSortOrder = 0;
+
+    if (columnSorter?.columnKey && columnSorter?.order) {
+      newSortColumn = columnSorter.columnKey as string;
+      newSortOrder = columnSorter.order === 'ascend' ? 1 : 2;
+    }
+
     const { sortColumns } = this.props;
-    // default sort logic sorting string, boolean and number
-    const compareSort = (m: Sort, n: Sort) => {
-      if (typeof m === 'string') {
-        return (m || ' ').localeCompare(n);
-      }
-      return m - n;
-    };
-    return () => {
-      if (sortColumns?.includes(col)) {
-        // display in unsorted order if no sort specified
-        if (sort === SortOrder.Unsorted) {
-          const { collection } = createKeyedCollection(this.props.collection);
-          const collectionArray = createCollectionArray(collection);
-          this.setState({
-            collectionArray,
-            sortColumn: '',
-            sort,
-          });
-          return;
+    const col = newSortColumn;
+
+    if (sortColumns?.includes(col) || newSortOrder === 0) {
+      let sortedArray = [...this.props.collection];
+
+      if (newSortOrder !== 0) {
+        const compareSort = (m: Sort, n: Sort) => {
+          if (typeof m === 'string' && typeof n === 'string') {
+            return (m || '').localeCompare(n || '');
+          }
+          if (typeof m === 'number' && typeof n === 'number') {
+            return m - n;
+          }
+          if (typeof m === 'boolean' && typeof n === 'boolean') {
+            return m === n ? 0 : m ? 1 : -1;
+          }
+          const mStr = String(m ?? '');
+          const nStr = String(n ?? '');
+          return mStr.localeCompare(nStr);
+        };
+
+        sortedArray.sort((a: any, b: any) => compareSort(a[col], b[col]));
+        if (newSortOrder === 2) {
+          sortedArray.reverse();
         }
-
-        // newly ordered collection
-        const sorted = [...this.state.collectionArray].sort(
-          (a: Record<PropertyKey, any>, b: Record<PropertyKey, any>) =>
-            compareSort(a[col], b[col]),
+      } else {
+        const { collectionArray } = createKeyedCollection(
+          this.props.collection,
         );
-        const newCollection =
-          sort === SortOrder.Asc ? sorted : sorted.reverse();
-
-        this.setState(prevState => ({
-          ...prevState,
-          collectionArray: newCollection,
-          sortColumn: col,
-          sort,
-        }));
+        sortedArray = collectionArray;
       }
-    };
-  }
 
-  renderSortIcon(col: string) {
-    if (this.state.sortColumn === col && this.state.sort === SortOrder.Asc) {
-      return <Icons.SortAsc onClick={this.sortColumn(col, 2)} />;
+      this.setState({
+        collectionArray: sortedArray,
+        sortColumn: newSortColumn,
+        sort: newSortOrder,
+      });
     }
-    if (this.state.sortColumn === col && this.state.sort === SortOrder.Desc) {
-      return <Icons.SortDesc onClick={this.sortColumn(col, 0)} />;
-    }
-    return <Icons.Sort onClick={this.sortColumn(col, 1)} />;
   }
 
-  renderTH(col: string, sortColumns: Array<string>) {
-    const tooltip = this.getTooltip(col);
-    return (
-      <th key={col} className="no-wrap">
-        {this.getLabel(col)}
-        {tooltip && (
-          <>
-            {' '}
-            <InfoTooltipWithTrigger
-              label={t('description')}
-              tooltip={tooltip}
-            />
-          </>
-        )}
-        {sortColumns?.includes(col) && this.renderSortIcon(col)}
-      </th>
-    );
-  }
-
-  renderHeaderRow() {
-    const cols = this.effectiveTableColumns();
-    const { allowDeletes, expandFieldset, extraButtons, sortColumns } =
-      this.props;
-    return (
-      <thead>
-        <tr>
-          {expandFieldset && <th aria-label="Expand" className="tiny-cell" />}
-          {cols.map(col => this.renderTH(col, sortColumns))}
-          {extraButtons}
-          {allowDeletes && (
-            <th key="delete-item" aria-label="Delete" className="tiny-cell" />
-          )}
-        </tr>
-      </thead>
-    );
-  }
-
-  renderExpandableSection(item: any) {
+  renderExpandableSection(item: any): ReactNode {
     const propsGenerator = () => ({ item, onChange: this.onFieldsetChange });
     return recurseReactClone(
       this.props.expandFieldset,
@@ -376,109 +284,121 @@ export default class CRUDCollection extends PureComponent<
     );
   }
 
-  getCellProps(record: any, col: any) {
-    const cellPropsFn = this.props.itemCellProps?.[col];
-    const val = record[col];
-    return cellPropsFn ? cellPropsFn(val, this.getLabel(col), record) : {};
-  }
-
-  renderCell(record: any, col: any) {
+  renderCell(record: any, col: any): ReactNode {
     const renderer = this.props.itemRenderers?.[col];
     const val = record[col];
     const onChange = this.onCellChange.bind(this, record.id, col);
     return renderer ? renderer(val, onChange, this.getLabel(col), record) : val;
   }
 
-  renderItem(record: any) {
-    const { allowAddItem, allowDeletes, expandFieldset, tableColumns } =
-      this.props;
-    /* eslint-disable no-underscore-dangle */
-    const isExpanded =
-      !!this.state.expandedColumns[record.id] || record.__expanded;
-    let tds = [];
-    if (expandFieldset) {
-      tds.push(
-        <td key="__expand" className="expand">
-          <i
-            role="button"
-            aria-label="Toggle expand"
-            tabIndex={0}
-            // TODO: Remove fa-icon
-            // eslint-disable-next-line icons/no-fa-icons-usage
-            className={`fa fa-caret-${
-              isExpanded ? 'down' : 'right'
-            } text-primary pointer`}
-            onClick={this.toggleExpand.bind(this, record.id)}
-          />
-        </td>,
-      );
-    }
-    tds = tds.concat(
-      tableColumns.map(col => (
-        <td {...this.getCellProps(record, col)} key={col}>
-          {this.renderCell(record, col)}
-        </td>
-      )),
-    );
-    if (allowAddItem) {
-      tds.push(<td key="add" aria-label="Add" />);
-    }
+  buildTableColumns() {
+    const { tableColumns, allowDeletes, sortColumns = [] } = this.props;
+
+    const antdColumns: ColumnsType = tableColumns.map(col => {
+      const label = this.getLabel(col);
+      const tooltip = this.getTooltip(col);
+      const isSortable = sortColumns.includes(col);
+      const currentSortOrder: SortOrder | null | undefined =
+        this.state.sortColumn === col
+          ? this.state.sort === 1
+            ? 'ascend'
+            : this.state.sort === 2
+              ? 'descend'
+              : null
+          : null;
+
+      return {
+        key: col,
+        dataIndex: col,
+        minWidth: 100,
+        title: (
+          <>
+            {label}
+            {tooltip && (
+              <>
+                {' '}
+                <InfoTooltip
+                  label={t('description')}
+                  tooltip={tooltip}
+                  placement="top"
+                />
+              </>
+            )}
+          </>
+        ),
+        render: (text: any, record: CollectionItem) =>
+          this.renderCell(record, col),
+        onCell: (record: CollectionItem) => {
+          const cellPropsFn = this.props.itemCellProps?.[col];
+          const val = record[col];
+          return cellPropsFn ? cellPropsFn(val, label, record) : {};
+        },
+        sorter: isSortable,
+        sortOrder: currentSortOrder,
+      };
+    });
+
     if (allowDeletes) {
-      tds.push(
-        <td
-          key="__actions"
-          data-test="crud-delete-option"
-          className="text-primary"
-        >
-          <Icons.DeleteOutlined
-            aria-label="Delete item"
-            className="pointer"
-            data-test="crud-delete-icon"
-            role="button"
-            tabIndex={0}
-            onClick={this.deleteItem.bind(this, record.id)}
-            iconSize="l"
-          />
-        </td>,
-      );
-    }
-    const trs = [
-      <tr {...{ 'data-test': 'table-row' }} className="row" key={record.id}>
-        {tds}
-      </tr>,
-    ];
-    if (isExpanded) {
-      trs.push(
-        <tr className="exp" key={`exp__${record.id}`}>
-          <td
-            colSpan={this.effectiveTableColumns().length}
-            className="expanded"
+      antdColumns.push({
+        key: '__actions',
+        dataIndex: '__actions',
+        sorter: false,
+        title: <></>,
+        onCell: () => ({}),
+        sortOrder: null,
+        minWidth: 50,
+        render: (_, record: CollectionItem) => (
+          <span
+            data-test="crud-delete-option"
+            className="text-primary"
+            css={(theme: SupersetTheme) => css`
+              display: flex;
+              justify-content: center;
+              color: ${theme.colorTextTertiary};
+            `}
           >
-            <div>{this.renderExpandableSection(record)}</div>
-          </td>
-        </tr>,
-      );
+            <Icons.DeleteOutlined
+              aria-label="Delete item"
+              className="pointer"
+              data-test="crud-delete-icon"
+              role="button"
+              tabIndex={0}
+              onClick={() => this.deleteItem(record.id)}
+              iconSize="l"
+              iconColor="inherit"
+            />
+          </span>
+        ),
+      });
     }
-    return trs;
-  }
 
-  renderEmptyCell() {
-    return (
-      <tr>
-        <td className="empty-collection">{this.props.emptyMessage}</td>
-      </tr>
-    );
-  }
-
-  renderTableBody() {
-    const data = this.state.collectionArray;
-    const content = data.length
-      ? data.map(d => this.renderItem(d))
-      : this.renderEmptyCell();
-    return <tbody data-test="table-content-rows">{content}</tbody>;
+    return antdColumns as ColumnsType<CollectionItem>;
   }
 
   render() {
+    const {
+      stickyHeader,
+      emptyMessage = t('No items'),
+      expandFieldset,
+    } = this.props;
+
+    const tableColumns = this.buildTableColumns();
+    const expandedRowKeys = Object.keys(this.state.expandedColumns).filter(
+      id => this.state.expandedColumns[id],
+    );
+
+    const expandableConfig = expandFieldset
+      ? {
+          expandedRowRender: (record: CollectionItem) =>
+            this.renderExpandableSection(record),
+          rowExpandable: () => true,
+          expandedRowKeys,
+          onExpand: (expanded: boolean, record: CollectionItem) => {
+            this.toggleExpand(record.id);
+          },
+        }
+      : undefined;
+
     return (
       <>
         <CrudButtonWrapper>
@@ -486,7 +406,7 @@ export default class CRUDCollection extends PureComponent<
             <StyledButtonWrapper>
               <Button
                 buttonSize="small"
-                buttonStyle="tertiary"
+                buttonStyle="secondary"
                 onClick={this.onAddItem}
                 data-test="add-item-button"
               >
@@ -499,15 +419,26 @@ export default class CRUDCollection extends PureComponent<
             </StyledButtonWrapper>
           )}
         </CrudButtonWrapper>
-        <CrudTableWrapper
-          className="CRUD"
-          stickyHeader={this.props.stickyHeader}
-        >
-          <table data-test="crud-table" className="table">
-            {this.renderHeaderRow()}
-            {this.renderTableBody()}
-          </table>
-        </CrudTableWrapper>
+        <Table<CollectionItem>
+          data-test="crud-table"
+          columns={tableColumns}
+          data={this.state.collectionArray as CollectionItem[]}
+          rowKey={(record: CollectionItem) => String(record.id)}
+          sticky={stickyHeader}
+          pagination={false}
+          onChange={this.handleTableChange}
+          locale={{ emptyText: emptyMessage }}
+          css={
+            stickyHeader &&
+            css`
+              height: 350px;
+              overflow: auto;
+            `
+          }
+          expandable={expandableConfig}
+          size={TableSize.Middle}
+          tableLayout="auto"
+        />
       </>
     );
   }
diff --git a/superset-frontend/src/components/Datasource/DatasourceEditor.jsx b/superset-frontend/src/components/Datasource/DatasourceEditor.jsx
index 9723e825875..44a076c5e42 100644
--- a/superset-frontend/src/components/Datasource/DatasourceEditor.jsx
+++ b/superset-frontend/src/components/Datasource/DatasourceEditor.jsx
@@ -19,10 +19,8 @@
 import rison from 'rison';
 import { PureComponent, useCallback } from 'react';
 import PropTypes from 'prop-types';
-import { Radio } from 'src/components/Radio';
-import Card from 'src/components/Card';
-import Alert from 'src/components/Alert';
-import Badge from 'src/components/Badge';
+import { connect } from 'react-redux';
+import { Radio } from '@superset-ui/core/components/Radio';
 import {
   css,
   isFeatureEnabled,
@@ -31,47 +29,62 @@ import {
   FeatureFlag,
   styled,
   SupersetClient,
+  themeObject,
   t,
   withTheme,
   getClientErrorObject,
   getExtensionsRegistry,
 } from '@superset-ui/core';
-import { Select, AsyncSelect, Row, Col } from 'src/components';
-import { FormLabel } from 'src/components/Form';
-import Button from 'src/components/Button';
-import Tabs from 'src/components/Tabs';
-import CertifiedBadge from 'src/components/CertifiedBadge';
-import WarningIconWithTooltip from 'src/components/WarningIconWithTooltip';
-import DatabaseSelector from 'src/components/DatabaseSelector';
-import Label from 'src/components/Label';
-import Loading from 'src/components/Loading';
+import Tabs from '@superset-ui/core/components/Tabs';
+import WarningIconWithTooltip from '@superset-ui/core/components/WarningIconWithTooltip';
 import TableSelector from 'src/components/TableSelector';
-import EditableTitle from 'src/components/EditableTitle';
 import CheckboxControl from 'src/explore/components/controls/CheckboxControl';
 import TextControl from 'src/explore/components/controls/TextControl';
 import TextAreaControl from 'src/explore/components/controls/TextAreaControl';
 import SpatialControl from 'src/explore/components/controls/SpatialControl';
 import withToasts from 'src/components/MessageToasts/withToasts';
-import { Icons } from 'src/components/Icons';
 import CurrencyControl from 'src/explore/components/controls/CurrencyControl';
-import { executeQuery, resetDatabaseState } from 'src/database/actions';
-import { connect } from 'react-redux';
+import {
+  Alert,
+  AsyncSelect,
+  Badge,
+  Button,
+  Card,
+  CertifiedBadge,
+  Col,
+  Divider,
+  EditableTitle,
+  FormLabel,
+  Icons,
+  Loading,
+  Row,
+  Select,
+  Typography,
+  Label,
+} from '@superset-ui/core/components';
+import { FilterableTable } from 'src/components';
+import {
+  executeQuery,
+  formatQuery,
+  resetDatabaseState,
+} from 'src/database/actions';
+import Mousetrap from 'mousetrap';
+import { DatabaseSelector } from '../DatabaseSelector';
 import CollectionTable from './CollectionTable';
 import Fieldset from './Fieldset';
 import Field from './Field';
 import { fetchSyncedColumns, updateColumns } from './utils';
-import FilterableTable from '../FilterableTable';
 
 const extensionsRegistry = getExtensionsRegistry();
 
 const DatasourceContainer = styled.div`
   .change-warning {
     margin: 16px 10px 0;
-    color: ${({ theme }) => theme.colors.warning.base};
+    color: ${({ theme }) => theme.colorWarning};
   }
 
   .change-warning .bold {
-    font-weight: ${({ theme }) => theme.typography.weights.bold};
+    font-weight: ${({ theme }) => theme.fontWeightStrong};
   }
 
   .form-group.has-feedback > .help-block {
@@ -88,7 +101,7 @@ const FlexRowContainer = styled.div`
   display: flex;
 
   svg {
-    margin-right: ${({ theme }) => theme.gridUnit}px;
+    margin-right: ${({ theme }) => theme.sizeUnit}px;
   }
 `;
 
@@ -100,15 +113,15 @@ const StyledTableTabs = styled(Tabs)`
 `;
 
 const StyledBadge = styled(Badge)`
-  .antd5-badge-count {
-    line-height: ${({ theme }) => theme.gridUnit * 4}px;
-    height: ${({ theme }) => theme.gridUnit * 4}px;
-    margin-left: ${({ theme }) => theme.gridUnit}px;
+  .ant-badge-count {
+    line-height: ${({ theme }) => theme.sizeUnit * 4}px;
+    height: ${({ theme }) => theme.sizeUnit * 4}px;
+    margin-left: ${({ theme }) => theme.sizeUnit}px;
   }
 `;
 
 const EditLockContainer = styled.div`
-  font-size: ${({ theme }) => theme.typography.sizes.s}px;
+  font-size: ${({ theme }) => theme.fontSizeSM}px;
   display: flex;
   align-items: center;
   a {
@@ -118,14 +131,14 @@ const EditLockContainer = styled.div`
 
 const ColumnButtonWrapper = styled.div`
   text-align: right;
-  ${({ theme }) => `margin-bottom: ${theme.gridUnit * 2}px`}
+  ${({ theme }) => `margin-bottom: ${theme.sizeUnit * 2}px`}
 `;
 
 const StyledLabelWrapper = styled.div`
   display: flex;
   align-items: center;
   span {
-    margin-right: ${({ theme }) => theme.gridUnit}px;
+    margin-right: ${({ theme }) => theme.sizeUnit}px;
   }
 `;
 
@@ -135,14 +148,14 @@ const StyledColumnsTabWrapper = styled.div`
   }
 
   .ant-tag {
-    margin-top: ${({ theme }) => theme.gridUnit}px;
+    margin-top: ${({ theme }) => theme.sizeUnit}px;
   }
 `;
 
 const StyledButtonWrapper = styled.span`
   ${({ theme }) => `
-    margin-top: ${theme.gridUnit * 3}px;
-    margin-left: ${theme.gridUnit * 3}px;
+    margin-top: ${theme.sizeUnit * 3}px;
+    margin-left: ${theme.sizeUnit * 3}px;
     button>span>:first-of-type {
       margin-right: 0;
     }
@@ -159,6 +172,15 @@ const DATA_TYPES = [
   { value: 'BOOLEAN', label: t('BOOLEAN') },
 ];
 
+const TABS_KEYS = {
+  SOURCE: 'SOURCE',
+  METRICS: 'METRICS',
+  COLUMNS: 'COLUMNS',
+  CALCULATED_COLUMNS: 'CALCULATED_COLUMNS',
+  SETTINGS: 'SETTINGS',
+  SPATIAL: 'SPATIAL',
+};
+
 const DATASOURCE_TYPES_ARR = [
   { key: 'physical', label: t('Physical (table or view)') },
   { key: 'virtual', label: t('Virtual (SQL)') },
@@ -317,13 +339,13 @@ function ColumnCollectionTable({
                 /* Note the fragmented translations may not work. */
                 <div>
                   {t('The pattern of timestamp format. For strings use ')}
-                  <a href="https://docs.python.org/2/library/datetime.html#strftime-strptime-behavior">
+                  <Typography.Link href="https://docs.python.org/2/library/datetime.html#strftime-strptime-behavior">
                     {t('Python datetime string pattern')}
-                  </a>
+                  </Typography.Link>
                   {t(' expression which needs to adhere to the ')}
-                  <a href="https://en.wikipedia.org/wiki/ISO_8601">
+                  <Typography.Link href="https://en.wikipedia.org/wiki/ISO_8601">
                     {t('ISO 8601')}
-                  </a>
+                  </Typography.Link>
                   {t(` standard to ensure that the lexicographical ordering
                       coincides with the chronological ordering. If the
                       timestamp format does not adhere to the ISO 8601 standard
@@ -419,11 +441,13 @@ function ColumnCollectionTable({
                 ),
               main_dttm_col: (value, _onItemChange, _label, record) => {
                 const checked = datasource.main_dttm_col === record.column_name;
-                const disabled = !columns.find(
-                  column => column.column_name === record.column_name,
-                ).is_dttm;
+                const disabled = !record?.is_dttm;
                 return (
                   <Radio
+                    aria-label={t(
+                      'Set %s as default datetime column',
+                      record.column_name,
+                    )}
                     data-test={`radio-default-dttm-${record.column_name}`}
                     checked={checked}
                     disabled={disabled}
@@ -469,11 +493,13 @@ function ColumnCollectionTable({
                 ),
               main_dttm_col: (value, _onItemChange, _label, record) => {
                 const checked = datasource.main_dttm_col === record.column_name;
-                const disabled = !columns.find(
-                  column => column.column_name === record.column_name,
-                ).is_dttm;
+                const disabled = !record?.is_dttm;
                 return (
                   <Radio
+                    aria-label={t(
+                      'Set %s as default datetime column',
+                      record.column_name,
+                    )}
                     data-test={`radio-default-dttm-${record.column_name}`}
                     checked={checked}
                     disabled={disabled}
@@ -535,7 +561,11 @@ StackedField.propTypes = {
 };
 
 function FormContainer({ children }) {
-  return <Card padded>{children}</Card>;
+  return (
+    <Card padded style={{ backgroundColor: themeObject.theme.colorBgLayout }}>
+      {children}
+    </Card>
+  );
 }
 
 FormContainer.propTypes = {
@@ -624,7 +654,7 @@ class DatasourceEditor extends PureComponent {
         col => !!col.expression,
       ),
       metadataLoading: false,
-      activeTabKey: 0,
+      activeTabKey: TABS_KEYS.SOURCE,
       datasourceType: props.datasource.sql
         ? DATASOURCE_TYPES.virtual.key
         : DATASOURCE_TYPES.physical.key,
@@ -640,6 +670,7 @@ class DatasourceEditor extends PureComponent {
     this.setColumns = this.setColumns.bind(this);
     this.validateAndChange = this.validateAndChange.bind(this);
     this.handleTabSelect = this.handleTabSelect.bind(this);
+    this.formatSql = this.formatSql.bind(this);
     this.currencies = ensureIsArray(props.currencies).map(currencyCode => ({
       value: currencyCode,
       label: `${getCurrencySymbol({
@@ -715,6 +746,27 @@ class DatasourceEditor extends PureComponent {
     });
   }
 
+  async onQueryFormat() {
+    const { datasource } = this.state;
+    if (!datasource.sql || !this.state.isEditMode) {
+      return;
+    }
+
+    try {
+      const response = await this.props.formatQuery(datasource.sql);
+      this.onDatasourcePropChange('sql', response.json.result);
+      this.props.addSuccessToast(t('SQL was formatted'));
+    } catch (error) {
+      const { error: clientError, statusText } =
+        await getClientErrorObject(error);
+      this.props.addDangerToast(
+        clientError ||
+          statusText ||
+          t('An error occurred while formatting SQL'),
+      );
+    }
+  }
+
   getSQLLabUrl() {
     const queryParams = new URLSearchParams({
       dbid: this.state.datasource.database.id,
@@ -738,6 +790,31 @@ class DatasourceEditor extends PureComponent {
     });
   }
 
+  async formatSql() {
+    const { datasource } = this.state;
+    if (!datasource.sql) {
+      return;
+    }
+
+    try {
+      const response = await SupersetClient.post({
+        endpoint: '/api/v1/sql/format',
+        body: JSON.stringify({ sql: datasource.sql }),
+        headers: { 'Content-Type': 'application/json' },
+      });
+      this.onDatasourcePropChange('sql', response.json.result);
+      this.props.addSuccessToast(t('SQL was formatted'));
+    } catch (error) {
+      const { error: clientError, statusText } =
+        await getClientErrorObject(error);
+      this.props.addDangerToast(
+        clientError ||
+          statusText ||
+          t('An error occurred while formatting SQL'),
+      );
+    }
+  }
+
   async syncMetadata() {
     const { datasource } = this.state;
     this.setState({ metadataLoading: true });
@@ -976,11 +1053,11 @@ class DatasourceEditor extends PureComponent {
   renderSpatialTab() {
     const { datasource } = this.state;
     const { spatials, all_cols: allCols } = datasource;
-    return (
-      <Tabs.TabPane
-        tab={<CollectionTabTitle collection={spatials} title={t('Spatial')} />}
-        key={4}
-      >
+
+    return {
+      key: TABS_KEYS.SPATIAL,
+      label: <CollectionTabTitle collection={spatials} title={t('Spatial')} />,
+      children: (
         <CollectionTable
           tableColumns={['name', 'config']}
           onChange={this.onDatasourcePropChange.bind(this, 'spatials')}
@@ -1000,15 +1077,15 @@ class DatasourceEditor extends PureComponent {
             ),
           }}
         />
-      </Tabs.TabPane>
-    );
+      ),
+    };
   }
 
   renderSqlEditorOverlay = () => (
     <div
       css={theme => css`
         position: absolute;
-        background: ${theme.colors.secondary.light5};
+        background: ${theme.colorBgLayout};
         align-items: center;
         display: flex;
         height: 100%;
@@ -1021,9 +1098,9 @@ class DatasourceEditor extends PureComponent {
         <span
           css={theme => css`
             display: block;
-            margin: ${theme.gridUnit * 4}px auto;
+            margin: ${theme.sizeUnit * 4}px auto;
             width: fit-content;
-            color: ${theme.colors.grayscale.base};
+            color: ${theme.colorText};
           `}
         >
           {t('We are working on your query')}
@@ -1039,10 +1116,8 @@ class DatasourceEditor extends PureComponent {
         target="_blank"
         rel="noopener noreferrer"
         css={theme => css`
-          color: ${isError
-            ? theme.colors.error.base
-            : theme.colors.grayscale.base};
-          font-size: ${theme.typography.sizes.s}px;
+          color: ${isError ? theme.colorErrorText : theme.colorText};
+          font-size: ${theme.fontSizeSM}px;
           text-decoration: underline;
         `}
       >
@@ -1055,7 +1130,7 @@ class DatasourceEditor extends PureComponent {
     <>
       <span
         css={theme => css`
-          font-size: ${theme.typography.sizes.s}px;
+          font-size: ${theme.fontSizeSM}px;
         `}
       >
         {this.props.database?.error && t('Error executing query. ')}
@@ -1063,7 +1138,8 @@ class DatasourceEditor extends PureComponent {
       {this.renderOpenInSqlLabLink(true)}
       <span
         css={theme => css`
-          font-size: ${theme.typography.sizes.s}px;
+          font-size: ${theme.fontSizeSM}px;
+          margin-right: ${theme.sizeUnit}px;
         `}
       >
         {t(' to check for details.')}
@@ -1082,19 +1158,26 @@ class DatasourceEditor extends PureComponent {
     return (
       <div>
         <EditLockContainer>
-          <span role="button" tabIndex={0} onClick={this.onChangeEditMode}>
+          <span
+            css={theme => css`
+              color: ${theme.colorTextTertiary};
+            `}
+            role="button"
+            tabIndex={0}
+            onClick={this.onChangeEditMode}
+          >
             {this.state.isEditMode ? (
               <Icons.UnlockOutlined
                 iconSize="xl"
                 css={theme => css`
-                  margin: auto ${theme.gridUnit}px auto 0;
+                  margin: auto ${theme.sizeUnit}px auto 0;
                 `}
               />
             ) : (
               <Icons.LockOutlined
                 iconSize="xl"
                 css={theme => ({
-                  margin: `auto ${theme.gridUnit}px auto 0`,
+                  margin: `auto ${theme.sizeUnit}px auto 0`,
                 })}
               />
             )}
@@ -1106,7 +1189,11 @@ class DatasourceEditor extends PureComponent {
             <div>{t('Click the lock to prevent further changes.')}</div>
           )}
         </EditLockContainer>
-        <div className="m-l-10 m-t-20 m-b-10">
+        <div
+          css={theme => css`
+            margin-top: ${theme.sizeUnit * 3}px;
+          `}
+        >
           {DATASOURCE_TYPES_ARR.map(type => (
             <Radio
               key={type.key}
@@ -1120,7 +1207,7 @@ class DatasourceEditor extends PureComponent {
             </Radio>
           ))}
         </div>
-        <hr />
+        <Divider />
         <Fieldset item={datasource} onChange={this.onDatasourceChange} compact>
           {this.state.datasourceType === DATASOURCE_TYPES.virtual.key && (
             <div>
@@ -1187,6 +1274,16 @@ class DatasourceEditor extends PureComponent {
                         <>
                           {this.renderSqlEditorOverlay()}
                           <TextAreaControl
+                            hotkeys={[
+                              {
+                                name: 'formatQuery',
+                                key: 'ctrl+shift+f',
+                                descr: t('Format SQL query'),
+                                func: () => {
+                                  this.onQueryFormat();
+                                },
+                              },
+                            ]}
                             language="sql"
                             offerEditInModal={false}
                             minLines={10}
@@ -1197,6 +1294,19 @@ class DatasourceEditor extends PureComponent {
                         </>
                       ) : (
                         <TextAreaControl
+                          css={theme => css`
+                            margin-top: ${theme.sizeUnit * 2}px;
+                          `}
+                          hotkeys={[
+                            {
+                              name: 'formatQuery',
+                              key: 'ctrl+shift+f',
+                              descr: t('Format SQL query'),
+                              func: () => {
+                                this.onQueryFormat();
+                              },
+                            },
+                          ]}
                           language="sql"
                           offerEditInModal={false}
                           minLines={10}
@@ -1213,22 +1323,25 @@ class DatasourceEditor extends PureComponent {
                           right: 0;
                           top: 0;
                           z-index: 2;
+                          display: flex;
                         `}
                       >
+                        {this.props.database?.error &&
+                          this.renderSqlErrorMessage()}
                         <Button
                           disabled={this.props.database?.isLoading}
                           tooltip={t('Open SQL Lab in a new tab')}
                           css={floatingButtonCss}
                           size="small"
+                          onClick={() => {
+                            this.openOnSqlLab();
+                          }}
                         >
                           <Icons.ExportOutlined
                             iconSize="s"
                             css={theme => ({
-                              color: theme.colors.primary.dark1,
+                              color: theme.colorPrimaryBg,
                             })}
-                            onClick={() => {
-                              this.openOnSqlLab();
-                            }}
                           />
                         </Button>
                         <Button
@@ -1244,27 +1357,24 @@ class DatasourceEditor extends PureComponent {
                           <Icons.CaretRightFilled
                             iconSize="s"
                             css={theme => ({
-                              color: theme.colors.grayscale.light5,
+                              color: theme.colorIcon,
                             })}
                           />
                         </Button>
                       </div>
                     }
-                    errorMessage={
-                      this.props.database?.error && this.renderSqlErrorMessage()
-                    }
                   />
                   {this.props.database?.queryResult && (
                     <>
                       <div
                         css={theme => css`
-                          margin-bottom: ${theme.gridUnit * 4}px;
+                          margin-bottom: ${theme.sizeUnit * 4}px;
                         `}
                       >
                         <span
                           css={theme => css`
-                            color: ${theme.colors.grayscale.base};
-                            font-size: ${theme.typography.sizes.s}px;
+                            color: ${theme.colorText};
+                            font-size: ${theme.fontSizeSM}px;
                           `}
                         >
                           {t(
@@ -1274,8 +1384,8 @@ class DatasourceEditor extends PureComponent {
                         {this.renderOpenInSqlLabLink()}
                         <span
                           css={theme => css`
-                            color: ${theme.colors.grayscale.base};
-                            font-size: ${theme.typography.sizes.s}px;
+                            color: ${theme.colorText};
+                            font-size: ${theme.fontSizeSM}px;
                           `}
                         >
                           {t(' to see details.')}
@@ -1287,10 +1397,10 @@ class DatasourceEditor extends PureComponent {
                         orderedColumnKeys={this.props.database?.queryResult.columns.map(
                           col => col.column_name,
                         )}
-                        height={100}
                         expandedColumns={
                           this.props.database?.queryResult.expandedColumns
                         }
+                        height={300}
                         allowHTML
                       />
                     </>
@@ -1370,7 +1480,7 @@ class DatasourceEditor extends PureComponent {
     if (this.state.errors.length > 0) {
       return (
         <Alert
-          css={theme => ({ marginBottom: theme.gridUnit * 4 })}
+          css={theme => ({ marginBottom: theme.sizeUnit * 4 })}
           type="error"
           message={
             <>
@@ -1506,7 +1616,12 @@ class DatasourceEditor extends PureComponent {
                   warningMarkdown={record.warning_markdown}
                 />
               )}
-              <EditableTitle canEdit title={v} onSaveTitle={onChange} />
+              <EditableTitle
+                canEdit
+                title={v}
+                onSaveTitle={onChange}
+                maxWidth={300}
+              />
             </FlexRowContainer>
           ),
           verbose_name: (v, onChange) => (
@@ -1554,7 +1669,7 @@ class DatasourceEditor extends PureComponent {
       <DatasourceContainer data-test="datasource-editor">
         {this.renderErrors()}
         <Alert
-          css={theme => ({ marginBottom: theme.gridUnit * 4 })}
+          css={theme => ({ marginBottom: theme.sizeUnit * 4 })}
           type="warning"
           message={
             <>
@@ -1567,116 +1682,138 @@ class DatasourceEditor extends PureComponent {
           }
         />
         <StyledTableTabs
-          fullWidth={false}
           id="table-tabs"
           data-test="edit-dataset-tabs"
           onChange={this.handleTabSelect}
           defaultActiveKey={activeTabKey}
-        >
-          <Tabs.TabPane key={0} tab={t('Source')}>
-            {this.renderSourceFieldset(theme)}
-          </Tabs.TabPane>
-          <Tabs.TabPane
-            tab={
-              <CollectionTabTitle
-                collection={sortedMetrics}
-                title={t('Metrics')}
-              />
-            }
-            key={1}
-          >
-            {this.renderMetricCollection()}
-          </Tabs.TabPane>
-          <Tabs.TabPane
-            tab={
-              <CollectionTabTitle
-                collection={this.state.databaseColumns}
-                title={t('Columns')}
-              />
-            }
-            key={2}
-          >
-            <StyledColumnsTabWrapper>
-              <ColumnButtonWrapper>
-                <StyledButtonWrapper>
-                  <Button
-                    buttonSize="small"
-                    buttonStyle="tertiary"
-                    onClick={this.syncMetadata}
-                    className="sync-from-source"
-                    disabled={this.state.isEditMode}
-                  >
-                    <Icons.DatabaseOutlined iconSize="m" />
-                    {t('Sync columns from source')}
-                  </Button>
-                </StyledButtonWrapper>
-              </ColumnButtonWrapper>
-              <ColumnCollectionTable
-                className="columns-table"
-                columns={this.state.databaseColumns}
-                datasource={datasource}
-                onColumnsChange={databaseColumns =>
-                  this.setColumns({ databaseColumns })
-                }
-                onDatasourceChange={this.onDatasourceChange}
-              />
-              {this.state.metadataLoading && <Loading />}
-            </StyledColumnsTabWrapper>
-          </Tabs.TabPane>
-          <Tabs.TabPane
-            tab={
-              <CollectionTabTitle
-                collection={this.state.calculatedColumns}
-                title={t('Calculated columns')}
-              />
-            }
-            key={3}
-          >
-            <StyledColumnsTabWrapper>
-              <ColumnCollectionTable
-                columns={this.state.calculatedColumns}
-                onColumnsChange={calculatedColumns =>
-                  this.setColumns({ calculatedColumns })
-                }
-                columnLabelTooltips={{
-                  column_name: t(
-                    'This field is used as a unique identifier to attach ' +
-                      'the calculated dimension to charts. It is also used ' +
-                      'as the alias in the SQL query.',
-                  ),
-                }}
-                onDatasourceChange={this.onDatasourceChange}
-                datasource={datasource}
-                editableColumnName
-                showExpression
-                allowAddItem
-                allowEditDataType
-                itemGenerator={() => ({
-                  column_name: t('<new column>'),
-                  filterable: true,
-                  groupby: true,
-                  expression: t('<enter SQL expression here>'),
-                  __expanded: true,
-                })}
-              />
-            </StyledColumnsTabWrapper>
-          </Tabs.TabPane>
-          <Tabs.TabPane key={4} tab={t('Settings')}>
-            <Row gutter={16}>
-              <Col xs={24} md={12}>
-                <FormContainer>{this.renderSettingsFieldset()}</FormContainer>
-              </Col>
-              <Col xs={24} md={12}>
-                <FormContainer>{this.renderAdvancedFieldset()}</FormContainer>
-              </Col>
-            </Row>
-          </Tabs.TabPane>
-        </StyledTableTabs>
+          items={[
+            {
+              key: TABS_KEYS.SOURCE,
+              label: t('Source'),
+              children: this.renderSourceFieldset(theme),
+            },
+            {
+              key: TABS_KEYS.METRICS,
+              label: (
+                <CollectionTabTitle
+                  collection={sortedMetrics}
+                  title={t('Metrics')}
+                />
+              ),
+              children: this.renderMetricCollection(),
+            },
+            {
+              key: TABS_KEYS.COLUMNS,
+              label: (
+                <CollectionTabTitle
+                  collection={this.state.databaseColumns}
+                  title={t('Columns')}
+                />
+              ),
+              children: (
+                <StyledColumnsTabWrapper>
+                  <ColumnButtonWrapper>
+                    <StyledButtonWrapper>
+                      <Button
+                        buttonSize="small"
+                        buttonStyle="tertiary"
+                        onClick={this.syncMetadata}
+                        className="sync-from-source"
+                        disabled={this.state.isEditMode}
+                      >
+                        <Icons.DatabaseOutlined iconSize="m" />
+                        {t('Sync columns from source')}
+                      </Button>
+                    </StyledButtonWrapper>
+                  </ColumnButtonWrapper>
+                  <ColumnCollectionTable
+                    className="columns-table"
+                    columns={this.state.databaseColumns}
+                    datasource={datasource}
+                    onColumnsChange={databaseColumns =>
+                      this.setColumns({ databaseColumns })
+                    }
+                    onDatasourceChange={this.onDatasourceChange}
+                  />
+                  {this.state.metadataLoading && <Loading />}
+                </StyledColumnsTabWrapper>
+              ),
+            },
+            {
+              key: TABS_KEYS.CALCULATED_COLUMNS,
+              label: (
+                <CollectionTabTitle
+                  collection={this.state.calculatedColumns}
+                  title={t('Calculated columns')}
+                />
+              ),
+              children: (
+                <StyledColumnsTabWrapper>
+                  <ColumnCollectionTable
+                    columns={this.state.calculatedColumns}
+                    onColumnsChange={calculatedColumns =>
+                      this.setColumns({ calculatedColumns })
+                    }
+                    columnLabelTooltips={{
+                      column_name: t(
+                        'This field is used as a unique identifier to attach ' +
+                          'the calculated dimension to charts. It is also used ' +
+                          'as the alias in the SQL query.',
+                      ),
+                    }}
+                    onDatasourceChange={this.onDatasourceChange}
+                    datasource={datasource}
+                    editableColumnName
+                    showExpression
+                    allowAddItem
+                    allowEditDataType
+                    itemGenerator={() => ({
+                      column_name: t('<new column>'),
+                      filterable: true,
+                      groupby: true,
+                      expression: t('<enter SQL expression here>'),
+                      expanded: true,
+                    })}
+                  />
+                </StyledColumnsTabWrapper>
+              ),
+            },
+            {
+              key: TABS_KEYS.SETTINGS,
+              label: t('Settings'),
+              children: (
+                <Row gutter={16}>
+                  <Col xs={24} md={12}>
+                    <FormContainer>
+                      {this.renderSettingsFieldset()}
+                    </FormContainer>
+                  </Col>
+                  <Col xs={24} md={12}>
+                    <FormContainer>
+                      {this.renderAdvancedFieldset()}
+                    </FormContainer>
+                  </Col>
+                </Row>
+              ),
+            },
+          ]}
+        />
       </DatasourceContainer>
     );
   }
 
+  componentDidMount() {
+    Mousetrap.bind('ctrl+shift+f', e => {
+      e.preventDefault();
+      if (this.state.isEditMode) {
+        this.onQueryFormat();
+      }
+      return false;
+    });
+  }
+
   componentWillUnmount() {
+    Mousetrap.unbind('ctrl+shift+f');
     this.props.resetQuery();
   }
 }
@@ -1689,6 +1826,7 @@ const DataSourceComponent = withTheme(DatasourceEditor);
 const mapDispatchToProps = dispatch => ({
   runQuery: payload => dispatch(executeQuery(payload)),
   resetQuery: () => dispatch(resetDatabaseState()),
+  formatQuery: sql => dispatch(formatQuery(sql)),
 });
 const mapStateToProps = state => ({
   database: state?.database,
diff --git a/superset-frontend/src/components/Datasource/DatasourceEditor.test.jsx b/superset-frontend/src/components/Datasource/DatasourceEditor.test.jsx
index f8a1c4d3db8..17eb53c20a2 100644
--- a/superset-frontend/src/components/Datasource/DatasourceEditor.test.jsx
+++ b/superset-frontend/src/components/Datasource/DatasourceEditor.test.jsx
@@ -20,19 +20,21 @@ import fetchMock from 'fetch-mock';
 import {
   render,
   screen,
-  userEvent,
   waitFor,
+  userEvent,
 } from 'spec/helpers/testing-library';
-import DatasourceEditor from 'src/components/Datasource/DatasourceEditor';
 import mockDatasource from 'spec/fixtures/mockDatasource';
 import { isFeatureEnabled } from '@superset-ui/core';
+import DatasourceEditor from './DatasourceEditor';
 
+/* eslint-disable jest/no-export */
 jest.mock('@superset-ui/core', () => ({
   ...jest.requireActual('@superset-ui/core'),
   isFeatureEnabled: jest.fn(),
 }));
 
-const props = {
+// Common setup for tests
+export const props = {
   datasource: mockDatasource['7__table'],
   addSuccessToast: () => {},
   addDangerToast: () => {},
@@ -41,16 +43,17 @@ const props = {
     state: 'State',
   },
   columnLabelTooltips: {
-    state: 'This is a tooltip for `state`',
+    state: 'This is a tooltip for state',
   },
 };
-const DATASOURCE_ENDPOINT = 'glob:*/datasource/external_metadata_by_name/*';
+export const DATASOURCE_ENDPOINT =
+  'glob:*/datasource/external_metadata_by_name/*';
 const routeProps = {
   history: {},
   location: {},
   match: {},
 };
-const asyncRender = props =>
+export const asyncRender = props =>
   waitFor(() =>
     render(<DatasourceEditor {...props} {...routeProps} />, {
       useRedux: true,
@@ -60,38 +63,51 @@ const asyncRender = props =>
   );
 
 describe('DatasourceEditor', () => {
-  fetchMock.get(DATASOURCE_ENDPOINT, []);
-
+  beforeAll(() => {
+    jest.clearAllMocks();
+  });
   beforeEach(async () => {
+    fetchMock.get(DATASOURCE_ENDPOINT, [], { overwriteRoutes: true });
     await asyncRender({
       ...props,
       datasource: { ...props.datasource, table_name: 'Vehicle Sales +' },
     });
   });
 
+  afterEach(() => {
+    fetchMock.restore();
+    // jest.clearAllMocks();
+  });
+
   it('renders Tabs', () => {
     expect(screen.getByTestId('edit-dataset-tabs')).toBeInTheDocument();
   });
 
-  it('can sync columns from source', () =>
-    new Promise(done => {
-      const columnsTab = screen.getByTestId('collection-tab-Columns');
+  it('can sync columns from source', async () => {
+    const columnsTab = screen.getByTestId('collection-tab-Columns');
+    userEvent.click(columnsTab);
 
-      userEvent.click(columnsTab);
-      const syncButton = screen.getByText(/sync columns from source/i);
-      expect(syncButton).toBeInTheDocument();
+    const syncButton = screen.getByText(/sync columns from source/i);
+    expect(syncButton).toBeInTheDocument();
 
-      userEvent.click(syncButton);
+    // Use a Promise to track when fetchMock is called
+    const fetchPromise = new Promise(resolve => {
+      fetchMock.get(
+        DATASOURCE_ENDPOINT,
+        url => {
+          resolve(url);
+          return [];
+        },
+        { overwriteRoutes: true },
+      );
+    });
 
-      setTimeout(() => {
-        expect(fetchMock.calls(DATASOURCE_ENDPOINT)).toHaveLength(1);
-        expect(fetchMock.calls(DATASOURCE_ENDPOINT)[0][0]).toContain(
-          'Vehicle+Sales%20%2B',
-        );
-        fetchMock.reset();
-        done();
-      }, 0);
-    }));
+    userEvent.click(syncButton);
+
+    // Wait for the fetch to be called
+    const url = await fetchPromise;
+    expect(url).toContain('Vehicle+Sales%20%2B');
+  });
 
   // to add, remove and modify columns accordingly
   it('can modify columns', async () => {
@@ -99,11 +115,12 @@ describe('DatasourceEditor', () => {
     userEvent.click(columnsTab);
 
     const getToggles = screen.getAllByRole('button', {
-      name: /toggle expand/i,
+      name: /expand row/i,
     });
     userEvent.click(getToggles[0]);
-    const getTextboxes = screen.getAllByRole('textbox');
-    expect(getTextboxes.length).toEqual(5);
+
+    const getTextboxes = await screen.findAllByRole('textbox');
+    expect(getTextboxes.length).toBeGreaterThanOrEqual(5);
 
     const inputLabel = screen.getByPlaceholderText('Label');
     const inputDescription = screen.getByPlaceholderText('Description');
@@ -113,228 +130,118 @@ describe('DatasourceEditor', () => {
       'Certification details',
     );
 
-    userEvent.type(await inputLabel, 'test_label');
-    userEvent.type(await inputDescription, 'test');
-    userEvent.type(await inputDtmFormat, 'test');
-    userEvent.type(await inputCertifiedBy, 'test');
-    userEvent.type(await inputCertDetails, 'test');
-  });
+    userEvent.type(inputLabel, 'test_label');
+    userEvent.type(inputDescription, 'test');
+    userEvent.type(inputDtmFormat, 'test');
+    userEvent.type(inputCertifiedBy, 'test');
+    userEvent.type(inputCertDetails, 'test');
+  }, 40000);
 
   it('can delete columns', async () => {
     const columnsTab = screen.getByTestId('collection-tab-Columns');
     userEvent.click(columnsTab);
 
     const getToggles = screen.getAllByRole('button', {
-      name: /toggle expand/i,
+      name: /expand row/i,
     });
 
     userEvent.click(getToggles[0]);
-    const deleteButtons = screen.getAllByRole('button', {
+
+    const deleteButtons = await screen.findAllByRole('button', {
       name: /delete item/i,
     });
-    expect(deleteButtons.length).toEqual(7);
+    const initialCount = deleteButtons.length;
+    expect(initialCount).toBeGreaterThan(0);
+
     userEvent.click(deleteButtons[0]);
-    const countRows = screen.getAllByRole('button', { name: /delete item/i });
-    expect(countRows.length).toEqual(6);
-  });
+
+    await waitFor(() => {
+      const countRows = screen.getAllByRole('button', { name: /delete item/i });
+      expect(countRows.length).toBe(initialCount - 1);
+    });
+  }, 60000); // 60 seconds timeout to avoid timeouts
 
   it('can add new columns', async () => {
     const calcColsTab = screen.getByTestId('collection-tab-Calculated columns');
     userEvent.click(calcColsTab);
+
     const addBtn = screen.getByRole('button', {
       name: /add item/i,
     });
     expect(addBtn).toBeInTheDocument();
+
     userEvent.click(addBtn);
+
     // newColumn (Column name) is the first textbox in the tab
-    const newColumn = screen.getAllByRole('textbox', { name: '' })[0];
-    expect(newColumn).toHaveValue('<new column>');
+    await waitFor(() => {
+      const newColumn = screen.getAllByRole('textbox')[0];
+      expect(newColumn).toHaveValue('<new column>');
+    });
   });
 
-  it('renders isSqla fields', () => {
+  it('renders isSqla fields', async () => {
     const columnsTab = screen.getByRole('tab', {
       name: /settings/i,
     });
     userEvent.click(columnsTab);
+
     const extraField = screen.getAllByText(/extra/i);
-    expect(extraField.length).toEqual(2);
+    expect(extraField.length).toBeGreaterThan(0);
     expect(
       screen.getByText(/autocomplete query predicate/i),
     ).toBeInTheDocument();
     expect(screen.getByText(/template parameters/i)).toBeInTheDocument();
   });
-
-  describe('enable edit Source tab', () => {
-    beforeAll(() => {
-      isFeatureEnabled.mockImplementation(() => false);
-    });
-
-    afterAll(() => {
-      isFeatureEnabled.mockRestore();
-    });
-
-    it('Source Tab: edit mode', () => {
-      const getLockBtn = screen.getByRole('img', { name: /lock/i });
-      userEvent.click(getLockBtn);
-      const physicalRadioBtn = screen.getByRole('radio', {
-        name: /physical \(table or view\)/i,
-      });
-      const virtualRadioBtn = screen.getByRole('radio', {
-        name: /virtual \(sql\)/i,
-      });
-      expect(physicalRadioBtn).toBeEnabled();
-      expect(virtualRadioBtn).toBeEnabled();
-    });
-
-    it('Source Tab: readOnly mode', () => {
-      const getLockBtn = screen.getByRole('img', { name: /lock/i });
-      expect(getLockBtn).toBeInTheDocument();
-      const physicalRadioBtn = screen.getByRole('radio', {
-        name: /physical \(table or view\)/i,
-      });
-      const virtualRadioBtn = screen.getByRole('radio', {
-        name: /virtual \(sql\)/i,
-      });
-      expect(physicalRadioBtn).toBeDisabled();
-      expect(virtualRadioBtn).toBeDisabled();
-    });
-  });
 });
 
-describe('DatasourceEditor RTL', () => {
-  jest.setTimeout(15000); // Extend timeout to 15s for this test
-
-  it('properly renders the metric information', async () => {
-    await asyncRender(props);
-    const metricButton = screen.getByTestId('collection-tab-Metrics');
-    userEvent.click(metricButton);
-    const expandToggle = await screen.findAllByLabelText(/toggle expand/i);
-    userEvent.click(expandToggle[0]);
-    const certificationDetails = await screen.findByPlaceholderText(
-      /certification details/i,
-    );
-    expect(certificationDetails.value).toEqual('foo');
-    const warningMarkdown = await screen.findByPlaceholderText(/certified by/i);
-    expect(warningMarkdown.value).toEqual('someone');
+describe('DatasourceEditor Source Tab', () => {
+  beforeAll(() => {
+    isFeatureEnabled.mockImplementation(() => false);
   });
-  it('renders currency controls', async () => {
-    const propsWithCurrency = {
+
+  beforeEach(async () => {
+    fetchMock.get(DATASOURCE_ENDPOINT, [], { overwriteRoutes: true });
+    await asyncRender({
       ...props,
-      datasource: {
-        ...props.datasource,
-        metrics: [
-          {
-            ...props.datasource.metrics[0],
-            currency: { symbol: 'USD', symbolPosition: 'prefix' },
-          },
-          ...props.datasource.metrics.slice(1),
-        ],
-      },
-    };
-    await asyncRender(propsWithCurrency);
-    const metricButton = screen.getByTestId('collection-tab-Metrics');
-    userEvent.click(metricButton);
-    const expandToggle = await screen.findAllByLabelText(/toggle expand/i);
-    userEvent.click(expandToggle[0]);
-
-    expect(await screen.findByText('Metric currency')).toBeVisible();
-    expect(
-      await waitFor(() =>
-        document.querySelector(
-          `[aria-label='Currency prefix or suffix'] .ant-select-selection-item`,
-        ),
-      ),
-    ).toHaveTextContent('Prefix');
-    await userEvent.click(
-      screen.getByRole('combobox', { name: 'Currency prefix or suffix' }),
-    );
-    const positionOptions = await waitFor(() =>
-      document.querySelectorAll(
-        `[aria-label='Currency prefix or suffix'] .ant-select-item-option-content`,
-      ),
-    );
-    expect(positionOptions[0]).toHaveTextContent('Prefix');
-    expect(positionOptions[1]).toHaveTextContent('Suffix');
-
-    propsWithCurrency.onChange.mockClear();
-    await userEvent.click(positionOptions[1]);
-    expect(propsWithCurrency.onChange.mock.calls[0][0]).toMatchObject(
-      expect.objectContaining({
-        metrics: expect.arrayContaining([
-          expect.objectContaining({
-            currency: { symbolPosition: 'suffix', symbol: 'USD' },
-          }),
-        ]),
-      }),
-    );
-
-    expect(
-      await waitFor(() =>
-        document.querySelector(
-          `[aria-label='Currency symbol'] .ant-select-selection-item`,
-        ),
-      ),
-    ).toHaveTextContent('$ (USD)');
-
-    propsWithCurrency.onChange.mockClear();
-    await userEvent.click(
-      screen.getByRole('combobox', { name: 'Currency symbol' }),
-    );
-    const symbolOptions = await waitFor(() =>
-      document.querySelectorAll(
-        `[aria-label='Currency symbol'] .ant-select-item-option-content`,
-      ),
-    );
-    expect(symbolOptions[0]).toHaveTextContent('$ (USD)');
-    expect(symbolOptions[1]).toHaveTextContent('£ (GBP)');
-    expect(symbolOptions[2]).toHaveTextContent('€ (EUR)');
-
-    await userEvent.click(symbolOptions[1]);
-    expect(propsWithCurrency.onChange.mock.calls[0][0]).toMatchObject(
-      expect.objectContaining({
-        metrics: expect.arrayContaining([
-          expect.objectContaining({
-            currency: { symbolPosition: 'suffix', symbol: 'GBP' },
-          }),
-        ]),
-      }),
-    );
+      datasource: { ...props.datasource, table_name: 'Vehicle Sales +' },
+    });
   });
-  it('properly updates the metric information', async () => {
-    await asyncRender(props);
-    const metricButton = screen.getByTestId('collection-tab-Metrics');
-    userEvent.click(metricButton);
-    const expandToggle = await screen.findAllByLabelText(/toggle expand/i);
-    userEvent.click(expandToggle[1]);
-    const certifiedBy = await screen.findByPlaceholderText(/certified by/i);
-    userEvent.type(certifiedBy, 'I am typing a new name');
-    const certificationDetails = await screen.findByPlaceholderText(
-      /certification details/i,
-    );
-    expect(certifiedBy.value).toEqual('I am typing a new name');
-    userEvent.type(certificationDetails, 'I am typing something new');
-    expect(certificationDetails.value).toEqual('I am typing something new');
+
+  afterEach(() => {
+    fetchMock.restore();
   });
-  it('shows the default datetime column', async () => {
-    await asyncRender(props);
-    const metricButton = screen.getByTestId('collection-tab-Columns');
-    userEvent.click(metricButton);
-    const dsDefaultDatetimeRadio = screen.getByTestId('radio-default-dttm-ds');
-    expect(dsDefaultDatetimeRadio).toBeChecked();
-    const genderDefaultDatetimeRadio = screen.getByTestId(
-      'radio-default-dttm-gender',
-    );
-    expect(genderDefaultDatetimeRadio).not.toBeChecked();
+
+  afterAll(() => {
+    isFeatureEnabled.mockRestore();
   });
-  it('allows choosing only temporal columns as the default datetime', async () => {
-    await asyncRender(props);
-    const metricButton = screen.getByTestId('collection-tab-Columns');
-    userEvent.click(metricButton);
-    const dsDefaultDatetimeRadio = screen.getByTestId('radio-default-dttm-ds');
-    expect(dsDefaultDatetimeRadio).toBeEnabled();
-    const genderDefaultDatetimeRadio = screen.getByTestId(
-      'radio-default-dttm-gender',
-    );
-    expect(genderDefaultDatetimeRadio).toBeDisabled();
+
+  it('Source Tab: edit mode', async () => {
+    const getLockBtn = screen.getByRole('img', { name: /lock/i });
+    userEvent.click(getLockBtn);
+
+    const physicalRadioBtn = screen.getByRole('radio', {
+      name: /physical \(table or view\)/i,
+    });
+    const virtualRadioBtn = screen.getByRole('radio', {
+      name: /virtual \(sql\)/i,
+    });
+
+    expect(physicalRadioBtn).toBeEnabled();
+    expect(virtualRadioBtn).toBeEnabled();
+  });
+
+  it('Source Tab: readOnly mode', () => {
+    const getLockBtn = screen.getByRole('img', { name: /lock/i });
+    expect(getLockBtn).toBeInTheDocument();
+
+    const physicalRadioBtn = screen.getByRole('radio', {
+      name: /physical \(table or view\)/i,
+    });
+    const virtualRadioBtn = screen.getByRole('radio', {
+      name: /virtual \(sql\)/i,
+    });
+
+    expect(physicalRadioBtn).toBeDisabled();
+    expect(virtualRadioBtn).toBeDisabled();
   });
 });
diff --git a/superset-frontend/src/components/Datasource/DatasourceEditorCurrency.test.jsx b/superset-frontend/src/components/Datasource/DatasourceEditorCurrency.test.jsx
new file mode 100644
index 00000000000..d6c81b0a8d7
--- /dev/null
+++ b/superset-frontend/src/components/Datasource/DatasourceEditorCurrency.test.jsx
@@ -0,0 +1,185 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 fetchMock from 'fetch-mock';
+import { render, screen, waitFor } from 'spec/helpers/testing-library';
+import userEvent from '@testing-library/user-event';
+import DatasourceEditor from './DatasourceEditor';
+import { props, DATASOURCE_ENDPOINT } from './DatasourceEditor.test';
+
+// Optimized render function that doesn't use waitFor initially
+// This helps prevent one source of the timeout
+const fastRender = props =>
+  render(<DatasourceEditor {...props} />, {
+    useRedux: true,
+    initialState: { common: { currencies: ['USD', 'GBP', 'EUR'] } },
+  });
+
+describe('DatasourceEditor Currency Tests', () => {
+  beforeEach(() => {
+    fetchMock.get(DATASOURCE_ENDPOINT, [], { overwriteRoutes: true });
+  });
+
+  afterEach(() => {
+    fetchMock.restore();
+  });
+
+  // The problematic test, now optimized
+  it('renders currency controls', async () => {
+    // Setup a metric with currency data
+    const propsWithCurrency = {
+      ...props,
+      datasource: {
+        ...props.datasource,
+        metrics: [
+          {
+            ...props.datasource.metrics[0],
+            currency: { symbol: 'USD', symbolPosition: 'prefix' },
+          },
+          ...props.datasource.metrics.slice(1),
+        ],
+      },
+      // Fresh mock for each test to avoid interference
+      onChange: jest.fn(),
+    };
+
+    // Faster rendering without initial waitFor
+    fastRender(propsWithCurrency);
+
+    // Navigate to metrics tab
+    const metricButton = screen.getByTestId('collection-tab-Metrics');
+    await userEvent.click(metricButton);
+
+    // Find and expand the first metric row
+    const expandToggles = await screen.findAllByLabelText(
+      /expand row/i,
+      {},
+      { timeout: 5000 },
+    );
+    await userEvent.click(expandToggles[0]);
+
+    // Check for currency section header
+    const currencyHeader = await screen.findByText(
+      'Metric currency',
+      {},
+      { timeout: 5000 },
+    );
+    expect(currencyHeader).toBeVisible();
+
+    // Check prefix/suffix dropdown - first find the wrapper
+    const positionSelector = screen.getByRole('combobox', {
+      name: 'Currency prefix or suffix',
+    });
+
+    // Verify current value is 'Prefix'
+    expect(positionSelector).toBeInTheDocument();
+
+    // Open the dropdown
+    userEvent.click(positionSelector);
+
+    // Wait for dropdown to open and find the suffix option
+    const suffixOption = await waitFor(
+      () => {
+        // Look for 'suffix' option in the dropdown
+        const options = document.querySelectorAll('.ant-select-item-option');
+        const suffixOpt = Array.from(options).find(opt =>
+          opt.textContent.toLowerCase().includes('suffix'),
+        );
+
+        if (!suffixOpt) throw new Error('Suffix option not found');
+        return suffixOpt;
+      },
+      { timeout: 5000 },
+    );
+
+    // Clear the mock to ensure clean state
+    propsWithCurrency.onChange.mockClear();
+
+    // Click the suffix option
+    userEvent.click(suffixOption);
+
+    // Check if onChange was called with the expected parameters
+    await waitFor(
+      () => {
+        expect(propsWithCurrency.onChange).toHaveBeenCalledTimes(1);
+        const callArg = propsWithCurrency.onChange.mock.calls[0][0];
+
+        // More robust check for the metrics array
+        const metrics = callArg.metrics || [];
+        const updatedMetric = metrics.find(
+          m => m.currency && m.currency.symbolPosition === 'suffix',
+        );
+
+        expect(updatedMetric).toBeDefined();
+        expect(updatedMetric.currency.symbol).toBe('USD');
+      },
+      { timeout: 5000 },
+    );
+
+    // Now test changing the currency symbol
+    const currencySymbol = await screen.findByRole(
+      'combobox',
+      {
+        name: 'Currency symbol',
+      },
+      { timeout: 5000 },
+    );
+
+    // Open the currency dropdown
+    userEvent.click(currencySymbol);
+
+    // Wait for dropdown to open and find the GBP option
+    const gbpOption = await waitFor(
+      () => {
+        // Look for 'GBP' option in the dropdown
+        const options = document.querySelectorAll('.ant-select-item-option');
+        const gbpOpt = Array.from(options).find(opt =>
+          opt.textContent.includes('GBP'),
+        );
+
+        if (!gbpOpt) throw new Error('GBP option not found');
+        return gbpOpt;
+      },
+      { timeout: 5000 },
+    );
+
+    // Clear mock again
+    propsWithCurrency.onChange.mockClear();
+
+    // Click the GBP option
+    userEvent.click(gbpOption);
+
+    // Verify the onChange with GBP was called
+    await waitFor(
+      () => {
+        expect(propsWithCurrency.onChange).toHaveBeenCalledTimes(1);
+        const callArg = propsWithCurrency.onChange.mock.calls[0][0];
+
+        // More robust check
+        const metrics = callArg.metrics || [];
+        const updatedMetric = metrics.find(
+          m => m.currency && m.currency.symbol === 'GBP',
+        );
+
+        expect(updatedMetric).toBeDefined();
+        expect(updatedMetric.currency.symbolPosition).toBe('suffix');
+      },
+      { timeout: 5000 },
+    );
+  }, 60000);
+});
diff --git a/superset-frontend/src/components/Datasource/DatasourceEditorRTL.test.jsx b/superset-frontend/src/components/Datasource/DatasourceEditorRTL.test.jsx
new file mode 100644
index 00000000000..5a4b869e7a7
--- /dev/null
+++ b/superset-frontend/src/components/Datasource/DatasourceEditorRTL.test.jsx
@@ -0,0 +1,124 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 fetchMock from 'fetch-mock';
+import { screen, userEvent, waitFor } from 'spec/helpers/testing-library';
+import {
+  props,
+  asyncRender,
+  DATASOURCE_ENDPOINT,
+} from './DatasourceEditor.test';
+
+describe('DatasourceEditor RTL Metrics Tests', () => {
+  beforeEach(() => {
+    fetchMock.get(DATASOURCE_ENDPOINT, [], { overwriteRoutes: true });
+    jest.clearAllMocks();
+  });
+
+  afterEach(() => {
+    fetchMock.restore();
+  });
+
+  it('properly renders the metric information', async () => {
+    await asyncRender(props);
+
+    const metricButton = screen.getByTestId('collection-tab-Metrics');
+    await userEvent.click(metricButton);
+
+    const expandToggle = await screen.findAllByLabelText(/expand row/i);
+    await userEvent.click(expandToggle[0]);
+
+    const certificationDetails = await screen.findByPlaceholderText(
+      /certification details/i,
+    );
+    expect(certificationDetails.value).toEqual('foo');
+
+    const warningMarkdown = await screen.findByPlaceholderText(/certified by/i);
+    expect(warningMarkdown.value).toEqual('someone');
+  });
+
+  it('properly updates the metric information', async () => {
+    await asyncRender(props);
+
+    const metricButton = screen.getByTestId('collection-tab-Metrics');
+    await userEvent.click(metricButton);
+
+    const expandToggle = await screen.findAllByLabelText(/expand row/i);
+    await userEvent.click(expandToggle[1]);
+
+    const certifiedBy = await screen.findByPlaceholderText(/certified by/i);
+    // Use userEvent.clear and userEvent.type instead of directly setting value
+    await userEvent.clear(certifiedBy);
+    await userEvent.type(certifiedBy, 'I am typing a new name');
+
+    const certificationDetails = await screen.findByPlaceholderText(
+      /certification details/i,
+    );
+    await waitFor(() => {
+      expect(certifiedBy.value).toEqual('I am typing a new name');
+    });
+
+    await userEvent.clear(certificationDetails);
+    await userEvent.type(certificationDetails, 'I am typing something new');
+
+    await waitFor(() => {
+      expect(certificationDetails.value).toEqual('I am typing something new');
+    });
+  });
+});
+
+describe('DatasourceEditor RTL Columns Tests', () => {
+  beforeEach(() => {
+    fetchMock.get(DATASOURCE_ENDPOINT, [], { overwriteRoutes: true });
+    jest.clearAllMocks();
+  });
+
+  afterEach(() => {
+    fetchMock.restore();
+  });
+
+  it('shows the default datetime column', async () => {
+    await asyncRender(props);
+
+    const columnsButton = screen.getByTestId('collection-tab-Columns');
+    await userEvent.click(columnsButton);
+
+    const dsDefaultDatetimeRadio = screen.getByTestId('radio-default-dttm-ds');
+    expect(dsDefaultDatetimeRadio).toBeChecked();
+
+    const genderDefaultDatetimeRadio = screen.getByTestId(
+      'radio-default-dttm-gender',
+    );
+    expect(genderDefaultDatetimeRadio).not.toBeChecked();
+  });
+
+  it('allows choosing only temporal columns as the default datetime', async () => {
+    await asyncRender(props);
+
+    const columnsButton = screen.getByTestId('collection-tab-Columns');
+    await userEvent.click(columnsButton);
+
+    const dsDefaultDatetimeRadio = screen.getByTestId('radio-default-dttm-ds');
+    expect(dsDefaultDatetimeRadio).toBeEnabled();
+
+    const genderDefaultDatetimeRadio = screen.getByTestId(
+      'radio-default-dttm-gender',
+    );
+    expect(genderDefaultDatetimeRadio).toBeDisabled();
+  });
+});
diff --git a/superset-frontend/src/components/Datasource/DatasourceModal.test.jsx b/superset-frontend/src/components/Datasource/DatasourceModal.test.jsx
index d84411f48ef..b614ff87db9 100644
--- a/superset-frontend/src/components/Datasource/DatasourceModal.test.jsx
+++ b/superset-frontend/src/components/Datasource/DatasourceModal.test.jsx
@@ -28,14 +28,14 @@ import {
 import fetchMock from 'fetch-mock';
 import sinon from 'sinon';
 import { SupersetClient } from '@superset-ui/core';
-import { DatasourceModal } from 'src/components/Datasource';
 import mockDatasource from 'spec/fixtures/mockDatasource';
+import { DatasourceModal } from '.';
 
 // Define your constants here
 const SAVE_ENDPOINT = 'glob:*/api/v1/dataset/7';
 const SAVE_PAYLOAD = { new: 'data' };
-const SAVE_DATASOURCE_ENDPOINT = 'glob:*/api/v1/dataset/7';
-const GET_DATASOURCE_ENDPOINT = SAVE_DATASOURCE_ENDPOINT;
+const SAVE_DATASOURCE_ENDPOINT = 'glob:*/api/v1/dataset/7?override_columns=*';
+const GET_DATASOURCE_ENDPOINT = 'glob:*/api/v1/dataset/7';
 const GET_DATABASE_ENDPOINT = 'glob:*/api/v1/database/?q=*';
 
 const mockedProps = {
diff --git a/superset-frontend/src/components/Datasource/DatasourceModal.tsx b/superset-frontend/src/components/Datasource/DatasourceModal.tsx
index 51a60e11bef..cb78a538e4b 100644
--- a/superset-frontend/src/components/Datasource/DatasourceModal.tsx
+++ b/superset-frontend/src/components/Datasource/DatasourceModal.tsx
@@ -17,11 +17,8 @@
  * under the License.
  */
 import { FunctionComponent, useState, useRef } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
-import Alert from 'src/components/Alert';
-import Button from 'src/components/Button';
+import { useSelector } from 'react-redux';
 import {
-  isDefined,
   styled,
   SupersetClient,
   getClientErrorObject,
@@ -31,21 +28,17 @@ import {
   css,
 } from '@superset-ui/core';
 
-import { Icons } from 'src/components/Icons';
-import Modal from 'src/components/Modal';
-import AsyncEsmComponent from 'src/components/AsyncEsmComponent';
-import ErrorMessageWithStackTrace from 'src/components/ErrorMessage/ErrorMessageWithStackTrace';
+import {
+  Icons,
+  Alert,
+  Button,
+  Modal,
+  AsyncEsmComponent,
+} from '@superset-ui/core/components';
 import withToasts from 'src/components/MessageToasts/withToasts';
-import {
-  startMetaDataLoading,
-  stopMetaDataLoading,
-  syncDatasourceMetadata,
-} from 'src/explore/actions/exploreActions';
-import {
-  fetchSyncedColumns,
-  updateColumns,
-} from 'src/components/Datasource/utils';
-import { DatasetObject } from '../../features/datasets/types';
+import { ErrorMessageWithStackTrace } from 'src/components';
+import type { DatasetObject } from 'src/features/datasets/types';
+import type { DatasourceModalProps } from './types';
 
 const DatasourceEditor = AsyncEsmComponent(() => import('./DatasourceEditor'));
 
@@ -68,17 +61,11 @@ const StyledDatasourceModal = styled(Modal)`
   .modal-footer {
     flex: 0 1 auto;
   }
-`;
 
-interface DatasourceModalProps {
-  addSuccessToast: (msg: string) => void;
-  addDangerToast: (msg: string) => void;
-  datasource: DatasetObject;
-  onChange: () => {};
-  onDatasourceSave: (datasource: object, errors?: Array<any>) => {};
-  onHide: () => {};
-  show: boolean;
-}
+  .ant-tabs-top {
+    margin-top: -${({ theme }) => theme.sizeUnit * 4}px;
+  }
+`;
 
 function buildExtraJsonObject(
   item: DatasetObject['metrics'][0] | DatasetObject['columns'][0],
@@ -98,14 +85,12 @@ function buildExtraJsonObject(
 
 const DatasourceModal: FunctionComponent<DatasourceModalProps> = ({
   addSuccessToast,
-  addDangerToast,
   datasource,
   onDatasourceSave,
   onHide,
   show,
 }) => {
   const theme = useTheme();
-  const dispatch = useDispatch();
   const [currentDatasource, setCurrentDatasource] = useState(datasource);
   const currencies = useSelector<
     {
@@ -152,9 +137,7 @@ const DatasourceModal: FunctionComponent<DatasourceModalProps> = ({
             metric_name: metric.metric_name,
             metric_type: metric.metric_type,
             d3format: metric.d3format || null,
-            currency: !isDefined(metric.currency)
-              ? null
-              : JSON.stringify(metric.currency),
+            currency: metric.currency,
             verbose_name: metric.verbose_name,
             warning_text: metric.warning_text,
             uuid: metric.uuid,
@@ -200,36 +183,13 @@ const DatasourceModal: FunctionComponent<DatasourceModalProps> = ({
   const onConfirmSave = async () => {
     // Pull out extra fields into the extra object
     setIsSaving(true);
+    const overrideColumns = datasource.sql !== currentDatasource.sql;
     try {
       await SupersetClient.put({
-        endpoint: `/api/v1/dataset/${currentDatasource.id}`,
+        endpoint: `/api/v1/dataset/${currentDatasource.id}?override_columns=${overrideColumns}`,
         jsonPayload: buildPayload(currentDatasource),
       });
-      if (datasource.sql !== currentDatasource.sql) {
-        // if sql has changed, save a second time with synced columns
-        dispatch(startMetaDataLoading());
-        try {
-          const columnJson = await fetchSyncedColumns(currentDatasource);
-          const columnChanges = updateColumns(
-            currentDatasource.columns,
-            columnJson,
-            addSuccessToast,
-          );
-          currentDatasource.columns = columnChanges.finalColumns;
-          dispatch(syncDatasourceMetadata(currentDatasource));
-          dispatch(stopMetaDataLoading());
-          addSuccessToast(t('Metadata has been synced'));
-        } catch (error) {
-          dispatch(stopMetaDataLoading());
-          addDangerToast(
-            t('An error has occurred while syncing virtual dataset columns'),
-          );
-        }
-        await SupersetClient.put({
-          endpoint: `/api/v1/dataset/${currentDatasource.id}`,
-          jsonPayload: buildPayload(currentDatasource),
-        });
-      }
+
       const { json } = await SupersetClient.get({
         endpoint: `/api/v1/dataset/${currentDatasource?.id}`,
       });
@@ -282,8 +242,8 @@ const DatasourceModal: FunctionComponent<DatasourceModalProps> = ({
     <div>
       <Alert
         css={theme => ({
-          marginTop: theme.gridUnit * 4,
-          marginBottom: theme.gridUnit * 4,
+          marginTop: theme.sizeUnit * 4,
+          marginBottom: theme.sizeUnit * 4,
         })}
         type="warning"
         showIcon
@@ -317,7 +277,7 @@ const DatasourceModal: FunctionComponent<DatasourceModalProps> = ({
           <Icons.EditOutlined
             iconSize="l"
             css={css`
-              margin: auto ${theme.gridUnit * 2}px auto 0;
+              margin: auto ${theme.sizeUnit * 2}px auto 0;
             `}
             data-test="edit-alt"
           />
@@ -331,7 +291,7 @@ const DatasourceModal: FunctionComponent<DatasourceModalProps> = ({
           <Button
             data-test="datasource-modal-cancel"
             buttonSize="small"
-            className="m-r-5"
+            buttonStyle="secondary"
             onClick={onHide}
           >
             {t('Cancel')}
diff --git a/superset-frontend/src/components/Datasource/Field.test.tsx b/superset-frontend/src/components/Datasource/Field.test.tsx
index cab68b0c2fc..3f2d3ee8c98 100644
--- a/superset-frontend/src/components/Datasource/Field.test.tsx
+++ b/superset-frontend/src/components/Datasource/Field.test.tsx
@@ -17,6 +17,7 @@
  * under the License.
  */
 import { fireEvent, render, screen } from 'spec/helpers/testing-library';
+import { Input } from '@superset-ui/core/components';
 
 import Field from './Field';
 
@@ -25,7 +26,7 @@ const defaultProps = {
   value: '',
   label: 'mock',
   description: 'description',
-  control: <input type="text" data-test="mock-text-control" />,
+  control: <Input data-test="mock-text-control" />,
   onChange: jest.fn(),
   compact: false,
   inline: false,
diff --git a/superset-frontend/src/components/Datasource/Field.tsx b/superset-frontend/src/components/Datasource/Field.tsx
index 289f1eac472..a70e7c64def 100644
--- a/superset-frontend/src/components/Datasource/Field.tsx
+++ b/superset-frontend/src/components/Datasource/Field.tsx
@@ -18,10 +18,13 @@
  */
 import { useCallback, ReactNode, ReactElement, cloneElement } from 'react';
 
-import { css, SupersetTheme } from '@superset-ui/core';
-import { Tooltip } from 'src/components/Tooltip';
-import { FormItem, FormLabel } from 'src/components/Form';
-import { Icons } from 'src/components/Icons';
+import { css, SupersetTheme, useTheme } from '@superset-ui/core';
+import {
+  Icons,
+  Tooltip,
+  FormItem,
+  FormLabel,
+} from '@superset-ui/core/components';
 
 const formItemInlineCss = css`
   .ant-form-item-control-input-content {
@@ -65,6 +68,28 @@ export default function Field<V>({
     value,
     onChange: onControlChange,
   });
+  const theme = useTheme();
+  const extra = !compact && description ? description : undefined;
+  const infoTooltip =
+    compact && description ? (
+      <Tooltip
+        css={css`
+          color: ${theme.colorTextTertiary};
+        `}
+        id="field-descr"
+        placement="right"
+        title={description}
+      >
+        <Icons.InfoCircleOutlined
+          iconSize="s"
+          css={css`
+            margin-left: ${theme.sizeUnit}px;
+          `}
+          iconColor={theme.colorTextTertiary}
+        />
+      </Tooltip>
+    ) : undefined;
+
   return (
     <div
       css={
@@ -77,35 +102,21 @@ export default function Field<V>({
       {additionalControl}
       <FormItem
         label={
-          <FormLabel className="m-r-5">
+          <FormLabel>
             {label || fieldKey}
-            {compact && description && (
-              <Tooltip id="field-descr" placement="right" title={description}>
-                <Icons.InfoCircleFilled iconSize="s" className="m-l-5" />
-              </Tooltip>
-            )}
+            {infoTooltip}
           </FormLabel>
         }
         css={inline && formItemInlineCss}
+        extra={extra}
       >
         {hookedControl}
-        {!compact && description && (
-          <div
-            css={(theme: SupersetTheme) => ({
-              color: theme.colors.grayscale.base,
-              [inline ? 'marginLeft' : 'marginTop']: theme.gridUnit,
-            })}
-          >
-            {description}
-          </div>
-        )}
       </FormItem>
       {errorMessage && (
         <div
           css={(theme: SupersetTheme) => ({
-            color: theme.colors.error.base,
-            marginTop: -16,
-            fontSize: theme.typography.sizes.s,
+            color: theme.colorText,
+            [inline ? 'marginLeft' : 'marginTop']: theme.sizeUnit,
           })}
         >
           {errorMessage}
diff --git a/superset-frontend/src/components/Datasource/Fieldset.tsx b/superset-frontend/src/components/Datasource/Fieldset.tsx
index 3d93f37ba5c..cf1efd4434d 100644
--- a/superset-frontend/src/components/Datasource/Fieldset.tsx
+++ b/superset-frontend/src/components/Datasource/Fieldset.tsx
@@ -16,52 +16,53 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { ReactNode, PureComponent } from 'react';
-import { Form } from 'src/components/Form';
-
+import { ReactNode, useCallback } from 'react';
+import { Divider, Form, Typography } from '@superset-ui/core/components';
 import { recurseReactClone } from './utils';
 import Field from './Field';
 
 interface FieldsetProps {
   children: ReactNode;
-  onChange: Function;
+  onChange: (updatedItem: Record<string, any>) => void;
   item: Record<string, any>;
-  title: ReactNode;
-  compact: boolean;
+  title?: ReactNode;
+  compact?: boolean;
 }
 
 type fieldKeyType = string | number;
 
-export default class Fieldset extends PureComponent<FieldsetProps> {
-  static defaultProps = {
-    compact: false,
-    title: null,
-  };
+export default function Fieldset({
+  children,
+  onChange,
+  item,
+  title = null,
+  compact = false,
+}: FieldsetProps) {
+  const handleChange = useCallback(
+    (fieldKey: fieldKeyType, val: any) => {
+      onChange({
+        ...item,
+        [fieldKey]: val,
+      });
+    },
+    [onChange, item],
+  );
 
-  constructor(props: FieldsetProps) {
-    super(props);
-    this.onChange = this.onChange.bind(this);
-  }
+  const propExtender = (field: { props: { fieldKey: fieldKeyType } }) => ({
+    onChange: handleChange,
+    value: item[field.props.fieldKey],
+    compact,
+  });
 
-  onChange(fieldKey: fieldKeyType, val: any) {
-    return this.props.onChange({
-      ...this.props.item,
-      [fieldKey]: val,
-    });
-  }
+  return (
+    <Form className="CRUD" layout="vertical">
+      {title && (
+        <Typography.Title level={5}>
+          {title} <Divider />
+        </Typography.Title>
+      )}
 
-  render() {
-    const { title } = this.props;
-    const propExtender = (field: { props: { fieldKey: fieldKeyType } }) => ({
-      onChange: this.onChange,
-      value: this.props.item[field.props.fieldKey],
-      compact: this.props.compact,
-    });
-    return (
-      <Form className="CRUD" layout="vertical">
-        {title && <legend>{title}</legend>}
-        {recurseReactClone(this.props.children, Field, propExtender)}
-      </Form>
-    );
-  }
+      {recurseReactClone(children, Field, propExtender)}
+    </Form>
+  );
 }
diff --git a/superset-frontend/src/components/Datasource/index.tsx b/superset-frontend/src/components/Datasource/index.tsx
index de28b24c4cb..59cc0dc8023 100644
--- a/superset-frontend/src/components/Datasource/index.tsx
+++ b/superset-frontend/src/components/Datasource/index.tsx
@@ -20,3 +20,4 @@ import ChangeDatasourceModal from './ChangeDatasourceModal';
 import DatasourceModal from './DatasourceModal';
 
 export { ChangeDatasourceModal, DatasourceModal };
+export type { DatasourceModalProps, ChangeDatasourceModalProps } from './types';
diff --git a/superset-frontend/src/components/Datasource/types.ts b/superset-frontend/src/components/Datasource/types.ts
new file mode 100644
index 00000000000..62cd19921dd
--- /dev/null
+++ b/superset-frontend/src/components/Datasource/types.ts
@@ -0,0 +1,92 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 type { ReactNode, DetailedHTMLProps, TdHTMLAttributes } from 'react';
+import type { DatasetObject } from 'src/features/datasets/types';
+
+export interface Datasource {
+  type: string;
+  id: number;
+  uid: string;
+}
+
+export interface DatasourceModalProps {
+  addSuccessToast: (msg: string) => void;
+  addDangerToast: (msg: string) => void;
+  datasource: DatasetObject;
+  onChange: () => {};
+  onDatasourceSave: (datasource: object, errors?: Array<any>) => {};
+  onHide: () => {};
+  show: boolean;
+}
+
+export interface ChangeDatasourceModalProps {
+  addDangerToast: (msg: string) => void;
+  addSuccessToast: (msg: string) => void;
+  onChange: (uid: string) => void;
+  onDatasourceSave: (datasource: object, errors?: Array<any>) => {};
+  onHide: () => void;
+  show: boolean;
+}
+
+export interface CRUDCollectionProps {
+  allowAddItem?: boolean;
+  allowDeletes?: boolean;
+  collection: Record<PropertyKey, any>[];
+  columnLabels?: Record<PropertyKey, any>;
+  columnLabelTooltips?: Record<PropertyKey, any>;
+  emptyMessage?: ReactNode;
+  expandFieldset?: ReactNode;
+  extraButtons?: ReactNode;
+  itemGenerator?: () => any;
+  itemCellProps?: ((
+    val: unknown,
+    label: string,
+    record: any,
+  ) => DetailedHTMLProps<
+    TdHTMLAttributes<HTMLTableCellElement>,
+    HTMLTableCellElement
+  >)[];
+  itemRenderers?: ((
+    val: unknown,
+    onChange: () => void,
+    label: string,
+    record: any,
+  ) => ReactNode)[];
+  onChange?: (arg0: any) => void;
+  tableColumns: any[];
+  tableLayout?: 'fixed' | 'auto';
+  sortColumns: string[];
+  stickyHeader?: boolean;
+}
+
+export type Sort = number | string | boolean | any;
+
+export enum SortOrder {
+  Asc = 1,
+  Desc = 2,
+  Unsorted = 0,
+}
+
+export interface CRUDCollectionState {
+  collection: Record<PropertyKey, any>;
+  collectionArray: Record<PropertyKey, any>[];
+  expandedColumns: Record<PropertyKey, any>;
+  sortColumn: string;
+  sort: SortOrder;
+}
diff --git a/superset-frontend/src/components/Datasource/utils.js b/superset-frontend/src/components/Datasource/utils.js
index dd319adbe2e..471a7a0065b 100644
--- a/superset-frontend/src/components/Datasource/utils.js
+++ b/superset-frontend/src/components/Datasource/utils.js
@@ -105,6 +105,7 @@ export function updateColumns(prevCols, newCols, addSuccessToast) {
         'Modified 1 column in the virtual dataset',
         'Modified %s columns in the virtual dataset',
         columnChanges.modified.length,
+        columnChanges.modified.length,
       ),
     );
   }
@@ -114,6 +115,7 @@ export function updateColumns(prevCols, newCols, addSuccessToast) {
         'Removed 1 column from the virtual dataset',
         'Removed %s columns from the virtual dataset',
         columnChanges.removed.length,
+        columnChanges.removed.length,
       ),
     );
   }
@@ -123,6 +125,7 @@ export function updateColumns(prevCols, newCols, addSuccessToast) {
         'Added 1 new column to the virtual dataset',
         'Added %s new columns to the virtual dataset',
         columnChanges.added.length,
+        columnChanges.added.length,
       ),
     );
   }
diff --git a/superset-frontend/src/components/Datasource/utils.test.tsx b/superset-frontend/src/components/Datasource/utils.test.tsx
index c247f5d4a79..83b6ca99870 100644
--- a/superset-frontend/src/components/Datasource/utils.test.tsx
+++ b/superset-frontend/src/components/Datasource/utils.test.tsx
@@ -51,6 +51,7 @@ describe('updateColumns', () => {
         'Added 1 new column to the virtual dataset',
         'Added %s new columns to the virtual dataset',
         2,
+        2,
       ),
     );
   });
@@ -88,6 +89,7 @@ describe('updateColumns', () => {
         'Modified 1 column in the virtual dataset',
         'Modified %s columns in the virtual dataset',
         1,
+        1,
       ),
     );
   });
@@ -114,6 +116,7 @@ describe('updateColumns', () => {
         'Removed 1 column from the virtual dataset',
         'Removed %s columns from the virtual dataset',
         1,
+        1,
       ),
     );
   });
@@ -146,6 +149,7 @@ describe('updateColumns', () => {
           'Modified 1 column in the virtual dataset',
           'Modified %s columns in the virtual dataset',
           1,
+          1,
         ),
       ],
       [
@@ -153,6 +157,7 @@ describe('updateColumns', () => {
           'Removed 1 column from the virtual dataset',
           'Removed %s columns from the virtual dataset',
           1,
+          1,
         ),
       ],
       [
@@ -160,6 +165,7 @@ describe('updateColumns', () => {
           'Added 1 new column to the virtual dataset',
           'Added %s new columns to the virtual dataset',
           1,
+          1,
         ),
       ],
     ]);
@@ -195,6 +201,7 @@ describe('updateColumns', () => {
           'Modified 1 column in the virtual dataset',
           'Modified %s columns in the virtual dataset',
           1,
+          1,
         ),
       ],
     ]);
diff --git a/superset-frontend/src/components/Descriptions/index.tsx b/superset-frontend/src/components/Descriptions/index.tsx
index 1d1de86d872..af1fde97c7f 100644
--- a/superset-frontend/src/components/Descriptions/index.tsx
+++ b/superset-frontend/src/components/Descriptions/index.tsx
@@ -17,5 +17,5 @@
  * under the License.
  */
 
-export { Descriptions } from 'antd-v5';
-export type { DescriptionsProps } from 'antd-v5/es/descriptions';
+export { Descriptions } from 'antd';
+export type { DescriptionsProps } from 'antd/es/descriptions';
diff --git a/superset-frontend/src/components/DropdownContainer/DropdownContainer.test.tsx b/superset-frontend/src/components/DropdownContainer/DropdownContainer.test.tsx
deleted file mode 100644
index 7833a1313be..00000000000
--- a/superset-frontend/src/components/DropdownContainer/DropdownContainer.test.tsx
+++ /dev/null
@@ -1,157 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 { screen, render, userEvent } from 'spec/helpers/testing-library';
-import Button from '../Button';
-import { Icons } from '../Icons';
-import DropdownContainer from '.';
-
-const generateItems = (n: number) =>
-  Array.from({ length: n }).map((_, i) => ({
-    id: `el-${i + 1}`,
-    element: <Button>{`Element ${i + 1}`}</Button>,
-  }));
-
-const ITEMS = generateItems(10);
-
-const mockOverflowingIndex = async (
-  overflowingIndex: number,
-  func: Function,
-) => {
-  const spy = jest.spyOn(global.React, 'useState');
-  spy.mockImplementation(() => [overflowingIndex, jest.fn()]);
-  await func();
-  spy.mockRestore();
-};
-
-test('renders children', () => {
-  render(<DropdownContainer items={generateItems(3)} />);
-  expect(screen.getByText('Element 1')).toBeInTheDocument();
-  expect(screen.getByText('Element 2')).toBeInTheDocument();
-  expect(screen.getByText('Element 3')).toBeInTheDocument();
-});
-
-test('renders children with custom horizontal spacing', () => {
-  render(<DropdownContainer items={ITEMS} style={{ gap: 20 }} />);
-  expect(screen.getByTestId('container')).toHaveStyle('gap: 20px');
-});
-
-test('renders a dropdown trigger when overflowing', async () => {
-  await mockOverflowingIndex(3, () => {
-    render(<DropdownContainer items={ITEMS} />);
-    expect(screen.getByText('More')).toBeInTheDocument();
-  });
-});
-
-test('renders a dropdown trigger with custom icon', async () => {
-  await mockOverflowingIndex(3, async () => {
-    render(
-      <DropdownContainer
-        items={ITEMS}
-        dropdownTriggerIcon={<Icons.LinkOutlined />}
-      />,
-    );
-    expect(
-      await screen.findByRole('img', { name: 'link' }),
-    ).toBeInTheDocument();
-  });
-});
-
-test('renders a dropdown trigger with custom text', async () => {
-  await mockOverflowingIndex(3, () => {
-    const customText = 'Custom text';
-    render(
-      <DropdownContainer items={ITEMS} dropdownTriggerText={customText} />,
-    );
-    expect(screen.getByText(customText)).toBeInTheDocument();
-  });
-});
-
-test('renders a dropdown trigger with custom count', async () => {
-  await mockOverflowingIndex(3, () => {
-    const customCount = 99;
-    render(
-      <DropdownContainer items={ITEMS} dropdownTriggerCount={customCount} />,
-    );
-    expect(screen.getByTitle(customCount)).toBeInTheDocument();
-  });
-});
-
-test('does not render a dropdown button when not overflowing', () => {
-  render(<DropdownContainer items={generateItems(3)} />);
-  expect(screen.queryByText('More')).not.toBeInTheDocument();
-});
-
-test('renders a dropdown when overflowing', async () => {
-  await mockOverflowingIndex(3, () => {
-    render(<DropdownContainer items={ITEMS} />);
-    userEvent.click(screen.getByText('More'));
-    expect(screen.getByTestId('dropdown-content')).toBeInTheDocument();
-  });
-});
-
-test('renders children with custom vertical spacing', async () => {
-  await mockOverflowingIndex(3, () => {
-    render(<DropdownContainer items={ITEMS} dropdownStyle={{ gap: 20 }} />);
-    userEvent.click(screen.getByText('More'));
-    expect(screen.getByTestId('dropdown-content')).toHaveStyle('gap: 20px');
-  });
-});
-
-test('fires event when overflowing state changes', async () => {
-  await mockOverflowingIndex(3, () => {
-    const onOverflowingStateChange = jest.fn();
-    render(
-      <DropdownContainer
-        items={generateItems(5)}
-        onOverflowingStateChange={onOverflowingStateChange}
-      />,
-    );
-    expect(onOverflowingStateChange).toHaveBeenCalledWith({
-      notOverflowed: ['el-1', 'el-2', 'el-3'],
-      overflowed: ['el-4', 'el-5'],
-    });
-  });
-});
-
-test('renders a dropdown with custom content', async () => {
-  await mockOverflowingIndex(3, () => {
-    const customDropdownContent = <div>Custom content</div>;
-    render(
-      <DropdownContainer
-        items={ITEMS}
-        dropdownContent={() => customDropdownContent}
-      />,
-    );
-    userEvent.click(screen.getByText('More'));
-    expect(screen.getByText('Custom content')).toBeInTheDocument();
-  });
-});
-
-test('Shows tooltip on dropdown trigger hover', async () => {
-  await mockOverflowingIndex(3, async () => {
-    render(
-      <DropdownContainer
-        items={generateItems(5)}
-        dropdownTriggerTooltip="Test tooltip"
-      />,
-    );
-    userEvent.hover(screen.getByText('More'));
-    expect(await screen.findByText('Test tooltip')).toBeInTheDocument();
-  });
-});
diff --git a/superset-frontend/src/components/DynamicPlugins/index.tsx b/superset-frontend/src/components/DynamicPlugins/index.tsx
index 7650e062596..28538a53ea3 100644
--- a/superset-frontend/src/components/DynamicPlugins/index.tsx
+++ b/superset-frontend/src/components/DynamicPlugins/index.tsx
@@ -28,25 +28,10 @@ import {
   makeApi,
 } from '@superset-ui/core';
 import { omitBy } from 'lodash';
+import type { Plugin, PluginAction, PluginContextType } from './types';
 
 const metadataRegistry = getChartMetadataRegistry();
 
-export type PluginContextType = {
-  loading: boolean;
-  /** These are actually only the dynamic plugins */
-  dynamicPlugins: {
-    [key: string]: {
-      key: string;
-      mounting: boolean;
-      error: null | Error;
-    };
-  };
-  keys: string[];
-  /** Mounted means the plugin's js bundle has been imported */
-  mountedPluginMetadata: Record<string, ChartMetadata>;
-  fetchAll: () => void;
-};
-
 const dummyPluginContext: PluginContextType = {
   loading: true,
   dynamicPlugins: {},
@@ -71,33 +56,6 @@ export const PluginContext = createContext(dummyPluginContext);
  */
 export const usePluginContext = () => useContext(PluginContext);
 
-// the plugin returned from the API
-type Plugin = {
-  name: string;
-  key: string;
-  bundle_url: string;
-  id: number;
-};
-
-// when a plugin completes loading
-type CompleteAction = {
-  type: 'complete';
-  key: string;
-  error: null | Error;
-};
-
-// when plugins start loading
-type BeginAction = {
-  type: 'begin';
-  keys: string[];
-};
-
-type ChangedKeysAction = {
-  type: 'changed keys';
-};
-
-type PluginAction = BeginAction | CompleteAction | ChangedKeysAction;
-
 function getRegistryData() {
   return {
     keys: metadataRegistry.keys(),
@@ -229,3 +187,5 @@ export const DynamicPluginProvider: FC = ({ children }) => {
     </PluginContext.Provider>
   );
 };
+
+export type { PluginContextType };
diff --git a/superset-frontend/src/components/DynamicPlugins/types.ts b/superset-frontend/src/components/DynamicPlugins/types.ts
new file mode 100644
index 00000000000..24a6bfdfac1
--- /dev/null
+++ b/superset-frontend/src/components/DynamicPlugins/types.ts
@@ -0,0 +1,62 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 type { ChartMetadata } from '@superset-ui/core';
+
+export type PluginContextType = {
+  loading: boolean;
+  /** These are actually only the dynamic plugins */
+  dynamicPlugins: {
+    [key: string]: {
+      key: string;
+      mounting: boolean;
+      error: null | Error;
+    };
+  };
+  keys: string[];
+  /** Mounted means the plugin's js bundle has been imported */
+  mountedPluginMetadata: Record<string, ChartMetadata>;
+  fetchAll: () => void;
+};
+
+// the plugin returned from the API
+export type Plugin = {
+  name: string;
+  key: string;
+  bundle_url: string;
+  id: number;
+};
+
+// when a plugin completes loading
+export type CompleteAction = {
+  type: 'complete';
+  key: string;
+  error: null | Error;
+};
+
+// when plugins start loading
+export type BeginAction = {
+  type: 'begin';
+  keys: string[];
+};
+
+export type ChangedKeysAction = {
+  type: 'changed keys';
+};
+
+export type PluginAction = BeginAction | CompleteAction | ChangedKeysAction;
diff --git a/superset-frontend/src/components/EditableTitle/EditableTitle.test.tsx b/superset-frontend/src/components/EditableTitle/EditableTitle.test.tsx
deleted file mode 100644
index 12ecfacf780..00000000000
--- a/superset-frontend/src/components/EditableTitle/EditableTitle.test.tsx
+++ /dev/null
@@ -1,113 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 { fireEvent, getByRole, render } from 'spec/helpers/testing-library';
-
-import EditableTable from 'src/components/EditableTitle';
-
-const mockEvent = {
-  target: {
-    value: 'new title',
-  },
-};
-const mockProps = {
-  title: 'my title',
-  canEdit: true,
-  onSaveTitle: jest.fn(),
-};
-
-test('should render title', () => {
-  const { getByRole } = render(<EditableTable {...mockProps} />);
-  expect(getByRole('button')).toBeInTheDocument();
-  expect(getByRole('button')).toHaveValue(mockProps.title);
-});
-test('should not render an input if it is not editable', () => {
-  const { queryByRole } = render(
-    <EditableTable title="my title" onSaveTitle={jest.fn()} />,
-  );
-  expect(queryByRole('button')).not.toBeInTheDocument();
-});
-
-describe('should handle click', () => {
-  test('should change title', () => {
-    const { getByRole, container } = render(<EditableTable {...mockProps} />);
-    fireEvent.click(getByRole('button'));
-    expect(container.querySelector('input')?.getAttribute('type')).toEqual(
-      'text',
-    );
-  });
-});
-
-describe('should handle change', () => {
-  test('should change title', () => {
-    const { getByTestId, container } = render(
-      <EditableTable {...mockProps} editing />,
-    );
-    fireEvent.change(getByTestId('editable-title-input'), mockEvent);
-    expect(container.querySelector('input')).toHaveValue('new title');
-  });
-});
-
-describe('should handle blur', () => {
-  const setup = (overrides: Partial<typeof mockProps> = {}) => {
-    const selectors = render(<EditableTable {...mockProps} {...overrides} />);
-    fireEvent.click(selectors.getByRole('button'));
-    return selectors;
-  };
-
-  test('default input type should be text', () => {
-    const { container } = setup();
-    expect(container.querySelector('input')?.getAttribute('type')).toEqual(
-      'text',
-    );
-  });
-
-  test('should trigger callback', () => {
-    const callback = jest.fn();
-    const { getByTestId, container } = setup({ onSaveTitle: callback });
-    fireEvent.change(getByTestId('editable-title-input'), mockEvent);
-    fireEvent.blur(getByTestId('editable-title-input'));
-    expect(callback).toHaveBeenCalledTimes(1);
-    expect(callback).toHaveBeenCalledWith('new title');
-    expect(container.querySelector('input')?.getAttribute('type')).toEqual(
-      'button',
-    );
-  });
-
-  test('should not trigger callback', () => {
-    const callback = jest.fn();
-    const { getByTestId, container } = setup({ onSaveTitle: callback });
-    fireEvent.blur(getByTestId('editable-title-input'));
-    expect(container.querySelector('input')?.getAttribute('type')).toEqual(
-      'button',
-    );
-    // no change
-    expect(callback).not.toHaveBeenCalled();
-  });
-
-  test('should not save empty title', () => {
-    const callback = jest.fn();
-    const { getByTestId, container } = setup({ onSaveTitle: callback });
-    fireEvent.blur(getByTestId('editable-title-input'));
-    expect(container.querySelector('input')?.getAttribute('type')).toEqual(
-      'button',
-    );
-    expect(getByRole(container, 'button')).toHaveValue(mockProps.title);
-    expect(callback).not.toHaveBeenCalled();
-  });
-});
diff --git a/superset-frontend/src/components/EditableTitle/index.tsx b/superset-frontend/src/components/EditableTitle/index.tsx
deleted file mode 100644
index fc01fb9f63b..00000000000
--- a/superset-frontend/src/components/EditableTitle/index.tsx
+++ /dev/null
@@ -1,265 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 { useEffect, useState, useRef } from 'react';
-import { Link } from 'react-router-dom';
-import cx from 'classnames';
-import { css, styled, SupersetTheme, t } from '@superset-ui/core';
-import { Tooltip } from 'src/components/Tooltip';
-import CertifiedBadge from '../CertifiedBadge';
-
-export interface EditableTitleProps {
-  canEdit?: boolean;
-  editing?: boolean;
-  emptyText?: string;
-  extraClasses?: Array<string> | string;
-  multiLine?: boolean;
-  noPermitTooltip?: string;
-  onSaveTitle: (arg0: string) => void;
-  showTooltip?: boolean;
-  style?: object;
-  title?: string;
-  defaultTitle?: string;
-  placeholder?: string;
-  certifiedBy?: string;
-  certificationDetails?: string;
-  url?: string;
-}
-
-const StyledCertifiedBadge = styled(CertifiedBadge)`
-  vertical-align: middle;
-`;
-
-export default function EditableTitle({
-  canEdit = false,
-  editing = false,
-  extraClasses,
-  multiLine = false,
-  noPermitTooltip,
-  onSaveTitle,
-  showTooltip = true,
-  style,
-  title = '',
-  defaultTitle = '',
-  placeholder = '',
-  certifiedBy,
-  certificationDetails,
-  url,
-  // rest is related to title tooltip
-  ...rest
-}: EditableTitleProps) {
-  const [isEditing, setIsEditing] = useState(editing);
-  const [currentTitle, setCurrentTitle] = useState(title);
-  const [lastTitle, setLastTitle] = useState(title);
-  const [contentBoundingRect, setContentBoundingRect] =
-    useState<DOMRect | null>(null);
-  // Used so we can access the DOM element if a user clicks on this component.
-
-  const contentRef = useRef<any | HTMLInputElement | HTMLTextAreaElement>();
-
-  useEffect(() => {
-    if (title !== currentTitle) {
-      setLastTitle(currentTitle);
-      setCurrentTitle(title);
-    }
-  }, [title]);
-
-  useEffect(() => {
-    if (isEditing) {
-      contentRef.current.focus();
-      // move cursor and scroll to the end
-      if (contentRef.current.setSelectionRange) {
-        const { length } = contentRef.current.value;
-        contentRef.current.setSelectionRange(length, length);
-        contentRef.current.scrollLeft = contentRef.current.scrollWidth;
-        contentRef.current.scrollTop = contentRef.current.scrollHeight;
-      }
-    }
-  }, [isEditing]);
-
-  function handleClick() {
-    if (!canEdit || isEditing) {
-      return;
-    }
-
-    // For multi-line values, save the actual rendered size of the displayed text.
-    // Later, if a textarea is constructed for editing the value, we'll need this.
-    const contentBounding = contentRef.current
-      ? contentRef.current.getBoundingClientRect()
-      : null;
-    setIsEditing(true);
-    setContentBoundingRect(contentBounding);
-  }
-
-  function handleBlur() {
-    const formattedTitle = currentTitle.trim();
-
-    if (!canEdit) {
-      return;
-    }
-
-    setIsEditing(false);
-
-    if (!formattedTitle.length) {
-      setCurrentTitle(lastTitle);
-      return;
-    }
-
-    if (lastTitle !== formattedTitle) {
-      setLastTitle(formattedTitle);
-    }
-
-    if (title !== formattedTitle) {
-      onSaveTitle(formattedTitle);
-    }
-  }
-
-  // tl;dr when a EditableTitle is being edited, typically the Tab that wraps it has been
-  // clicked and is focused/active. For accessibility, when the focused tab anchor intercepts
-  // the ' ' key (among others, including all arrows) the onChange() doesn't fire. Somehow
-  // keydown is still called so we can detect this and manually add a ' ' to the current title
-  function handleKeyDown(event: any) {
-    if (event.key === ' ') {
-      event.stopPropagation();
-    }
-    if (event.key === 'Enter') {
-      event.preventDefault();
-      handleBlur();
-    }
-  }
-
-  function handleChange(ev: any) {
-    if (!canEdit) {
-      return;
-    }
-    setCurrentTitle(ev.target.value);
-  }
-
-  function handleKeyPress(ev: any) {
-    if (ev.key === 'Enter') {
-      ev.preventDefault();
-      handleBlur();
-    }
-  }
-
-  let value: string | undefined;
-  value = currentTitle;
-  if (!isEditing && !currentTitle) {
-    value = defaultTitle || title;
-  }
-
-  // Construct an inline style based on previously-saved height of the rendered label. Only
-  // used in multi-line contexts.
-  const editStyle =
-    isEditing && contentBoundingRect
-      ? { height: `${contentBoundingRect.height}px` }
-      : undefined;
-
-  // Create a textarea when we're editing a multi-line value, otherwise create an input (which may
-  // be text or a button).
-  let titleComponent =
-    multiLine && isEditing ? (
-      <textarea
-        data-test="editable-title-input"
-        ref={contentRef}
-        value={value}
-        className={!title ? 'text-muted' : undefined}
-        onKeyDown={handleKeyDown}
-        onChange={handleChange}
-        onBlur={handleBlur}
-        onClick={handleClick}
-        onKeyPress={handleKeyPress}
-        placeholder={placeholder}
-        style={editStyle}
-      />
-    ) : (
-      <input
-        data-test="editable-title-input"
-        ref={contentRef}
-        type={isEditing ? 'text' : 'button'}
-        value={value}
-        className={!title ? 'text-muted' : undefined}
-        onKeyDown={handleKeyDown}
-        onChange={handleChange}
-        onBlur={handleBlur}
-        onClick={handleClick}
-        onKeyPress={handleKeyPress}
-        placeholder={placeholder}
-      />
-    );
-  if (showTooltip && !isEditing) {
-    titleComponent = (
-      <Tooltip
-        id="title-tooltip"
-        title={
-          canEdit
-            ? t('Click to edit')
-            : noPermitTooltip ||
-              t("You don't have the rights to alter this title.")
-        }
-      >
-        {titleComponent}
-      </Tooltip>
-    );
-  }
-  if (!canEdit) {
-    // don't actually want an input in this case
-    titleComponent = url ? (
-      <Link
-        to={url}
-        data-test="editable-title-input"
-        css={(theme: SupersetTheme) => css`
-          color: ${theme.colors.grayscale.dark1};
-          text-decoration: none;
-          :hover {
-            text-decoration: underline;
-          }
-          display: inline-block;
-        `}
-      >
-        {value}
-      </Link>
-    ) : (
-      <span data-test="editable-title-input">{value}</span>
-    );
-  }
-  return (
-    <span
-      data-test="editable-title"
-      className={cx(
-        'editable-title',
-        extraClasses,
-        canEdit && 'editable-title--editable',
-        isEditing && 'editable-title--editing',
-      )}
-      style={style}
-      {...rest}
-    >
-      {certifiedBy && (
-        <>
-          <StyledCertifiedBadge
-            certifiedBy={certifiedBy}
-            details={certificationDetails}
-            size="xl"
-          />{' '}
-        </>
-      )}
-      {titleComponent}
-    </span>
-  );
-}
diff --git a/superset-frontend/src/components/ErrorBoundary/ErrorBoundary.test.tsx b/superset-frontend/src/components/ErrorBoundary/ErrorBoundary.test.tsx
index 3d04008293b..1b167667a94 100644
--- a/superset-frontend/src/components/ErrorBoundary/ErrorBoundary.test.tsx
+++ b/superset-frontend/src/components/ErrorBoundary/ErrorBoundary.test.tsx
@@ -18,7 +18,8 @@
  */
 import { ReactElement } from 'react';
 import { render, screen } from 'spec/helpers/testing-library';
-import ErrorBoundary, { ErrorBoundaryProps } from '.';
+import type { ErrorBoundaryProps } from './types';
+import { ErrorBoundary } from '.';
 
 const mockedProps: Partial<ErrorBoundaryProps> = {
   children: <span>Error children</span>,
diff --git a/superset-frontend/src/components/ErrorBoundary/index.tsx b/superset-frontend/src/components/ErrorBoundary/index.tsx
index c7e60d577f8..1550f5e4f0c 100644
--- a/superset-frontend/src/components/ErrorBoundary/index.tsx
+++ b/superset-frontend/src/components/ErrorBoundary/index.tsx
@@ -16,23 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { Component, ErrorInfo, ReactNode } from 'react';
+import { Component, ErrorInfo } from 'react';
 import { t } from '@superset-ui/core';
-import ErrorAlert from 'src/components/ErrorMessage/ErrorAlert';
+import { ErrorAlert } from '../ErrorMessage';
+import type { ErrorBoundaryProps, ErrorBoundaryState } from './types';
 
-export interface ErrorBoundaryProps {
-  children: ReactNode;
-  onError?: (error: Error, info: ErrorInfo) => void;
-  showMessage?: boolean;
-  className?: string;
-}
-
-interface ErrorBoundaryState {
-  error: Error | null;
-  info: ErrorInfo | null;
-}
-
-export default class ErrorBoundary extends Component<
+export class ErrorBoundary extends Component<
   ErrorBoundaryProps,
   ErrorBoundaryState
 > {
@@ -70,3 +59,5 @@ export default class ErrorBoundary extends Component<
     return this.props.children;
   }
 }
+
+export type { ErrorBoundaryProps };
diff --git a/superset-frontend/src/components/ErrorBoundary/types.ts b/superset-frontend/src/components/ErrorBoundary/types.ts
new file mode 100644
index 00000000000..48b32124999
--- /dev/null
+++ b/superset-frontend/src/components/ErrorBoundary/types.ts
@@ -0,0 +1,31 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 type { ErrorInfo, ReactNode } from 'react';
+
+export interface ErrorBoundaryProps {
+  children: ReactNode;
+  onError?: (error: Error, info: ErrorInfo) => void;
+  showMessage?: boolean;
+  className?: string;
+}
+
+export interface ErrorBoundaryState {
+  error: Error | null;
+  info: ErrorInfo | null;
+}
diff --git a/superset-frontend/src/components/ErrorMessage/BasicErrorAlert.test.tsx b/superset-frontend/src/components/ErrorMessage/BasicErrorAlert.test.tsx
index 3ac2729f220..17048e1e53a 100644
--- a/superset-frontend/src/components/ErrorMessage/BasicErrorAlert.test.tsx
+++ b/superset-frontend/src/components/ErrorMessage/BasicErrorAlert.test.tsx
@@ -19,10 +19,10 @@
 
 import { render, screen } from 'spec/helpers/testing-library';
 import { ErrorLevel, supersetTheme } from '@superset-ui/core';
-import BasicErrorAlert from './BasicErrorAlert';
+import { BasicErrorAlert } from './BasicErrorAlert';
 
 jest.mock(
-  'src/components/Icons/AsyncIcon',
+  '@superset-ui/core/components/Icons/AsyncIcon',
   () =>
     ({ fileName }: { fileName: string }) => (
       <span role="img" aria-label={fileName.replace('_', '-')} />
@@ -72,7 +72,7 @@ test('should render with warning theme', () => {
   render(<BasicErrorAlert {...mockedProps} />);
   expect(screen.getByRole('alert')).toHaveStyle(
     `
-      backgroundColor: ${supersetTheme.colors.warning.light2};
+      color: ${supersetTheme.colorWarningText};
     `,
   );
 });
@@ -85,7 +85,7 @@ test('should render with error theme', () => {
   render(<BasicErrorAlert {...errorProps} />);
   expect(screen.getByRole('alert')).toHaveStyle(
     `
-      backgroundColor: ${supersetTheme.colors.error.light2};
+      color: ${supersetTheme.colorErrorText};
     `,
   );
 });
diff --git a/superset-frontend/src/components/ErrorMessage/BasicErrorAlert.tsx b/superset-frontend/src/components/ErrorMessage/BasicErrorAlert.tsx
index 1bad6a8a529..218fbfd43df 100644
--- a/superset-frontend/src/components/ErrorMessage/BasicErrorAlert.tsx
+++ b/superset-frontend/src/components/ErrorMessage/BasicErrorAlert.tsx
@@ -16,30 +16,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { ErrorLevel, styled, useTheme } from '@superset-ui/core';
-import { Icons } from 'src/components/Icons';
-
-const StyledContainer = styled.div<{ level: ErrorLevel }>`
-  display: flex;
-  flex-direction: row;
-  background-color: ${({ level, theme }) => theme.colors[level].light2};
-  border-radius: ${({ theme }) => theme.borderRadius}px;
-  border: 1px solid ${({ level, theme }) => theme.colors[level].base};
-  color: ${({ level, theme }) => theme.colors[level].dark2};
-  padding: ${({ theme }) => theme.gridUnit * 2}px;
-  margin-bottom: ${({ theme }) => theme.gridUnit}px;
-  width: 100%;
-`;
+import { ErrorLevel, styled, themeObject, useTheme } from '@superset-ui/core';
+import { Icons } from '@superset-ui/core/components';
 
 const StyledContent = styled.div`
   display: flex;
   flex-direction: column;
-  margin-left: ${({ theme }) => theme.gridUnit * 2}px;
+  margin-left: ${({ theme }) => theme.sizeUnit * 2}px;
   overflow: hidden;
 `;
 
 const StyledTitle = styled.span`
-  font-weight: ${({ theme }) => theme.typography.weights.bold};
+  font-weight: ${({ theme }) => theme.fontWeightStrong};
 `;
 
 interface BasicErrorAlertProps {
@@ -48,21 +36,32 @@ interface BasicErrorAlertProps {
   level?: ErrorLevel;
 }
 
-export default function BasicErrorAlert({
+export function BasicErrorAlert({
   body,
   level = 'error',
   title,
 }: BasicErrorAlertProps) {
   const theme = useTheme();
-  const iconColor = theme.colors[level].base;
+  const variants = themeObject.getColorVariants(level);
+  const style: React.CSSProperties = {
+    backgroundColor: variants.bg,
+    borderColor: variants.border,
+    color: variants.text,
+    display: 'flex',
+    flexDirection: 'row',
+    borderRadius: `${theme.borderRadius}px`,
+    padding: `${theme.sizeUnit * 2}px`,
+    marginBottom: `${theme.sizeUnit}px`,
+    width: '100%',
+  };
 
   return (
-    <StyledContainer level={level} role="alert">
-      <Icons.ExclamationCircleFilled iconColor={iconColor} />
+    <div style={style} role="alert">
+      <Icons.ExclamationCircleFilled iconColor={variants.text} />
       <StyledContent>
         <StyledTitle>{title}</StyledTitle>
         <p>{body}</p>
       </StyledContent>
-    </StyledContainer>
+    </div>
   );
 }
diff --git a/superset-frontend/src/components/ErrorMessage/DatabaseErrorMessage.test.tsx b/superset-frontend/src/components/ErrorMessage/DatabaseErrorMessage.test.tsx
index b9a98b7ced3..41367081224 100644
--- a/superset-frontend/src/components/ErrorMessage/DatabaseErrorMessage.test.tsx
+++ b/superset-frontend/src/components/ErrorMessage/DatabaseErrorMessage.test.tsx
@@ -19,10 +19,10 @@
 
 import { ErrorLevel, ErrorSource, ErrorTypeEnum } from '@superset-ui/core';
 import { render, screen, userEvent } from 'spec/helpers/testing-library';
-import DatabaseErrorMessage from './DatabaseErrorMessage';
+import { DatabaseErrorMessage } from './DatabaseErrorMessage';
 
 jest.mock(
-  'src/components/Icons/AsyncIcon',
+  '@superset-ui/core/components/Icons/AsyncIcon',
   () =>
     ({ fileName }: { fileName: string }) => (
       <span role="img" aria-label={fileName.replace('_', '-')} />
diff --git a/superset-frontend/src/components/ErrorMessage/DatabaseErrorMessage.tsx b/superset-frontend/src/components/ErrorMessage/DatabaseErrorMessage.tsx
index 7e9e69ea7ec..dcbd5fca5ef 100644
--- a/superset-frontend/src/components/ErrorMessage/DatabaseErrorMessage.tsx
+++ b/superset-frontend/src/components/ErrorMessage/DatabaseErrorMessage.tsx
@@ -19,9 +19,9 @@
 import { ReactNode } from 'react';
 import { t, tn } from '@superset-ui/core';
 
-import { ErrorMessageComponentProps } from './types';
-import IssueCode from './IssueCode';
-import ErrorAlert from './ErrorAlert';
+import type { ErrorMessageComponentProps } from './types';
+import { IssueCode } from './IssueCode';
+import { ErrorAlert } from './ErrorAlert';
 
 interface DatabaseErrorExtra {
   owners?: string[];
@@ -32,10 +32,9 @@ interface DatabaseErrorExtra {
   engine_name: string | null;
 }
 
-function DatabaseErrorMessage({
+export function DatabaseErrorMessage({
   error,
   source,
-  subtitle,
 }: ErrorMessageComponentProps<DatabaseErrorExtra | null>) {
   const { extra, level, message } = error;
 
@@ -89,5 +88,3 @@ function DatabaseErrorMessage({
     />
   );
 }
-
-export default DatabaseErrorMessage;
diff --git a/superset-frontend/src/components/ErrorMessage/DatasetNotFoundErrorMessage.test.tsx b/superset-frontend/src/components/ErrorMessage/DatasetNotFoundErrorMessage.test.tsx
index f54e29272cc..cfe1b61a606 100644
--- a/superset-frontend/src/components/ErrorMessage/DatasetNotFoundErrorMessage.test.tsx
+++ b/superset-frontend/src/components/ErrorMessage/DatasetNotFoundErrorMessage.test.tsx
@@ -19,10 +19,10 @@
 
 import { ErrorLevel, ErrorSource, ErrorTypeEnum } from '@superset-ui/core';
 import { render, screen } from 'spec/helpers/testing-library';
-import DatasetNotFoundErrorMessage from './DatasetNotFoundErrorMessage';
+import { DatasetNotFoundErrorMessage } from './DatasetNotFoundErrorMessage';
 
 jest.mock(
-  'src/components/Icons/AsyncIcon',
+  '@superset-ui/core/components/Icons/AsyncIcon',
   () =>
     ({ fileName }: { fileName: string }) => (
       <span role="img" aria-label={fileName.replace('_', '-')} />
diff --git a/superset-frontend/src/components/ErrorMessage/DatasetNotFoundErrorMessage.tsx b/superset-frontend/src/components/ErrorMessage/DatasetNotFoundErrorMessage.tsx
index 238b345c348..0da2973796a 100644
--- a/superset-frontend/src/components/ErrorMessage/DatasetNotFoundErrorMessage.tsx
+++ b/superset-frontend/src/components/ErrorMessage/DatasetNotFoundErrorMessage.tsx
@@ -18,10 +18,10 @@
  */
 import { t } from '@superset-ui/core';
 
-import { ErrorMessageComponentProps } from './types';
-import ErrorAlert from './ErrorAlert';
+import type { ErrorMessageComponentProps } from './types';
+import { ErrorAlert } from './ErrorAlert';
 
-function DatasetNotFoundErrorMessage({
+export function DatasetNotFoundErrorMessage({
   error,
   subtitle,
 }: ErrorMessageComponentProps) {
@@ -35,5 +35,3 @@ function DatasetNotFoundErrorMessage({
     />
   );
 }
-
-export default DatasetNotFoundErrorMessage;
diff --git a/superset-frontend/src/components/ErrorMessage/ErrorAlert.stories.tsx b/superset-frontend/src/components/ErrorMessage/ErrorAlert.stories.tsx
index b7595c00fa8..5ae44b2f738 100644
--- a/superset-frontend/src/components/ErrorMessage/ErrorAlert.stories.tsx
+++ b/superset-frontend/src/components/ErrorMessage/ErrorAlert.stories.tsx
@@ -17,8 +17,8 @@
  * under the License.
  */
 import { Meta, StoryFn } from '@storybook/react';
-import { Layout, Row, Col, Card } from 'antd-v5';
-import ErrorAlert from './ErrorAlert';
+import { Card, Col, Layout, Row } from '@superset-ui/core/components';
+import { ErrorAlert } from './ErrorAlert';
 
 const { Content } = Layout;
 
@@ -32,12 +32,8 @@ Please check your query and ensure it follows the correct syntax.`;
 const detailsExample = `Additional details about the issue are provided here.
 This content is shown when the user clicks "Show more".`;
 
-const ErrorCard: React.FC<{ children: React.ReactNode }> = ({ children }) => (
-  <Card>{children}</Card>
-);
-
 export default {
-  title: 'Components/ErrorAlert',
+  title: 'Components/ErrorMessage/ErrorAlert',
   component: ErrorAlert,
 } as Meta;
 
@@ -47,12 +43,12 @@ export const Gallery: StoryFn = () => (
       <h2>Non-Compact Errors</h2>
       <Row gutter={[16, 16]}>
         <Col xs={48} sm={24} md={16} lg={16} xl={12}>
-          <ErrorCard>
+          <Card>
             <ErrorAlert message="Only message props was passed here" />
-          </ErrorCard>
+          </Card>
         </Col>
         <Col xs={48} sm={24} md={16} lg={16} xl={12}>
-          <ErrorCard>
+          <Card>
             <ErrorAlert
               errorType="Database Connection Error"
               type="warning"
@@ -60,10 +56,10 @@ export const Gallery: StoryFn = () => (
               descriptionDetails={detailsExample}
               descriptionDetailsCollapsed
             />
-          </ErrorCard>
+          </Card>
         </Col>
         <Col xs={48} sm={24} md={16} lg={16} xl={12}>
-          <ErrorCard>
+          <Card>
             <ErrorAlert
               errorType="Error"
               message="SQL Syntax Error - No defaults set here"
@@ -72,10 +68,10 @@ export const Gallery: StoryFn = () => (
               descriptionDetailsCollapsed
               descriptionPre
             />
-          </ErrorCard>
+          </Card>
         </Col>
         <Col xs={48} sm={24} md={16} lg={16} xl={12}>
-          <ErrorCard>
+          <Card>
             <ErrorAlert
               errorType="Error"
               message="See the details below"
@@ -84,10 +80,10 @@ export const Gallery: StoryFn = () => (
               descriptionDetails={detailsExample}
               descriptionDetailsCollapsed={false}
             />
-          </ErrorCard>
+          </Card>
         </Col>
         <Col xs={48} sm={24} md={16} lg={16} xl={12}>
-          <ErrorCard>
+          <Card>
             <ErrorAlert
               errorType="Informational Warning"
               message="This is a non-pre-wrap styled description"
@@ -97,31 +93,31 @@ export const Gallery: StoryFn = () => (
               descriptionDetailsCollapsed={false}
               descriptionPre={false}
             />
-          </ErrorCard>
+          </Card>
         </Col>
         <Col xs={24} sm={12} md={8} lg={8} xl={6}>
-          <ErrorCard>
+          <Card>
             <ErrorAlert
               errorType="Error"
               message="Something went wrong"
               type="error"
             />
-          </ErrorCard>
+          </Card>
         </Col>
         <Col xs={24} sm={12} md={8} lg={8} xl={6}>
-          <ErrorCard>
+          <Card>
             <ErrorAlert
               errorType="Warning"
               message="Be cautious"
               type="warning"
             />
-          </ErrorCard>
+          </Card>
         </Col>
       </Row>
       <h2>Compact Errors (with Modal)</h2>
       <Row gutter={[16, 16]}>
         <Col xs={24} sm={12} md={8} lg={8} xl={6}>
-          <ErrorCard>
+          <Card>
             <ErrorAlert
               errorType="Error"
               message="Compact mode example"
@@ -131,10 +127,10 @@ export const Gallery: StoryFn = () => (
               description={sqlErrorDescription}
               descriptionDetails={detailsExample}
             />
-          </ErrorCard>
+          </Card>
         </Col>
         <Col xs={24} sm={12} md={8} lg={8} xl={6}>
-          <ErrorCard>
+          <Card>
             <ErrorAlert
               errorType="Warning"
               message="Compact mode example"
@@ -143,7 +139,7 @@ export const Gallery: StoryFn = () => (
               descriptionDetails={detailsExample}
               descriptionDetailsCollapsed
             />
-          </ErrorCard>
+          </Card>
         </Col>
       </Row>
     </Content>
diff --git a/superset-frontend/src/components/ErrorMessage/ErrorAlert.test.tsx b/superset-frontend/src/components/ErrorMessage/ErrorAlert.test.tsx
index a46b9660721..2538b1e8008 100644
--- a/superset-frontend/src/components/ErrorMessage/ErrorAlert.test.tsx
+++ b/superset-frontend/src/components/ErrorMessage/ErrorAlert.test.tsx
@@ -18,7 +18,7 @@
  */
 
 import { screen, fireEvent, render } from 'spec/helpers/testing-library';
-import ErrorAlert from './ErrorAlert';
+import { ErrorAlert } from './ErrorAlert';
 
 describe('ErrorAlert', () => {
   it('renders the error message correctly', () => {
diff --git a/superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx b/superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx
index b04b0f1f0af..1c503de955c 100644
--- a/superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx
+++ b/superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx
@@ -17,28 +17,17 @@
  * under the License.
  */
 import { useState } from 'react';
-import { Tooltip } from 'src/components/Tooltip';
-import Modal from 'src/components/Modal';
-import { Icons } from 'src/components/Icons';
-import Alert from 'src/components/Alert';
 import { t, useTheme } from '@superset-ui/core';
+import {
+  Alert,
+  Icons,
+  Modal,
+  Tooltip,
+  Typography,
+} from '@superset-ui/core/components';
+import type { ErrorAlertProps } from './types';
 
-export interface ErrorAlertProps {
-  errorType?: string; // Strong text on the first line
-  message: React.ReactNode | string; // Text shown on the first line
-  type?: 'warning' | 'error' | 'info'; // Allows only 'warning' or 'error'
-  description?: React.ReactNode; // Text shown under the first line, not collapsible
-  descriptionDetails?: React.ReactNode | string; // Text shown under the first line, collapsible
-  descriptionDetailsCollapsed?: boolean; // Hides the collapsible section unless "Show more" is clicked, default true
-  descriptionPre?: boolean; // Uses pre-style to break lines, default true
-  compact?: boolean; // Shows the error icon with tooltip and modal, default false
-  children?: React.ReactNode; // Additional content to show in the modal
-  closable?: boolean; // Show close button, default true
-  showIcon?: boolean; // Show icon, default true
-  className?: string;
-}
-
-const ErrorAlert: React.FC<ErrorAlertProps> = ({
+export const ErrorAlert: React.FC<ErrorAlertProps> = ({
   errorType = t('Error'),
   message,
   type = 'error',
@@ -70,7 +59,7 @@ const ErrorAlert: React.FC<ErrorAlertProps> = ({
         <Icons.ExclamationCircleOutlined />
       );
     const color =
-      type === 'warning' ? theme.colors.warning.base : theme.colors.error.base;
+      type === 'warning' ? theme.colorWarningText : theme.colorErrorText;
     return (
       <div className={className} style={{ cursor: 'pointer' }}>
         <span style={{ color }}>{icon} </span>
@@ -80,19 +69,25 @@ const ErrorAlert: React.FC<ErrorAlertProps> = ({
   };
   const preStyle = {
     whiteSpace: 'pre-wrap',
-    fontFamily: theme.typography.families.sansSerif,
+    fontFamily: theme.fontFamilyCode,
   };
   const renderDescription = () => (
     <div>
+      {message && <div>{message}</div>}
       {description && (
-        <p style={descriptionPre ? preStyle : {}} data-testid="description">
+        <Typography.Paragraph
+          style={descriptionPre ? preStyle : {}}
+          data-testid="description"
+        >
           {description}
-        </p>
+        </Typography.Paragraph>
       )}
       {descriptionDetails && (
         <div>
           {isDescriptionVisible && (
-            <p style={descriptionPre ? preStyle : {}}>{descriptionDetails}</p>
+            <Typography.Paragraph style={descriptionPre ? preStyle : {}}>
+              {descriptionDetails}
+            </Typography.Paragraph>
           )}
           <span
             role="button"
@@ -108,19 +103,13 @@ const ErrorAlert: React.FC<ErrorAlertProps> = ({
   );
   const renderAlert = (closable: boolean) => (
     <Alert
+      message={errorType}
       description={renderDescription()}
       type={type}
-      showIcon
+      showIcon={showIcon}
       closable={closable}
       className={className}
-    >
-      <strong>{errorType}</strong>
-      {message && (
-        <>
-          : <span>{message}</span>
-        </>
-      )}
-    </Alert>
+    />
   );
 
   if (compact) {
@@ -146,5 +135,3 @@ const ErrorAlert: React.FC<ErrorAlertProps> = ({
 
   return renderAlert(closable);
 };
-
-export default ErrorAlert;
diff --git a/superset-frontend/src/components/ErrorMessage/ErrorMessageWithStackTrace.test.tsx b/superset-frontend/src/components/ErrorMessage/ErrorMessageWithStackTrace.test.tsx
index f9a3415ace2..b27ff32d00a 100644
--- a/superset-frontend/src/components/ErrorMessage/ErrorMessageWithStackTrace.test.tsx
+++ b/superset-frontend/src/components/ErrorMessage/ErrorMessageWithStackTrace.test.tsx
@@ -19,11 +19,11 @@
 
 import { ErrorLevel, ErrorSource, ErrorTypeEnum } from '@superset-ui/core';
 import { render, screen, userEvent } from 'spec/helpers/testing-library';
-import ErrorMessageWithStackTrace from './ErrorMessageWithStackTrace';
-import BasicErrorAlert from './BasicErrorAlert';
+import { ErrorMessageWithStackTrace } from './ErrorMessageWithStackTrace';
+import { BasicErrorAlert } from './BasicErrorAlert';
 
 jest.mock(
-  'src/components/Icons/AsyncIcon',
+  '@superset-ui/core/components/Icons/AsyncIcon',
   () =>
     ({ fileName }: { fileName: string }) => (
       <span role="img" aria-label={fileName.replace('_', '-')} />
diff --git a/superset-frontend/src/components/ErrorMessage/ErrorMessageWithStackTrace.tsx b/superset-frontend/src/components/ErrorMessage/ErrorMessageWithStackTrace.tsx
index b993927a7cd..c28e5b11366 100644
--- a/superset-frontend/src/components/ErrorMessage/ErrorMessageWithStackTrace.tsx
+++ b/superset-frontend/src/components/ErrorMessage/ErrorMessageWithStackTrace.tsx
@@ -18,8 +18,9 @@
  */
 import { ReactNode } from 'react';
 import { ErrorSource, t, SupersetError } from '@superset-ui/core';
-import getErrorMessageComponentRegistry from './getErrorMessageComponentRegistry';
-import ErrorAlert from './ErrorAlert';
+import { Typography } from '@superset-ui/core/components';
+import { getErrorMessageComponentRegistry } from './getErrorMessageComponentRegistry';
+import { ErrorAlert } from './ErrorAlert';
 
 const DEFAULT_TITLE = t('Unexpected error');
 
@@ -38,7 +39,7 @@ type Props = {
   compact?: boolean;
 };
 
-export default function ErrorMessageWithStackTrace({
+export function ErrorMessageWithStackTrace({
   title = DEFAULT_TITLE,
   error,
   subtitle,
@@ -75,9 +76,13 @@ export default function ErrorMessageWithStackTrace({
     (link || stackTrace ? (
       <>
         {link && (
-          <a href={link} target="_blank" rel="noopener noreferrer">
+          <Typography.Link
+            href={link}
+            target="_blank"
+            rel="noopener noreferrer"
+          >
             {t('Request Access')}
-          </a>
+          </Typography.Link>
         )}
         <br />
         {stackTrace && <pre>{stackTrace}</pre>}
diff --git a/superset-frontend/src/components/ErrorMessage/FrontendNetworkErrorMessage.test.tsx b/superset-frontend/src/components/ErrorMessage/FrontendNetworkErrorMessage.test.tsx
index c364501c67d..c7a1175efa9 100644
--- a/superset-frontend/src/components/ErrorMessage/FrontendNetworkErrorMessage.test.tsx
+++ b/superset-frontend/src/components/ErrorMessage/FrontendNetworkErrorMessage.test.tsx
@@ -19,10 +19,10 @@
 
 import { ErrorLevel, ErrorSource, ErrorTypeEnum } from '@superset-ui/core';
 import { render, screen, userEvent } from 'spec/helpers/testing-library';
-import FrontendNetworkErrorMessage from './FrontendNetworkErrorMessage';
+import { FrontendNetworkErrorMessage } from './FrontendNetworkErrorMessage';
 
 jest.mock(
-  'src/components/Icons/AsyncIcon',
+  '@superset-ui/core/components/Icons/AsyncIcon',
   () =>
     ({ fileName }: { fileName: string }) => (
       <span role="img" aria-label={fileName.replace('_', '-')} />
diff --git a/superset-frontend/src/components/ErrorMessage/FrontendNetworkErrorMessage.tsx b/superset-frontend/src/components/ErrorMessage/FrontendNetworkErrorMessage.tsx
index 303735ca49d..11a32a9682c 100644
--- a/superset-frontend/src/components/ErrorMessage/FrontendNetworkErrorMessage.tsx
+++ b/superset-frontend/src/components/ErrorMessage/FrontendNetworkErrorMessage.tsx
@@ -18,10 +18,10 @@
  */
 import { t } from '@superset-ui/core';
 
-import { ErrorMessageComponentProps } from './types';
-import ErrorAlert from './ErrorAlert';
+import type { ErrorMessageComponentProps } from './types';
+import { ErrorAlert } from './ErrorAlert';
 
-function FrontendNetworkErrorMessage({
+export function FrontendNetworkErrorMessage({
   error,
   subtitle,
   compact,
@@ -36,4 +36,3 @@ function FrontendNetworkErrorMessage({
     />
   );
 }
-export default FrontendNetworkErrorMessage;
diff --git a/superset-frontend/src/components/ErrorMessage/InvalidSQLErrorMessage.test.tsx b/superset-frontend/src/components/ErrorMessage/InvalidSQLErrorMessage.test.tsx
index 99973b2d2ba..6ca62b99814 100644
--- a/superset-frontend/src/components/ErrorMessage/InvalidSQLErrorMessage.test.tsx
+++ b/superset-frontend/src/components/ErrorMessage/InvalidSQLErrorMessage.test.tsx
@@ -18,7 +18,7 @@
 
 import { render, cleanup } from 'spec/helpers/testing-library';
 import { ErrorLevel, ErrorSource, ErrorTypeEnum } from '@superset-ui/core';
-import InvalidSQLErrorMessage from './InvalidSQLErrorMessage';
+import { InvalidSQLErrorMessage } from './InvalidSQLErrorMessage';
 
 const defaultProps = {
   error: {
diff --git a/superset-frontend/src/components/ErrorMessage/InvalidSQLErrorMessage.tsx b/superset-frontend/src/components/ErrorMessage/InvalidSQLErrorMessage.tsx
index 27ca263cfd0..7ce24c6d5e9 100644
--- a/superset-frontend/src/components/ErrorMessage/InvalidSQLErrorMessage.tsx
+++ b/superset-frontend/src/components/ErrorMessage/InvalidSQLErrorMessage.tsx
@@ -18,8 +18,8 @@
  */
 
 import { t } from '@superset-ui/core';
-import { ErrorMessageComponentProps } from './types';
-import ErrorAlert from './ErrorAlert';
+import type { ErrorMessageComponentProps } from './types';
+import { ErrorAlert } from './ErrorAlert';
 
 interface SupersetParseErrorExtra {
   sql: string;
@@ -31,9 +31,8 @@ interface SupersetParseErrorExtra {
 /*
  * Component for showing syntax errors in SQL Lab.
  */
-function InvalidSQLErrorMessage({
+export function InvalidSQLErrorMessage({
   error,
-  source,
   subtitle,
 }: ErrorMessageComponentProps<SupersetParseErrorExtra>) {
   const { extra, level, message } = error;
@@ -62,5 +61,3 @@ function InvalidSQLErrorMessage({
     />
   );
 }
-
-export default InvalidSQLErrorMessage;
diff --git a/superset-frontend/src/components/ErrorMessage/IssueCode.test.tsx b/superset-frontend/src/components/ErrorMessage/IssueCode.test.tsx
index 7e75ae9067b..7c711397419 100644
--- a/superset-frontend/src/components/ErrorMessage/IssueCode.test.tsx
+++ b/superset-frontend/src/components/ErrorMessage/IssueCode.test.tsx
@@ -18,7 +18,7 @@
  */
 
 import { render, screen } from 'spec/helpers/testing-library';
-import IssueCode from './IssueCode';
+import { IssueCode } from './IssueCode';
 
 const mockedProps = {
   code: 1,
diff --git a/superset-frontend/src/components/ErrorMessage/IssueCode.tsx b/superset-frontend/src/components/ErrorMessage/IssueCode.tsx
index af8ab9c7910..f964f0907d1 100644
--- a/superset-frontend/src/components/ErrorMessage/IssueCode.tsx
+++ b/superset-frontend/src/components/ErrorMessage/IssueCode.tsx
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components';
 import { useTheme } from '@superset-ui/core';
 
 interface IssueCodeProps {
@@ -24,7 +24,7 @@ interface IssueCodeProps {
   message: string;
 }
 
-export default function IssueCode({ code, message }: IssueCodeProps) {
+export function IssueCode({ code, message }: IssueCodeProps) {
   const theme = useTheme();
   return (
     <>
@@ -35,7 +35,7 @@ export default function IssueCode({ code, message }: IssueCodeProps) {
         target="_blank"
         aria-label="Superset docs link"
       >
-        <Icons.Full iconSize="m" iconColor={theme.colors.primary.dark1} />
+        <Icons.Full iconSize="m" iconColor={theme.colorPrimary} />
       </a>
     </>
   );
diff --git a/superset-frontend/src/components/ErrorMessage/MarshmallowErrorMessage.test.tsx b/superset-frontend/src/components/ErrorMessage/MarshmallowErrorMessage.test.tsx
index bde3ee0667b..c2f0a938ba7 100644
--- a/superset-frontend/src/components/ErrorMessage/MarshmallowErrorMessage.test.tsx
+++ b/superset-frontend/src/components/ErrorMessage/MarshmallowErrorMessage.test.tsx
@@ -19,7 +19,7 @@
 
 import { render, screen, fireEvent } from 'spec/helpers/testing-library';
 import { ErrorLevel, ErrorTypeEnum } from '@superset-ui/core';
-import MarshmallowErrorMessage from './MarshmallowErrorMessage';
+import { MarshmallowErrorMessage } from './MarshmallowErrorMessage';
 
 describe('MarshmallowErrorMessage', () => {
   const mockError = {
diff --git a/superset-frontend/src/components/ErrorMessage/MarshmallowErrorMessage.tsx b/superset-frontend/src/components/ErrorMessage/MarshmallowErrorMessage.tsx
index 556aa4e0750..6612abd5be0 100644
--- a/superset-frontend/src/components/ErrorMessage/MarshmallowErrorMessage.tsx
+++ b/superset-frontend/src/components/ErrorMessage/MarshmallowErrorMessage.tsx
@@ -17,11 +17,10 @@
  * under the License.
  */
 import { JSONTree } from 'react-json-tree';
-import { css, styled, SupersetTheme, t } from '@superset-ui/core';
-
+import { t } from '@superset-ui/core';
 import { useJsonTreeTheme } from 'src/hooks/useJsonTreeTheme';
-import Collapse from 'src/components/Collapse';
-import { ErrorMessageComponentProps } from './types';
+import { Collapse, List, Typography } from '@superset-ui/core/components';
+import type { ErrorMessageComponentProps } from './types';
 
 interface MarshmallowErrorExtra {
   messages: object;
@@ -32,23 +31,6 @@ interface MarshmallowErrorExtra {
   }[];
 }
 
-const StyledUl = styled.ul`
-  padding-left: ${({ theme }) => theme.gridUnit * 5}px;
-  padding-top: ${({ theme }) => theme.gridUnit * 4}px;
-`;
-
-const collapseStyle = (theme: SupersetTheme) => css`
-  .ant-collapse-arrow {
-    left: 0px !important;
-  }
-  .ant-collapse-header {
-    padding-left: ${theme.gridUnit * 4}px !important;
-  }
-  .ant-collapse-content-box {
-    padding: 0px !important;
-  }
-`;
-
 const extractInvalidValues = (messages: object, payload: object): string[] => {
   const invalidValues: string[] = [];
 
@@ -76,7 +58,7 @@ const extractInvalidValues = (messages: object, payload: object): string[] => {
   return invalidValues;
 };
 
-export default function MarshmallowErrorMessage({
+export function MarshmallowErrorMessage({
   error,
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   source = 'crud',
@@ -91,24 +73,33 @@ export default function MarshmallowErrorMessage({
 
       {message}
 
-      <StyledUl>
-        {extractInvalidValues(extra.messages, extra.payload).map(
-          (value, index) => (
-            <li key={index}>{value}</li>
-          ),
+      <List
+        size="small"
+        dataSource={extractInvalidValues(extra.messages, extra.payload)}
+        renderItem={(value, index) => (
+          <List.Item key={index}>
+            <Typography.Text>{value}</Typography.Text>
+          </List.Item>
         )}
-      </StyledUl>
+      />
 
-      <Collapse ghost css={collapseStyle}>
-        <Collapse.Panel header={t('Details')} key="details" css={collapseStyle}>
-          <JSONTree
-            data={extra.messages}
-            shouldExpandNode={() => true}
-            hideRoot
-            theme={jsonTreeTheme}
-          />
-        </Collapse.Panel>
-      </Collapse>
+      <Collapse
+        ghost
+        items={[
+          {
+            label: t('Details'),
+            key: 'details',
+            children: (
+              <JSONTree
+                data={extra.messages}
+                shouldExpandNode={() => true}
+                hideRoot
+                theme={jsonTreeTheme}
+              />
+            ),
+          },
+        ]}
+      />
     </div>
   );
 }
diff --git a/superset-frontend/src/components/ErrorMessage/OAuth2RedirectMessage.test.tsx b/superset-frontend/src/components/ErrorMessage/OAuth2RedirectMessage.test.tsx
index 3edc1b7d6a6..99ecf894dc9 100644
--- a/superset-frontend/src/components/ErrorMessage/OAuth2RedirectMessage.test.tsx
+++ b/superset-frontend/src/components/ErrorMessage/OAuth2RedirectMessage.test.tsx
@@ -22,10 +22,10 @@ import { Provider } from 'react-redux';
 import { createStore } from 'redux';
 import { render, fireEvent, waitFor } from 'spec/helpers/testing-library';
 import { ErrorLevel, ErrorSource, ErrorTypeEnum } from '@superset-ui/core';
-import OAuth2RedirectMessage from 'src/components/ErrorMessage/OAuth2RedirectMessage';
 import { reRunQuery } from 'src/SqlLab/actions/sqlLab';
 import { triggerQuery } from 'src/components/Chart/chartAction';
 import { onRefresh } from 'src/dashboard/actions/dashboardState';
+import { OAuth2RedirectMessage } from '.';
 
 // Mock the Redux store
 const mockStore = createStore(() => ({
diff --git a/superset-frontend/src/components/ErrorMessage/OAuth2RedirectMessage.tsx b/superset-frontend/src/components/ErrorMessage/OAuth2RedirectMessage.tsx
index 0e2bad17d1c..0c5073dd57d 100644
--- a/superset-frontend/src/components/ErrorMessage/OAuth2RedirectMessage.tsx
+++ b/superset-frontend/src/components/ErrorMessage/OAuth2RedirectMessage.tsx
@@ -27,8 +27,8 @@ import { triggerQuery } from 'src/components/Chart/chartAction';
 import { onRefresh } from 'src/dashboard/actions/dashboardState';
 import { QueryResponse, t } from '@superset-ui/core';
 
-import { ErrorMessageComponentProps } from './types';
-import ErrorAlert from './ErrorAlert';
+import type { ErrorMessageComponentProps } from './types';
+import { ErrorAlert } from './ErrorAlert';
 
 interface OAuth2RedirectExtra {
   url: string;
@@ -59,7 +59,7 @@ interface OAuth2RedirectExtra {
  * by the backend and sent from the opened tab to the original tab. For extra security,
  * we also check that the source of the message is the opened tab via a ref.
  */
-function OAuth2RedirectMessage({
+export function OAuth2RedirectMessage({
   error,
   source,
 }: ErrorMessageComponentProps<OAuth2RedirectExtra>) {
@@ -175,5 +175,3 @@ function OAuth2RedirectMessage({
     />
   );
 }
-
-export default OAuth2RedirectMessage;
diff --git a/superset-frontend/src/components/ErrorMessage/ParameterErrorMessage.test.tsx b/superset-frontend/src/components/ErrorMessage/ParameterErrorMessage.test.tsx
index e2fc8b92e80..80a0f7e5500 100644
--- a/superset-frontend/src/components/ErrorMessage/ParameterErrorMessage.test.tsx
+++ b/superset-frontend/src/components/ErrorMessage/ParameterErrorMessage.test.tsx
@@ -19,10 +19,10 @@
 
 import { ErrorLevel, ErrorSource, ErrorTypeEnum } from '@superset-ui/core';
 import { render, screen, userEvent } from 'spec/helpers/testing-library';
-import ParameterErrorMessage from './ParameterErrorMessage';
+import { ParameterErrorMessage } from './ParameterErrorMessage';
 
 jest.mock(
-  'src/components/Icons/AsyncIcon',
+  '@superset-ui/core/components/Icons/AsyncIcon',
   () =>
     ({ fileName }: { fileName: string }) => (
       <span role="img" aria-label={fileName.replace('_', '-')} />
diff --git a/superset-frontend/src/components/ErrorMessage/ParameterErrorMessage.tsx b/superset-frontend/src/components/ErrorMessage/ParameterErrorMessage.tsx
index 5fbf31d1ffd..56ac4f049d8 100644
--- a/superset-frontend/src/components/ErrorMessage/ParameterErrorMessage.tsx
+++ b/superset-frontend/src/components/ErrorMessage/ParameterErrorMessage.tsx
@@ -20,9 +20,10 @@ import { ReactNode } from 'react';
 import { t, tn } from '@superset-ui/core';
 import levenshtein from 'js-levenshtein';
 
+import { List } from '@superset-ui/core/components';
 import { ErrorMessageComponentProps } from './types';
-import IssueCode from './IssueCode';
-import ErrorAlert from './ErrorAlert';
+import { IssueCode } from './IssueCode';
+import { ErrorAlert } from './ErrorAlert';
 
 interface ParameterErrorExtra {
   undefined_parameters?: string[];
@@ -51,9 +52,8 @@ const findMatches = (undefinedParameters: string[], templateKeys: string[]) => {
   return matches;
 };
 
-function ParameterErrorMessage({
+export function ParameterErrorMessage({
   error,
-  source = 'sqllab',
   subtitle,
 }: ErrorMessageComponentProps<ParameterErrorExtra>) {
   const { extra = { issue_codes: [] }, level, message } = error;
@@ -75,11 +75,15 @@ function ParameterErrorMessage({
         {Object.keys(matches).length > 0 && (
           <>
             <p>{t('Did you mean:')}</p>
-            <ul>
-              {Object.entries(matches).map(
-                ([undefinedParameter, templateKeys]) => (
-                  <li>
-                    {tn(
+            <List
+              split={false}
+              size="small"
+              dataSource={Object.entries(matches)}
+              renderItem={([undefinedParameter, templateKeys]) => (
+                <List.Item compact>
+                  <List.Item.Meta
+                    avatar={<span>•</span>}
+                    title={tn(
                       '%(suggestion)s instead of "%(undefinedParameter)s?"',
                       '%(firstSuggestions)s or %(lastSuggestion)s instead of "%(undefinedParameter)s"?',
                       templateKeys.length,
@@ -90,10 +94,10 @@ function ParameterErrorMessage({
                         undefinedParameter,
                       },
                     )}
-                  </li>
-                ),
+                  />
+                </List.Item>
               )}
-            </ul>
+            />
             <br />
           </>
         )}
@@ -106,7 +110,6 @@ function ParameterErrorMessage({
       </p>
     </>
   );
-
   return (
     <ErrorAlert
       errorType={t('Parameter error')}
@@ -117,5 +120,3 @@ function ParameterErrorMessage({
     />
   );
 }
-
-export default ParameterErrorMessage;
diff --git a/superset-frontend/src/components/ErrorMessage/TimeoutErrorMessage.test.tsx b/superset-frontend/src/components/ErrorMessage/TimeoutErrorMessage.test.tsx
index 8fb2e3d041d..7ceb0062c42 100644
--- a/superset-frontend/src/components/ErrorMessage/TimeoutErrorMessage.test.tsx
+++ b/superset-frontend/src/components/ErrorMessage/TimeoutErrorMessage.test.tsx
@@ -19,10 +19,10 @@
 
 import { ErrorSource, ErrorTypeEnum, ErrorLevel } from '@superset-ui/core';
 import { render, screen, userEvent } from 'spec/helpers/testing-library';
-import TimeoutErrorMessage from './TimeoutErrorMessage';
+import { TimeoutErrorMessage } from './TimeoutErrorMessage';
 
 jest.mock(
-  'src/components/Icons/AsyncIcon',
+  '@superset-ui/core/components/Icons/AsyncIcon',
   () =>
     ({ fileName }: { fileName: string }) => (
       <span role="img" aria-label={fileName.replace('_', '-')} />
diff --git a/superset-frontend/src/components/ErrorMessage/TimeoutErrorMessage.tsx b/superset-frontend/src/components/ErrorMessage/TimeoutErrorMessage.tsx
index f0df59e1474..64d3e48ff75 100644
--- a/superset-frontend/src/components/ErrorMessage/TimeoutErrorMessage.tsx
+++ b/superset-frontend/src/components/ErrorMessage/TimeoutErrorMessage.tsx
@@ -19,9 +19,9 @@
 import { ReactNode } from 'react';
 import { t, tn } from '@superset-ui/core';
 
-import { ErrorMessageComponentProps } from './types';
-import IssueCode from './IssueCode';
-import ErrorAlert from './ErrorAlert';
+import type { ErrorMessageComponentProps } from './types';
+import { IssueCode } from './IssueCode';
+import { ErrorAlert } from './ErrorAlert';
 
 interface TimeoutErrorExtra {
   issue_codes: {
@@ -32,7 +32,7 @@ interface TimeoutErrorExtra {
   timeout: number;
 }
 
-function TimeoutErrorMessage({
+export function TimeoutErrorMessage({
   error,
   source,
 }: ErrorMessageComponentProps<TimeoutErrorExtra>) {
@@ -97,5 +97,3 @@ function TimeoutErrorMessage({
     />
   );
 }
-
-export default TimeoutErrorMessage;
diff --git a/superset-frontend/src/components/ErrorMessage/getErrorMessageComponentRegistry.test.tsx b/superset-frontend/src/components/ErrorMessage/getErrorMessageComponentRegistry.test.tsx
index 03c7c4be705..0d54b546571 100644
--- a/superset-frontend/src/components/ErrorMessage/getErrorMessageComponentRegistry.test.tsx
+++ b/superset-frontend/src/components/ErrorMessage/getErrorMessageComponentRegistry.test.tsx
@@ -16,8 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import getErrorMessageComponentRegistry from 'src/components/ErrorMessage/getErrorMessageComponentRegistry';
-import { ErrorMessageComponentProps } from 'src/components/ErrorMessage/types';
+import type { ErrorMessageComponentProps } from './types';
+import { getErrorMessageComponentRegistry } from './getErrorMessageComponentRegistry';
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const ERROR_MESSAGE_COMPONENT = (_: ErrorMessageComponentProps) => (
diff --git a/superset-frontend/src/components/ErrorMessage/getErrorMessageComponentRegistry.ts b/superset-frontend/src/components/ErrorMessage/getErrorMessageComponentRegistry.ts
index 9f69f9ab2d8..3e6f057edc8 100644
--- a/superset-frontend/src/components/ErrorMessage/getErrorMessageComponentRegistry.ts
+++ b/superset-frontend/src/components/ErrorMessage/getErrorMessageComponentRegistry.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { Registry, makeSingleton, OverwritePolicy } from '@superset-ui/core';
-import { ErrorMessageComponent } from './types';
+import type { ErrorMessageComponent } from './types';
 
 class ErrorMessageComponentRegistry extends Registry<
   ErrorMessageComponent,
@@ -31,8 +31,6 @@ class ErrorMessageComponentRegistry extends Registry<
   }
 }
 
-const getErrorMessageComponentRegistry = makeSingleton(
+export const getErrorMessageComponentRegistry = makeSingleton(
   ErrorMessageComponentRegistry,
 );
-
-export default getErrorMessageComponentRegistry;
diff --git a/superset-frontend/src/components/ErrorMessage/index.tsx b/superset-frontend/src/components/ErrorMessage/index.tsx
new file mode 100644
index 00000000000..c8898acfc31
--- /dev/null
+++ b/superset-frontend/src/components/ErrorMessage/index.tsx
@@ -0,0 +1,33 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+export { BasicErrorAlert } from './BasicErrorAlert';
+export { DatabaseErrorMessage } from './DatabaseErrorMessage';
+export { DatasetNotFoundErrorMessage } from './DatasetNotFoundErrorMessage';
+export { ErrorAlert } from './ErrorAlert';
+export { ErrorMessageWithStackTrace } from './ErrorMessageWithStackTrace';
+export { getErrorMessageComponentRegistry } from './getErrorMessageComponentRegistry';
+export { FrontendNetworkErrorMessage } from './FrontendNetworkErrorMessage';
+export { InvalidSQLErrorMessage } from './InvalidSQLErrorMessage';
+export { IssueCode } from './IssueCode';
+export { MarshmallowErrorMessage } from './MarshmallowErrorMessage';
+export { OAuth2RedirectMessage } from './OAuth2RedirectMessage';
+export { ParameterErrorMessage } from './ParameterErrorMessage';
+export { TimeoutErrorMessage } from './TimeoutErrorMessage';
+
+export type { ErrorAlertProps, ErrorMessageComponentProps } from './types';
diff --git a/superset-frontend/src/components/ErrorMessage/types.ts b/superset-frontend/src/components/ErrorMessage/types.ts
index bb3d39c255f..de38332fa6b 100644
--- a/superset-frontend/src/components/ErrorMessage/types.ts
+++ b/superset-frontend/src/components/ErrorMessage/types.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { ReactNode, ComponentType } from 'react';
-import { ErrorSource, SupersetError } from '@superset-ui/core';
+import type { ReactNode, ComponentType } from 'react';
+import type { ErrorSource, SupersetError } from '@superset-ui/core';
 
 export type ErrorMessageComponentProps<ExtraType = Record<string, any> | null> =
   {
@@ -29,3 +29,18 @@ export type ErrorMessageComponentProps<ExtraType = Record<string, any> | null> =
   };
 
 export type ErrorMessageComponent = ComponentType<ErrorMessageComponentProps>;
+
+export interface ErrorAlertProps {
+  errorType?: string; // Strong text on the first line
+  message: React.ReactNode | string; // Text shown on the first line
+  type?: 'warning' | 'error' | 'info'; // Allows only 'warning' or 'error'
+  description?: React.ReactNode; // Text shown under the first line, not collapsible
+  descriptionDetails?: React.ReactNode | string; // Text shown under the first line, collapsible
+  descriptionDetailsCollapsed?: boolean; // Hides the collapsible section unless "Show more" is clicked, default true
+  descriptionPre?: boolean; // Uses pre-style to break lines, default true
+  compact?: boolean; // Shows the error icon with tooltip and modal, default false
+  children?: React.ReactNode; // Additional content to show in the modal
+  closable?: boolean; // Show close button, default true
+  showIcon?: boolean; // Show icon, default true
+  className?: string;
+}
diff --git a/superset-frontend/src/components/FacePile/FacePile.stories.tsx b/superset-frontend/src/components/FacePile/FacePile.stories.tsx
index 7af1a9d006e..b3e122c056a 100644
--- a/superset-frontend/src/components/FacePile/FacePile.stories.tsx
+++ b/superset-frontend/src/components/FacePile/FacePile.stories.tsx
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import FacePile from '.';
+import { FacePile } from '.';
 
 export default {
-  title: 'FacePile',
+  title: 'Components/FacePile',
   component: FacePile,
   argTypes: {
     maxCount: { control: 'number', defaultValue: 4 },
diff --git a/superset-frontend/src/components/FacePile/FacePile.test.tsx b/superset-frontend/src/components/FacePile/FacePile.test.tsx
index f947ad4c8e2..80fade7d8ce 100644
--- a/superset-frontend/src/components/FacePile/FacePile.test.tsx
+++ b/superset-frontend/src/components/FacePile/FacePile.test.tsx
@@ -18,7 +18,7 @@
  */
 import { act, fireEvent, render, screen } from 'spec/helpers/testing-library';
 import { store } from 'src/views/store';
-import FacePile from '.';
+import { FacePile } from '.';
 import { getRandomColor } from './utils';
 
 const users = [...new Array(10)].map((_, i) => ({
diff --git a/superset-frontend/src/components/FacePile/index.tsx b/superset-frontend/src/components/FacePile/index.tsx
index 38cc1de4741..220209afc2d 100644
--- a/superset-frontend/src/components/FacePile/index.tsx
+++ b/superset-frontend/src/components/FacePile/index.tsx
@@ -16,26 +16,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import type Owner from 'src/types/Owner';
+
 import {
   getCategoricalSchemeRegistry,
   isFeatureEnabled,
   FeatureFlag,
 } from '@superset-ui/core';
 import getOwnerName from 'src/utils/getOwnerName';
-import { Tooltip } from 'src/components/Tooltip';
-import { Avatar, AvatarGroup } from 'src/components/Avatar';
+import { Avatar, AvatarGroup, Tooltip } from '@superset-ui/core/components';
 import { ensureAppRoot } from 'src/utils/pathUtils';
 import { getRandomColor } from './utils';
-
-interface FacePileProps {
-  users: Owner[];
-  maxCount?: number;
-}
+import type { FacePileProps } from './types';
 
 const colorList = getCategoricalSchemeRegistry().get()?.colors ?? [];
 
-export default function FacePile({ users, maxCount = 4 }: FacePileProps) {
+export function FacePile({ users, maxCount = 4 }: FacePileProps) {
   return (
     <AvatarGroup max={{ count: maxCount }}>
       {users.map(user => {
@@ -65,3 +60,5 @@ export default function FacePile({ users, maxCount = 4 }: FacePileProps) {
     </AvatarGroup>
   );
 }
+
+export type { FacePileProps };
diff --git a/superset-frontend/src/components/FacePile/types.ts b/superset-frontend/src/components/FacePile/types.ts
new file mode 100644
index 00000000000..2fffa11b0e5
--- /dev/null
+++ b/superset-frontend/src/components/FacePile/types.ts
@@ -0,0 +1,24 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 type Owner from 'src/types/Owner';
+
+export interface FacePileProps {
+  users: Owner[];
+  maxCount?: number;
+}
diff --git a/superset-frontend/src/components/FilterableTable/FilterableTable.stories.tsx b/superset-frontend/src/components/FilterableTable/FilterableTable.stories.tsx
index a9127b63141..d77e270d079 100644
--- a/superset-frontend/src/components/FilterableTable/FilterableTable.stories.tsx
+++ b/superset-frontend/src/components/FilterableTable/FilterableTable.stories.tsx
@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import FilterableTable, { FilterableTableProps } from '.';
+import type { FilterableTableProps } from './types';
+import { FilterableTable } from '.';
 
 export default {
-  title: 'FilterableTable',
+  title: 'Components/FilterableTable',
   component: FilterableTable,
 };
 
diff --git a/superset-frontend/src/components/FilterableTable/FilterableTable.test.tsx b/superset-frontend/src/components/FilterableTable/FilterableTable.test.tsx
index 8e07d0e97f4..b5a5ceaeec5 100644
--- a/superset-frontend/src/components/FilterableTable/FilterableTable.test.tsx
+++ b/superset-frontend/src/components/FilterableTable/FilterableTable.test.tsx
@@ -17,7 +17,6 @@
  * under the License.
  */
 import { isValidElement } from 'react';
-import FilterableTable from 'src/components/FilterableTable';
 import {
   render,
   screen,
@@ -25,6 +24,7 @@ import {
   within,
 } from 'spec/helpers/testing-library';
 import { setupAGGridModules } from 'src/setup/setupAGGridModules';
+import { FilterableTable } from '.';
 
 describe('FilterableTable', () => {
   beforeAll(() => {
diff --git a/superset-frontend/src/components/FilterableTable/index.tsx b/superset-frontend/src/components/FilterableTable/index.tsx
index 920e7d68cd6..e414bc7d80c 100644
--- a/superset-frontend/src/components/FilterableTable/index.tsx
+++ b/superset-frontend/src/components/FilterableTable/index.tsx
@@ -18,9 +18,13 @@
  */
 import { useMemo, useRef, useCallback } from 'react';
 import { styled } from '@superset-ui/core';
+import { GridSize } from 'src/components/GridTable/constants';
+import { GridTable } from 'src/components/GridTable';
+import { type ColDef } from 'src/components/GridTable/types';
 import { useCellContentParser } from './useCellContentParser';
 import { renderResultCell } from './utils';
-import GridTable, { GridSize, ColDef } from '../GridTable';
+
+import type { FilterableTableProps, Datum, CellDataType } from './types';
 
 // This regex handles all possible number formats in javascript, including ints, floats,
 // exponential notation, NaN, and Infinity.
@@ -32,23 +36,6 @@ const StyledFilterableTable = styled.div`
   overflow: hidden;
 `;
 
-type CellDataType = string | number | null;
-type Datum = Record<string, CellDataType>;
-
-export interface FilterableTableProps {
-  orderedColumnKeys: string[];
-  data: Record<string, unknown>[];
-  height: number;
-  filterText?: string;
-  headerHeight?: number;
-  overscanColumnCount?: number;
-  overscanRowCount?: number;
-  rowHeight?: number;
-  striped?: boolean;
-  expandedColumns?: string[];
-  allowHTML?: boolean;
-}
-
 const parseNumberFromString = (value: string | number | null) => {
   if (typeof value === 'string' && ONLY_NUMBER_REGEX.test(value)) {
     return parseFloat(value);
@@ -76,7 +63,7 @@ const sortResults = (valueA: string | number, valueB: string | number) => {
   return aValue < bValue ? -1 : 1;
 };
 
-const FilterableTable = ({
+export const FilterableTable = ({
   orderedColumnKeys,
   data,
   height,
@@ -159,4 +146,4 @@ const FilterableTable = ({
   );
 };
 
-export default FilterableTable;
+export type { FilterableTableProps };
diff --git a/superset-frontend/src/components/FilterableTable/types.ts b/superset-frontend/src/components/FilterableTable/types.ts
new file mode 100644
index 00000000000..97292aedd45
--- /dev/null
+++ b/superset-frontend/src/components/FilterableTable/types.ts
@@ -0,0 +1,34 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+export type CellDataType = string | number | null;
+export type Datum = Record<string, CellDataType>;
+
+export interface FilterableTableProps {
+  orderedColumnKeys: string[];
+  data: Record<string, unknown>[];
+  height: number;
+  filterText?: string;
+  headerHeight?: number;
+  overscanColumnCount?: number;
+  overscanRowCount?: number;
+  rowHeight?: number;
+  striped?: boolean;
+  expandedColumns?: string[];
+  allowHTML?: boolean;
+}
diff --git a/superset-frontend/src/components/FilterableTable/utils.tsx b/superset-frontend/src/components/FilterableTable/utils.tsx
index a4e4a4c8445..c0c8b576657 100644
--- a/superset-frontend/src/components/FilterableTable/utils.tsx
+++ b/superset-frontend/src/components/FilterableTable/utils.tsx
@@ -16,8 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { JsonModal, safeJsonObjectParse } from 'src/components/JsonModal';
 import { t, safeHtmlSpan } from '@superset-ui/core';
+import { JsonModal } from '../JsonModal';
+import { safeJsonObjectParse } from '../JsonModal/utils';
 import { NULL_STRING, CellDataType } from './useCellContentParser';
 
 type CellParams = {
diff --git a/superset-frontend/src/components/FlashProvider/FlashProvider.test.tsx b/superset-frontend/src/components/FlashProvider/FlashProvider.test.tsx
index f7e41d9a766..6b93e4009d7 100644
--- a/superset-frontend/src/components/FlashProvider/FlashProvider.test.tsx
+++ b/superset-frontend/src/components/FlashProvider/FlashProvider.test.tsx
@@ -20,7 +20,8 @@
 import { render, screen } from 'spec/helpers/testing-library';
 import { Provider } from 'react-redux';
 import { store } from 'src/views/store';
-import FlashProvider, { FlashMessage } from './index';
+import type { FlashMessage } from './types';
+import { FlashProvider } from '.';
 
 test('Rerendering correctly with default props', () => {
   const messages: FlashMessage[] = [];
diff --git a/superset-frontend/src/components/FlashProvider/index.tsx b/superset-frontend/src/components/FlashProvider/index.tsx
index b9e8e4a8e21..d6c07d4652b 100644
--- a/superset-frontend/src/components/FlashProvider/index.tsx
+++ b/superset-frontend/src/components/FlashProvider/index.tsx
@@ -18,9 +18,7 @@
  */
 import { useToasts } from 'src/components/MessageToasts/withToasts';
 import { useComponentDidMount } from '@superset-ui/core';
-
-type FlashMessageType = 'info' | 'alert' | 'danger' | 'warning' | 'success';
-export type FlashMessage = [FlashMessageType, string];
+import type { FlashMessage } from './types';
 
 interface Props {
   children: JSX.Element;
@@ -35,7 +33,7 @@ const flashObj = {
   success: 'addSuccessToast',
 };
 
-export default function FlashProvider({ children, messages }: Props) {
+export function FlashProvider({ children, messages }: Props) {
   const toasts = useToasts();
   useComponentDidMount(() => {
     messages.forEach(message => {
@@ -49,3 +47,5 @@ export default function FlashProvider({ children, messages }: Props) {
   });
   return children;
 }
+
+export type { FlashMessage };
diff --git a/superset-frontend/src/components/FlashProvider/types.ts b/superset-frontend/src/components/FlashProvider/types.ts
new file mode 100644
index 00000000000..8716eb985bb
--- /dev/null
+++ b/superset-frontend/src/components/FlashProvider/types.ts
@@ -0,0 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 FlashMessageType = 'info' | 'alert' | 'danger' | 'warning' | 'success';
+export type FlashMessage = [FlashMessageType, string];
diff --git a/superset-frontend/src/components/Form/LabeledErrorBoundInput.tsx b/superset-frontend/src/components/Form/LabeledErrorBoundInput.tsx
deleted file mode 100644
index 5ef9024dea2..00000000000
--- a/superset-frontend/src/components/Form/LabeledErrorBoundInput.tsx
+++ /dev/null
@@ -1,174 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 { styled, css, SupersetTheme, t } from '@superset-ui/core';
-import { Tooltip } from 'src/components/Tooltip';
-import { Input } from 'src/components/Input';
-import InfoTooltip from 'src/components/InfoTooltip';
-import { Icons } from 'src/components/Icons';
-import Button from 'src/components/Button';
-import errorIcon from 'src/assets/images/icons/error.svg';
-import FormItem from './FormItem';
-import FormLabel from './FormLabel';
-
-export interface LabeledErrorBoundInputProps {
-  label?: string;
-  validationMethods:
-    | { onBlur: (value: any) => void }
-    | { onChange: (value: any) => void };
-  errorMessage?: string | null;
-  helpText?: string;
-  required?: boolean;
-  hasTooltip?: boolean;
-  tooltipText?: string | null;
-  id?: string;
-  classname?: string;
-  visibilityToggle?: boolean;
-  [x: string]: any;
-}
-
-const StyledInput = styled(Input)`
-  margin: ${({ theme }) => `${theme.gridUnit}px 0 ${theme.gridUnit * 2}px`};
-`;
-
-const StyledInputPassword = styled(Input.Password)`
-  margin: ${({ theme }) => `${theme.gridUnit}px 0 ${theme.gridUnit * 2}px`};
-`;
-
-const alertIconStyles = (theme: SupersetTheme, hasError: boolean) => css`
-  .ant-form-item-children-icon {
-    display: none;
-  }
-  ${hasError &&
-  `.ant-form-item-control-input-content {
-      position: relative;
-      &:after {
-        content: ' ';
-        display: inline-block;
-        background: ${theme.colors.error.base};
-        mask: url(${errorIcon});
-        mask-size: cover;
-        width: ${theme.gridUnit * 4}px;
-        height: ${theme.gridUnit * 4}px;
-        position: absolute;
-        right: ${theme.gridUnit * 1.25}px;
-        top: ${theme.gridUnit * 2.75}px;
-      }
-    }`}
-`;
-
-const StyledFormGroup = styled('div')`
-  input::-webkit-outer-spin-button,
-  input::-webkit-inner-spin-button {
-    -webkit-appearance: none;
-    margin: 0;
-  }
-  margin-bottom: ${({ theme }) => theme.gridUnit * 3}px;
-  .ant-form-item {
-    margin-bottom: 0;
-  }
-`;
-
-const StyledAlignment = styled.div`
-  display: flex;
-  align-items: center;
-`;
-
-const StyledFormLabel = styled(FormLabel)`
-  margin-bottom: 0;
-`;
-
-const iconReset = css`
-  &.anticon > * {
-    line-height: 0;
-  }
-`;
-
-const LabeledErrorBoundInput = ({
-  label,
-  validationMethods,
-  errorMessage,
-  helpText,
-  required = false,
-  hasTooltip = false,
-  tooltipText,
-  id,
-  className,
-  visibilityToggle,
-  get_url,
-  description,
-  ...props
-}: LabeledErrorBoundInputProps) => (
-  <StyledFormGroup className={className}>
-    <StyledAlignment>
-      <StyledFormLabel htmlFor={id} required={required}>
-        {label}
-      </StyledFormLabel>
-      {hasTooltip && <InfoTooltip tooltip={`${tooltipText}`} />}
-    </StyledAlignment>
-    <FormItem
-      css={(theme: SupersetTheme) => alertIconStyles(theme, !!errorMessage)}
-      validateTrigger={Object.keys(validationMethods)}
-      validateStatus={errorMessage ? 'error' : 'success'}
-      help={errorMessage || helpText}
-      hasFeedback={!!errorMessage}
-    >
-      {visibilityToggle || props.name === 'password' ? (
-        <StyledInputPassword
-          {...props}
-          {...validationMethods}
-          iconRender={visible =>
-            visible ? (
-              <Tooltip title={t('Hide password.')}>
-                <Icons.EyeInvisibleOutlined iconSize="m" css={iconReset} />
-              </Tooltip>
-            ) : (
-              <Tooltip title={t('Show password.')}>
-                <Icons.EyeOutlined
-                  iconSize="m"
-                  css={iconReset}
-                  data-test="icon-eye"
-                />
-              </Tooltip>
-            )
-          }
-          role="textbox"
-        />
-      ) : (
-        <StyledInput {...props} {...validationMethods} />
-      )}
-      {get_url && description ? (
-        <Button
-          type="link"
-          htmlType="button"
-          buttonStyle="default"
-          onClick={() => {
-            window.open(get_url);
-            return true;
-          }}
-        >
-          Get {description}
-        </Button>
-      ) : (
-        <br />
-      )}
-    </FormItem>
-  </StyledFormGroup>
-);
-
-export default LabeledErrorBoundInput;
diff --git a/superset-frontend/src/components/FormRow/FormRow.test.jsx b/superset-frontend/src/components/FormRow/FormRow.test.jsx
deleted file mode 100644
index 62853a13b10..00000000000
--- a/superset-frontend/src/components/FormRow/FormRow.test.jsx
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 { render } from 'spec/helpers/testing-library';
-
-import TextControl from 'src/explore/components/controls/TextControl';
-import FormRow from 'src/components/FormRow';
-
-jest.mock('@superset-ui/chart-controls', () => ({
-  ...jest.requireActual('@superset-ui/chart-controls'),
-  InfoTooltipWithTrigger: () => <div data-test="mock-info-tooltip" />,
-}));
-jest.mock('src/components', () => ({
-  ...jest.requireActual('src/components'),
-  Row: ({ children }) => <div data-test="mock-row">{children}</div>,
-  Col: ({ children }) => <div data-test="mock-col">{children}</div>,
-}));
-
-const defaultProps = {
-  label: 'Hello',
-  tooltip: 'A tooltip',
-  control: <TextControl label="test_cbox" />,
-};
-
-const setup = (overrideProps = {}) => {
-  const props = {
-    ...defaultProps,
-    ...overrideProps,
-  };
-  return render(<FormRow {...props} />);
-};
-
-test('renders an InfoTooltipWithTrigger only if needed', () => {
-  const { getByTestId, queryByTestId, rerender } = setup();
-  expect(getByTestId('mock-info-tooltip')).toBeInTheDocument();
-  rerender(<FormRow {...defaultProps} tooltip={null} />);
-  expect(queryByTestId('mock-info-tooltip')).not.toBeInTheDocument();
-});
-
-test('renders a Row and 2 Cols', () => {
-  const { getByTestId, getAllByTestId } = setup();
-  expect(getByTestId('mock-row')).toBeInTheDocument();
-  expect(getAllByTestId('mock-col')).toHaveLength(2);
-});
diff --git a/superset-frontend/src/components/FormRow/index.jsx b/superset-frontend/src/components/FormRow/index.jsx
deleted file mode 100644
index 6d5f75f9146..00000000000
--- a/superset-frontend/src/components/FormRow/index.jsx
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 PropTypes from 'prop-types';
-import { Row, Col } from 'src/components';
-
-import { InfoTooltipWithTrigger } from '@superset-ui/chart-controls';
-
-const STYLE_ROW = { marginTop: '5px', minHeight: '30px' };
-const STYLE_RALIGN = { textAlign: 'right' };
-
-const propTypes = {
-  label: PropTypes.string.isRequired,
-  tooltip: PropTypes.string,
-  control: PropTypes.node.isRequired,
-  isCheckbox: PropTypes.bool,
-};
-
-const defaultProps = {
-  tooltip: null,
-  isCheckbox: false,
-};
-
-export default function FormRow({ label, tooltip, control, isCheckbox }) {
-  const labelAndTooltip = (
-    <span>
-      {label}{' '}
-      {tooltip && (
-        <InfoTooltipWithTrigger
-          placement="top"
-          label={label}
-          tooltip={tooltip}
-        />
-      )}
-    </span>
-  );
-  if (isCheckbox) {
-    return (
-      <Row style={STYLE_ROW} gutter={16}>
-        <Col xs={24} md={8} style={STYLE_RALIGN}>
-          {control}
-        </Col>
-        <Col xs={24} md={16}>
-          {labelAndTooltip}
-        </Col>
-      </Row>
-    );
-  }
-  return (
-    <Row style={STYLE_ROW} gutter={16}>
-      <Col xs={24} md={8} style={STYLE_RALIGN}>
-        {labelAndTooltip}
-      </Col>
-      <Col xs={24} md={16}>
-        {control}
-      </Col>
-    </Row>
-  );
-}
-FormRow.propTypes = propTypes;
-FormRow.defaultProps = defaultProps;
diff --git a/superset-frontend/src/components/GenericLink/GenericLink.test.tsx b/superset-frontend/src/components/GenericLink/GenericLink.test.tsx
index 33681823ea3..7d30215e2e1 100644
--- a/superset-frontend/src/components/GenericLink/GenericLink.test.tsx
+++ b/superset-frontend/src/components/GenericLink/GenericLink.test.tsx
@@ -18,7 +18,7 @@
  */
 
 import { render, screen } from 'spec/helpers/testing-library';
-import { GenericLink } from './GenericLink';
+import { GenericLink } from '.';
 
 test('renders', () => {
   render(<GenericLink to="/explore">Link to Explore</GenericLink>, {
diff --git a/superset-frontend/src/components/GenericLink/GenericLink.tsx b/superset-frontend/src/components/GenericLink/index.tsx
similarity index 100%
rename from superset-frontend/src/components/GenericLink/GenericLink.tsx
rename to superset-frontend/src/components/GenericLink/index.tsx
diff --git a/superset-frontend/src/components/GridTable/GridTable.test.tsx b/superset-frontend/src/components/GridTable/GridTable.test.tsx
index 849831af6a2..09b7b0e699f 100644
--- a/superset-frontend/src/components/GridTable/GridTable.test.tsx
+++ b/superset-frontend/src/components/GridTable/GridTable.test.tsx
@@ -18,12 +18,7 @@
  */
 import { render } from 'spec/helpers/testing-library';
 import { setupAGGridModules } from 'src/setup/setupAGGridModules';
-import GridTable from '.';
-
-jest.mock('src/components/ErrorBoundary', () => ({
-  __esModule: true,
-  default: ({ children }: { children: React.ReactNode }) => <>{children}</>,
-}));
+import { GridTable } from '.';
 
 const mockedProps = {
   queryId: 'abc',
diff --git a/superset-frontend/src/components/GridTable/Header.test.tsx b/superset-frontend/src/components/GridTable/Header.test.tsx
index 47b16115ff4..9976df6c814 100644
--- a/superset-frontend/src/components/GridTable/Header.test.tsx
+++ b/superset-frontend/src/components/GridTable/Header.test.tsx
@@ -18,20 +18,25 @@
  */
 import type { Column, GridApi } from 'ag-grid-community';
 import { act, fireEvent, render } from 'spec/helpers/testing-library';
-import Header from './Header';
+import { Header } from './Header';
 import { PIVOT_COL_ID } from './constants';
 
-jest.mock('src/components/Dropdown', () => ({
+jest.mock('@superset-ui/core/components/Dropdown', () => ({
   Dropdown: () => <div data-test="mock-dropdown" />,
 }));
 
-jest.mock('src/components/Icons', () => ({
-  Icons: {
-    Sort: jest.fn(() => <div data-test="mock-sort" />),
-    SortAsc: jest.fn(() => <div data-test="mock-sort-asc" />),
-    SortDesc: jest.fn(() => <div data-test="mock-sort-desc" />),
-  },
-}));
+jest.mock('@superset-ui/core/components/Icons', () => {
+  const actualIcons = jest.requireActual('@superset-ui/core/components/Icons');
+  return {
+    __esModule: true,
+    Icons: {
+      ...actualIcons.Icons, // retain the real `Icons` export
+      Sort: jest.fn(() => <div data-test="mock-sort" />),
+      SortAsc: jest.fn(() => <div data-test="mock-sort-asc" />),
+      SortDesc: jest.fn(() => <div data-test="mock-sort-desc" />),
+    },
+  };
+});
 
 class MockApi extends EventTarget {
   getAllDisplayedColumns() {
diff --git a/superset-frontend/src/components/GridTable/Header.tsx b/superset-frontend/src/components/GridTable/Header.tsx
index 03af51ccf52..46ef0091705 100644
--- a/superset-frontend/src/components/GridTable/Header.tsx
+++ b/superset-frontend/src/components/GridTable/Header.tsx
@@ -20,9 +20,9 @@ import { useCallback, useEffect, useRef, useState } from 'react';
 import { styled, useTheme, t } from '@superset-ui/core';
 import type { Column, GridApi } from 'ag-grid-community';
 
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { PIVOT_COL_ID } from './constants';
-import HeaderMenu from './HeaderMenu';
+import { HeaderMenu } from './HeaderMenu';
 
 interface Params {
   enableFilterButton?: boolean;
@@ -63,9 +63,9 @@ const HeaderAction = styled.div`
     justify-content: center;
     width: 100%;
   }
-  & .antd5-dropdown-trigger {
+  & .ant-dropdown-trigger {
     cursor: context-menu;
-    padding: ${({ theme }) => theme.gridUnit * 2}px;
+    padding: ${({ theme }) => theme.sizeUnit * 2}px;
     background-color: var(--ag-background-color);
     box-shadow: 0 0 2px var(--ag-chip-border-color);
     border-radius: 50%;
@@ -80,7 +80,7 @@ const IconPlaceholder = styled.div`
   top: 0;
 `;
 
-const Header: React.FC<Params> = ({
+export const Header: React.FC<Params> = ({
   enableFilterButton,
   enableSorting,
   displayName,
@@ -156,13 +156,13 @@ const Header: React.FC<Params> = ({
                 {currentSort === 'asc' && (
                   <Icons.SortAsc
                     iconSize="xxl"
-                    iconColor={theme.colors.primary.base}
+                    iconColor={theme.colorPrimary}
                   />
                 )}
                 {currentSort === 'desc' && (
                   <Icons.SortDesc
                     iconSize="xxl"
-                    iconColor={theme.colors.primary.base}
+                    iconColor={theme.colorPrimary}
                   />
                 )}
               </IconPlaceholder>
@@ -195,5 +195,3 @@ const Header: React.FC<Params> = ({
     </>
   );
 };
-
-export default Header;
diff --git a/superset-frontend/src/components/GridTable/HeaderMenu.test.tsx b/superset-frontend/src/components/GridTable/HeaderMenu.test.tsx
index 2b8dbc11abb..67b67e6b3fc 100644
--- a/superset-frontend/src/components/GridTable/HeaderMenu.test.tsx
+++ b/superset-frontend/src/components/GridTable/HeaderMenu.test.tsx
@@ -18,51 +18,12 @@
  */
 import type { Column, GridApi } from 'ag-grid-community';
 import {
-  fireEvent,
   render,
   waitFor,
   screen,
+  userEvent,
 } from 'spec/helpers/testing-library';
-import HeaderMenu from './HeaderMenu';
-
-jest.mock('src/components/Menu', () => {
-  const Menu = ({ children }: { children: React.ReactChild }) => (
-    <div data-test="mock-Menu">{children}</div>
-  );
-  Menu.Item = ({
-    children,
-    onClick,
-  }: {
-    children: React.ReactChild;
-    onClick: () => void;
-  }) => (
-    <button type="button" data-test="mock-Item" onClick={onClick}>
-      {children}
-    </button>
-  );
-  Menu.SubMenu = ({
-    title,
-    children,
-  }: {
-    title: React.ReactNode;
-    children: React.ReactNode;
-  }) => (
-    <div>
-      {title}
-      <button type="button" data-test="mock-SubMenu">
-        {children}
-      </button>
-    </div>
-  );
-  Menu.Divider = () => <div data-test="mock-Divider" />;
-  return { Menu };
-});
-
-jest.mock('src/components/Dropdown', () => ({
-  MenuDotsDropdown: ({ overlay }: { overlay: React.ReactChild }) => (
-    <div data-test="mock-Dropdown">{overlay}</div>
-  ),
-}));
+import { HeaderMenu, type HeaderMenuProps } from './HeaderMenu';
 
 jest.mock('src/utils/copy', () => jest.fn().mockImplementation(f => f()));
 
@@ -112,9 +73,17 @@ afterEach(() => {
   (mockGridApi.moveColumns as jest.Mock).mockClear();
 });
 
+const setup = (props: HeaderMenuProps = mockedProps) => {
+  const wrapper = render(<HeaderMenu {...props} />);
+  const dropdownTrigger = wrapper.getByTestId('dropdown-trigger');
+  userEvent.click(dropdownTrigger);
+
+  return wrapper;
+};
+
 test('renders copy data', async () => {
-  const { getByText } = render(<HeaderMenu {...mockedProps} />);
-  fireEvent.click(getByText('Copy'));
+  const { getByText } = setup();
+  userEvent.click(getByText('Copy'));
   await waitFor(() =>
     expect(mockGridApi.getDataAsCsv).toHaveBeenCalledTimes(1),
   );
@@ -125,16 +94,16 @@ test('renders copy data', async () => {
 });
 
 test('renders buttons pinning both sides', () => {
-  const { queryByText, getByText } = render(<HeaderMenu {...mockedProps} />);
+  const { queryByText, getByText } = setup();
   expect(queryByText('Pin Left')).toBeInTheDocument();
   expect(queryByText('Pin Right')).toBeInTheDocument();
-  fireEvent.click(getByText('Pin Left'));
+  userEvent.click(getByText('Pin Left'));
   expect(mockGridApi.setColumnsPinned).toHaveBeenCalledTimes(1);
   expect(mockGridApi.setColumnsPinned).toHaveBeenCalledWith(
     [mockedProps.colId],
     'left',
   );
-  fireEvent.click(getByText('Pin Right'));
+  userEvent.click(getByText('Pin Right'));
   expect(mockGridApi.setColumnsPinned).toHaveBeenLastCalledWith(
     [mockedProps.colId],
     'right',
@@ -142,12 +111,13 @@ test('renders buttons pinning both sides', () => {
 });
 
 test('renders unpin on pinned left', () => {
-  const { queryByText, getByText } = render(
-    <HeaderMenu {...mockedProps} pinnedLeft />,
-  );
+  const { queryByText, getByText } = setup({
+    ...mockedProps,
+    pinnedLeft: true,
+  });
   expect(queryByText('Pin Left')).not.toBeInTheDocument();
   expect(queryByText('Unpin')).toBeInTheDocument();
-  fireEvent.click(getByText('Unpin'));
+  userEvent.click(getByText('Unpin'));
   expect(mockGridApi.setColumnsPinned).toHaveBeenCalledTimes(1);
   expect(mockGridApi.setColumnsPinned).toHaveBeenCalledWith(
     [mockedProps.colId],
@@ -156,34 +126,36 @@ test('renders unpin on pinned left', () => {
 });
 
 test('renders unpin on pinned right', () => {
-  const { queryByText } = render(<HeaderMenu {...mockedProps} pinnedRight />);
+  const { queryByText } = setup({ ...mockedProps, pinnedRight: true });
   expect(queryByText('Pin Right')).not.toBeInTheDocument();
   expect(queryByText('Unpin')).toBeInTheDocument();
 });
 
 test('renders autosize column', async () => {
-  const { getByText } = render(<HeaderMenu {...mockedProps} />);
-  fireEvent.click(getByText('Autosize Column'));
+  const { getByText } = setup();
+  userEvent.click(getByText('Autosize Column'));
   await waitFor(() =>
     expect(mockGridApi.autoSizeColumns).toHaveBeenCalledTimes(1),
   );
 });
 
 test('renders unhide when invisible column exists', async () => {
-  const { queryByText } = render(
-    <HeaderMenu {...mockedProps} invisibleColumns={[mockInvisibleColumn]} />,
-  );
+  const { queryByText, getByText } = setup({
+    ...mockedProps,
+    invisibleColumns: [mockInvisibleColumn],
+  });
   expect(queryByText('Unhide')).toBeInTheDocument();
+  userEvent.click(getByText('Unhide'));
   const unhideColumnsButton = await screen.findByText('column2');
-  fireEvent.click(unhideColumnsButton);
+  userEvent.click(unhideColumnsButton);
   expect(mockGridApi.setColumnsVisible).toHaveBeenCalledTimes(1);
   expect(mockGridApi.setColumnsVisible).toHaveBeenCalledWith(['column2'], true);
 });
 
 describe('for main menu', () => {
   test('renders Copy to Clipboard', async () => {
-    const { getByText } = render(<HeaderMenu {...mockedProps} isMain />);
-    fireEvent.click(getByText('Copy the current data'));
+    const { getByText } = setup({ ...mockedProps, isMain: true });
+    userEvent.click(getByText('Copy the current data'));
     await waitFor(() =>
       expect(mockGridApi.getDataAsCsv).toHaveBeenCalledTimes(1),
     );
@@ -195,8 +167,8 @@ describe('for main menu', () => {
   });
 
   test('renders Download to CSV', async () => {
-    const { getByText } = render(<HeaderMenu {...mockedProps} isMain />);
-    fireEvent.click(getByText('Download to CSV'));
+    const { getByText } = setup({ ...mockedProps, isMain: true });
+    userEvent.click(getByText('Download to CSV'));
     await waitFor(() =>
       expect(mockGridApi.exportDataAsCsv).toHaveBeenCalledTimes(1),
     );
@@ -206,25 +178,22 @@ describe('for main menu', () => {
   });
 
   test('renders autosize column', async () => {
-    const { getByText } = render(<HeaderMenu {...mockedProps} isMain />);
-    fireEvent.click(getByText('Autosize all columns'));
+    const { getByText } = setup({ ...mockedProps, isMain: true });
+    userEvent.click(getByText('Autosize all columns'));
     await waitFor(() =>
       expect(mockGridApi.autoSizeAllColumns).toHaveBeenCalledTimes(1),
     );
   });
 
   test('renders all unhide all hidden columns when multiple invisible columns exist', async () => {
-    render(
-      <HeaderMenu
-        {...mockedProps}
-        isMain
-        invisibleColumns={[mockInvisibleColumn, mockInvisibleColumn3]}
-      />,
-    );
-    const unhideColumnsButton = await screen.findByText(
-      `All ${2} hidden columns`,
-    );
-    fireEvent.click(unhideColumnsButton);
+    setup({
+      ...mockedProps,
+      isMain: true,
+      invisibleColumns: [mockInvisibleColumn, mockInvisibleColumn3],
+    });
+    userEvent.click(screen.getByText('Unhide'));
+    const unhideColumnsButton = await screen.findByText(`All 2 hidden columns`);
+    userEvent.click(unhideColumnsButton);
     expect(mockGridApi.setColumnsVisible).toHaveBeenCalledTimes(1);
     expect(mockGridApi.setColumnsVisible).toHaveBeenCalledWith(
       [mockInvisibleColumn, mockInvisibleColumn3],
@@ -233,14 +202,12 @@ describe('for main menu', () => {
   });
 
   test('reset columns configuration', async () => {
-    const { getByText } = render(
-      <HeaderMenu
-        {...mockedProps}
-        isMain
-        invisibleColumns={[mockInvisibleColumn]}
-      />,
-    );
-    fireEvent.click(getByText('Reset columns'));
+    const { getByText } = setup({
+      ...mockedProps,
+      isMain: true,
+      invisibleColumns: [mockInvisibleColumn],
+    });
+    userEvent.click(getByText('Reset columns'));
     await waitFor(() =>
       expect(mockGridApi.setColumnsVisible).toHaveBeenCalledTimes(1),
     );
diff --git a/superset-frontend/src/components/GridTable/HeaderMenu.tsx b/superset-frontend/src/components/GridTable/HeaderMenu.tsx
index c9e14c4b1a8..3149fa2738b 100644
--- a/superset-frontend/src/components/GridTable/HeaderMenu.tsx
+++ b/superset-frontend/src/components/GridTable/HeaderMenu.tsx
@@ -20,17 +20,20 @@ import { useCallback } from 'react';
 import { styled, t } from '@superset-ui/core';
 import type { Column, ColumnPinnedType, GridApi } from 'ag-grid-community';
 
-import { Icons } from 'src/components/Icons';
-import { MenuDotsDropdown, DropdownProps } from 'src/components/Dropdown';
-import { Menu } from 'src/components/Menu';
+import { Icons } from '@superset-ui/core/components/Icons';
+import { Menu, MenuItem } from '@superset-ui/core/components/Menu';
 import copyTextToClipboard from 'src/utils/copy';
+import {
+  MenuDotsDropdown,
+  type DropdownProps,
+} from '@superset-ui/core/components';
 import { PIVOT_COL_ID } from './constants';
 
 const IconEmpty = styled.span`
   width: 14px;
 `;
 
-type Params = {
+export type HeaderMenuProps = {
   colId: string;
   column?: Column;
   api: GridApi;
@@ -41,7 +44,7 @@ type Params = {
   onVisibleChange: DropdownProps['onOpenChange'];
 };
 
-const HeaderMenu: React.FC<Params> = ({
+export const HeaderMenu: React.FC<HeaderMenuProps> = ({
   colId,
   api,
   pinnedLeft,
@@ -49,7 +52,7 @@ const HeaderMenu: React.FC<Params> = ({
   invisibleColumns,
   isMain,
   onVisibleChange,
-}: Params) => {
+}: HeaderMenuProps) => {
   const pinColumn = useCallback(
     (pinLoc: ColumnPinnedType) => {
       api.setColumnsPinned([colId], pinLoc);
@@ -57,113 +60,183 @@ const HeaderMenu: React.FC<Params> = ({
     [api, colId],
   );
 
-  const unHideAction = invisibleColumns.length > 0 && (
-    <Menu.SubMenu title={t('Unhide')} icon={<Icons.EyeOutlined iconSize="m" />}>
-      {invisibleColumns.length > 1 && (
-        <Menu.Item
-          onClick={() => {
-            api.setColumnsVisible(invisibleColumns, true);
-          }}
-        >
-          <b>{t('All %s hidden columns', invisibleColumns.length)}</b>
-        </Menu.Item>
-      )}
-      {invisibleColumns.map(c => (
-        <Menu.Item
-          key={c.getColId()}
-          onClick={() => {
-            api.setColumnsVisible([c.getColId()], true);
-          }}
-        >
-          {c.getColDef().headerName}
-        </Menu.Item>
-      ))}
-    </Menu.SubMenu>
+  const unHideAction: MenuItem = {
+    label: t('Unhide'),
+    key: 'unHideSubMenu',
+    icon: <Icons.EyeInvisibleOutlined iconSize="m" />,
+    children: [
+      invisibleColumns.length > 1 && {
+        key: 'allHidden',
+        label: <b>{t('All %s hidden columns', invisibleColumns.length)}</b>,
+        onClick: () => {
+          api.setColumnsVisible(invisibleColumns, true);
+        },
+      },
+      ...invisibleColumns.map(c => ({
+        key: c.getColId(),
+        label: c.getColDef().headerName,
+        onClick: () => {
+          api.setColumnsVisible([c.getColId()], true);
+        },
+      })),
+    ].filter(Boolean) as MenuItem[],
+  };
+
+  const mainMenuItems: MenuItem[] = [
+    {
+      key: 'copyData',
+      label: t('Copy the current data'),
+      icon: <Icons.CopyOutlined iconSize="m" />,
+      onClick: () => {
+        copyTextToClipboard(
+          () =>
+            new Promise((resolve, reject) => {
+              const data = api.getDataAsCsv({
+                columnKeys: api
+                  .getAllDisplayedColumns()
+                  .map(c => c.getColId())
+                  .filter(id => id !== colId),
+                suppressQuotes: true,
+                columnSeparator: '\t',
+              });
+              if (data) {
+                resolve(data);
+              } else {
+                reject();
+              }
+            }),
+        );
+      },
+    },
+    {
+      key: 'downloadCsv',
+      label: t('Download to CSV'),
+      icon: <Icons.DownloadOutlined iconSize="m" />,
+      onClick: () => {
+        api.exportDataAsCsv({
+          columnKeys: api
+            .getAllDisplayedColumns()
+            .map(c => c.getColId())
+            .filter(id => id !== colId),
+        });
+      },
+    },
+    {
+      type: 'divider',
+    },
+    {
+      key: 'autoSizeAllColumns',
+      label: t('Autosize all columns'),
+      icon: <Icons.ColumnWidthOutlined iconSize="m" />,
+      onClick: () => {
+        api.autoSizeAllColumns();
+      },
+    },
+  ];
+
+  mainMenuItems.push(unHideAction);
+
+  mainMenuItems.push(
+    {
+      type: 'divider',
+    },
+    {
+      key: 'resetColumns',
+      label: t('Reset columns'),
+      icon: <IconEmpty className="anticon" />,
+      onClick: () => {
+        api.setColumnsVisible(invisibleColumns, true);
+        const columns = api.getColumns();
+        if (columns) {
+          const pinnedColumns = columns.filter(
+            c => c.getColId() !== PIVOT_COL_ID && c.isPinned(),
+          );
+          api.setColumnsPinned(pinnedColumns, null);
+          api.moveColumns(columns, 0);
+          const firstColumn = columns.find(c => c.getColId() !== PIVOT_COL_ID);
+          if (firstColumn) {
+            api.ensureColumnVisible(firstColumn, 'start');
+          }
+        }
+      },
+    },
   );
 
-  if (isMain) {
-    return (
-      <MenuDotsDropdown
-        placement="bottomLeft"
-        trigger={['click']}
-        onOpenChange={onVisibleChange}
-        overlay={
-          <Menu style={{ width: 250 }} mode="vertical">
-            <Menu.Item
-              onClick={() => {
-                copyTextToClipboard(
-                  () =>
-                    new Promise((resolve, reject) => {
-                      const data = api.getDataAsCsv({
-                        columnKeys: api
-                          .getAllDisplayedColumns()
-                          .map(c => c.getColId())
-                          .filter(id => id !== colId),
-                        suppressQuotes: true,
-                        columnSeparator: '\t',
-                      });
-                      if (data) {
-                        resolve(data);
-                      } else {
-                        reject();
-                      }
-                    }),
-                );
-              }}
-              icon={<Icons.CopyOutlined iconSize="m" />}
-            >
-              {t('Copy the current data')}
-            </Menu.Item>
-            <Menu.Item
-              onClick={() => {
-                api.exportDataAsCsv({
-                  columnKeys: api
-                    .getAllDisplayedColumns()
-                    .map(c => c.getColId())
-                    .filter(id => id !== colId),
-                });
-              }}
-              icon={<Icons.DownloadOutlined iconSize="m" />}
-            >
-              {t('Download to CSV')}
-            </Menu.Item>
-            <Menu.Divider />
-            <Menu.Item
-              onClick={() => {
-                api.autoSizeAllColumns();
-              }}
-              icon={<Icons.ColumnWidthOutlined iconSize="m" />}
-            >
-              {t('Autosize all columns')}
-            </Menu.Item>
-            {unHideAction}
-            <Menu.Divider />
-            <Menu.Item
-              onClick={() => {
-                api.setColumnsVisible(invisibleColumns, true);
-                const columns = api.getColumns();
-                if (columns) {
-                  const pinnedColumns = columns.filter(
-                    c => c.getColId() !== PIVOT_COL_ID && c.isPinned(),
-                  );
-                  api.setColumnsPinned(pinnedColumns, null);
-                  api.moveColumns(columns, 0);
-                  const firstColumn = columns.find(
-                    c => c.getColId() !== PIVOT_COL_ID,
-                  );
-                  if (firstColumn) {
-                    api.ensureColumnVisible(firstColumn, 'start');
-                  }
-                }
-              }}
-              icon={<IconEmpty className="anticon" />}
-            >
-              {t('Reset columns')}
-            </Menu.Item>
-          </Menu>
-        }
-      />
-    );
+  const menuItems: MenuItem[] = [
+    {
+      key: 'copy',
+      label: t('Copy'),
+      icon: <Icons.CopyOutlined iconSize="m" />,
+      onClick: () => {
+        copyTextToClipboard(
+          () =>
+            new Promise((resolve, reject) => {
+              const data = api.getDataAsCsv({
+                columnKeys: [colId],
+                suppressQuotes: true,
+              });
+              if (data) {
+                resolve(data);
+              } else {
+                reject();
+              }
+            }),
+        );
+      },
+    },
+  ];
+
+  if (pinnedLeft || pinnedRight) {
+    menuItems.push({
+      key: 'unpin',
+      label: t('Unpin'),
+      icon: <Icons.UnlockOutlined iconSize="m" />,
+      onClick: () => pinColumn(null),
+    });
+  }
+  if (!pinnedLeft) {
+    menuItems.push({
+      key: 'pinLeft',
+      label: t('Pin Left'),
+      icon: <Icons.VerticalRightOutlined iconSize="m" />,
+      onClick: () => pinColumn('left'),
+    });
+  }
+
+  if (!pinnedRight) {
+    menuItems.push({
+      key: 'pinRight',
+      label: t('Pin Right'),
+      icon: <Icons.VerticalLeftOutlined iconSize="m" />,
+      onClick: () => pinColumn('right'),
+    });
+  }
+
+  menuItems.push(
+    {
+      type: 'divider',
+    },
+    {
+      key: 'autosize',
+      label: t('Autosize Column'),
+      icon: <Icons.ColumnWidthOutlined iconSize="m" />,
+      onClick: () => {
+        api.autoSizeColumns([colId]);
+      },
+    },
+    {
+      key: 'hide',
+      label: t('Hide Column'),
+      icon: <Icons.EyeInvisibleOutlined iconSize="m" />,
+      onClick: () => {
+        api.setColumnsVisible([colId], false);
+      },
+      disabled: api.getColumns()?.length === invisibleColumns.length + 1,
+    },
+  );
+
+  if (invisibleColumns.length > 0) {
+    menuItems.push(unHideAction);
   }
 
   return (
@@ -172,75 +245,12 @@ const HeaderMenu: React.FC<Params> = ({
       trigger={['click']}
       onOpenChange={onVisibleChange}
       overlay={
-        <Menu style={{ width: 180 }} mode="vertical">
-          <Menu.Item
-            onClick={() => {
-              copyTextToClipboard(
-                () =>
-                  new Promise((resolve, reject) => {
-                    const data = api.getDataAsCsv({
-                      columnKeys: [colId],
-                      suppressQuotes: true,
-                    });
-                    if (data) {
-                      resolve(data);
-                    } else {
-                      reject();
-                    }
-                  }),
-              );
-            }}
-            icon={<Icons.CopyOutlined iconSize="m" />}
-          >
-            {t('Copy')}
-          </Menu.Item>
-          {(pinnedLeft || pinnedRight) && (
-            <Menu.Item
-              onClick={() => pinColumn(null)}
-              icon={<Icons.UnlockOutlined iconSize="m" />}
-            >
-              {t('Unpin')}
-            </Menu.Item>
-          )}
-          {!pinnedLeft && (
-            <Menu.Item
-              onClick={() => pinColumn('left')}
-              icon={<Icons.VerticalRightOutlined iconSize="m" />}
-            >
-              {t('Pin Left')}
-            </Menu.Item>
-          )}
-          {!pinnedRight && (
-            <Menu.Item
-              onClick={() => pinColumn('right')}
-              icon={<Icons.VerticalLeftOutlined iconSize="m" />}
-            >
-              {t('Pin Right')}
-            </Menu.Item>
-          )}
-          <Menu.Divider />
-          <Menu.Item
-            onClick={() => {
-              api.autoSizeColumns([colId]);
-            }}
-            icon={<Icons.ColumnWidthOutlined iconSize="m" />}
-          >
-            {t('Autosize Column')}
-          </Menu.Item>
-          <Menu.Item
-            onClick={() => {
-              api.setColumnsVisible([colId], false);
-            }}
-            disabled={api.getColumns()?.length === invisibleColumns.length + 1}
-            icon={<Icons.EyeInvisibleOutlined iconSize="m" />}
-          >
-            {t('Hide Column')}
-          </Menu.Item>
-          {unHideAction}
-        </Menu>
+        <Menu
+          style={{ width: isMain ? 250 : 180 }}
+          mode="vertical"
+          items={isMain ? mainMenuItems : menuItems}
+        />
       }
     />
   );
 };
-
-export default HeaderMenu;
diff --git a/superset-frontend/src/components/GridTable/index.tsx b/superset-frontend/src/components/GridTable/index.tsx
index ad3130840f4..df6e1350466 100644
--- a/superset-frontend/src/components/GridTable/index.tsx
+++ b/superset-frontend/src/components/GridTable/index.tsx
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { ReactNode, useCallback, useMemo } from 'react';
+import { useCallback, useMemo } from 'react';
 import { Global } from '@emotion/react';
 import { css, useTheme } from '@superset-ui/core';
 
@@ -27,61 +27,19 @@ import 'ag-grid-community/styles/ag-grid.css';
 import 'ag-grid-community/styles/ag-theme-quartz.css';
 
 import copyTextToClipboard from 'src/utils/copy';
-import ErrorBoundary from 'src/components/ErrorBoundary';
 
 import { PIVOT_COL_ID, GridSize } from './constants';
-import Header from './Header';
+import { Header } from './Header';
+import type { TableProps } from './types';
 
 const gridComponents = {
   agColumnHeader: Header,
 };
 
-export { GridSize };
-
-export type ColDef = {
-  type: string;
-  field: string;
-};
-
-export interface TableProps<RecordType> {
-  /**
-   * Data that will populate the each row and map to the column key.
-   */
-  data: RecordType[];
-  /**
-   * Table column definitions.
-   */
-  columns: {
-    label: string;
-    headerName?: string;
-    width?: number;
-    comparator?: (valueA: string | number, valueB: string | number) => number;
-    render?: (value: any) => ReactNode;
-  }[];
-
-  size?: GridSize;
-
-  externalFilter?: AgGridReactProps['doesExternalFilterPass'];
-
-  height: number;
-
-  columnReorderable?: boolean;
-
-  sortable?: boolean;
-
-  enableActions?: boolean;
-
-  showRowNumber?: boolean;
-
-  usePagination?: boolean;
-
-  striped?: boolean;
-}
-
 const onSortChanged: AgGridReactProps['onSortChanged'] = ({ api }) =>
   api.refreshCells();
 
-function GridTable<RecordType extends object>({
+export function GridTable<RecordType extends object>({
   data,
   columns,
   sortable = true,
@@ -169,7 +127,7 @@ function GridTable<RecordType extends object>({
     [columnReorderable, enableActions, sortable],
   );
 
-  const rowHeight = theme.gridUnit * (size === GridSize.Middle ? 9 : 7);
+  const rowHeight = theme.sizeUnit * (size === GridSize.Middle ? 9 : 7);
 
   const gridOptions = useMemo<GridOptions>(
     () => ({
@@ -184,26 +142,38 @@ function GridTable<RecordType extends object>({
   );
 
   return (
-    <ErrorBoundary>
+    <>
       <Global
         styles={() => css`
           #grid-table.ag-theme-quartz {
-            --ag-icon-font-family: agGridMaterial;
-            --ag-grid-size: ${theme.gridUnit}px;
-            --ag-font-size: ${theme.typography.sizes[
-              size === GridSize.Middle ? 'm' : 's'
-            ]}px;
-            --ag-font-family: ${theme.typography.families.sansSerif};
+            --ag-grid-size: ${theme.sizeUnit}px;
+            --ag-font-family: ${theme.fontFamily};
+            --ag-font-size: ${theme.fontSize}px;
             --ag-row-height: ${rowHeight}px;
+            --ag-background-color: ${theme.colorBgBase};
+            --ag-foreground-color: ${theme.colorText};
+            --ag-header-background-color: ${theme.colorBgElevated};
+            --ag-header-foreground-color: ${theme.colorTextHeading};
+            --ag-border-color: ${theme.colorBorder};
+            --ag-row-border-color: ${theme.colorSplit};
+            --ag-row-hover-color: ${theme.colorFillSecondary};
+            --ag-selected-row-background-color: ${theme.colorPrimaryBg};
+            --ag-selected-row-foreground-color: ${theme.colorPrimaryText};
+            --ag-range-selection-border-color: ${theme.colorPrimary};
+            --ag-range-selection-background-color: ${theme.colorPrimaryBg};
+            --ag-checkbox-checked-color: ${theme.colorPrimary};
+            --ag-disabled-foreground-color: ${theme.colorTextDisabled};
             ${!striped &&
-            `--ag-odd-row-background-color: ${theme.colors.grayscale.light5};`}
-            --ag-border-color: ${theme.colors.grayscale.light2};
-            --ag-row-border-color: ${theme.colors.grayscale.light2};
-            --ag-header-background-color: ${theme.colors.grayscale.light4};
+            `--ag-odd-row-background-color: ${theme.colorBgElevated};`}
+            --ag-font-size: ${GridSize.Middle === size
+              ? theme.fontSize
+              : theme.fontSizeSM}px;
           }
+
           #grid-table .ag-cell {
             -webkit-font-smoothing: antialiased;
           }
+
           .locked-col {
             background: var(--ag-row-border-color);
             padding: 0;
@@ -211,12 +181,15 @@ function GridTable<RecordType extends object>({
             font-size: calc(var(--ag-font-size) * 0.9);
             color: var(--ag-disabled-foreground-color);
           }
+
           .ag-row-hover .locked-col {
             background: var(--ag-row-hover-color);
           }
+
           .ag-header-cell {
             overflow: hidden;
           }
+
           & [role='columnheader']:hover .customHeaderAction {
             display: flex;
           }
@@ -231,7 +204,6 @@ function GridTable<RecordType extends object>({
         `}
       >
         <AgGridReact
-          // TODO: migrate to Theme API - https://www.ag-grid.com/react-data-grid/theming-migration/
           rowData={data}
           columnDefs={columnDefs}
           defaultColDef={defaultColDef}
@@ -243,8 +215,8 @@ function GridTable<RecordType extends object>({
           onCellKeyDown={onKeyDown}
         />
       </div>
-    </ErrorBoundary>
+    </>
   );
 }
 
-export default GridTable;
+export type { TableProps };
diff --git a/superset-frontend/src/components/GridTable/types.ts b/superset-frontend/src/components/GridTable/types.ts
new file mode 100644
index 00000000000..8dda781f6cf
--- /dev/null
+++ b/superset-frontend/src/components/GridTable/types.ts
@@ -0,0 +1,62 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { ReactNode } from 'react';
+
+import type { AgGridReactProps } from 'ag-grid-react';
+import { GridSize } from './constants';
+
+export type ColDef = {
+  type: string;
+  field: string;
+};
+
+export interface TableProps<RecordType> {
+  /**
+   * Data that will populate the each row and map to the column key.
+   */
+  data: RecordType[];
+  /**
+   * Table column definitions.
+   */
+  columns: {
+    label: string;
+    headerName?: string;
+    width?: number;
+    comparator?: (valueA: string | number, valueB: string | number) => number;
+    render?: (value: any) => ReactNode;
+  }[];
+
+  size?: GridSize;
+
+  externalFilter?: AgGridReactProps['doesExternalFilterPass'];
+
+  height: number;
+
+  columnReorderable?: boolean;
+
+  sortable?: boolean;
+
+  enableActions?: boolean;
+
+  showRowNumber?: boolean;
+
+  usePagination?: boolean;
+
+  striped?: boolean;
+}
diff --git a/superset-frontend/src/components/ImportModal/ErrorAlert.tsx b/superset-frontend/src/components/ImportModal/ErrorAlert.tsx
index 04513580703..0d81b818e94 100644
--- a/superset-frontend/src/components/ImportModal/ErrorAlert.tsx
+++ b/superset-frontend/src/components/ImportModal/ErrorAlert.tsx
@@ -21,7 +21,7 @@ import { FunctionComponent } from 'react';
 import { t, SupersetTheme } from '@superset-ui/core';
 
 import { getDatabaseDocumentationLinks } from 'src/views/CRUD/hooks';
-import Alert from 'src/components/Alert';
+import { Alert } from '@superset-ui/core/components';
 import { antdWarningAlertStyles } from './styles';
 
 const supersetTextDocs = getDatabaseDocumentationLinks();
@@ -34,7 +34,7 @@ export interface IProps {
   showDbInstallInstructions: boolean;
 }
 
-const ErrorAlert: FunctionComponent<IProps> = ({
+export const ErrorAlert: FunctionComponent<IProps> = ({
   errorMessage,
   showDbInstallInstructions,
 }) => (
@@ -67,5 +67,3 @@ const ErrorAlert: FunctionComponent<IProps> = ({
     }
   />
 );
-
-export default ErrorAlert;
diff --git a/superset-frontend/src/components/ImportModal/ImportErrorAlert.tsx b/superset-frontend/src/components/ImportModal/ImportErrorAlert.tsx
new file mode 100644
index 00000000000..f835f6d9733
--- /dev/null
+++ b/superset-frontend/src/components/ImportModal/ImportErrorAlert.tsx
@@ -0,0 +1,66 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { FunctionComponent } from 'react';
+import { t } from '@superset-ui/core';
+
+import { getDatabaseDocumentationLinks } from 'src/views/CRUD/hooks';
+import { ErrorAlert } from 'src/components';
+
+const supersetTextDocs = getDatabaseDocumentationLinks();
+export const DOCUMENTATION_LINK = supersetTextDocs
+  ? supersetTextDocs.support
+  : 'https://superset.apache.org/docs/databases/installing-database-drivers';
+
+export interface IProps {
+  errorMessage: string;
+  showDbInstallInstructions: boolean;
+}
+
+export const ImportErrorAlert: FunctionComponent<IProps> = ({
+  errorMessage,
+  showDbInstallInstructions,
+}) => (
+  <ErrorAlert
+    type="error"
+    errorType={t('Import Error')}
+    message={errorMessage}
+    description={
+      showDbInstallInstructions ? (
+        <>
+          <br />
+          {t(
+            'Database driver for importing maybe not installed. Visit the Superset documentation page for installation instructions: ',
+          )}
+          <a
+            href={DOCUMENTATION_LINK}
+            target="_blank"
+            rel="noopener noreferrer"
+            className="additional-fields-alert-description"
+          >
+            {t('here')}
+          </a>
+          .
+        </>
+      ) : (
+        ''
+      )
+    }
+  />
+);
diff --git a/superset-frontend/src/components/ImportModal/ImportModal.test.tsx b/superset-frontend/src/components/ImportModal/ImportModal.test.tsx
index 69bd1a8e1aa..720d3a78643 100644
--- a/superset-frontend/src/components/ImportModal/ImportModal.test.tsx
+++ b/superset-frontend/src/components/ImportModal/ImportModal.test.tsx
@@ -21,9 +21,8 @@ import configureStore from 'redux-mock-store';
 import { fireEvent, render, waitFor } from 'spec/helpers/testing-library';
 import fetchMock from 'fetch-mock';
 import { ImportResourceName } from 'src/views/CRUD/types';
-import ImportModelsModal, {
-  ImportModelsModalProps,
-} from 'src/components/ImportModal';
+import type { ImportModelsModalProps } from './types';
+import { ImportModal } from '.';
 
 const mockStore = configureStore([thunk]);
 const store = mockStore({});
@@ -49,7 +48,7 @@ afterEach(() => {
 });
 
 const setup = (overrides: Partial<ImportModelsModalProps> = {}) =>
-  render(<ImportModelsModal {...requiredProps} {...overrides} />, { store });
+  render(<ImportModal {...requiredProps} {...overrides} />, { store });
 
 test('renders', () => {
   const { container } = setup();
diff --git a/superset-frontend/src/components/ImportModal/index.tsx b/superset-frontend/src/components/ImportModal/index.tsx
index 12b4be4f4fb..7cbc2de069a 100644
--- a/superset-frontend/src/components/ImportModal/index.tsx
+++ b/superset-frontend/src/components/ImportModal/index.tsx
@@ -17,112 +17,50 @@
  * under the License.
  */
 import { FunctionComponent, useEffect, useState, ChangeEvent } from 'react';
-
-// eslint-disable-next-line no-restricted-imports
-import { UploadChangeParam, UploadFile } from 'antd/lib/upload/interface'; // TODO: Remove antd
-import { styled, t } from '@superset-ui/core';
-
-import Button from 'src/components/Button';
-import Modal from 'src/components/Modal';
-import { Upload } from 'src/components';
+import { styled, t, css } from '@superset-ui/core';
 import { useImportResource } from 'src/views/CRUD/hooks';
-import { ImportResourceName } from 'src/views/CRUD/types';
-import ErrorAlert from './ErrorAlert';
+import {
+  Upload,
+  type UploadChangeParam,
+  type UploadFile,
+} from '@superset-ui/core/components/Upload';
+import { Button, Input, Modal } from '@superset-ui/core/components';
+import { ImportErrorAlert } from './ImportErrorAlert';
+import type { ImportModelsModalProps } from './types';
 
 const HelperMessage = styled.div`
   display: block;
-  color: ${({ theme }) => theme.colors.grayscale.base};
-  font-size: ${({ theme }) => theme.typography.sizes.s}px;
+  color: ${({ theme }) => theme.colorTextSecondary};
+  font-size: ${({ theme }) => theme.fontSizeSM}px;
 `;
 
-const StyledInputContainer = styled.div`
-  padding-bottom: ${({ theme }) => theme.gridUnit * 2}px;
-  padding-top: ${({ theme }) => theme.gridUnit * 2}px;
+const StyledContainer = styled.div`
+  ${({ theme }) => css`
+    padding-top: ${theme.sizeUnit * 2}px;
+    padding-bottom: ${theme.sizeUnit * 2}px;
 
-  & > div {
-    margin: ${({ theme }) => theme.gridUnit}px 0;
-  }
-
-  &.extra-container {
-    padding-top: 8px;
-  }
-
-  .confirm-overwrite {
-    margin-bottom: ${({ theme }) => theme.gridUnit * 2}px;
-  }
-
-  .input-container {
-    display: flex;
-    align-items: center;
-
-    label {
-      display: flex;
-      margin-right: ${({ theme }) => theme.gridUnit * 2}px;
+    & > div {
+      margin: ${theme.sizeUnit}px 0;
     }
 
-    i {
-      margin: 0 ${({ theme }) => theme.gridUnit}px;
+    .confirm-overwrite {
+      margin-bottom: ${theme.sizeUnit * 2}px;
     }
-  }
+    input[type='text'],
+    input[type='number'] {
+      &[name='name'] {
+        flex: 0 1 auto;
+        width: 40%;
+      }
 
-  input,
-  textarea {
-    flex: 1 1 auto;
-  }
-
-  textarea {
-    height: 160px;
-    resize: none;
-  }
-
-  input::placeholder,
-  textarea::placeholder {
-    color: ${({ theme }) => theme.colors.grayscale.light1};
-  }
-
-  textarea,
-  input[type='text'],
-  input[type='number'] {
-    padding: ${({ theme }) => theme.gridUnit * 1.5}px
-      ${({ theme }) => theme.gridUnit * 2}px;
-    border-style: none;
-    border: 1px solid ${({ theme }) => theme.colors.grayscale.light2};
-    border-radius: ${({ theme }) => theme.gridUnit}px;
-
-    &[name='name'] {
-      flex: 0 1 auto;
-      width: 40%;
+      &[name='sqlalchemy_uri'] {
+        margin-right: ${theme.sizeUnit * 3}px;
+      }
     }
-
-    &[name='sqlalchemy_uri'] {
-      margin-right: ${({ theme }) => theme.gridUnit * 3}px;
-    }
-  }
+  `}
 `;
 
-export interface ImportModelsModalProps {
-  resourceName: ImportResourceName;
-  resourceLabel: string;
-  passwordsNeededMessage: string;
-  confirmOverwriteMessage: string;
-  addDangerToast: (msg: string) => void;
-  addSuccessToast: (msg: string) => void;
-  onModelImport: () => void;
-  show: boolean;
-  onHide: () => void;
-  passwordFields?: string[];
-  setPasswordFields?: (passwordFields: string[]) => void;
-  sshTunnelPasswordFields?: string[];
-  setSSHTunnelPasswordFields?: (sshTunnelPasswordFields: string[]) => void;
-  sshTunnelPrivateKeyFields?: string[];
-  setSSHTunnelPrivateKeyFields?: (sshTunnelPrivateKeyFields: string[]) => void;
-  sshTunnelPrivateKeyPasswordFields?: string[];
-  setSSHTunnelPrivateKeyPasswordFields?: (
-    sshTunnelPrivateKeyPasswordFields: string[],
-  ) => void;
-}
-
-const ImportModelsModal: FunctionComponent<ImportModelsModalProps> = ({
+export const ImportModal: FunctionComponent<ImportModelsModalProps> = ({
   resourceName,
   resourceLabel,
   passwordsNeededMessage,
@@ -295,12 +233,12 @@ const ImportModelsModal: FunctionComponent<ImportModelsModalProps> = ({
         {files.map(fileName => (
           <>
             {passwordFields?.indexOf(fileName) >= 0 && (
-              <StyledInputContainer key={`password-for-${fileName}`}>
+              <StyledContainer key={`password-for-${fileName}`}>
                 <div className="control-label">
                   {t('%s PASSWORD', fileName.slice(10))}
                   <span className="required">*</span>
                 </div>
-                <input
+                <Input
                   name={`password-${fileName}`}
                   autoComplete={`password-${fileName}`}
                   type="password"
@@ -312,15 +250,15 @@ const ImportModelsModal: FunctionComponent<ImportModelsModalProps> = ({
                     })
                   }
                 />
-              </StyledInputContainer>
+              </StyledContainer>
             )}
             {sshTunnelPasswordFields?.indexOf(fileName) >= 0 && (
-              <StyledInputContainer key={`ssh_tunnel_password-for-${fileName}`}>
+              <StyledContainer key={`ssh_tunnel_password-for-${fileName}`}>
                 <div className="control-label">
                   {t('%s SSH TUNNEL PASSWORD', fileName.slice(10))}
                   <span className="required">*</span>
                 </div>
-                <input
+                <Input
                   name={`ssh_tunnel_password-${fileName}`}
                   autoComplete={`ssh_tunnel_password-${fileName}`}
                   type="password"
@@ -333,17 +271,15 @@ const ImportModelsModal: FunctionComponent<ImportModelsModalProps> = ({
                   }
                   data-test="ssh_tunnel_password"
                 />
-              </StyledInputContainer>
+              </StyledContainer>
             )}
             {sshTunnelPrivateKeyFields?.indexOf(fileName) >= 0 && (
-              <StyledInputContainer
-                key={`ssh_tunnel_private_key-for-${fileName}`}
-              >
+              <StyledContainer key={`ssh_tunnel_private_key-for-${fileName}`}>
                 <div className="control-label">
                   {t('%s SSH TUNNEL PRIVATE KEY', fileName.slice(10))}
                   <span className="required">*</span>
                 </div>
-                <textarea
+                <Input.TextArea
                   name={`ssh_tunnel_private_key-${fileName}`}
                   autoComplete={`ssh_tunnel_private_key-${fileName}`}
                   value={sshTunnelPrivateKeys[fileName]}
@@ -355,17 +291,17 @@ const ImportModelsModal: FunctionComponent<ImportModelsModalProps> = ({
                   }
                   data-test="ssh_tunnel_private_key"
                 />
-              </StyledInputContainer>
+              </StyledContainer>
             )}
             {sshTunnelPrivateKeyPasswordFields?.indexOf(fileName) >= 0 && (
-              <StyledInputContainer
+              <StyledContainer
                 key={`ssh_tunnel_private_key_password-for-${fileName}`}
               >
                 <div className="control-label">
                   {t('%s SSH TUNNEL PRIVATE KEY PASSWORD', fileName.slice(10))}
                   <span className="required">*</span>
                 </div>
-                <input
+                <Input
                   name={`ssh_tunnel_private_key_password-${fileName}`}
                   autoComplete={`ssh_tunnel_private_key_password-${fileName}`}
                   type="password"
@@ -378,7 +314,7 @@ const ImportModelsModal: FunctionComponent<ImportModelsModalProps> = ({
                   }
                   data-test="ssh_tunnel_private_key_password"
                 />
-              </StyledInputContainer>
+              </StyledContainer>
             )}
           </>
         ))}
@@ -393,18 +329,18 @@ const ImportModelsModal: FunctionComponent<ImportModelsModalProps> = ({
 
     return (
       <>
-        <StyledInputContainer>
+        <StyledContainer>
           <div className="confirm-overwrite">{confirmOverwriteMessage}</div>
           <div className="control-label">
             {t('Type "%s" to confirm', t('OVERWRITE'))}
           </div>
-          <input
+          <Input
             data-test="overwrite-modal-input"
             id="overwrite"
             type="text"
             onChange={confirmOverwrite}
           />
-        </StyledInputContainer>
+        </StyledContainer>
       </>
     );
   };
@@ -431,7 +367,7 @@ const ImportModelsModal: FunctionComponent<ImportModelsModalProps> = ({
       show={show}
       title={<h4>{t('Import %s', resourceLabel)}</h4>}
     >
-      <StyledInputContainer>
+      <StyledContainer>
         <Upload
           name="modelFile"
           id="modelFile"
@@ -446,9 +382,9 @@ const ImportModelsModal: FunctionComponent<ImportModelsModalProps> = ({
         >
           <Button loading={importingModel}>{t('Select file')}</Button>
         </Upload>
-      </StyledInputContainer>
+      </StyledContainer>
       {errorMessage && (
-        <ErrorAlert
+        <ImportErrorAlert
           errorMessage={errorMessage}
           showDbInstallInstructions={
             passwordFields.length > 0 ||
@@ -464,4 +400,4 @@ const ImportModelsModal: FunctionComponent<ImportModelsModalProps> = ({
   );
 };
 
-export default ImportModelsModal;
+export type { ImportModelsModalProps };
diff --git a/superset-frontend/src/components/ImportModal/styles.ts b/superset-frontend/src/components/ImportModal/styles.ts
index f0120f62398..07d22b080ff 100644
--- a/superset-frontend/src/components/ImportModal/styles.ts
+++ b/superset-frontend/src/components/ImportModal/styles.ts
@@ -20,9 +20,9 @@
 import { css, SupersetTheme } from '@superset-ui/core';
 
 export const antdWarningAlertStyles = (theme: SupersetTheme) => css`
-  margin: ${theme.gridUnit * 4}px 0;
+  margin: ${theme.sizeUnit * 4}px 0;
 
-  .antd5-alert-message {
+  .ant-alert-message {
     margin: 0;
   }
 `;
diff --git a/superset-frontend/src/components/ImportModal/types.ts b/superset-frontend/src/components/ImportModal/types.ts
new file mode 100644
index 00000000000..5b9fc57ab22
--- /dev/null
+++ b/superset-frontend/src/components/ImportModal/types.ts
@@ -0,0 +1,41 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { ImportResourceName } from 'src/views/CRUD/types';
+
+export interface ImportModelsModalProps {
+  resourceName: ImportResourceName;
+  resourceLabel: string;
+  passwordsNeededMessage: string;
+  confirmOverwriteMessage: string;
+  addDangerToast: (msg: string) => void;
+  addSuccessToast: (msg: string) => void;
+  onModelImport: () => void;
+  show: boolean;
+  onHide: () => void;
+  passwordFields?: string[];
+  setPasswordFields?: (passwordFields: string[]) => void;
+  sshTunnelPasswordFields?: string[];
+  setSSHTunnelPasswordFields?: (sshTunnelPasswordFields: string[]) => void;
+  sshTunnelPrivateKeyFields?: string[];
+  setSSHTunnelPrivateKeyFields?: (sshTunnelPrivateKeyFields: string[]) => void;
+  sshTunnelPrivateKeyPasswordFields?: string[];
+  setSSHTunnelPrivateKeyPasswordFields?: (
+    sshTunnelPrivateKeyPasswordFields: string[],
+  ) => void;
+}
diff --git a/superset-frontend/src/components/IndeterminateCheckbox/IndeterminateCheckbox.test.tsx b/superset-frontend/src/components/IndeterminateCheckbox/IndeterminateCheckbox.test.tsx
deleted file mode 100644
index c60c146c18d..00000000000
--- a/superset-frontend/src/components/IndeterminateCheckbox/IndeterminateCheckbox.test.tsx
+++ /dev/null
@@ -1,88 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 {
-  render,
-  screen,
-  userEvent,
-  waitFor,
-} from 'spec/helpers/testing-library';
-import IndeterminateCheckbox, { IndeterminateCheckboxProps } from '.';
-
-const mockedProps: IndeterminateCheckboxProps = {
-  checked: false,
-  id: 'checkbox-id',
-  indeterminate: false,
-  title: 'Checkbox title',
-  onChange: jest.fn(),
-};
-
-const asyncRender = (props = mockedProps) =>
-  waitFor(() => render(<IndeterminateCheckbox {...props} />));
-
-test('should render', async () => {
-  const { container } = await asyncRender();
-  expect(container).toBeInTheDocument();
-});
-
-test('should render the label', async () => {
-  await asyncRender();
-  expect(screen.getByTitle('Checkbox title')).toBeInTheDocument();
-});
-
-test('should render the checkbox', async () => {
-  await asyncRender();
-  expect(screen.getByRole('checkbox')).toBeInTheDocument();
-});
-
-test('should render the checkbox-half icon', async () => {
-  const indeterminateProps = {
-    ...mockedProps,
-    indeterminate: true,
-  };
-  await asyncRender(indeterminateProps);
-  expect(screen.getByRole('img')).toBeInTheDocument();
-  expect(screen.getByRole('img')).toHaveAttribute(
-    'aria-label',
-    'checkbox-half',
-  );
-});
-
-test('should render the checkbox-off icon', async () => {
-  await asyncRender();
-  expect(screen.getByRole('img')).toBeInTheDocument();
-  expect(screen.getByRole('img')).toHaveAttribute('aria-label', 'checkbox-off');
-});
-
-test('should render the checkbox-on icon', async () => {
-  const checkboxOnProps = {
-    ...mockedProps,
-    checked: true,
-  };
-  await asyncRender(checkboxOnProps);
-  expect(screen.getByRole('img')).toBeInTheDocument();
-  expect(screen.getByRole('img')).toHaveAttribute('aria-label', 'checkbox-on');
-});
-
-test('should call the onChange', async () => {
-  await asyncRender();
-  const label = screen.getByTitle('Checkbox title');
-  userEvent.click(label);
-  expect(mockedProps.onChange).toHaveBeenCalledTimes(1);
-});
diff --git a/superset-frontend/src/components/IndeterminateCheckbox/index.tsx b/superset-frontend/src/components/IndeterminateCheckbox/index.tsx
deleted file mode 100644
index 4cf13aa50c1..00000000000
--- a/superset-frontend/src/components/IndeterminateCheckbox/index.tsx
+++ /dev/null
@@ -1,122 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 {
-  EventHandler,
-  SyntheticEvent,
-  MutableRefObject,
-  forwardRef,
-  useRef,
-  useEffect,
-} from 'react';
-
-import { styled } from '@superset-ui/core';
-import { Icons } from 'src/components/Icons';
-
-export interface IndeterminateCheckboxProps {
-  indeterminate: boolean;
-  id: string;
-  checked: boolean;
-  onChange: EventHandler<SyntheticEvent<HTMLInputElement>>;
-  title?: string;
-  labelText?: string;
-}
-
-const CheckboxLabel = styled.label`
-  cursor: pointer;
-  display: inline-block;
-  margin-bottom: 0;
-`;
-
-const CheckboxHalf = styled(Icons.CheckboxHalf)`
-  color: ${({ theme }) => theme.colors.primary.base};
-  cursor: pointer;
-`;
-
-const CheckboxOff = styled(Icons.CheckboxOff)`
-  color: ${({ theme }) => theme.colors.grayscale.base};
-  cursor: pointer;
-`;
-
-const CheckboxOn = styled(Icons.CheckboxOn)`
-  color: ${({ theme }) => theme.colors.primary.base};
-  cursor: pointer;
-`;
-
-const HiddenInput = styled.input`
-  &[type='checkbox'] {
-    cursor: pointer;
-    opacity: 0;
-    position: absolute;
-    left: 3px;
-    margin: 0;
-    top: 4px;
-  }
-`;
-
-const InputContainer = styled.div`
-  cursor: pointer;
-  display: inline-block;
-  position: relative;
-`;
-
-const IndeterminateCheckbox = forwardRef(
-  (
-    {
-      indeterminate,
-      id,
-      checked,
-      onChange,
-      title = '',
-      labelText = '',
-      ...rest
-    }: IndeterminateCheckboxProps,
-    ref: MutableRefObject<any>,
-  ) => {
-    const defaultRef = useRef<HTMLInputElement>();
-    const resolvedRef = ref || defaultRef;
-
-    useEffect(() => {
-      resolvedRef.current.indeterminate = indeterminate;
-    }, [resolvedRef, indeterminate]);
-
-    return (
-      <>
-        <InputContainer>
-          {indeterminate && <CheckboxHalf />}
-          {!indeterminate && checked && <CheckboxOn />}
-          {!indeterminate && !checked && <CheckboxOff />}
-          <HiddenInput
-            name={id}
-            id={id}
-            type="checkbox"
-            ref={resolvedRef}
-            checked={checked}
-            onChange={onChange}
-            {...rest}
-          />
-        </InputContainer>
-        <CheckboxLabel title={title} htmlFor={id}>
-          {labelText}
-        </CheckboxLabel>
-      </>
-    );
-  },
-);
-
-export default IndeterminateCheckbox;
diff --git a/superset-frontend/src/components/InfoTooltip/index.tsx b/superset-frontend/src/components/InfoTooltip/index.tsx
deleted file mode 100644
index 5062506afca..00000000000
--- a/superset-frontend/src/components/InfoTooltip/index.tsx
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 { styled, useTheme, css } from '@superset-ui/core';
-import { Tooltip } from 'src/components/Tooltip';
-import { Icons } from 'src/components/Icons';
-import { ActionType } from 'src/types/Action';
-
-export interface InfoTooltipProps {
-  iconStyle?: React.CSSProperties;
-  tooltip: string;
-  placement?:
-    | 'bottom'
-    | 'left'
-    | 'right'
-    | 'top'
-    | 'topLeft'
-    | 'topRight'
-    | 'bottomLeft'
-    | 'bottomRight'
-    | 'leftTop'
-    | 'leftBottom'
-    | 'rightTop'
-    | 'rightBottom'
-    | undefined;
-  trigger?: ActionType | ActionType[];
-  overlayStyle?: any;
-  bgColor?: string;
-  viewBox?: string;
-}
-
-const StyledTooltip = styled(Tooltip)`
-  cursor: pointer;
-`;
-
-const StyledTooltipTitle = styled.span`
-  display: -webkit-box;
-  -webkit-line-clamp: 20;
-  -webkit-box-orient: vertical;
-  overflow: hidden;
-  text-overflow: ellipsis;
-`;
-
-const defaultOverlayStyle = {
-  fontSize: '12px',
-  lineHeight: '16px',
-};
-const InfoIconContainer = styled.div`
-  ${({ theme }) => css`
-    display: flex;
-    flex-direction: row;
-    justify-content: center;
-    align-items: center;
-    margin-left: ${theme.gridUnit}px;
-  `}
-`;
-const defaultColor = 'rgba(0,0,0,0.9)';
-
-export default function InfoTooltip({
-  tooltip,
-  iconStyle = {},
-  placement = 'right',
-  trigger = 'hover',
-  overlayStyle = defaultOverlayStyle,
-  bgColor = defaultColor,
-  viewBox = '0 -1 24 24',
-}: InfoTooltipProps) {
-  const theme = useTheme();
-  const alteredIconStyle = {
-    ...iconStyle,
-    color: iconStyle.color || theme.colors.grayscale.base,
-  };
-  return (
-    <StyledTooltip
-      title={<StyledTooltipTitle>{tooltip}</StyledTooltipTitle>}
-      placement={placement}
-      trigger={trigger}
-      overlayStyle={overlayStyle}
-      color={bgColor}
-    >
-      <InfoIconContainer>
-        <Icons.InfoCircleFilled
-          aria-label="info-tooltip"
-          data-test="info-tooltip-icon"
-          iconSize="m"
-          style={alteredIconStyle}
-          viewBox={viewBox}
-        />
-      </InfoIconContainer>
-    </StyledTooltip>
-  );
-}
diff --git a/superset-frontend/src/components/Input/Input.stories.tsx b/superset-frontend/src/components/Input/Input.stories.tsx
deleted file mode 100644
index 4023c53d97e..00000000000
--- a/superset-frontend/src/components/Input/Input.stories.tsx
+++ /dev/null
@@ -1,138 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 { InputProps, TextAreaProps } from 'antd-v5/lib/input';
-import { InputNumberProps } from 'antd-v5/lib/input-number';
-import { AntdThemeProvider } from 'src/components/AntdThemeProvider';
-import { Input, TextArea, InputNumber } from '.';
-
-export default {
-  title: 'Input',
-  component: Input,
-};
-
-export const InteractiveInput = (args: InputProps) => (
-  <AntdThemeProvider>
-    <Input {...args} />
-  </AntdThemeProvider>
-);
-
-export const InteractiveInputNumber = (args: InputNumberProps) => (
-  <AntdThemeProvider>
-    <InputNumber {...args} />
-  </AntdThemeProvider>
-);
-
-export const InteractiveTextArea = (args: TextAreaProps) => (
-  <AntdThemeProvider>
-    <TextArea {...args} />
-  </AntdThemeProvider>
-);
-
-InteractiveInput.args = {
-  allowClear: false,
-  disabled: false,
-  showCount: false,
-  type: 'text',
-  variant: 'outlined',
-};
-
-InteractiveInput.argTypes = {
-  defaultValue: {
-    control: {
-      type: 'text',
-    },
-  },
-
-  id: {
-    control: {
-      type: 'text',
-    },
-  },
-
-  maxLength: {
-    control: {
-      type: 'number',
-    },
-  },
-
-  status: {
-    control: {
-      type: 'select',
-    },
-    options: ['error', 'warning'],
-  },
-
-  size: {
-    control: {
-      type: 'select',
-    },
-    options: ['large', 'middle', 'small'],
-  },
-  variant: {
-    control: {
-      type: 'select',
-    },
-    options: ['outlined', 'borderless', 'filled'],
-  },
-};
-
-InteractiveTextArea.args = {
-  ...InteractiveInput.args,
-  autoSize: false,
-};
-
-InteractiveTextArea.argTypes = InteractiveInput.argTypes;
-
-InteractiveInputNumber.args = {
-  autoFocus: false,
-  disabled: false,
-  keyboard: true,
-  max: Number.MAX_SAFE_INTEGER,
-  min: Number.MIN_SAFE_INTEGER,
-  readonly: false,
-  step: 1,
-  stringMode: false,
-};
-
-InteractiveInputNumber.argTypes = {
-  controls: {
-    control: { type: 'boolean' },
-  },
-
-  decimalSeperator: {
-    control: { type: 'text' },
-  },
-
-  placeholder: {
-    control: { type: 'text' },
-  },
-
-  defaultValue: {
-    control: { type: 'number' },
-  },
-
-  precision: {
-    control: { type: 'number' },
-  },
-
-  status: InteractiveInput.argTypes.status,
-  size: InteractiveInput.argTypes.size,
-  variant: InteractiveInput.argTypes.variant,
-};
diff --git a/superset-frontend/src/components/JsonModal/JsonModal.test.tsx b/superset-frontend/src/components/JsonModal/JsonModal.test.tsx
index 44f01404a3b..7344bb577f5 100644
--- a/superset-frontend/src/components/JsonModal/JsonModal.test.tsx
+++ b/superset-frontend/src/components/JsonModal/JsonModal.test.tsx
@@ -17,7 +17,8 @@
  * under the License.
  */
 import { fireEvent, render } from 'spec/helpers/testing-library';
-import { JsonModal, convertBigIntStrToNumber } from '.';
+import { JsonModal } from '.';
+import { convertBigIntStrToNumber } from './utils';
 
 jest.mock('react-json-tree', () => ({
   JSONTree: () => <div data-test="mock-json-tree" />,
diff --git a/superset-frontend/src/components/JsonModal/index.tsx b/superset-frontend/src/components/JsonModal/index.tsx
index 79ff25ef5af..f108c3dc19b 100644
--- a/superset-frontend/src/components/JsonModal/index.tsx
+++ b/superset-frontend/src/components/JsonModal/index.tsx
@@ -35,62 +35,23 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import JSONbig from 'json-bigint';
 import { FC, useMemo } from 'react';
 import { JSONTree } from 'react-json-tree';
 import { useJsonTreeTheme } from 'src/hooks/useJsonTreeTheme';
-import Button from '../Button';
-import CopyToClipboard from '../CopyToClipboard';
-import ModalTrigger from '../ModalTrigger';
-
-export function safeJsonObjectParse(
-  data: unknown,
-): null | unknown[] | Record<string, unknown> {
-  if (typeof data === 'object') {
-    return data as null | unknown[] | Record<string, unknown>;
-  }
-
-  // First perform a cheap proxy to avoid calling JSON.parse on data that is clearly not a
-  // JSON object or array
-  if (
-    typeof data !== 'string' ||
-    ['{', '['].indexOf(data.substring(0, 1)) === -1
-  ) {
-    return null;
-  }
-
-  // We know `data` is a string starting with '{' or '[', so try to parse it as a valid object
-  try {
-    const jsonData = JSONbig({ storeAsString: true }).parse(data);
-    if (jsonData && typeof jsonData === 'object') {
-      return jsonData;
-    }
-    return null;
-  } catch (_) {
-    return null;
-  }
-}
-
-export function convertBigIntStrToNumber(value: string | number) {
-  if (typeof value === 'string' && /^"-?\d+"$/.test(value)) {
-    return value.substring(1, value.length - 1);
-  }
-  return value;
-}
+import { Button, ModalTrigger } from '@superset-ui/core/components';
+import { CopyToClipboard } from '../CopyToClipboard';
+import { convertBigIntStrToNumber } from './utils';
+import type { JsonModalProps } from './types';
 
 function renderBigIntStrToNumber(value: string | number) {
   return <>{convertBigIntStrToNumber(value)}</>;
 }
 
-type CellDataType = string | number | null | object;
-
-export interface Props {
-  modalTitle: string;
-  jsonObject: Record<string, unknown> | unknown[];
-  jsonValue: CellDataType;
-}
-
-export const JsonModal: FC<Props> = ({ modalTitle, jsonObject, jsonValue }) => {
+export const JsonModal: FC<JsonModalProps> = ({
+  modalTitle,
+  jsonObject,
+  jsonValue,
+}) => {
   const jsonTreeTheme = useJsonTreeTheme();
   const content = useMemo(
     () =>
@@ -117,3 +78,5 @@ export const JsonModal: FC<Props> = ({ modalTitle, jsonObject, jsonValue }) => {
     />
   );
 };
+
+export type { JsonModalProps };
diff --git a/superset-frontend/src/components/JsonModal/types.ts b/superset-frontend/src/components/JsonModal/types.ts
new file mode 100644
index 00000000000..b9d3c74cb3a
--- /dev/null
+++ b/superset-frontend/src/components/JsonModal/types.ts
@@ -0,0 +1,26 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 CellDataType = string | number | null | object;
+
+export interface JsonModalProps {
+  modalTitle: string;
+  jsonObject: Record<string, unknown> | unknown[];
+  jsonValue: CellDataType;
+}
diff --git a/superset-frontend/src/components/JsonModal/utils.ts b/superset-frontend/src/components/JsonModal/utils.ts
new file mode 100644
index 00000000000..31b4e33855a
--- /dev/null
+++ b/superset-frontend/src/components/JsonModal/utils.ts
@@ -0,0 +1,54 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 JSONbig from 'json-bigint';
+
+export function safeJsonObjectParse(
+  data: unknown,
+): null | unknown[] | Record<string, unknown> {
+  if (typeof data === 'object') {
+    return data as null | unknown[] | Record<string, unknown>;
+  }
+
+  // First perform a cheap proxy to avoid calling JSON.parse on data that is clearly not a
+  // JSON object or array
+  if (
+    typeof data !== 'string' ||
+    ['{', '['].indexOf(data.substring(0, 1)) === -1
+  ) {
+    return null;
+  }
+
+  // We know `data` is a string starting with '{' or '[', so try to parse it as a valid object
+  try {
+    const jsonData = JSONbig({ storeAsString: true }).parse(data);
+    if (jsonData && typeof jsonData === 'object') {
+      return jsonData;
+    }
+    return null;
+  } catch (_) {
+    return null;
+  }
+}
+
+export function convertBigIntStrToNumber(value: string | number) {
+  if (typeof value === 'string' && /^"-?\d+"$/.test(value)) {
+    return value.substring(1, value.length - 1);
+  }
+  return value;
+}
diff --git a/superset-frontend/src/components/Label/index.tsx b/superset-frontend/src/components/Label/index.tsx
deleted file mode 100644
index 72f14218b9e..00000000000
--- a/superset-frontend/src/components/Label/index.tsx
+++ /dev/null
@@ -1,144 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 {
-  CSSProperties,
-  HTMLAttributes,
-  MouseEventHandler,
-  ReactNode,
-} from 'react';
-
-import { Tag } from 'src/components';
-import { useTheme } from '@superset-ui/core';
-import DatasetTypeLabel from 'src/components/Label/reusable/DatasetTypeLabel';
-import PublishedLabel from 'src/components/Label/reusable/PublishedLabel';
-
-export type OnClickHandler = MouseEventHandler<HTMLElement>;
-
-export type Type =
-  | 'success'
-  | 'warning'
-  | 'danger'
-  | 'info'
-  | 'default'
-  | 'primary'
-  | 'secondary';
-
-export interface LabelProps extends HTMLAttributes<HTMLSpanElement> {
-  key?: string;
-  className?: string;
-  onClick?: OnClickHandler;
-  type?: Type;
-  style?: CSSProperties;
-  children?: ReactNode;
-  role?: string;
-  monospace?: boolean;
-  icon?: ReactNode;
-}
-
-export default function Label(props: LabelProps) {
-  const theme = useTheme();
-  const { colors, transitionTiming } = theme;
-  const {
-    type = 'default',
-    monospace = false,
-    style,
-    onClick,
-    children,
-    icon,
-    ...rest
-  } = props;
-  const { primary, secondary, grayscale, success, warning, error, info } =
-    colors;
-
-  let baseColor;
-  if (type === 'primary') {
-    baseColor = primary;
-  } else if (type === 'secondary') {
-    baseColor = secondary;
-  } else if (type === 'success') {
-    baseColor = success;
-  } else if (type === 'warning') {
-    baseColor = warning;
-  } else if (type === 'danger') {
-    baseColor = error;
-  } else if (type === 'info') {
-    baseColor = info;
-  } else {
-    baseColor = grayscale;
-  }
-  const color = baseColor.dark2;
-  let borderColor = baseColor.light1;
-  let backgroundColor = baseColor.light2;
-
-  // TODO - REMOVE IF BLOCK LOGIC WHEN shades are fixed to be aligned in terms of brightness
-  // currently shades for >=light2 are not aligned for primary, default and secondary
-  if (['default', 'primary', 'secondary'].includes(type)) {
-    // @ts-ignore
-    backgroundColor = baseColor.light4;
-    borderColor = baseColor.light2;
-  }
-
-  const backgroundColorHover = onClick ? baseColor.light1 : backgroundColor;
-  const borderColorHover = onClick ? baseColor.base : borderColor;
-
-  if (type === 'default') {
-    // Lighter for default
-    backgroundColor = grayscale.light3;
-  }
-
-  const css = {
-    transition: `background-color ${transitionTiming}s`,
-    whiteSpace: 'nowrap',
-    cursor: onClick ? 'pointer' : 'default',
-    overflow: 'hidden',
-    textOverflow: 'ellipsis',
-    backgroundColor,
-    borderRadius: 8,
-    borderColor,
-    padding: '0.35em 0.8em',
-    lineHeight: 1,
-    color,
-    display: 'inline-flex',
-    verticalAlign: 'middle',
-    alignItems: 'center',
-    maxWidth: '100%',
-    '&:hover': {
-      backgroundColor: backgroundColorHover,
-      borderColor: borderColorHover,
-      opacity: 1,
-    },
-    ...(monospace
-      ? { 'font-family': theme.typography.families.monospace }
-      : {}),
-  };
-
-  return (
-    <Tag
-      onClick={onClick}
-      role={onClick ? 'button' : undefined}
-      style={style}
-      icon={icon}
-      {...rest}
-      css={css}
-    >
-      {children}
-    </Tag>
-  );
-}
-export { DatasetTypeLabel, PublishedLabel };
diff --git a/superset-frontend/src/components/ListView/ActionsBar.tsx b/superset-frontend/src/components/ListView/ActionsBar.tsx
index e04f5475af0..e802005de74 100644
--- a/superset-frontend/src/components/ListView/ActionsBar.tsx
+++ b/superset-frontend/src/components/ListView/ActionsBar.tsx
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,8 +37,12 @@
  */
 import { ReactElement } from 'react';
 import { styled } from '@superset-ui/core';
-import { Tooltip, TooltipPlacement } from 'src/components/Tooltip';
-import { Icons, IconNameType } from 'src/components/Icons';
+import {
+  Icons,
+  IconNameType,
+  Tooltip,
+  type TooltipPlacement,
+} from '@superset-ui/core/components';
 
 export type ActionProps = {
   label: string;
@@ -36,59 +59,47 @@ interface ActionsBarProps {
 const StyledActions = styled.span`
   white-space: nowrap;
   min-width: 100px;
-  svg,
-  i {
-    margin-right: 8px;
-
+  .action-button {
+    cursor: pointer;
+    color: ${({ theme }) => theme.colorIcon};
+    margin-right: ${({ theme }) => theme.sizeUnit}px;
     &:hover {
       path {
-        fill: ${({ theme }) => theme.colors.primary.base};
+        fill: ${({ theme }) => theme.colorPrimary};
       }
     }
   }
 `;
 
-const ActionWrapper = styled.span`
-  color: ${({ theme }) => theme.colors.grayscale.base};
-`;
-
-export default function ActionsBar({ actions }: ActionsBarProps) {
+export function ActionsBar({ actions }: ActionsBarProps) {
   return (
     <StyledActions className="actions">
       {actions.map((action, index) => {
         const ActionIcon = Icons[action.icon as IconNameType];
-        if (action.tooltip) {
-          return (
-            <Tooltip
-              id={`${action.label}-tooltip`}
-              title={action.tooltip}
-              placement={action.placement}
-              key={index}
-            >
-              <ActionWrapper
-                role="button"
-                tabIndex={0}
-                className="action-button"
-                data-test={action.label}
-                onClick={action.onClick}
-              >
-                <ActionIcon iconSize="l" />
-              </ActionWrapper>
-            </Tooltip>
-          );
-        }
-
-        return (
-          <ActionWrapper
+        const actionButton = (
+          <span
             role="button"
             tabIndex={0}
+            style={{ cursor: 'pointer' }}
             className="action-button"
-            onClick={action.onClick}
             data-test={action.label}
-            key={index}
+            onClick={action.onClick}
+            key={action.tooltip ? undefined : index}
           >
             <ActionIcon />
-          </ActionWrapper>
+          </span>
+        );
+        return action.tooltip ? (
+          <Tooltip
+            id={`${action.label}-tooltip`}
+            title={action.tooltip}
+            placement={action.placement}
+            key={index}
+          >
+            {actionButton}
+          </Tooltip>
+        ) : (
+          actionButton
         );
       })}
     </StyledActions>
diff --git a/superset-frontend/src/components/ListView/CardCollection.tsx b/superset-frontend/src/components/ListView/CardCollection.tsx
index 550cb84c390..82c35b13a4e 100644
--- a/superset-frontend/src/components/ListView/CardCollection.tsx
+++ b/superset-frontend/src/components/ListView/CardCollection.tsx
@@ -33,13 +33,14 @@ interface CardCollectionProps {
 const CardContainer = styled.div<{ showThumbnails?: boolean }>`
   ${({ theme, showThumbnails }) => `
     display: grid;
-    grid-gap: ${theme.gridUnit * 12}px ${theme.gridUnit * 4}px;
+    justify-content: start;
+    grid-gap: ${theme.sizeUnit * 12}px ${theme.sizeUnit * 4}px;
     grid-template-columns: repeat(auto-fit, 300px);
-    margin-top: ${theme.gridUnit * -6}px;
+    margin-top: ${theme.sizeUnit * -6}px;
     padding: ${
       showThumbnails
-        ? `${theme.gridUnit * 8 + 3}px ${theme.gridUnit * 9}px`
-        : `${theme.gridUnit * 8 + 1}px ${theme.gridUnit * 9}px`
+        ? `${theme.sizeUnit * 8 + 3}px ${theme.sizeUnit * 20}px`
+        : `${theme.sizeUnit * 8 + 1}px ${theme.sizeUnit * 20}px`
     };
   `}
 `;
@@ -47,7 +48,7 @@ const CardContainer = styled.div<{ showThumbnails?: boolean }>`
 const CardWrapper = styled.div`
   border: 2px solid transparent;
   &.card-selected {
-    border: 2px solid ${({ theme }) => theme.colors.primary.base};
+    border: 2px solid ${({ theme }) => theme.colorPrimary};
   }
   &.bulk-select {
     cursor: pointer;
diff --git a/superset-frontend/src/components/ListView/CardSortSelect.tsx b/superset-frontend/src/components/ListView/CardSortSelect.tsx
index b64b5f24a47..9be9b7cc1bb 100644
--- a/superset-frontend/src/components/ListView/CardSortSelect.tsx
+++ b/superset-frontend/src/components/ListView/CardSortSelect.tsx
@@ -18,14 +18,13 @@
  */
 import { useState, useMemo } from 'react';
 import { styled, t } from '@superset-ui/core';
-import { Select } from 'src/components';
-import { FormLabel } from 'src/components/Form';
+import { FormLabel, Select } from '@superset-ui/core/components';
 import { SELECT_WIDTH } from './utils';
 import { CardSortSelectOption, SortColumn } from './types';
 
 const SortContainer = styled.div`
   display: inline-flex;
-  font-size: ${({ theme }) => theme.typography.sizes.s}px;
+  font-size: ${({ theme }) => theme.fontSizeSM}px;
   align-items: center;
   text-align: left;
   width: ${SELECT_WIDTH}px;
diff --git a/superset-frontend/src/components/ListView/CrossLinks.tsx b/superset-frontend/src/components/ListView/CrossLinks.tsx
index 25f2ba82721..d0bbcc03e86 100644
--- a/superset-frontend/src/components/ListView/CrossLinks.tsx
+++ b/superset-frontend/src/components/ListView/CrossLinks.tsx
@@ -38,7 +38,7 @@ const StyledCrossLinks = styled.div`
       width: 100%;
       display: flex;
 
-      .antd5-tooltip-open {
+      .ant-tooltip-open {
         display: inline;
       }
 
@@ -54,7 +54,7 @@ const StyledCrossLinks = styled.div`
       .count {
         cursor: pointer;
         color: ${theme.colors.grayscale.base};
-        font-weight: ${theme.typography.weights.bold};
+        font-weight: ${theme.fontWeightStrong};
       }
     }
   `}
diff --git a/superset-frontend/src/components/ListView/CrossLinksTooltip.test.tsx b/superset-frontend/src/components/ListView/CrossLinksTooltip.test.tsx
index b17b417269f..08a863c9875 100644
--- a/superset-frontend/src/components/ListView/CrossLinksTooltip.test.tsx
+++ b/superset-frontend/src/components/ListView/CrossLinksTooltip.test.tsx
@@ -65,7 +65,7 @@ test('should render', () => {
 
 test('should render multiple links', async () => {
   setup();
-  userEvent.hover(screen.getByText('Hover me'));
+  await userEvent.hover(screen.getByText('Hover me'));
 
   await waitFor(() => {
     expect(screen.getByText('Test dashboard')).toBeInTheDocument();
@@ -76,9 +76,9 @@ test('should render multiple links', async () => {
   });
 });
 
-test('should not render the "+ {x} more"', () => {
+test('should not render the "+ {x} more"', async () => {
   setup();
-  userEvent.hover(screen.getByText('Hover me'));
+  await userEvent.hover(screen.getByText('Hover me'));
   expect(screen.queryByTestId('plus-more')).not.toBeInTheDocument();
 });
 
@@ -86,7 +86,7 @@ test('should render the "+ {x} more"', async () => {
   setup({
     moreItems: 3,
   });
-  userEvent.hover(screen.getByText('Hover me'));
+  await userEvent.hover(screen.getByText('Hover me'));
   expect(await screen.findByTestId('plus-more')).toBeInTheDocument();
   expect(await screen.findByText('+ 3 more')).toBeInTheDocument();
 });
diff --git a/superset-frontend/src/components/ListView/CrossLinksTooltip.tsx b/superset-frontend/src/components/ListView/CrossLinksTooltip.tsx
index aba3750dee7..52517869ab7 100644
--- a/superset-frontend/src/components/ListView/CrossLinksTooltip.tsx
+++ b/superset-frontend/src/components/ListView/CrossLinksTooltip.tsx
@@ -18,8 +18,8 @@
  */
 import { ReactNode } from 'react';
 import { styled, t } from '@superset-ui/core';
-import { Tooltip } from 'src/components/Tooltip';
 import { Link } from 'react-router-dom';
+import { Tooltip } from '@superset-ui/core/components';
 
 export type CrossLinksTooltipProps = {
   children: ReactNode;
diff --git a/superset-frontend/src/components/ListView/Filters/Base.ts b/superset-frontend/src/components/ListView/Filters/Base.ts
index 6baca649ffa..3c8c32521a4 100644
--- a/superset-frontend/src/components/ListView/Filters/Base.ts
+++ b/superset-frontend/src/components/ListView/Filters/Base.ts
@@ -16,22 +16,26 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { ReactNode } from 'react';
-import { styled } from '@superset-ui/core';
-import { SELECT_WIDTH } from 'src/components/ListView/utils';
+import { styled, css } from '@superset-ui/core';
+import { Flex } from '@superset-ui/core/components';
 
-export interface BaseFilter {
-  Header: ReactNode;
-  initialValue: any;
+interface FilterContainerProps {
+  width?: number;
 }
 
-export const FilterContainer = styled.div`
-  display: inline-flex;
-  font-size: ${({ theme }) => theme.typography.sizes.s}px;
-  align-items: center;
-  width: ${SELECT_WIDTH}px;
-`;
+export const FilterContainer = styled(Flex)<FilterContainerProps>`
+  ${({ theme, width }) => css`
+    width: ${width ? `${width}px` : 'auto'};
 
-export type FilterHandler = {
-  clearFilter: () => void;
-};
+    label {
+      display: block;
+      font-size: ${theme.fontSizeSM}px;
+      color: ${theme.colorTextLabel};
+      margin-bottom: ${theme.sizeUnit}px;
+    }
+    .anticon-info-circle {
+      margin: 0px 0px ${theme.sizeUnit}px ${theme.sizeUnit}px;
+   }
+  }
+  `}
+`;
diff --git a/superset-frontend/src/components/ListView/Filters/DateRange.tsx b/superset-frontend/src/components/ListView/Filters/DateRange.tsx
index 030d462f8ef..9a6117bb4f3 100644
--- a/superset-frontend/src/components/ListView/Filters/DateRange.tsx
+++ b/superset-frontend/src/components/ListView/Filters/DateRange.tsx
@@ -24,15 +24,19 @@ import {
   RefObject,
 } from 'react';
 
-import { styled, t } from '@superset-ui/core';
-import { RangePicker } from 'src/components/DatePicker';
-import { FormLabel } from 'src/components/Form';
-import { extendedDayjs } from 'src/utils/dates';
+import { t } from '@superset-ui/core';
 import { Dayjs } from 'dayjs';
-import Loading from 'src/components/Loading';
-import { AntdThemeProvider } from 'src/components/AntdThemeProvider';
 import { useLocale } from 'src/hooks/useLocale';
-import { BaseFilter, FilterHandler } from './Base';
+import { extendedDayjs } from '@superset-ui/core/utils/dates';
+import {
+  AntdThemeProvider,
+  Loading,
+  FormLabel,
+  RangePicker,
+} from '@superset-ui/core/components';
+import type { BaseFilter, FilterHandler } from './types';
+import { FilterContainer } from './Base';
+import { RANGE_WIDTH } from '../utils';
 
 interface DateRangeFilterProps extends BaseFilter {
   onSubmit: (val: number[] | string[]) => void;
@@ -42,14 +46,6 @@ interface DateRangeFilterProps extends BaseFilter {
 
 type ValueState = [number, number] | [string, string] | null;
 
-const RangeFilterContainer = styled.div`
-  display: inline-flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: flex-start;
-  width: 360px;
-`;
-
 function DateRangeFilter(
   {
     Header,
@@ -79,7 +75,13 @@ function DateRangeFilter(
   }
   return (
     <AntdThemeProvider locale={locale}>
-      <RangeFilterContainer>
+      <FilterContainer
+        data-test="date-range-filter-container"
+        vertical
+        justify="center"
+        align="start"
+        width={RANGE_WIDTH}
+      >
         <FormLabel>{Header}</FormLabel>
         <RangePicker
           placeholder={[t('Start date'), t('End date')]}
@@ -102,7 +104,7 @@ function DateRangeFilter(
             onSubmit(changeValue);
           }}
         />
-      </RangeFilterContainer>
+      </FilterContainer>
     </AntdThemeProvider>
   );
 }
diff --git a/superset-frontend/src/components/ListView/Filters/NumericalRange.tsx b/superset-frontend/src/components/ListView/Filters/NumericalRange.tsx
index 04c4f29fec8..3023fd896d4 100644
--- a/superset-frontend/src/components/ListView/Filters/NumericalRange.tsx
+++ b/superset-frontend/src/components/ListView/Filters/NumericalRange.tsx
@@ -18,17 +18,11 @@
  */
 import { useState, forwardRef, useImperativeHandle, RefObject } from 'react';
 import { styled, t } from '@superset-ui/core';
-import { InputNumber } from 'src/components/Input';
-import { FormLabel } from 'src/components/Form';
-import { BaseFilter, FilterHandler } from './Base';
-
-const RangeFilterContainer = styled.div`
-  display: inline-flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: flex-start;
-  width: 360px;
-`;
+import { InputNumber } from '@superset-ui/core/components/Input';
+import { FormLabel } from '@superset-ui/core/components/Form';
+import type { BaseFilter, FilterHandler } from './types';
+import { FilterContainer } from './Base';
+import { RANGE_WIDTH } from '../utils';
 
 const InputContainer = styled.div`
   display: flex;
@@ -38,16 +32,16 @@ const InputContainer = styled.div`
 `;
 
 const StyledDivider = styled.span`
-  margin: 0 ${({ theme }) => theme.gridUnit * 2}px;
-  color: ${({ theme }) => theme.colors.grayscale.base};
-  font-weight: ${({ theme }) => theme.typography.weights.bold};
-  font-size: ${({ theme }) => theme.typography.sizes.m}px;
+  margin: 0 ${({ theme }) => theme.sizeUnit * 2}px;
+  color: ${({ theme }) => theme.colorText};
+  font-weight: ${({ theme }) => theme.fontWeightNormal};
+  font-size: ${({ theme }) => theme.fontSize}px;
 `;
 
 const ErrorMessage = styled.div`
-  color: ${({ theme }) => theme.colors.error.base};
-  font-size: ${({ theme }) => theme.typography.sizes.s}px;
-  font-weight: ${({ theme }) => theme.typography.weights.bold};
+  color: ${({ theme }) => theme.colorErrorText};
+  font-size: ${({ theme }) => theme.fontSizeSM}px;
+  font-weight: ${({ theme }) => theme.fontWeightNormal};
   position: absolute;
   bottom: -50%;
   left: 0;
@@ -103,7 +97,13 @@ function NumericalRangeFilter(
   }));
 
   return (
-    <RangeFilterContainer>
+    <FilterContainer
+      data-test="numerical-range-filter-container"
+      width={RANGE_WIDTH}
+      vertical
+      justify="center"
+      align="start"
+    >
       <FormLabel>{Header}</FormLabel>
       <InputContainer>
         <InputNumber
@@ -127,7 +127,7 @@ function NumericalRangeFilter(
           </ErrorMessage>
         )}
       </InputContainer>
-    </RangeFilterContainer>
+    </FilterContainer>
   );
 }
 
diff --git a/superset-frontend/src/components/ListView/Filters/Search.tsx b/superset-frontend/src/components/ListView/Filters/Search.tsx
index 313467ab96c..4673dbc59d7 100644
--- a/superset-frontend/src/components/ListView/Filters/Search.tsx
+++ b/superset-frontend/src/components/ListView/Filters/Search.tsx
@@ -24,13 +24,17 @@ import {
   ChangeEvent,
 } from 'react';
 
-import { t, styled, useTheme, css } from '@superset-ui/core';
-import { Icons } from 'src/components/Icons';
-import { Input as AntdInput } from 'src/components/Input';
-import { SELECT_WIDTH } from 'src/components/ListView/utils';
-import { FormLabel } from 'src/components/Form';
-import InfoTooltip from 'src/components/InfoTooltip';
-import { BaseFilter, FilterHandler } from './Base';
+import { t, styled, useTheme } from '@superset-ui/core';
+import {
+  Input,
+  InfoTooltip,
+  FormLabel,
+  Icons,
+  Flex,
+} from '@superset-ui/core/components';
+import type { BaseFilter, FilterHandler } from './types';
+import { FilterContainer } from './Base';
+import { SELECT_WIDTH } from '../utils';
 
 interface SearchHeaderProps extends BaseFilter {
   Header: string;
@@ -39,12 +43,8 @@ interface SearchHeaderProps extends BaseFilter {
   toolTipDescription: string | undefined;
 }
 
-const Container = styled.div`
-  width: ${SELECT_WIDTH}px;
-`;
-
-const StyledInput = styled(AntdInput)`
-  border-radius: ${({ theme }) => theme.gridUnit}px;
+const StyledInput = styled(Input)`
+  border-radius: ${({ theme }) => theme.borderRadius}px;
 `;
 
 function SearchFilter(
@@ -79,18 +79,17 @@ function SearchFilter(
   }));
 
   return (
-    <Container>
-      <div
-        css={css`
-          display: flex;
-          align-items: start;
-        `}
-      >
+    <FilterContainer
+      data-test="search-filter-container"
+      width={SELECT_WIDTH}
+      vertical
+      justify="center"
+      align="start"
+    >
+      <Flex>
         <FormLabel>{Header}</FormLabel>
-        {toolTipDescription && (
-          <InfoTooltip tooltip={toolTipDescription} viewBox="0 -7 28 28" />
-        )}
-      </div>
+        {toolTipDescription && <InfoTooltip tooltip={toolTipDescription} />}
+      </Flex>
       <StyledInput
         allowClear
         data-test="filters-search"
@@ -107,7 +106,7 @@ function SearchFilter(
           />
         }
       />
-    </Container>
+    </FilterContainer>
   );
 }
 
diff --git a/superset-frontend/src/components/ListView/Filters/Select.tsx b/superset-frontend/src/components/ListView/Filters/Select.tsx
index 02cd8989759..c7d4451159d 100644
--- a/superset-frontend/src/components/ListView/Filters/Select.tsx
+++ b/superset-frontend/src/components/ListView/Filters/Select.tsx
@@ -25,11 +25,11 @@ import {
 } from 'react';
 
 import { t } from '@superset-ui/core';
-import { Select } from 'src/components';
-import { Filter, SelectOption } from 'src/components/ListView/types';
-import { FormLabel } from 'src/components/Form';
-import AsyncSelect from 'src/components/Select/AsyncSelect';
-import { FilterContainer, BaseFilter, FilterHandler } from './Base';
+import { Select, AsyncSelect, FormLabel } from '@superset-ui/core/components';
+import { ListViewFilter as Filter, SelectOption } from '../types';
+import type { BaseFilter, FilterHandler } from './types';
+import { FilterContainer } from './Base';
+import { SELECT_WIDTH } from '../utils';
 
 interface SelectFilterProps extends BaseFilter {
   fetchSelects?: Filter['fetchSelects'];
@@ -38,6 +38,7 @@ interface SelectFilterProps extends BaseFilter {
   paginate?: boolean;
   selects: Filter['selects'];
   loading?: boolean;
+  dropdownStyle?: React.CSSProperties;
 }
 
 function SelectFilter(
@@ -49,6 +50,7 @@ function SelectFilter(
     onSelect,
     selects = [],
     loading = false,
+    dropdownStyle,
   }: SelectFilterProps,
   ref: RefObject<FilterHandler>,
 ) {
@@ -88,19 +90,26 @@ function SelectFilter(
     },
     [fetchSelects],
   );
-
+  const placeholder = t('Choose...');
   return (
-    <FilterContainer>
+    <FilterContainer
+      data-test="select-filter-container"
+      width={SELECT_WIDTH}
+      vertical
+      justify="center"
+      align="start"
+    >
+      <FormLabel>{Header}</FormLabel>
       {fetchSelects ? (
         <AsyncSelect
           allowClear
           ariaLabel={typeof Header === 'string' ? Header : name || t('Filter')}
           data-test="filters-select"
-          header={<FormLabel>{Header}</FormLabel>}
           onChange={onChange}
           onClear={onClear}
           options={fetchAndFormatSelects}
-          placeholder={t('Select or type a value')}
+          placeholder={placeholder}
+          dropdownStyle={dropdownStyle}
           showSearch
           value={selectedOption}
         />
@@ -109,12 +118,12 @@ function SelectFilter(
           allowClear
           ariaLabel={typeof Header === 'string' ? Header : name || t('Filter')}
           data-test="filters-select"
-          header={<FormLabel>{Header}</FormLabel>}
           labelInValue
           onChange={onChange}
           onClear={onClear}
           options={selects}
-          placeholder={t('Select or type a value')}
+          placeholder={placeholder}
+          dropdownStyle={dropdownStyle}
           showSearch
           value={selectedOption}
           loading={loading}
diff --git a/superset-frontend/src/components/ListView/Filters/index.tsx b/superset-frontend/src/components/ListView/Filters/index.tsx
index 5c794f15df0..391f2cba2e4 100644
--- a/superset-frontend/src/components/ListView/Filters/index.tsx
+++ b/superset-frontend/src/components/ListView/Filters/index.tsx
@@ -26,17 +26,17 @@ import {
 
 import { withTheme } from '@superset-ui/core';
 
-import {
-  FilterValue,
-  Filters,
+import type {
+  ListViewFilterValue as FilterValue,
+  ListViewFilters as Filters,
   InternalFilter,
   SelectOption,
-} from 'src/components/ListView/types';
+} from '../types';
+import type { FilterHandler } from './types';
 import SearchFilter from './Search';
 import SelectFilter from './Select';
 import DateRangeFilter from './DateRange';
 import NumericalRangeFilter from './NumericalRange';
-import { FilterHandler } from './Base';
 
 interface UIFiltersProps {
   filters: Filters;
@@ -80,6 +80,7 @@ function UIFilters(
             dateFilterValueType,
             min,
             max,
+            dropdownStyle,
           },
           index,
         ) => {
@@ -109,6 +110,7 @@ function UIFilters(
                 paginate={paginate}
                 selects={selects}
                 loading={loading ?? false}
+                dropdownStyle={dropdownStyle}
               />
             );
           }
diff --git a/superset-frontend/src/components/ListView/Filters/types.ts b/superset-frontend/src/components/ListView/Filters/types.ts
new file mode 100644
index 00000000000..5d01d859090
--- /dev/null
+++ b/superset-frontend/src/components/ListView/Filters/types.ts
@@ -0,0 +1,27 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { ReactNode } from 'react';
+
+export interface BaseFilter {
+  Header: ReactNode;
+  initialValue: any;
+}
+export type FilterHandler = {
+  clearFilter: () => void;
+};
diff --git a/superset-frontend/src/components/ListView/ListView.test.jsx b/superset-frontend/src/components/ListView/ListView.test.jsx
index d1d801d4f56..2cd517f40b7 100644
--- a/superset-frontend/src/components/ListView/ListView.test.jsx
+++ b/superset-frontend/src/components/ListView/ListView.test.jsx
@@ -24,7 +24,7 @@ import configureStore from 'redux-mock-store';
 import fetchMock from 'fetch-mock';
 
 // Only import components that are directly referenced in tests
-import ListView from 'src/components/ListView/ListView';
+import { ListView } from './ListView';
 
 const middlewares = [thunk];
 const mockStore = configureStore(middlewares);
@@ -47,18 +47,22 @@ const mockedProps = {
       accessor: 'id',
       Header: 'ID',
       sortable: true,
+      id: 'id',
     },
     {
       accessor: 'age',
       Header: 'Age',
+      id: 'age',
     },
     {
       accessor: 'name',
       Header: 'Name',
+      id: 'name',
     },
     {
       accessor: 'time',
       Header: 'Time',
+      id: 'time',
     },
   ],
   filters: [
@@ -189,7 +193,7 @@ describe('ListView', () => {
   });
 
   it('handles bulk actions on 1 row', async () => {
-    const checkboxes = screen.getAllByRole('checkbox', { name: '' });
+    const checkboxes = screen.getAllByRole('checkbox');
     await userEvent.click(checkboxes[1]); // Index 1 is the first row checkbox
 
     const bulkActionButton = within(
diff --git a/superset-frontend/src/components/ListView/ListView.test.tsx b/superset-frontend/src/components/ListView/ListView.test.tsx
index dd5b6de2a32..f40dc229fbc 100644
--- a/superset-frontend/src/components/ListView/ListView.test.tsx
+++ b/superset-frontend/src/components/ListView/ListView.test.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { render, waitFor } from 'spec/helpers/testing-library';
-import ListView from './ListView';
+import { ListView } from './ListView';
 
 const mockedProps = {
   title: 'Data Table',
@@ -26,18 +26,22 @@ const mockedProps = {
       accessor: 'id',
       Header: 'ID',
       sortable: true,
+      id: 'id',
     },
     {
       accessor: 'age',
       Header: 'Age',
+      id: 'age',
     },
     {
       accessor: 'name',
       Header: 'Name',
+      id: 'name',
     },
     {
       accessor: 'time',
       Header: 'Time',
+      id: 'time',
     },
   ],
   data: [
diff --git a/superset-frontend/src/components/ListView/ListView.tsx b/superset-frontend/src/components/ListView/ListView.tsx
index 13ea7f91133..a7df93e3cc2 100644
--- a/superset-frontend/src/components/ListView/ListView.tsx
+++ b/superset-frontend/src/components/ListView/ListView.tsx
@@ -18,116 +18,119 @@
  */
 import { t, styled } from '@superset-ui/core';
 import { useCallback, useEffect, useRef, useState, ReactNode } from 'react';
-import Alert from 'src/components/Alert';
 import cx from 'classnames';
-import Button from 'src/components/Button';
-import { Icons } from 'src/components/Icons';
-import IndeterminateCheckbox from 'src/components/IndeterminateCheckbox';
-import Pagination from 'src/components/Pagination';
-import TableCollection from 'src/components/TableCollection';
+import Pagination from '@superset-ui/core/components/Pagination';
+import TableCollection from '@superset-ui/core/components/TableCollection';
 import BulkTagModal from 'src/features/tags/BulkTagModal';
+import {
+  Alert,
+  Button,
+  Checkbox,
+  Icons,
+  EmptyState,
+  type EmptyStateProps,
+} from '@superset-ui/core/components';
 import CardCollection from './CardCollection';
 import FilterControls from './Filters';
 import { CardSortSelect } from './CardSortSelect';
 import {
-  FetchDataConfig,
-  Filters,
+  ListViewFetchDataConfig as FetchDataConfig,
+  ListViewFilters as Filters,
   SortColumn,
   CardSortSelectOption,
   ViewModeType,
 } from './types';
 import { ListViewError, useListViewState } from './utils';
-import { EmptyState, EmptyStateProps } from '../EmptyState';
 
 const ListViewStyles = styled.div`
-  text-align: center;
+  ${({ theme }) => `
+    text-align: center;
 
-  .superset-list-view {
-    text-align: left;
-    border-radius: 4px 0;
-    margin: 0 ${({ theme }) => theme.gridUnit * 4}px;
+    .superset-list-view {
+      text-align: left;
+      border-radius: 4px 0;
+      margin: 0 ${theme.sizeUnit * 4}px;
 
-    .header {
-      display: flex;
-      padding-bottom: ${({ theme }) => theme.gridUnit * 4}px;
-
-      & .controls {
+      .header {
         display: flex;
-        flex-wrap: wrap;
-        column-gap: ${({ theme }) => theme.gridUnit * 6}px;
-        row-gap: ${({ theme }) => theme.gridUnit * 4}px;
+        padding-bottom: ${theme.sizeUnit * 4}px;
+
+        & .controls {
+          display: flex;
+          flex-wrap: wrap;
+          column-gap: ${theme.sizeUnit * 6}px;
+          row-gap: ${theme.sizeUnit * 4}px;
+        }
+      }
+
+      .body.empty table {
+        margin-bottom: 0;
+      }
+
+      .body {
+        overflow-x: auto;
+      }
+
+      .ant-empty {
+        .ant-empty-image {
+          height: auto;
+        }
       }
     }
 
-    .body.empty table {
-      margin-bottom: 0;
+    .pagination-container {
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      margin-bottom: ${theme.sizeUnit * 4}px;
     }
 
-    .body {
-      overflow-x: auto;
+    .row-count-container {
+      margin-top: ${theme.sizeUnit * 2}px;
+      color: ${theme.colors.grayscale.base};
     }
-
-    .antd5-empty {
-      .antd5-empty-image {
-        height: auto;
-      }
-    }
-  }
-
-  .pagination-container {
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    margin-bottom: ${({ theme }) => theme.gridUnit * 4}px;
-  }
-
-  .row-count-container {
-    margin-top: ${({ theme }) => theme.gridUnit * 2}px;
-    color: ${({ theme }) => theme.colors.grayscale.base};
-  }
+  `}
 `;
 
 const BulkSelectWrapper = styled(Alert)`
   ${({ theme }) => `
     border-radius: 0;
     margin-bottom: 0;
-    color: ${theme.colors.grayscale.dark1};
-    background-color: ${theme.colors.primary.light4};
+    color: ${theme.colorText};
+    background-color: ${theme.colorPrimaryBg};
 
     .selectedCopy {
       display: inline-block;
-      padding: ${theme.gridUnit * 2}px 0;
+      padding: ${theme.sizeUnit * 2}px 0;
     }
 
     .deselect-all, .tag-btn {
-      color: ${theme.colors.primary.base};
-      margin-left: ${theme.gridUnit * 4}px;
+      color: ${theme.colorPrimary};
+      margin-left: ${theme.sizeUnit * 4}px;
     }
 
     .divider {
-      margin: ${`${-theme.gridUnit * 2}px 0 ${-theme.gridUnit * 2}px ${
-        theme.gridUnit * 4
-      }px`};
+      margin: ${`${-theme.sizeUnit * 2}px 0 ${-theme.sizeUnit * 2}px ${theme.sizeUnit * 4}px`};
       width: 1px;
-      height: ${theme.gridUnit * 8}px;
-      box-shadow: inset -1px 0px 0px ${theme.colors.grayscale.light2};
+      height: ${theme.sizeUnit * 8}px;
+      box-shadow: inset -1px 0px 0px ${theme.colorBorder};
       display: inline-flex;
       vertical-align: middle;
       position: relative;
     }
 
     .ant-alert-close-icon {
-      margin-top: ${theme.gridUnit * 1.5}px;
+      margin-top: ${theme.sizeUnit * 1.5}px;
     }
   `}
 `;
 
 const bulkSelectColumnConfig = {
   Cell: ({ row }: any) => (
-    <IndeterminateCheckbox {...row.getToggleRowSelectedProps()} id={row.id} />
+    <Checkbox {...row.getToggleRowSelectedProps()} id={row.id} />
   ),
   Header: ({ getToggleAllRowsSelectedProps }: any) => (
-    <IndeterminateCheckbox
+    <Checkbox
       {...getToggleAllRowsSelectedProps()}
       id="header-toggle-all"
       data-test="header-toggle-all"
@@ -138,36 +141,41 @@ const bulkSelectColumnConfig = {
 };
 
 const ViewModeContainer = styled.div`
-  padding-right: ${({ theme }) => theme.gridUnit * 4}px;
-  margin-top: ${({ theme }) => theme.gridUnit * 5 + 1}px;
-  white-space: nowrap;
-  display: inline-block;
-
-  .toggle-button {
+  ${({ theme }) => `
+    padding-right: ${theme.sizeUnit * 4}px;
+    margin-top: ${theme.sizeUnit * 5 + 1}px;
+    white-space: nowrap;
     display: inline-block;
-    border-radius: ${({ theme }) => theme.gridUnit / 2}px;
-    padding: ${({ theme }) => theme.gridUnit}px;
-    padding-bottom: ${({ theme }) => theme.gridUnit * 0.5}px;
 
-    &:first-of-type {
-      margin-right: ${({ theme }) => theme.gridUnit * 2}px;
-    }
-  }
+    .toggle-button {
+      display: inline-block;
+      border-radius: ${theme.borderRadius}px;
+      padding: ${theme.sizeUnit}px;
+      padding-bottom: ${theme.sizeUnit * 0.5}px;
 
-  .active {
-    background-color: ${({ theme }) => theme.colors.grayscale.base};
-    svg {
-      color: ${({ theme }) => theme.colors.grayscale.light5};
+      &:first-of-type {
+        margin-right: ${theme.sizeUnit * 2}px;
+      }
     }
-  }
+
+    .active {
+      background-color: ${theme.colors.grayscale.base};
+
+      svg {
+        color: ${theme.colorBgLayout};
+      }
+    }
+  `}
 `;
 
 const EmptyWrapper = styled.div`
-  padding: ${({ theme }) => theme.gridUnit * 40}px 0;
+  ${({ theme }) => `
+    padding: ${theme.sizeUnit * 40}px 0;
 
-  &.table {
-    background: ${({ theme }) => theme.colors.grayscale.light5};
-  }
+    &.table {
+      background: ${theme.colorBgContainer};
+    }
+  `}
 `;
 
 const ViewModeToggle = ({
@@ -236,7 +244,7 @@ export interface ListViewProps<T extends object = any> {
   bulkTagResourceName?: string;
 }
 
-function ListView<T extends object = any>({
+export function ListView<T extends object = any>({
   columns,
   data,
   count,
@@ -342,7 +350,7 @@ function ListView<T extends object = any>({
           onHide={() => setShowBulkTagModal(false)}
         />
       )}
-      <div data-test={className} className={`superset-list-view ${className}`}>
+      <div data-test={className} className={`superset-list-view ${className} `}>
         <div className="header">
           {cardViewEnabled && (
             <ViewModeToggle mode={viewMode} setMode={setViewMode} />
@@ -365,7 +373,7 @@ function ListView<T extends object = any>({
             )}
           </div>
         </div>
-        <div className={`body ${rows.length === 0 ? 'empty' : ''}`}>
+        <div className={`body ${rows.length === 0 ? 'empty' : ''} `}>
           {bulkSelectEnabled && (
             <BulkSelectWrapper
               data-test="bulk-select-controls"
@@ -382,6 +390,7 @@ function ListView<T extends object = any>({
                     <>
                       <span
                         data-test="bulk-select-deselect-all"
+                        style={{ cursor: 'pointer' }}
                         role="button"
                         tabIndex={0}
                         className="deselect-all"
@@ -409,6 +418,7 @@ function ListView<T extends object = any>({
                         <span
                           data-test="bulk-select-tag-btn"
                           role="button"
+                          style={{ cursor: 'pointer' }}
                           tabIndex={0}
                           className="tag-btn"
                           onClick={() => setShowBulkTagModal(true)}
@@ -438,11 +448,22 @@ function ListView<T extends object = any>({
               getTableBodyProps={getTableBodyProps}
               prepareRow={prepareRow}
               headerGroups={headerGroups}
+              setSortBy={setSortBy}
               rows={rows}
               columns={columns}
               loading={loading}
               highlightRowId={highlightRowId}
               columnsForWrapText={columnsForWrapText}
+              bulkSelectEnabled={bulkSelectEnabled}
+              selectedFlatRows={selectedFlatRows}
+              toggleRowSelected={(rowId, value) => {
+                const row = rows.find(r => r.id === rowId);
+                if (row) {
+                  prepareRow(row);
+                  row.toggleRowSelected(value);
+                }
+              }}
+              toggleAllRowsSelected={toggleAllRowsSelected}
             />
           )}
           {!loading && rows.length === 0 && (
@@ -490,5 +511,3 @@ function ListView<T extends object = any>({
     </ListViewStyles>
   );
 }
-
-export default ListView;
diff --git a/superset-frontend/src/components/ListView/index.ts b/superset-frontend/src/components/ListView/index.ts
index 0d6753fc6f3..0d24fd2cf4b 100644
--- a/superset-frontend/src/components/ListView/index.ts
+++ b/superset-frontend/src/components/ListView/index.ts
@@ -18,5 +18,9 @@
  */
 export * from './ListView';
 export * from './types';
-
-export { default } from './ListView';
+export {
+  ActionsBar as ListViewActionsBar,
+  type ActionProps as ListViewActionProps,
+} from './ActionsBar';
+export { DashboardCrossLinks } from './DashboardCrossLinks';
+export { default as ListViewUIFilters } from './Filters';
diff --git a/superset-frontend/src/components/ListView/types.ts b/superset-frontend/src/components/ListView/types.ts
index 6e0ff40743c..5f0275ecad3 100644
--- a/superset-frontend/src/components/ListView/types.ts
+++ b/superset-frontend/src/components/ListView/types.ts
@@ -35,13 +35,13 @@ export interface CardSortSelectOption {
   value: any;
 }
 
-export interface Filter {
+export interface ListViewFilter {
   Header: ReactNode;
   key: string;
   id: string;
   toolTipDescription?: string;
   urlDisplay?: string;
-  operator?: FilterOperator;
+  operator?: ListViewFilterOperator;
   input?:
     | 'text'
     | 'textarea'
@@ -64,9 +64,10 @@ export interface Filter {
   dateFilterValueType?: 'unix' | 'iso';
   min?: number;
   max?: number;
+  dropdownStyle?: React.CSSProperties;
 }
 
-export type Filters = Filter[];
+export type ListViewFilters = ListViewFilter[];
 
 export type ViewModeType = 'card' | 'table';
 
@@ -81,25 +82,25 @@ export type InnerFilterValue =
   | { label: string; value: string | number }
   | [number | null, number | null];
 
-export interface FilterValue {
+export interface ListViewFilterValue {
   id: string;
   urlDisplay?: string;
   operator?: string;
   value: InnerFilterValue;
 }
 
-export interface FetchDataConfig {
+export interface ListViewFetchDataConfig {
   pageIndex: number;
   pageSize: number;
   sortBy: SortColumn[];
-  filters: FilterValue[];
+  filters: ListViewFilterValue[];
 }
 
-export interface InternalFilter extends FilterValue {
+export interface InternalFilter extends ListViewFilterValue {
   Header?: string;
 }
 
-export enum FilterOperator {
+export enum ListViewFilterOperator {
   StartsWith = 'sw',
   EndsWith = 'ew',
   Contains = 'ct',
diff --git a/superset-frontend/src/components/ListView/utils.ts b/superset-frontend/src/components/ListView/utils.ts
index 8b72ec1f7df..443d57c7d5a 100644
--- a/superset-frontend/src/components/ListView/utils.ts
+++ b/superset-frontend/src/components/ListView/utils.ts
@@ -36,9 +36,9 @@ import {
 import rison from 'rison';
 import { isEqual } from 'lodash';
 import {
-  FetchDataConfig,
-  Filter,
-  FilterValue,
+  ListViewFetchDataConfig as FetchDataConfig,
+  ListViewFilter as Filter,
+  ListViewFilterValue as FilterValue,
   InnerFilterValue,
   InternalFilter,
   SortColumn,
@@ -63,7 +63,9 @@ const RisonParam: QueryParamConfig<string, any> = {
       : rison.decode(dataStr),
 };
 
-export const SELECT_WIDTH = 200;
+export const SELECT_WIDTH = 175;
+export const RANGE_WIDTH = 300;
+export const WIDER_DROPDOWN_WIDTH = '300px';
 
 export class ListViewError extends Error {
   name = 'ListViewError';
diff --git a/superset-frontend/src/components/ListViewCard/index.tsx b/superset-frontend/src/components/ListViewCard/index.tsx
deleted file mode 100644
index b785961dbbd..00000000000
--- a/superset-frontend/src/components/ListViewCard/index.tsx
+++ /dev/null
@@ -1,295 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 { ReactNode, ComponentType, ReactElement, FC } from 'react';
-import { styled, useTheme } from '@superset-ui/core';
-import { Skeleton, Card } from 'src/components';
-import { Tooltip } from 'src/components/Tooltip';
-import { theme as supersetTheme } from 'src/preamble';
-import { ConfigProvider } from 'antd-v5';
-import ImageLoader, { BackgroundPosition } from './ImageLoader';
-import CertifiedBadge from '../CertifiedBadge';
-
-const ActionsWrapper = styled.div`
-  width: 64px;
-  display: flex;
-  justify-content: flex-end;
-`;
-
-// Styling part 1: Override Card tokens when possible
-const listViewCardTheme = {
-  components: {
-    Card: {
-      colorBgContainer: supersetTheme.colors.grayscale.light5,
-    },
-  },
-};
-
-// Styling part 2: Use CSS when necessary
-const StyledCard = styled(Card)`
-  ${({ theme }) => `
-    overflow: hidden;
-
-    .gradient-container {
-      position: relative;
-      height: 100%;
-    }
-    &:hover {
-      box-shadow: 8px 8px 28px 0px ${theme.colors.grayscale.light1};
-      transition: box-shadow ${theme.transitionTiming}s ease-in-out;
-
-      .cover-footer {
-        transform: translateY(0);
-      }
-    }
-  `}
-`;
-
-const Cover = styled.div`
-  height: 264px;
-  border-bottom: 1px solid ${({ theme }) => theme.colors.grayscale.light2};
-  overflow: hidden;
-
-  .cover-footer {
-    transform: translateY(${({ theme }) => theme.gridUnit * 9}px);
-    transition: ${({ theme }) => theme.transitionTiming}s ease-out;
-  }
-`;
-
-const TitleContainer = styled.div`
-  display: flex;
-  justify-content: flex-start;
-  flex-direction: column;
-
-  .card-actions {
-    margin-left: auto;
-    align-self: flex-end;
-    padding-left: ${({ theme }) => theme.gridUnit}px;
-    span[role='img'] {
-      display: flex;
-      align-items: center;
-    }
-  }
-
-  .titleRow {
-    display: flex;
-    justify-content: flex-start;
-    flex-direction: row;
-  }
-`;
-
-const TitleLink = styled.span`
-  overflow: hidden;
-  text-overflow: ellipsis;
-  & a {
-    color: ${({ theme }) => theme.colors.grayscale.dark1} !important;
-  }
-`;
-
-const TitleRight = styled.span`
-  position: absolute;
-  right: -1px;
-  font-weight: 400;
-  bottom: ${({ theme }) => theme.gridUnit}px;
-`;
-
-const CoverFooter = styled.div`
-  display: flex;
-  flex-wrap: nowrap;
-  position: relative;
-  top: -${({ theme }) => theme.gridUnit * 9}px;
-  padding: 0 8px;
-`;
-
-const CoverFooterLeft = styled.div`
-  flex: 1;
-  overflow: hidden;
-`;
-
-const CoverFooterRight = styled.div`
-  align-self: flex-end;
-  margin-left: auto;
-  max-width: 200px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-`;
-
-const ThinSkeleton = styled(Skeleton)`
-  h3 {
-    margin: ${({ theme }) => theme.gridUnit}px 0;
-  }
-
-  ul {
-    margin-bottom: 0;
-  }
-`;
-
-const paragraphConfig = { rows: 1, width: 150 };
-
-interface LinkProps {
-  to: string;
-}
-
-const AnchorLink: FC<LinkProps> = ({ to, children }) => (
-  <a href={to}>{children}</a>
-);
-
-interface CardProps {
-  title?: ReactNode;
-  subtitle?: ReactNode;
-  url?: string;
-  linkComponent?: ComponentType<LinkProps>;
-  imgURL?: string | null;
-  imgFallbackURL?: string;
-  imgPosition?: BackgroundPosition;
-  description: string;
-  loading?: boolean;
-  titleRight?: ReactNode;
-  coverLeft?: ReactNode;
-  coverRight?: ReactNode;
-  actions?: ReactNode | null;
-  rows?: number | string;
-  avatar?: ReactElement | null;
-  cover?: ReactNode | null;
-  certifiedBy?: string;
-  certificationDetails?: string;
-}
-
-function ListViewCard({
-  title,
-  subtitle,
-  url,
-  linkComponent,
-  titleRight,
-  imgURL,
-  imgFallbackURL,
-  description,
-  coverLeft,
-  coverRight,
-  actions,
-  avatar,
-  loading,
-  imgPosition = 'top',
-  cover,
-  certifiedBy,
-  certificationDetails,
-}: CardProps) {
-  const Link = url && linkComponent ? linkComponent : AnchorLink;
-  const theme = useTheme();
-  return (
-    <ConfigProvider theme={listViewCardTheme}>
-      <StyledCard
-        data-test="styled-card"
-        padded
-        cover={
-          cover || (
-            <Cover>
-              <Link to={url!}>
-                <div className="gradient-container">
-                  <ImageLoader
-                    src={imgURL || ''}
-                    fallback={imgFallbackURL || ''}
-                    isLoading={loading}
-                    position={imgPosition}
-                  />
-                </div>
-              </Link>
-              <CoverFooter className="cover-footer">
-                {!loading && coverLeft && (
-                  <CoverFooterLeft>{coverLeft}</CoverFooterLeft>
-                )}
-                {!loading && coverRight && (
-                  <CoverFooterRight>{coverRight}</CoverFooterRight>
-                )}
-              </CoverFooter>
-            </Cover>
-          )
-        }
-      >
-        {loading && (
-          <Card.Meta
-            title={
-              <>
-                <TitleContainer>
-                  <Skeleton.Input
-                    active
-                    size="small"
-                    css={{
-                      width: Math.trunc(theme.gridUnit * 62.5),
-                    }}
-                  />
-                  <div className="card-actions">
-                    <Skeleton.Button active shape="circle" />{' '}
-                    <Skeleton.Button
-                      active
-                      css={{
-                        width: theme.gridUnit * 10,
-                      }}
-                    />
-                  </div>
-                </TitleContainer>
-              </>
-            }
-            description={
-              <ThinSkeleton
-                round
-                active
-                title={false}
-                paragraph={paragraphConfig}
-              />
-            }
-          />
-        )}
-        {!loading && (
-          <Card.Meta
-            title={
-              <TitleContainer>
-                {subtitle || null}
-                <div className="titleRow">
-                  <Tooltip title={title}>
-                    <TitleLink>
-                      {certifiedBy && (
-                        <>
-                          <CertifiedBadge
-                            certifiedBy={certifiedBy}
-                            details={certificationDetails}
-                          />{' '}
-                        </>
-                      )}
-                      {title}
-                    </TitleLink>
-                  </Tooltip>
-                  {titleRight && <TitleRight>{titleRight}</TitleRight>}
-                  <div className="card-actions" data-test="card-actions">
-                    {actions}
-                  </div>
-                </div>
-              </TitleContainer>
-            }
-            description={description}
-            avatar={avatar || null}
-          />
-        )}
-      </StyledCard>
-    </ConfigProvider>
-  );
-}
-
-ListViewCard.Actions = ActionsWrapper;
-
-export default ListViewCard;
diff --git a/superset-frontend/src/components/MessageToasts/Toast.tsx b/superset-frontend/src/components/MessageToasts/Toast.tsx
index 6b67846c221..2c8b174ea38 100644
--- a/superset-frontend/src/components/MessageToasts/Toast.tsx
+++ b/superset-frontend/src/components/MessageToasts/Toast.tsx
@@ -16,33 +16,40 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { styled, css, SupersetTheme } from '@superset-ui/core';
+import { styled, css, SupersetTheme, useTheme } from '@superset-ui/core';
 import cx from 'classnames';
 import { Interweave } from 'interweave';
 import { useCallback, useEffect, useRef, useState } from 'react';
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { ToastType, ToastMeta } from './types';
 
 const ToastContainer = styled.div`
   ${({ theme }) => css`
     display: flex;
-    justify-content: center;
+    justify-content: space-between; // Changed from center to space-between
     align-items: center;
 
-    span {
-      padding: 0 ${theme.gridUnit * 2}px;
+    // Content container for icon and text
+    .toast__content {
+      display: flex;
+      align-items: center;
+      flex: 1; // Take available space
+    }
+
+    .anticon {
+      padding: 0 ${theme.sizeUnit}px;
     }
 
     .toast__close,
     .toast__close span {
-      padding: 0;
+      padding-left: ${theme.sizeUnit * 4}px;
     }
   `}
 `;
 
 const notificationStyledIcon = (theme: SupersetTheme) => css`
-  min-width: ${theme.gridUnit * 5}px;
-  color: ${theme.colors.grayscale.base};
+  min-width: ${theme.sizeUnit * 5}px;
+  color: ${theme.colorTextLightSolid};
   margin-right: 0;
 `;
 
@@ -54,6 +61,7 @@ interface ToastPresenterProps {
 export default function Toast({ toast, onCloseToast }: ToastPresenterProps) {
   const hideTimer = useRef<ReturnType<typeof setTimeout>>();
   const [visible, setVisible] = useState(false);
+
   const showToast = () => {
     setVisible(true);
   };
@@ -73,7 +81,6 @@ export default function Toast({ toast, onCloseToast }: ToastPresenterProps) {
 
   useEffect(() => {
     setTimeout(showToast);
-
     if (toast.duration > 0) {
       hideTimer.current = setTimeout(handleClosePress, toast.duration);
     }
@@ -84,19 +91,38 @@ export default function Toast({ toast, onCloseToast }: ToastPresenterProps) {
     };
   }, [handleClosePress, toast.duration]);
 
+  const theme = useTheme();
   let className = 'toast--success';
   let icon = (
-    <Icons.CheckCircleFilled css={theme => notificationStyledIcon(theme)} />
+    <Icons.CheckCircleFilled
+      css={theme => notificationStyledIcon(theme)}
+      iconColor={theme.colorSuccess}
+    />
   );
 
   if (toast.toastType === ToastType.Warning) {
-    icon = <Icons.ExclamationCircleFilled css={notificationStyledIcon} />;
+    icon = (
+      <Icons.ExclamationCircleFilled
+        css={notificationStyledIcon}
+        iconColor={theme.colorWarning}
+      />
+    );
     className = 'toast--warning';
   } else if (toast.toastType === ToastType.Danger) {
-    icon = <Icons.ExclamationCircleFilled css={notificationStyledIcon} />;
+    icon = (
+      <Icons.ExclamationCircleFilled
+        css={notificationStyledIcon}
+        iconColor={theme.colorError}
+      />
+    );
     className = 'toast--danger';
   } else if (toast.toastType === ToastType.Info) {
-    icon = <Icons.InfoCircleFilled css={notificationStyledIcon} />;
+    icon = (
+      <Icons.InfoCircleFilled
+        css={notificationStyledIcon}
+        iconColor={theme.colorInfo}
+      />
+    );
     className = 'toast--info';
   }
 
@@ -106,11 +132,14 @@ export default function Toast({ toast, onCloseToast }: ToastPresenterProps) {
       data-test="toast-container"
       role="alert"
     >
-      {icon}
-      <Interweave content={toast.text} noHtml={!toast.allowHtml} />
+      <div className="toast__content">
+        {icon}
+        <Interweave content={toast.text} noHtml={!toast.allowHtml} />
+      </div>
       <Icons.CloseOutlined
         iconSize="m"
         className="toast__close pointer"
+        iconColor={theme.colorTextTertiary}
         role="button"
         tabIndex={0}
         onClick={handleClosePress}
diff --git a/superset-frontend/src/components/MessageToasts/ToastPresenter.tsx b/superset-frontend/src/components/MessageToasts/ToastPresenter.tsx
index 23499556751..f1e06262e20 100644
--- a/superset-frontend/src/components/MessageToasts/ToastPresenter.tsx
+++ b/superset-frontend/src/components/MessageToasts/ToastPresenter.tsx
@@ -24,54 +24,55 @@ export interface VisualProps {
   position: 'bottom' | 'top';
 }
 
-const StyledToastPresenter = styled.div<VisualProps>`
-  max-width: 600px;
-  position: fixed;
-  ${({ position }) => (position === 'bottom' ? 'bottom' : 'top')}: 0px;
-  right: 0px;
-  margin-right: 50px;
-  margin-bottom: 50px;
-  z-index: ${({ theme }) => theme.zIndex.max + 1};
-  word-break: break-word;
+const StyledToastPresenter = styled.div<VisualProps>(
+  ({ theme, position }) =>
+    // Single access to theme, using dot notation
+    `
+    max-width: 600px;
+    position: fixed;
+    ${position === 'bottom' ? 'bottom' : 'top'}: 0px;
+    right: 0px;
+    margin-right: 50px;
+    margin-bottom: 50px;
+    z-index: ${theme.zIndexPopupBase + 1};
+    word-break: break-word;
 
-  .toast {
-    background: ${({ theme }) => theme.colors.grayscale.dark1};
-    border-radius: ${({ theme }) => theme.borderRadius};
-    box-shadow: 0 2px 4px 0
-      fade(
-        ${({ theme }) => theme.colors.grayscale.dark2},
-        ${({ theme }) => theme.opacity.mediumLight}
-      );
-    color: ${({ theme }) => theme.colors.grayscale.light5};
-    opacity: 0;
-    position: relative;
-    transform: translateY(-100%);
-    white-space: pre-line;
-    will-change: transform, opacity;
-    transition:
-      transform ${({ theme }) => theme.transitionTiming}s,
-      opacity ${({ theme }) => theme.transitionTiming}s;
-
-    &:after {
-      content: '';
-      position: absolute;
-      top: 0;
-      left: 0;
-      width: 6px;
-      height: 100%;
+    .toast {
+      padding: ${theme.sizeUnit * 4}px;
+      margin: ${theme.sizeUnit * 4}px;
+      background: ${theme.colorBgSpotlight};
+      border-radius: ${theme.borderRadius}px;
+      box-shadow: ${theme.boxShadow};
+      color: ${theme.colorTextLightSolid};
+      opacity: 0;
+      position: relative;
+      transform: translateY(-100%);
+      white-space: pre-line;
+      will-change: transform, opacity;
+      transition:
+        transform ${theme.motionDurationMid},
+        opacity ${theme.motionDurationMid};
+      &:after {
+        content: '';
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 6px;
+        height: 100%;
+      }
     }
-  }
 
-  .toast > button {
-    color: ${({ theme }) => theme.colors.grayscale.light5};
-    opacity: 1;
-  }
+    .toast > button {
+      color: ${theme.colors.grayscale.light5};
+      opacity: 1;
+    }
 
-  .toast--visible {
-    opacity: 1;
-    transform: translateY(0);
-  }
-`;
+    .toast--visible {
+      opacity: 1;
+      transform: translateY(0);
+    }
+  `,
+);
 
 type ToastPresenterProps = Partial<VisualProps> & {
   toasts: Array<ToastMeta>;
diff --git a/superset-frontend/src/components/ResizableSidebar/index.tsx b/superset-frontend/src/components/ResizableSidebar/index.tsx
index c7f64f462b7..f19bae62b9b 100644
--- a/superset-frontend/src/components/ResizableSidebar/index.tsx
+++ b/superset-frontend/src/components/ResizableSidebar/index.tsx
@@ -26,7 +26,7 @@ const ResizableWrapper = styled.div`
   height: 100%;
 
   :hover .sidebar-resizer::after {
-    background-color: ${({ theme }) => theme.colors.primary.base};
+    background-color: ${({ theme }) => theme.colorPrimary};
   }
 
   .sidebar-resizer {
diff --git a/superset-frontend/src/explore/components/RowCountLabel/RowCountLabel.stories.tsx b/superset-frontend/src/components/RowCountLabel/RowCountLabel.stories.tsx
similarity index 97%
rename from superset-frontend/src/explore/components/RowCountLabel/RowCountLabel.stories.tsx
rename to superset-frontend/src/components/RowCountLabel/RowCountLabel.stories.tsx
index 4fb6f66c7dc..bd5e0c62a4d 100644
--- a/superset-frontend/src/explore/components/RowCountLabel/RowCountLabel.stories.tsx
+++ b/superset-frontend/src/components/RowCountLabel/RowCountLabel.stories.tsx
@@ -19,7 +19,7 @@
 import RowCountLabel, { RowCountLabelProps } from '.';
 
 export default {
-  title: 'RowCountLabel',
+  title: 'Components/RowCountLabel',
   component: RowCountLabel,
 };
 
diff --git a/superset-frontend/src/explore/components/RowCountLabel/RowCountLabel.test.tsx b/superset-frontend/src/components/RowCountLabel/RowCountLabel.test.tsx
similarity index 97%
rename from superset-frontend/src/explore/components/RowCountLabel/RowCountLabel.test.tsx
rename to superset-frontend/src/components/RowCountLabel/RowCountLabel.test.tsx
index ed34aa55a3a..a2104483d9d 100644
--- a/superset-frontend/src/explore/components/RowCountLabel/RowCountLabel.test.tsx
+++ b/superset-frontend/src/components/RowCountLabel/RowCountLabel.test.tsx
@@ -51,7 +51,6 @@ test('RowCountLabel renders limit with danger and tooltip', async () => {
   userEvent.hover(screen.getByText(expectedText));
   const tooltip = await screen.findByRole('tooltip');
   expect(tooltip).toHaveTextContent('The row limit');
-  expect(tooltip).toHaveStyle('background: rgba(0, 0, 0, 0.902);');
 });
 
 test('RowCountLabel renders loading', () => {
diff --git a/superset-frontend/src/explore/components/RowCountLabel/index.tsx b/superset-frontend/src/components/RowCountLabel/index.tsx
similarity index 85%
rename from superset-frontend/src/explore/components/RowCountLabel/index.tsx
rename to superset-frontend/src/components/RowCountLabel/index.tsx
index 85f28a5be36..0e644c5c4f4 100644
--- a/superset-frontend/src/explore/components/RowCountLabel/index.tsx
+++ b/superset-frontend/src/components/RowCountLabel/index.tsx
@@ -18,13 +18,13 @@
  */
 import { getNumberFormatter, t, tn } from '@superset-ui/core';
 
-import Label from 'src/components/Label';
-import { Tooltip } from 'src/components/Tooltip';
+import { Label, Tooltip } from '@superset-ui/core/components';
 
 type RowCountLabelProps = {
   rowcount?: number;
   limit?: number;
   loading?: boolean;
+  label?: JSX.Element;
 };
 
 const limitReachedMsg = t(
@@ -32,12 +32,12 @@ const limitReachedMsg = t(
 );
 
 export default function RowCountLabel(props: RowCountLabelProps) {
-  const { rowcount = 0, limit = null, loading } = props;
+  const { rowcount = 0, limit = null, loading, label } = props;
   const limitReached = limit && rowcount >= limit;
   const type =
-    limitReached || (rowcount === 0 && !loading) ? 'danger' : 'default';
+    limitReached || (rowcount === 0 && !loading) ? 'error' : 'default';
   const formattedRowCount = getNumberFormatter()(rowcount);
-  const label = (
+  const labelText = (
     <Label type={type}>
       {loading ? (
         t('Loading...')
@@ -50,10 +50,10 @@ export default function RowCountLabel(props: RowCountLabelProps) {
   );
   return limitReached ? (
     <Tooltip id="tt-rowcount-tooltip" title={<span>{limitReachedMsg}</span>}>
-      {label}
+      {label || labelText}
     </Tooltip>
   ) : (
-    label
+    label || labelText
   );
 }
 
diff --git a/superset-frontend/src/components/Select/CustomTag.tsx b/superset-frontend/src/components/Select/CustomTag.tsx
deleted file mode 100644
index ab5d135ec9d..00000000000
--- a/superset-frontend/src/components/Select/CustomTag.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 { MouseEvent } from 'react';
-// eslint-disable-next-line no-restricted-imports
-import { Tag as AntdTag } from 'antd'; // TODO: Remove antd
-import { styled, useCSSTextTruncation } from '@superset-ui/core';
-import { Tooltip } from '../Tooltip';
-import { CustomCloseIcon } from '../Tags/Tag';
-import { CustomTagProps } from './types';
-
-const StyledTag = styled(AntdTag)`
-  & .ant-tag-close-icon {
-    display: inline-flex;
-    align-items: center;
-    margin-left: ${({ theme }) => theme.gridUnit}px;
-  }
-
-  & .tag-content {
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
-`;
-
-// TODO: use antd Tag props instead of any. Currently it's causing a typescript error
-const Tag = (props: any) => {
-  const [tagRef, tagIsTruncated] = useCSSTextTruncation<HTMLSpanElement>();
-  return (
-    <Tooltip title={tagIsTruncated ? props.children : null}>
-      <StyledTag
-        closeIcon={props?.closable ? CustomCloseIcon : undefined}
-        {...props}
-        className="ant-select-selection-item"
-      >
-        <span className="tag-content" ref={tagRef}>
-          {props.children}
-        </span>
-      </StyledTag>
-    </Tooltip>
-  );
-};
-
-/**
- * Custom tag renderer
- */
-export const customTagRender = (props: CustomTagProps) => {
-  const { label } = props;
-
-  const onPreventMouseDown = (event: MouseEvent<HTMLElement>) => {
-    // if close icon is clicked, stop propagation to avoid opening the dropdown
-    const target = event.target as HTMLElement;
-    if (
-      target.tagName === 'svg' ||
-      target.tagName === 'path' ||
-      (target.tagName === 'span' &&
-        target.className.includes('ant-tag-close-icon'))
-    ) {
-      event.stopPropagation();
-    }
-  };
-
-  return (
-    <Tag onMouseDown={onPreventMouseDown} {...(props as object)}>
-      {label}
-    </Tag>
-  );
-};
diff --git a/superset-frontend/src/components/TableCollection/index.tsx b/superset-frontend/src/components/TableCollection/index.tsx
deleted file mode 100644
index d48c7a78edc..00000000000
--- a/superset-frontend/src/components/TableCollection/index.tsx
+++ /dev/null
@@ -1,328 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 { memo } from 'react';
-import cx from 'classnames';
-import { TableInstance } from 'react-table';
-import { styled } from '@superset-ui/core';
-import { Icons } from 'src/components/Icons';
-
-interface TableCollectionProps {
-  getTableProps: (userProps?: any) => any;
-  getTableBodyProps: (userProps?: any) => any;
-  prepareRow: TableInstance['prepareRow'];
-  headerGroups: TableInstance['headerGroups'];
-  rows: TableInstance['rows'];
-  columns: TableInstance['column'][];
-  loading: boolean;
-  highlightRowId?: number;
-  columnsForWrapText?: string[];
-}
-
-export const Table = styled.table`
-  ${({ theme }) => `
-    background-color: ${theme.colors.grayscale.light5};
-    border-collapse: separate;
-    border-radius: ${theme.borderRadius}px;
-
-    thead > tr > th {
-      border: 0;
-    }
-
-    tbody {
-      tr:first-of-type > td {
-        border-top: 0;
-      }
-    }
-    th {
-      background: ${theme.colors.grayscale.light5};
-      position: sticky;
-      top: 0;
-
-      &:first-of-type {
-        padding-left: ${theme.gridUnit * 4}px;
-      }
-
-      &.xs {
-        min-width: 25px;
-      }
-      &.sm {
-        min-width: 50px;
-      }
-      &.md {
-        min-width: 75px;
-      }
-      &.lg {
-        min-width: 100px;
-      }
-      &.xl {
-        min-width: 150px;
-      }
-      &.xxl {
-        min-width: 200px;
-      }
-
-      span {
-        white-space: nowrap;
-        display: flex;
-        align-items: center;
-        line-height: 2;
-      }
-
-      svg {
-        display: inline-block;
-        position: relative;
-      }
-    }
-
-    td {
-      &.xs {
-        width: 25px;
-      }
-      &.sm {
-        width: 50px;
-      }
-      &.md {
-        width: 75px;
-      }
-      &.lg {
-        width: 100px;
-      }
-      &.xl {
-        width: 150px;
-      }
-      &.xxl {
-        width: 200px;
-      }
-    }
-
-    .table-cell-loader {
-      position: relative;
-
-      .loading-bar {
-        background-color: ${theme.colors.secondary.light4};
-        border-radius: 7px;
-
-        span {
-          visibility: hidden;
-        }
-      }
-
-      .empty-loading-bar {
-        display: inline-block;
-        width: 100%;
-        height: 1.2em;
-      }
-    }
-
-    .actions {
-      white-space: nowrap;
-      min-width: 100px;
-
-      svg,
-      i {
-        margin-right: 8px;
-
-        &:hover {
-          path {
-            fill: ${theme.colors.primary.base};
-          }
-        }
-      }
-    }
-
-    .table-row {
-      .actions {
-        opacity: 0;
-        font-size: ${theme.typography.sizes.xl}px;
-        display: flex;
-      }
-
-      &:hover {
-        background-color: ${theme.colors.secondary.light5};
-
-        .actions {
-          opacity: 1;
-          transition: opacity ease-in ${theme.transitionTiming}s;
-        }
-      }
-    }
-
-    .table-row-selected {
-      background-color: ${theme.colors.secondary.light4};
-
-      &:hover {
-        background-color: ${theme.colors.secondary.light4};
-      }
-    }
-
-    .table-cell {
-      font-feature-settings: 'tnum' 1;
-      text-overflow: ellipsis;
-      overflow: hidden;
-      max-width: 320px;
-      line-height: 1;
-      vertical-align: middle;
-      &:first-of-type {
-        padding-left: ${theme.gridUnit * 4}px;
-      }
-      &__wrap {
-        white-space: normal;
-      }
-      &__nowrap {
-        white-space: nowrap;
-      }
-    }
-
-    @keyframes loading-shimmer {
-      40% {
-        background-position: 100% 0;
-      }
-
-      100% {
-        background-position: 100% 0;
-      }
-    }
-  `}
-`;
-
-Table.displayName = 'table';
-
-export default memo(
-  ({
-    getTableProps,
-    getTableBodyProps,
-    prepareRow,
-    headerGroups,
-    columns,
-    rows,
-    loading,
-    highlightRowId,
-    columnsForWrapText,
-  }: TableCollectionProps) => (
-    <Table
-      {...getTableProps()}
-      className="table table-hover"
-      data-test="listview-table"
-    >
-      <thead>
-        {headerGroups.map(headerGroup => (
-          <tr {...headerGroup.getHeaderGroupProps()}>
-            {headerGroup.headers.map(column => {
-              let sortIcon = <Icons.Sort />;
-              if (column.isSorted && column.isSortedDesc) {
-                sortIcon = <Icons.SortDesc />;
-              } else if (column.isSorted && !column.isSortedDesc) {
-                sortIcon = <Icons.SortAsc />;
-              }
-              return column.hidden ? null : (
-                <th
-                  {...column.getHeaderProps(
-                    column.canSort ? column.getSortByToggleProps() : {},
-                  )}
-                  data-test="sort-header"
-                  className={cx({
-                    [column.size || '']: column.size,
-                  })}
-                >
-                  <span>
-                    {column.render('Header')}
-                    {column.canSort && sortIcon}
-                  </span>
-                </th>
-              );
-            })}
-          </tr>
-        ))}
-      </thead>
-      <tbody {...getTableBodyProps()}>
-        {loading &&
-          rows.length === 0 &&
-          [...new Array(12)].map((_, i) => (
-            <tr key={i}>
-              {columns.map((column, i2) => {
-                if (column.hidden) return null;
-                return (
-                  <td
-                    key={i2}
-                    className={cx('table-cell', {
-                      'table-cell-loader': loading,
-                    })}
-                  >
-                    <span
-                      className="loading-bar empty-loading-bar"
-                      role="progressbar"
-                      aria-label="loading"
-                    />
-                  </td>
-                );
-              })}
-            </tr>
-          ))}
-        {rows.length > 0 &&
-          rows.map(row => {
-            prepareRow(row);
-            // @ts-ignore
-            const rowId = row.original.id;
-            return (
-              <tr
-                data-test="table-row"
-                {...row.getRowProps()}
-                className={cx('table-row', {
-                  'table-row-selected':
-                    row.isSelected ||
-                    (typeof rowId !== 'undefined' && rowId === highlightRowId),
-                })}
-              >
-                {row.cells.map(cell => {
-                  if (cell.column.hidden) return null;
-                  const columnCellProps = cell.column.cellProps || {};
-                  const isWrapText = columnsForWrapText?.includes(
-                    cell.column.Header as string,
-                  );
-                  return (
-                    <td
-                      data-test="table-row-cell"
-                      className={cx(
-                        `table-cell table-cell__${
-                          isWrapText ? 'wrap' : 'nowrap'
-                        }`,
-                        {
-                          'table-cell-loader': loading,
-                          [cell.column.size || '']: cell.column.size,
-                        },
-                      )}
-                      {...cell.getCellProps()}
-                      {...columnCellProps}
-                    >
-                      <span
-                        className={cx({ 'loading-bar': loading })}
-                        role={loading ? 'progressbar' : undefined}
-                      >
-                        <span data-test="cell-text">{cell.render('Cell')}</span>
-                      </span>
-                    </td>
-                  );
-                })}
-              </tr>
-            );
-          })}
-      </tbody>
-    </Table>
-  ),
-);
diff --git a/superset-frontend/src/components/TableSelector/TableSelector.test.tsx b/superset-frontend/src/components/TableSelector/TableSelector.test.tsx
index 466f2d16834..150f33e3d8a 100644
--- a/superset-frontend/src/components/TableSelector/TableSelector.test.tsx
+++ b/superset-frontend/src/components/TableSelector/TableSelector.test.tsx
@@ -93,7 +93,7 @@ test('renders with default props', async () => {
     name: 'Select database or type to search databases',
   });
   const schemaSelect = screen.getByRole('combobox', {
-    name: 'Select schema or type to search schemas',
+    name: 'Select schema or type to search schemas: test_schema',
   });
   const tableSelect = screen.getByRole('combobox', {
     name: 'Select table or type to search tables',
@@ -118,10 +118,8 @@ test('skips select all options', async () => {
   const tableSelect = screen.getByRole('combobox', {
     name: 'Select table or type to search tables',
   });
-  userEvent.click(tableSelect);
-  expect(
-    await screen.findByRole('option', { name: 'table_a' }),
-  ).toBeInTheDocument();
+  await userEvent.click(tableSelect);
+  expect(await screen.findByText('table_a')).toBeInTheDocument();
   expect(
     screen.queryByRole('option', { name: /Select All/i }),
   ).not.toBeInTheDocument();
@@ -140,17 +138,13 @@ test('renders table options without Select All option', async () => {
   });
 
   await act(async () => {
-    userEvent.click(tableSelect);
+    await userEvent.click(tableSelect);
   });
 
   await waitFor(
     () => {
-      expect(
-        screen.getByRole('option', { name: 'table_a' }),
-      ).toBeInTheDocument();
-      expect(
-        screen.getByRole('option', { name: 'table_b' }),
-      ).toBeInTheDocument();
+      expect(screen.getByText('table_a')).toBeInTheDocument();
+      expect(screen.getByText('table_b')).toBeInTheDocument();
     },
     { timeout: 10000 },
   );
@@ -177,20 +171,18 @@ test('table select retain value if not in SQL Lab mode', async () => {
   expect(getSelectItemContainer(tableSelect)).toHaveLength(0);
 
   await act(async () => {
-    userEvent.click(tableSelect);
+    await userEvent.click(tableSelect);
   });
 
   await waitFor(
     () => {
-      expect(
-        screen.getByRole('option', { name: 'table_a' }),
-      ).toBeInTheDocument();
+      expect(screen.getByText('table_a')).toBeInTheDocument();
     },
     { timeout: 10000 },
   );
 
   await act(async () => {
-    userEvent.click(screen.getAllByText('table_a')[1]);
+    await userEvent.click(screen.getByText('table_a'));
   });
 
   await waitFor(
@@ -250,21 +242,20 @@ test('table multi select retain all the values selected', async () => {
   expect(screen.queryByText('table_a')).not.toBeInTheDocument();
   expect(getSelectItemContainer(tableSelect)).toHaveLength(0);
 
-  userEvent.click(tableSelect);
+  await userEvent.click(tableSelect);
 
   await waitFor(async () => {
     const item = await screen.findAllByText('table_b');
-    userEvent.click(item[item.length - 1]);
+    await userEvent.click(item[item.length - 1]);
   });
 
   await waitFor(async () => {
     const item = await screen.findAllByText('table_c');
-    userEvent.click(item[item.length - 1]);
+    await userEvent.click(item[item.length - 1]);
   });
 
-  const selection1 = await screen.findByRole('option', { name: 'table_b' });
-  expect(selection1).toHaveAttribute('aria-selected', 'true');
-
-  const selection2 = await screen.findByRole('option', { name: 'table_c' });
-  expect(selection2).toHaveAttribute('aria-selected', 'true');
+  const selections = await screen.findAllByRole('option', { selected: true });
+  expect(selections).toHaveLength(2);
+  expect(selections[0]).toHaveTextContent('table_b');
+  expect(selections[1]).toHaveTextContent('table_c');
 });
diff --git a/superset-frontend/src/components/TableSelector/index.tsx b/superset-frontend/src/components/TableSelector/index.tsx
index f0e77988613..a557a7c0339 100644
--- a/superset-frontend/src/components/TableSelector/index.tsx
+++ b/superset-frontend/src/components/TableSelector/index.tsx
@@ -23,8 +23,7 @@ import {
   useMemo,
   useEffect,
 } from 'react';
-// eslint-disable-next-line no-restricted-imports
-import { SelectValue } from 'antd/lib/select'; // TODO: Remove antd
+import type { SelectValue } from '@superset-ui/core/components';
 
 import {
   styled,
@@ -32,15 +31,16 @@ import {
   getClientErrorMessage,
   getClientErrorObject,
 } from '@superset-ui/core';
-import { Select } from 'src/components';
-import { FormLabel } from 'src/components/Form';
-import { Icons } from 'src/components/Icons';
-import DatabaseSelector, {
-  DatabaseObject,
-} from 'src/components/DatabaseSelector';
-import RefreshLabel from 'src/components/RefreshLabel';
-import CertifiedBadge from 'src/components/CertifiedBadge';
-import WarningIconWithTooltip from 'src/components/WarningIconWithTooltip';
+import {
+  FormLabel,
+  CertifiedBadge,
+  Select,
+} from '@superset-ui/core/components';
+import { DatabaseSelector } from 'src/components';
+import { Icons } from '@superset-ui/core/components/Icons';
+import type { DatabaseObject } from 'src/components/DatabaseSelector/types';
+import RefreshLabel from '@superset-ui/core/components/RefreshLabel';
+import WarningIconWithTooltip from '@superset-ui/core/components/WarningIconWithTooltip';
 import { useToasts } from 'src/components/MessageToasts/withToasts';
 import { useTables, Table } from 'src/hooks/apiResources';
 
@@ -52,8 +52,8 @@ const TableSelectorWrapper = styled.div`
       display: flex;
       align-items: center;
       width: ${REFRESH_WIDTH}px;
-      margin-left: ${theme.gridUnit}px;
-      margin-top: ${theme.gridUnit * 5}px;
+      margin-left: ${theme.sizeUnit}px;
+      margin-top: ${theme.sizeUnit * 5}px;
     }
 
     .section {
@@ -63,7 +63,7 @@ const TableSelectorWrapper = styled.div`
     }
 
     .divider {
-      border-bottom: 1px solid ${theme.colors.secondary.light5};
+      border-bottom: 1px solid ${theme.colorSplit};
       margin: 15px 0;
     }
 
@@ -73,7 +73,7 @@ const TableSelectorWrapper = styled.div`
 
     .select {
       flex: 1;
-      max-width: calc(100% - ${theme.gridUnit + REFRESH_WIDTH}px)
+      max-width: calc(100% - ${theme.sizeUnit + REFRESH_WIDTH}px)
     }
   `}
 `;
@@ -85,7 +85,7 @@ const TableLabel = styled.span`
 
   svg,
   small {
-    margin-right: ${({ theme }) => theme.gridUnit}px;
+    margin-right: ${({ theme }) => theme.sizeUnit}px;
   }
 `;
 
@@ -218,11 +218,12 @@ const TableSelector: FunctionComponent<TableSelectorProps> = ({
       data
         ? data.options.map(table => ({
             value: table.value,
-            label: <TableOption table={table} />,
+            label: customTableOptionLabelRenderer ? (
+              customTableOptionLabelRenderer(table)
+            ) : (
+              <TableOption table={table} />
+            ),
             text: table.value,
-            ...(customTableOptionLabelRenderer && {
-              customLabel: customTableOptionLabelRenderer(table),
-            }),
           }))
         : [],
     [data, customTableOptionLabelRenderer],
diff --git a/superset-frontend/src/components/Tag/Tag.stories.tsx b/superset-frontend/src/components/Tag/Tag.stories.tsx
new file mode 100644
index 00000000000..57d2df7a43d
--- /dev/null
+++ b/superset-frontend/src/components/Tag/Tag.stories.tsx
@@ -0,0 +1,187 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { useState } from 'react';
+import { Meta, StoryObj } from '@storybook/react';
+import { Tag } from 'src/components/Tag';
+import type { CheckableTagProps } from 'src/components/Tag';
+import TagType from 'src/types/TagType';
+
+export default {
+  title: 'Components/Tag',
+  component: Tag,
+  argTypes: {
+    name: {
+      control: 'text',
+      description: 'The name of the tag displayed inside',
+      table: {
+        category: 'Tag custom properties',
+        type: { summary: 'number | object' },
+      },
+    },
+    editable: {
+      control: 'boolean',
+      description: 'Whether the tag is editable or not',
+      table: {
+        category: 'Tag custom properties',
+        type: { summary: 'number | object' },
+      },
+    },
+    toolTipTitle: {
+      control: 'text',
+      description: 'Tooltip text for the tag',
+      table: {
+        category: 'Tag custom properties',
+        type: { summary: 'number | object' },
+      },
+    },
+    color: {
+      control: 'text',
+      description: 'Color of the Tag',
+      table: {
+        category: 'Tag',
+        type: { summary: 'text' },
+      },
+    },
+    icon: {
+      control: false,
+      description: 'Set the icon of tag',
+      table: {
+        category: 'Tag',
+        type: { summary: 'ReactNode' },
+      },
+    },
+    bordered: {
+      control: 'boolean',
+      description: 'Whether the tag has a border or not',
+      table: {
+        category: 'Tag',
+        type: { summary: 'boolean' },
+        defaultValue: { summary: 'false' },
+      },
+    },
+    checked: {
+      confirm: 'boolean',
+      control: 'boolean',
+      description: 'Whether the tag is checked or not',
+      table: {
+        category: 'CheckableTag',
+        type: { summary: 'number | object' },
+      },
+    },
+    // Exclude unwanted properties
+    children: {
+      table: {
+        disable: true,
+      },
+    },
+    closable: {
+      table: {
+        disable: true,
+      },
+    },
+    css: {
+      table: {
+        disable: true,
+      },
+    },
+    id: {
+      table: {
+        disable: true,
+      },
+    },
+    index: {
+      table: {
+        disable: true,
+      },
+    },
+    onClick: {
+      table: {
+        disable: true,
+      },
+    },
+    onClose: {
+      table: {
+        disable: true,
+      },
+    },
+    onDelete: {
+      table: {
+        disable: true,
+      },
+    },
+    role: {
+      table: {
+        disable: true,
+      },
+    },
+    style: {
+      table: {
+        disable: true,
+      },
+    },
+    type: {
+      table: {
+        disable: true,
+      },
+    },
+  },
+  parameters: {
+    docs: {
+      description: {
+        component:
+          'The Tag component is used to display a tag with various properties such as color, closable, and editable. It can also be used as a CheckableTag which allows for selection.',
+      },
+    },
+  },
+} as Meta<typeof Tag>;
+
+type Story = StoryObj<TagType>;
+
+export const TagStory: Story = {
+  args: {
+    name: 'Tag',
+  },
+  render: args => (
+    <div>
+      <Tag {...args} />
+    </div>
+  ),
+};
+
+type CheckableTagStoryType = StoryObj<CheckableTagProps>;
+
+export const CheckableTagStory: CheckableTagStoryType = {
+  args: {
+    checked: false,
+  },
+  render: args => {
+    const [checked, setChecked] = useState(args?.checked || false);
+    return (
+      <div>
+        <Tag.CheckableTag
+          {...args}
+          checked={checked}
+          onClick={() => setChecked((prev: boolean) => !prev)}
+        >
+          Click me
+        </Tag.CheckableTag>
+      </div>
+    );
+  },
+};
diff --git a/superset-frontend/src/components/Tags/Tag.test.tsx b/superset-frontend/src/components/Tag/Tag.test.tsx
similarity index 97%
rename from superset-frontend/src/components/Tags/Tag.test.tsx
rename to superset-frontend/src/components/Tag/Tag.test.tsx
index 79c3d27ad4a..b130432694d 100644
--- a/superset-frontend/src/components/Tags/Tag.test.tsx
+++ b/superset-frontend/src/components/Tag/Tag.test.tsx
@@ -18,7 +18,7 @@
  */
 import { render, screen } from 'spec/helpers/testing-library';
 import TagType from 'src/types/TagType';
-import Tag from './Tag';
+import { Tag } from '.';
 
 const mockedProps: TagType = {
   name: 'example-tag',
@@ -40,7 +40,7 @@ test('should render shortname properly', () => {
   const { container } = setup();
   expect(container).toBeInTheDocument();
   expect(screen.getByTestId('tag')).toBeInTheDocument();
-  expect(screen.getByTestId('tag')).toHaveTextContent(mockedProps.name);
+  expect(screen.getByTestId('tag')).toHaveTextContent(mockedProps.name || '');
 });
 
 test('should render longname properly', () => {
diff --git a/superset-frontend/src/components/Tag/TagType.ts b/superset-frontend/src/components/Tag/TagType.ts
new file mode 100644
index 00000000000..e7165234a38
--- /dev/null
+++ b/superset-frontend/src/components/Tag/TagType.ts
@@ -0,0 +1,41 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { CSSProperties, MouseEventHandler, ReactNode } from 'react';
+import { SerializedStyles } from '@emotion/react';
+
+export interface TagType {
+  id?: number;
+  className?: string;
+  type?: string | number;
+  editable?: boolean;
+  onDelete?: (index: number) => void;
+  onClick?: MouseEventHandler<HTMLSpanElement>;
+  onMouseDown?: MouseEventHandler<HTMLSpanElement>;
+  onClose?: () => void;
+  color?: string;
+  name?: string;
+  index?: number;
+  toolTipTitle?: string;
+  children?: ReactNode;
+  role?: string;
+  style?: CSSProperties;
+  icon?: ReactNode;
+  css?: SerializedStyles;
+  closable?: boolean;
+}
diff --git a/superset-frontend/src/components/Tags/Tag.tsx b/superset-frontend/src/components/Tag/index.tsx
similarity index 78%
rename from superset-frontend/src/components/Tags/Tag.tsx
rename to superset-frontend/src/components/Tag/index.tsx
index bc154707143..503bc9fef1d 100644
--- a/superset-frontend/src/components/Tags/Tag.tsx
+++ b/superset-frontend/src/components/Tag/index.tsx
@@ -20,25 +20,21 @@
 import { styled } from '@superset-ui/core';
 import { Link } from 'react-router-dom';
 import TagType from 'src/types/TagType';
-import { Tag as AntdTag } from 'antd-v5';
+import { Tag as AntdTag, Tooltip } from '@superset-ui/core/components';
+import type { TagProps } from 'antd/es';
+import type { CheckableTagProps } from 'antd/es/tag';
 import { useMemo } from 'react';
-import { Tooltip } from 'src/components/Tooltip';
-import { Icons } from 'src/components/Icons';
 
 const StyledTag = styled(AntdTag)`
   ${({ theme }) => `
-  margin-top: ${theme.gridUnit}px;
-  margin-bottom: ${theme.gridUnit}px;
+  margin-top: ${theme.sizeUnit}px;
+  margin-bottom: ${theme.sizeUnit}px;
   `};
 `;
 
-export const CustomCloseIcon = (
-  <Icons.CloseOutlined iconSize="xs" role="button" />
-);
-
 const MAX_DISPLAY_CHAR = 20;
 
-const Tag = ({
+const SupersetTag = ({
   name,
   id,
   index = undefined,
@@ -49,8 +45,11 @@ const Tag = ({
   children,
   ...rest
 }: TagType) => {
-  const isLongTag = useMemo(() => name.length > MAX_DISPLAY_CHAR, [name]);
-  const tagDisplay = isLongTag ? `${name.slice(0, MAX_DISPLAY_CHAR)}...` : name;
+  const tagDisplay = useMemo(() => {
+    if (!name) return null;
+    const isLongTag = name.length > MAX_DISPLAY_CHAR;
+    return isLongTag ? `${name.slice(0, MAX_DISPLAY_CHAR)}...` : name;
+  }, [name]);
 
   const handleClose = () => (index !== undefined ? onDelete?.(index) : null);
 
@@ -64,7 +63,7 @@ const Tag = ({
             key={id}
             closable={editable}
             onClose={handleClose}
-            closeIcon={editable ? CustomCloseIcon : undefined}
+            closeIcon={editable}
             {...rest}
           >
             {children || tagDisplay}
@@ -100,4 +99,7 @@ const Tag = ({
   return tagElem;
 };
 
-export default Tag;
+export const Tag = Object.assign(SupersetTag, {
+  CheckableTag: AntdTag.CheckableTag,
+});
+export type { TagProps, CheckableTagProps, TagType };
diff --git a/superset-frontend/src/components/Tags/utils.test.tsx b/superset-frontend/src/components/Tag/utils.test.tsx
similarity index 94%
rename from superset-frontend/src/components/Tags/utils.test.tsx
rename to superset-frontend/src/components/Tag/utils.test.tsx
index e4ba71e3e22..58a4fc92196 100644
--- a/superset-frontend/src/components/Tags/utils.test.tsx
+++ b/superset-frontend/src/components/Tag/utils.test.tsx
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { tagToSelectOption } from 'src/components/Tags/utils';
+import { tagToSelectOption } from 'src/components/Tag/utils';
 
 describe('tagToSelectOption', () => {
   test('converts a Tag object with table_name to a SelectTagsValue', () => {
diff --git a/superset-frontend/src/components/Tags/utils.tsx b/superset-frontend/src/components/Tag/utils.tsx
similarity index 100%
rename from superset-frontend/src/components/Tags/utils.tsx
rename to superset-frontend/src/components/Tag/utils.tsx
diff --git a/superset-frontend/src/components/TagsList/TagsList.stories.tsx b/superset-frontend/src/components/TagsList/TagsList.stories.tsx
new file mode 100644
index 00000000000..75c1a5fcd22
--- /dev/null
+++ b/superset-frontend/src/components/TagsList/TagsList.stories.tsx
@@ -0,0 +1,80 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { Meta, StoryObj } from '@storybook/react';
+import { TagsList, type TagsListProps } from 'src/components/TagsList';
+
+export default {
+  title: 'Components/TagsList',
+  component: TagsList,
+  argTypes: {
+    tags: {
+      control: false,
+      description: 'List of tags to display',
+      table: {
+        category: 'Tag List',
+        type: { summary: 'number | object' },
+      },
+    },
+    editable: {
+      control: 'boolean',
+      description: 'Whether the tags are editable',
+      table: {
+        category: 'Tag List',
+        type: { summary: 'boolean' },
+      },
+    },
+    maxTags: {
+      control: 'number',
+      description: 'Maximum number of tags to display',
+      table: {
+        category: 'Tag List',
+        type: { summary: 'number | undefined' },
+      },
+    },
+    onDelete: {
+      table: {
+        disable: true,
+      },
+    },
+  },
+  parameters: {
+    docs: {
+      description: {
+        component:
+          'The TagsList component displays a list of tags. It can be configured to be editable, allowing users to delete tags. The maxTags prop limits the number of tags displayed before truncating.',
+      },
+    },
+  },
+} as Meta<TagsListProps>;
+
+type Story = StoryObj<TagsListProps>;
+
+export const TagsListStory: Story = {
+  args: {
+    tags: [
+      { name: 'tag1' },
+      { name: 'tag2' },
+      { name: 'tag3' },
+      { name: 'tag4' },
+      { name: 'tag5' },
+      { name: 'tag6' },
+    ],
+  },
+  render: (args: TagsListProps) => <TagsList {...args} />,
+};
diff --git a/superset-frontend/src/components/Tags/TagsList.test.tsx b/superset-frontend/src/components/TagsList/TagsList.test.tsx
similarity index 97%
rename from superset-frontend/src/components/Tags/TagsList.test.tsx
rename to superset-frontend/src/components/TagsList/TagsList.test.tsx
index e28160a91f5..d8001bb6e65 100644
--- a/superset-frontend/src/components/Tags/TagsList.test.tsx
+++ b/superset-frontend/src/components/TagsList/TagsList.test.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { render, waitFor } from 'spec/helpers/testing-library';
-import TagsList, { TagsListProps } from './TagsList';
+import { TagsList, TagsListProps } from '.';
 
 const testTags = [
   {
diff --git a/superset-frontend/src/components/Tags/TagsList.tsx b/superset-frontend/src/components/TagsList/index.tsx
similarity index 97%
rename from superset-frontend/src/components/Tags/TagsList.tsx
rename to superset-frontend/src/components/TagsList/index.tsx
index 3e7dd4099eb..61086bf28ea 100644
--- a/superset-frontend/src/components/Tags/TagsList.tsx
+++ b/superset-frontend/src/components/TagsList/index.tsx
@@ -20,7 +20,7 @@
 import { useMemo, useState } from 'react';
 import { styled } from '@superset-ui/core';
 import TagType from 'src/types/TagType';
-import Tag from './Tag';
+import { Tag } from 'src/components/Tag';
 
 export type TagsListProps = {
   tags: TagType[];
@@ -41,7 +41,7 @@ const TagsDiv = styled.div`
   flex-wrap: wrap;
 `;
 
-const TagsList = ({
+export const TagsList = ({
   tags,
   editable = false,
   onDelete,
@@ -112,5 +112,3 @@ const TagsList = ({
     </TagsDiv>
   );
 };
-
-export default TagsList;
diff --git a/superset-frontend/src/components/AntdThemeProvider/index.tsx b/superset-frontend/src/components/TimePicker/index.tsx
similarity index 68%
rename from superset-frontend/src/components/AntdThemeProvider/index.tsx
rename to superset-frontend/src/components/TimePicker/index.tsx
index 28ddcabf34a..811a5442be9 100644
--- a/superset-frontend/src/components/AntdThemeProvider/index.tsx
+++ b/superset-frontend/src/components/TimePicker/index.tsx
@@ -16,20 +16,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import {
+  TimePicker as AntdTimePicker,
+  TimePickerProps,
+  TimeRangePickerProps,
+} from 'antd';
 
-import { ConfigProvider, type ConfigProviderProps } from 'antd-v5';
-import { getTheme, ThemeType } from 'src/theme/index';
+const commonCss = { width: '100%' };
 
-export const AntdThemeProvider = ({
-  theme,
-  children,
-  ...rest
-}: ConfigProviderProps) => (
-  <ConfigProvider
-    theme={theme || getTheme(ThemeType.LIGHT)}
-    prefixCls="antd5"
-    {...rest}
-  >
-    {children}
-  </ConfigProvider>
+export const TimePicker = (props: TimePickerProps) => (
+  <AntdTimePicker css={commonCss} {...props} />
+);
+
+export const TimeRangePicker = (props: TimeRangePickerProps) => (
+  <AntdTimePicker.RangePicker css={commonCss} {...props} />
 );
diff --git a/superset-frontend/src/components/index.ts b/superset-frontend/src/components/index.ts
index 3858ad83c2a..09d50bb315a 100644
--- a/superset-frontend/src/components/index.ts
+++ b/superset-frontend/src/components/index.ts
@@ -16,53 +16,37 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
-/*
- * Re-exporting of components in src/components to facilitate
- * their imports by other components.
- * E.g. import { Select } from 'src/components'
- */
-export { default as Select } from './Select/Select';
-export { default as AsyncSelect } from './Select/AsyncSelect';
-export { default as Button } from './Button';
-export { default as Card } from './Card';
-
-// Vanilla Ant Design components from v5
+export * from './CopyToClipboard';
+export * from './FilterableTable';
+export * from './AlteredSliceTag';
 export {
-  AutoComplete,
-  Col,
-  Grid,
-  Layout,
-  Row,
-  Skeleton,
-  Tag,
-  Tree,
-  TreeSelect,
-  Typography,
-} from 'antd-v5';
-
-// Vanilla Ant Design components from v4 that require migration
-// eslint-disable-next-line no-restricted-imports
-export { Upload } from 'antd'; // TODO: Remove antd
-
-/*
- * Components that conflict with the ones in src/components.
- * We should try to avoid using Ant Design directly. The components
- * listed below may need review. Avoid incrementing this list by using
- * or extending the components in src/components.
- */
-// TODO: Remove these imports
-// eslint-disable-next-line no-restricted-imports
+  ListView,
+  ListViewActionsBar,
+  ListViewUIFilters,
+  DashboardCrossLinks,
+  ListViewFilterOperator,
+  type ListViewProps,
+  type ListViewActionProps,
+  type ListViewFilters,
+  type ListViewFilter,
+  type ListViewFetchDataConfig,
+  type ListViewFilterValue,
+} from './ListView';
+export { DatabaseSelector, type DatabaseObject } from './DatabaseSelector';
+export * from './Datasource';
+export * from './ErrorMessage';
+export { ImportModal, type ImportModelsModalProps } from './ImportModal';
+export { ErrorBoundary, type ErrorBoundaryProps } from './ErrorBoundary';
+export * from './GenericLink';
+export { FlashProvider, type FlashMessage } from './FlashProvider';
+export { GridTable, type TableProps } from './GridTable';
+export * from './Tag';
+export * from './TagsList';
+export { ModifiedInfo, type ModifiedInfoProps } from './AuditInfo';
 export {
-  Breadcrumb as AntdBreadcrumb,
-  Checkbox as AntdCheckbox,
-  Collapse as AntdCollapse,
-  Form as AntdForm,
-  Select as AntdSelect,
-} from 'antd';
-
-// Exported types
-// eslint-disable-next-line no-restricted-imports
-export type { FormInstance } from 'antd/lib/form'; // TODO: Remove antd
-// eslint-disable-next-line no-restricted-imports
-export type { RadioChangeEvent } from 'antd/lib/radio'; // TODO: Remove antd
+  DynamicPluginProvider,
+  PluginContext,
+  usePluginContext,
+  type PluginContextType,
+} from './DynamicPlugins';
+export * from './FacePile';
diff --git a/superset-frontend/src/constants.ts b/superset-frontend/src/constants.ts
index 59c7efa7102..093dde8ec28 100644
--- a/superset-frontend/src/constants.ts
+++ b/superset-frontend/src/constants.ts
@@ -16,20 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import {
-  t,
-  DEFAULT_D3_FORMAT,
-  DEFAULT_D3_TIME_FORMAT,
-} from '@superset-ui/core';
+import { DEFAULT_D3_FORMAT, DEFAULT_D3_TIME_FORMAT } from '@superset-ui/core';
 
 import { BootstrapData, CommonBootstrapData } from './types/bootstrapTypes';
 
 export const DATETIME_WITH_TIME_ZONE = 'YYYY-MM-DD HH:mm:ssZ';
 export const TIME_WITH_MS = 'HH:mm:ss.SSS';
 
-export const BOOL_TRUE_DISPLAY = 'True';
-export const BOOL_FALSE_DISPLAY = 'False';
-
 export const URL_PARAMS = {
   standalone: {
     name: 'standalone',
@@ -127,21 +120,6 @@ export const RESERVED_DASHBOARD_URL_PARAMS: string[] = [
   URL_PARAMS.preselectFilters.name,
 ];
 
-/**
- * Faster debounce delay for inputs without expensive operation.
- */
-export const FAST_DEBOUNCE = 250;
-
-/**
- * Slower debounce delay for inputs with expensive API calls.
- */
-export const SLOW_DEBOUNCE = 500;
-
-/**
- * Display null as `N/A`
- */
-export const NULL_DISPLAY = t('N/A');
-
 export const DEFAULT_COMMON_BOOTSTRAP_DATA: CommonBootstrapData = {
   application_root: '/',
   static_assets_prefix: '',
@@ -163,7 +141,7 @@ export const DEFAULT_COMMON_BOOTSTRAP_DATA: CommonBootstrapData = {
   },
   extra_categorical_color_schemes: [],
   extra_sequential_color_schemes: [],
-  theme_overrides: {},
+  theme: {},
   menu_data: {
     menu: [],
     brand: {
diff --git a/superset-frontend/src/dashboard/actions/nativeFilters.ts b/superset-frontend/src/dashboard/actions/nativeFilters.ts
index 9ec73af4256..86406cef2f5 100644
--- a/superset-frontend/src/dashboard/actions/nativeFilters.ts
+++ b/superset-frontend/src/dashboard/actions/nativeFilters.ts
@@ -122,7 +122,7 @@ export const setInScopeStatusOfFilters =
     // need to update native_filter_configuration in the dashboard metadata
     const metadata = cloneDeep(getState().dashboardInfo.metadata);
     const filterConfig: FilterConfiguration =
-      metadata.native_filter_configuration;
+      metadata.native_filter_configuration || [];
     const mergedFilterConfig = filterConfig.map(filter => {
       const filterWithScope = filtersWithScopes.find(
         scope => scope.id === filter.id,
diff --git a/superset-frontend/src/dashboard/components/AddSliceCard/AddSliceCard.tsx b/superset-frontend/src/dashboard/components/AddSliceCard/AddSliceCard.tsx
index 75941c6c7c8..d684456a98c 100644
--- a/superset-frontend/src/dashboard/components/AddSliceCard/AddSliceCard.tsx
+++ b/superset-frontend/src/dashboard/components/AddSliceCard/AddSliceCard.tsx
@@ -30,10 +30,8 @@ import {
 } from 'react';
 
 import { t, isFeatureEnabled, FeatureFlag, css } from '@superset-ui/core';
-import ImageLoader from 'src/components/ListViewCard/ImageLoader';
-import { usePluginContext } from 'src/components/DynamicPlugins';
-import { Tooltip } from 'src/components/Tooltip';
-import { GenericLink } from 'src/components/GenericLink/GenericLink';
+import { Tooltip, ImageLoader } from '@superset-ui/core/components';
+import { GenericLink, usePluginContext } from 'src/components';
 import { assetUrl } from 'src/utils/assetUrl';
 import { Theme } from '@emotion/react';
 
@@ -86,18 +84,18 @@ const MetadataItem: FC<{
 }> = ({ label, value, tooltipText }) => (
   <div
     css={(theme: Theme) => css`
-      font-size: ${theme.typography.sizes.s}px;
+      font-size: ${theme.fontSizeSM}px;
       display: flex;
       justify-content: space-between;
 
       &:not(:last-child) {
-        margin-bottom: ${theme.gridUnit}px;
+        margin-bottom: ${theme.sizeUnit}px;
       }
     `}
   >
     <span
       css={(theme: Theme) => css`
-        margin-right: ${theme.gridUnit * 4}px;
+        margin-right: ${theme.sizeUnit * 4}px;
         color: ${theme.colors.grayscale.base};
       `}
     >
@@ -123,13 +121,13 @@ const SliceAddedBadgePlaceholder: FC<{
     ref={placeholderRef}
     css={(theme: Theme) => css`
       /* Display styles */
-      border: 1px solid ${theme.colors.primary.dark1};
-      border-radius: ${theme.gridUnit}px;
-      color: ${theme.colors.primary.dark1};
-      font-size: ${theme.typography.sizes.xs}px;
+      border: 1px solid ${theme.colorBorder};
+      border-radius: ${theme.borderRadius}px;
+      color: ${theme.colorPrimaryText};
+      font-size: ${theme.fontSizeXS}px;
       letter-spacing: 0.02em;
-      padding: ${theme.gridUnit / 2}px ${theme.gridUnit * 2}px;
-      margin-left: ${theme.gridUnit * 4}px;
+      padding: ${theme.sizeUnit / 2}px ${theme.sizeUnit * 2}px;
+      margin-left: ${theme.sizeUnit * 4}px;
       pointer-events: none;
 
       /* Position styles */
@@ -149,13 +147,13 @@ const SliceAddedBadge: FC<{ placeholder?: HTMLDivElement }> = ({
   <div
     css={(theme: Theme) => css`
       /* Display styles */
-      border: 1px solid ${theme.colors.primary.dark1};
-      border-radius: ${theme.gridUnit}px;
-      color: ${theme.colors.primary.dark1};
-      font-size: ${theme.typography.sizes.xs}px;
+      border: 1px solid ${theme.colorBorder};
+      border-radius: ${theme.borderRadius}px;
+      color: ${theme.colorPrimaryText};
+      font-size: ${theme.fontSizeXS}px;
       letter-spacing: 0.02em;
-      padding: ${theme.gridUnit / 2}px ${theme.gridUnit * 2}px;
-      margin-left: ${theme.gridUnit * 4}px;
+      padding: ${theme.sizeUnit / 2}px ${theme.sizeUnit * 2}px;
+      margin-left: ${theme.sizeUnit * 4}px;
       pointer-events: none;
 
       /* Position styles */
@@ -203,21 +201,20 @@ const AddSliceCard: FC<{
       <div
         data-test="chart-card"
         css={(theme: Theme) => css`
-          border: 1px solid ${theme.colors.grayscale.light2};
-          border-radius: ${theme.gridUnit}px;
-          background: ${theme.colors.grayscale.light5};
-          padding: ${theme.gridUnit * 4}px;
-          margin: 0 ${theme.gridUnit * 3}px ${theme.gridUnit * 3}px
-            ${theme.gridUnit * 3}px;
+          border: 1px solid ${theme.colorBorder};
+          border-radius: ${theme.borderRadius}px;
+          padding: ${theme.sizeUnit * 4}px;
+          margin: 0 ${theme.sizeUnit * 3}px ${theme.sizeUnit * 3}px
+            ${theme.sizeUnit * 3}px;
           position: relative;
           cursor: ${isSelected ? 'not-allowed' : 'move'};
           white-space: nowrap;
           overflow: hidden;
           line-height: 1.3;
-          color: ${theme.colors.grayscale.dark1};
+          color: ${theme.colorText};
 
           &:hover {
-            background: ${theme.colors.grayscale.light4};
+            //background: ${theme.colors.grayscale.light4};
           }
 
           opacity: ${isSelected ? 0.4 : 'unset'};
@@ -260,8 +257,8 @@ const AddSliceCard: FC<{
             <div
               data-test="card-title"
               css={(theme: Theme) => css`
-                margin-bottom: ${theme.gridUnit * 2}px;
-                font-weight: ${theme.typography.weights.bold};
+                margin-bottom: ${theme.sizeUnit * 2}px;
+                font-weight: ${theme.fontWeightStrong};
                 display: flex;
                 justify-content: space-between;
                 align-items: center;
diff --git a/superset-frontend/src/dashboard/components/AnchorLink/AnchorLink.stories.tsx b/superset-frontend/src/dashboard/components/AnchorLink/AnchorLink.stories.tsx
index 325abb3f346..36e0dd6ce56 100644
--- a/superset-frontend/src/dashboard/components/AnchorLink/AnchorLink.stories.tsx
+++ b/superset-frontend/src/dashboard/components/AnchorLink/AnchorLink.stories.tsx
@@ -19,7 +19,7 @@
 import AnchorLink from '.';
 
 export default {
-  title: 'AnchorLink',
+  title: 'Components/AnchorLink',
   component: AnchorLink,
 };
 
diff --git a/superset-frontend/src/dashboard/components/BuilderComponentPane/index.tsx b/superset-frontend/src/dashboard/components/BuilderComponentPane/index.tsx
index 9b7623fd0a0..e279d3e35a4 100644
--- a/superset-frontend/src/dashboard/components/BuilderComponentPane/index.tsx
+++ b/superset-frontend/src/dashboard/components/BuilderComponentPane/index.tsx
@@ -18,7 +18,7 @@
  */
 /* eslint-env browser */
 import { rgba } from 'emotion-rgba';
-import Tabs from 'src/components/Tabs';
+import Tabs from '@superset-ui/core/components/Tabs';
 import { t, css, SupersetTheme } from '@superset-ui/core';
 import SliceAdder from 'src/dashboard/containers/SliceAdder';
 import dashboardComponents from 'src/visualizations/presets/dashboardComponents';
@@ -32,6 +32,11 @@ import NewDynamicComponent from '../gridComponents/new/NewDynamicComponent';
 
 const BUILDER_PANE_WIDTH = 374;
 
+const TABS_KEYS = {
+  CHARTS: 'CHARTS',
+  LAYOUT_ELEMENTS: 'LAYOUT_ELEMENTS',
+};
+
 const BuilderComponentPane = ({ topOffset = 0 }) => (
   <div
     data-test="dashboard-builder-sidepane"
@@ -49,7 +54,7 @@ const BuilderComponentPane = ({ topOffset = 0 }) => (
         height: 100%;
         width: ${BUILDER_PANE_WIDTH}px;
         box-shadow: -4px 0 4px 0 ${rgba(theme.colors.grayscale.dark2, 0.1)};
-        background-color: ${theme.colors.grayscale.light5};
+        background-color: ${theme.colorBgBase};
       `}
     >
       <Tabs
@@ -57,7 +62,7 @@ const BuilderComponentPane = ({ topOffset = 0 }) => (
         id="tabs"
         css={(theme: SupersetTheme) => css`
           line-height: inherit;
-          margin-top: ${theme.gridUnit * 2}px;
+          margin-top: ${theme.sizeUnit * 2}px;
           height: 100%;
 
           & .ant-tabs-content-holder {
@@ -67,33 +72,44 @@ const BuilderComponentPane = ({ topOffset = 0 }) => (
             }
           }
         `}
-      >
-        <Tabs.TabPane
-          key={1}
-          tab={t('Charts')}
-          css={css`
-            height: 100%;
-          `}
-        >
-          <SliceAdder />
-        </Tabs.TabPane>
-        <Tabs.TabPane key={2} tab={t('Layout elements')}>
-          <NewTabs />
-          <NewRow />
-          <NewColumn />
-          <NewHeader />
-          <NewMarkdown />
-          <NewDivider />
-          {dashboardComponents
-            .getAll()
-            .map(({ key: componentKey, metadata }) => (
-              <NewDynamicComponent
-                metadata={metadata}
-                componentKey={componentKey}
-              />
-            ))}
-        </Tabs.TabPane>
-      </Tabs>
+        items={[
+          {
+            key: TABS_KEYS.CHARTS,
+            label: t('Charts'),
+            children: (
+              <div
+                css={css`
+                  height: calc(100vh - ${topOffset * 2}px);
+                `}
+              >
+                <SliceAdder />
+              </div>
+            ),
+          },
+          {
+            key: TABS_KEYS.LAYOUT_ELEMENTS,
+            label: t('Layout elements'),
+            children: (
+              <>
+                <NewTabs />
+                <NewRow />
+                <NewColumn />
+                <NewHeader />
+                <NewMarkdown />
+                <NewDivider />
+                {dashboardComponents
+                  .getAll()
+                  .map(({ key: componentKey, metadata }) => (
+                    <NewDynamicComponent
+                      metadata={metadata}
+                      componentKey={componentKey}
+                    />
+                  ))}
+              </>
+            ),
+          },
+        ]}
+      />
     </div>
   </div>
 );
diff --git a/superset-frontend/src/dashboard/components/CssEditor/CssEditor.test.tsx b/superset-frontend/src/dashboard/components/CssEditor/CssEditor.test.tsx
index fbaadf89128..63bdea50792 100644
--- a/superset-frontend/src/dashboard/components/CssEditor/CssEditor.test.tsx
+++ b/superset-frontend/src/dashboard/components/CssEditor/CssEditor.test.tsx
@@ -22,12 +22,12 @@ import {
   userEvent,
   waitFor,
 } from 'spec/helpers/testing-library';
-import { CssEditor as AceCssEditor } from 'src/components/AsyncAceEditor';
+import { CssEditor as AceCssEditor } from '@superset-ui/core/components/AsyncAceEditor';
 import { IAceEditorProps } from 'react-ace';
 import fetchMock from 'fetch-mock';
 import CssEditor from '.';
 
-jest.mock('src/components/AsyncAceEditor', () => ({
+jest.mock('@superset-ui/core/components/AsyncAceEditor', () => ({
   CssEditor: ({ value, onChange }: IAceEditorProps) => (
     <textarea
       defaultValue={value}
diff --git a/superset-frontend/src/dashboard/components/CssEditor/index.tsx b/superset-frontend/src/dashboard/components/CssEditor/index.tsx
index 2b9b9907048..127946a8cfe 100644
--- a/superset-frontend/src/dashboard/components/CssEditor/index.tsx
+++ b/superset-frontend/src/dashboard/components/CssEditor/index.tsx
@@ -17,13 +17,15 @@
  * under the License.
  */
 import { Key, ReactNode, PureComponent } from 'react';
-import { Dropdown } from 'src/components/Dropdown';
+import {
+  Dropdown,
+  CssEditor as AceCssEditor,
+  Button,
+  ModalTrigger,
+} from '@superset-ui/core/components';
 import rison from 'rison';
-import { Menu } from 'src/components/Menu';
-import Button from 'src/components/Button';
+import { Menu } from '@superset-ui/core/components/Menu';
 import { t, styled, SupersetClient } from '@superset-ui/core';
-import ModalTrigger from 'src/components/ModalTrigger';
-import { CssEditor as AceCssEditor } from 'src/components/AsyncAceEditor';
 
 export interface CssEditorProps {
   initialCss: string;
@@ -45,14 +47,14 @@ const StyledWrapper = styled.div`
       display: flex;
       flex-direction: row;
       justify-content: space-between;
-      margin-bottom: ${theme.gridUnit * 2}px;
+      margin-bottom: ${theme.sizeUnit * 2}px;
 
       h5 {
-        margin-top: ${theme.gridUnit}px;
+        margin-top: ${theme.sizeUnit}px;
       }
     }
     .css-editor {
-      border: 1px solid ${theme.colors.grayscale.light1};
+      border: 1px solid ${theme.colorBorder};
     }
   `}
 `;
@@ -101,21 +103,27 @@ class CssEditor extends PureComponent<CssEditorProps, CssEditorState> {
   }
 
   changeCssTemplate(info: { key: Key }) {
-    const keyAsString = String(info.key);
-    this.changeCss(keyAsString);
+    const selectedTemplate = this.state.templates?.find(
+      template => template.label === info.key,
+    );
+    if (selectedTemplate) {
+      this.changeCss(selectedTemplate.css);
+    }
   }
 
   renderTemplateSelector() {
     if (this.state.templates) {
       const menu = (
-        <Menu onClick={this.changeCssTemplate}>
-          {this.state.templates.map(template => (
-            <Menu.Item key={template.css}>{template.label}</Menu.Item>
-          ))}
-        </Menu>
+        <Menu
+          onClick={this.changeCssTemplate}
+          items={this.state.templates.map(template => ({
+            key: template.label,
+            label: template.label,
+          }))}
+        />
       );
       return (
-        <Dropdown dropdownRender={() => menu} placement="bottomRight">
+        <Dropdown popupRender={() => menu} placement="bottomRight">
           <Button>{t('Load a CSS template')}</Button>
         </Dropdown>
       );
diff --git a/superset-frontend/src/dashboard/components/Dashboard.jsx b/superset-frontend/src/dashboard/components/Dashboard.jsx
index 762e1203908..e1881aa24cf 100644
--- a/superset-frontend/src/dashboard/components/Dashboard.jsx
+++ b/superset-frontend/src/dashboard/components/Dashboard.jsx
@@ -20,8 +20,8 @@ import { PureComponent } from 'react';
 import PropTypes from 'prop-types';
 import { t } from '@superset-ui/core';
 
-import { PluginContext } from 'src/components/DynamicPlugins';
-import Loading from 'src/components/Loading';
+import { Loading } from '@superset-ui/core/components';
+import { PluginContext } from 'src/components';
 import getBootstrapData from 'src/utils/getBootstrapData';
 import getChartIdsFromLayout from '../util/getChartIdsFromLayout';
 import getLayoutComponentFromChartId from '../util/getLayoutComponentFromChartId';
diff --git a/superset-frontend/src/dashboard/components/Dashboard.test.jsx b/superset-frontend/src/dashboard/components/Dashboard.test.jsx
index 0fb87d9721a..8d530134a85 100644
--- a/superset-frontend/src/dashboard/components/Dashboard.test.jsx
+++ b/superset-frontend/src/dashboard/components/Dashboard.test.jsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { render, screen } from 'spec/helpers/testing-library';
-import { PluginContext } from 'src/components/DynamicPlugins';
+import { PluginContext } from 'src/components';
 
 import Dashboard from 'src/dashboard/components/Dashboard';
 import { CHART_TYPE } from 'src/dashboard/util/componentTypes';
diff --git a/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardBuilder.test.tsx b/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardBuilder.test.tsx
index 9963369745c..752b2f4ad5e 100644
--- a/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardBuilder.test.tsx
+++ b/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardBuilder.test.tsx
@@ -17,7 +17,12 @@
  * under the License.
  */
 import fetchMock from 'fetch-mock';
-import { fireEvent, render, within } from 'spec/helpers/testing-library';
+import {
+  fireEvent,
+  render,
+  within,
+  screen,
+} from 'spec/helpers/testing-library';
 import DashboardBuilder from 'src/dashboard/components/DashboardBuilder/DashboardBuilder';
 import useStoredSidebarWidth from 'src/components/ResizableSidebar/useStoredSidebarWidth';
 import {
@@ -48,13 +53,13 @@ jest.mock('src/dashboard/actions/dashboardState', () => ({
 jest.mock('src/components/ResizableSidebar/useStoredSidebarWidth');
 
 // mock following dependent components to fix the prop warnings
-jest.mock('src/components/Select/Select', () => () => (
+jest.mock('@superset-ui/core/components/Select/Select', () => () => (
   <div data-test="mock-select" />
 ));
-jest.mock('src/components/Select/AsyncSelect', () => () => (
+jest.mock('@superset-ui/core/components/Select/AsyncSelect', () => () => (
   <div data-test="mock-async-select" />
 ));
-jest.mock('src/components/PageHeaderWithActions', () => ({
+jest.mock('@superset-ui/core/components/PageHeaderWithActions', () => ({
   PageHeaderWithActions: () => (
     <div data-test="mock-page-header-with-actions" />
   ),
@@ -166,13 +171,12 @@ describe('DashboardBuilder', () => {
       dashboardLayout: undoableDashboardLayoutWithTabs,
     });
     const parentSize = await findByTestId('grid-container');
-    const expectedCount =
-      undoableDashboardLayoutWithTabs.present.TABS_ID.children.length;
+    const first_tab = screen.getByText('tab1');
+    expect(first_tab).toBeInTheDocument();
     const tabPanels = within(parentSize).getAllByRole('tabpanel', {
       // to include invisible tab panels
-      hidden: true,
+      hidden: false,
     });
-    expect(tabPanels.length).toBe(expectedCount);
     expect(
       within(tabPanels[0]).getAllByTestId('mock-dashboard-grid').length,
     ).toBe(1);
@@ -187,15 +191,15 @@ describe('DashboardBuilder', () => {
       },
     });
     const parentSize = await findByTestId('grid-container');
-    const expectedCount =
-      undoableDashboardLayoutWithTabs.present.TABS_ID.children.length;
+    const second_tab = screen.getByText('tab2');
+    expect(second_tab).toBeInTheDocument();
+    fireEvent.click(second_tab);
     const tabPanels = within(parentSize).getAllByRole('tabpanel', {
       // to include invisible tab panels
       hidden: true,
     });
-    expect(tabPanels.length).toBe(expectedCount);
     expect(
-      within(tabPanels[1]).getAllByTestId('mock-dashboard-grid').length,
+      within(tabPanels[0]).getAllByTestId('mock-dashboard-grid').length,
     ).toBe(1);
   });
 
diff --git a/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardBuilder.tsx b/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardBuilder.tsx
index 7694140aa21..5be93425bdd 100644
--- a/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardBuilder.tsx
+++ b/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardBuilder.tsx
@@ -29,10 +29,11 @@ import {
   useElementOnScreen,
 } from '@superset-ui/core';
 import { useDispatch, useSelector } from 'react-redux';
-import ErrorBoundary from 'src/components/ErrorBoundary';
+import { EmptyState, Loading } from '@superset-ui/core/components';
+import { ErrorBoundary, BasicErrorAlert } from 'src/components';
 import BuilderComponentPane from 'src/dashboard/components/BuilderComponentPane';
 import DashboardHeader from 'src/dashboard/components/Header';
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
 import IconButton from 'src/dashboard/components/IconButton';
 import { Droppable } from 'src/dashboard/components/dnd/DragDroppable';
 import DashboardComponent from 'src/dashboard/containers/DashboardComponent';
@@ -61,8 +62,6 @@ import {
   DashboardStandaloneMode,
 } from 'src/dashboard/util/constants';
 import FilterBar from 'src/dashboard/components/nativeFilters/FilterBar';
-import Loading from 'src/components/Loading';
-import { EmptyState } from 'src/components/EmptyState';
 import { useUiConfig } from 'src/components/UiConfigContext';
 import ResizableSidebar from 'src/components/ResizableSidebar';
 import {
@@ -74,7 +73,6 @@ import {
   OPEN_FILTER_BAR_WIDTH,
   EMPTY_CONTAINER_Z_INDEX,
 } from 'src/dashboard/constants';
-import BasicErrorAlert from 'src/components/ErrorMessage/BasicErrorAlert';
 import { getRootLevelTabsComponent, shouldFocusTabs } from './utils';
 import DashboardContainer from './DashboardContainer';
 import { useNativeFilters } from './state';
@@ -110,12 +108,12 @@ const StyledHeader = styled.div`
       position: absolute;
       content: '';
       display: none;
-      width: calc(100% - ${theme.gridUnit * 2}px);
-      height: calc(100% - ${theme.gridUnit * 2}px);
-      left: ${theme.gridUnit}px;
-      top: ${theme.gridUnit}px;
+      width: calc(100% - ${theme.sizeUnit * 2}px);
+      height: calc(100% - ${theme.sizeUnit * 2}px);
+      left: ${theme.sizeUnit}px;
+      top: ${theme.sizeUnit}px;
       border: 1px dashed transparent;
-      border-radius: ${theme.gridUnit}px;
+      border-radius: ${theme.borderRadius}px;
       opacity: 0.5;
     }
   `}
@@ -141,17 +139,14 @@ const DashboardContentWrapper = styled.div`
 
       /* drop shadow for top-level tabs only */
       & .dashboard-component-tabs {
-        box-shadow: 0 ${theme.gridUnit}px ${theme.gridUnit}px 0
-          ${addAlpha(
-            theme.colors.grayscale.dark2,
-            parseFloat(theme.opacity.light) / 100,
-          )};
-        padding-left: ${theme.gridUnit *
+        box-shadow: 0 ${theme.sizeUnit}px ${theme.sizeUnit}px 0
+          ${addAlpha(theme.colors.grayscale.dark2, 0.1)};
+        padding-left: ${theme.sizeUnit *
         2}px; /* note this is added to tab-level padding, to match header */
       }
 
       .dropdown-toggle.btn.btn-primary .caret {
-        color: ${theme.colors.grayscale.light5};
+        color: ${theme.colorText};
       }
 
       .background--transparent {
@@ -159,7 +154,7 @@ const DashboardContentWrapper = styled.div`
       }
 
       .background--white {
-        background-color: ${theme.colors.grayscale.light5};
+        background-color: ${theme.colorBgContainer};
       }
     }
     &.dashboard--editing {
@@ -178,7 +173,7 @@ const DashboardContentWrapper = styled.div`
 
       .grid-row.grid-row--hovered:after,
       .dashboard-component-tabs > .grid-row--hovered:after {
-        border: 2px dashed ${theme.colors.primary.base};
+        border: 2px dashed ${theme.colorPrimary};
       }
 
       .resizable-container {
@@ -203,7 +198,7 @@ const DashboardContentWrapper = styled.div`
         &:hover,
         &.resizable-container--resizing:hover {
           & > .dashboard-component-chart-holder:after {
-            border: 1px dashed ${theme.colors.primary.base};
+            border: 1px dashed ${theme.colorPrimary};
           }
         }
       }
@@ -211,19 +206,19 @@ const DashboardContentWrapper = styled.div`
       .resizable-container--resizing:hover > .grid-row:after,
       .hover-menu:hover + .grid-row:after,
       .dashboard-component-tabs > .hover-menu:hover + div:after {
-        border: 1px dashed ${theme.colors.primary.base};
+        border: 1px dashed ${theme.colorPrimary};
         z-index: 2;
       }
 
       .grid-row:after,
       .dashboard-component-tabs > .hover-menu + div:after {
-        border: 1px dashed ${theme.colors.grayscale.light2};
+        border: 1px dashed ${theme.colorBorder};
       }
 
       /* provide hit area in case row contents is edge to edge */
       .dashboard-component-tabs-content {
         > .dragdroppable-row {
-          padding-top: ${theme.gridUnit * 4}px;
+          padding-top: ${theme.sizeUnit * 4}px;
         }
       }
 
@@ -241,7 +236,7 @@ const DashboardContentWrapper = styled.div`
         }
 
         &:hover:after {
-          border: 1px dashed ${theme.colors.primary.base};
+          border: 1px dashed ${theme.colorPrimary};
           z-index: 2;
         }
       }
@@ -253,7 +248,7 @@ const DashboardContentWrapper = styled.div`
 
     & .dashboard-component-tabs-content {
       & > div:not(:last-child):not(.empty-droptarget) {
-        margin-bottom: ${theme.gridUnit * 4}px;
+        margin-bottom: ${theme.sizeUnit * 4}px;
       }
 
       & > .empty-droptarget {
@@ -263,13 +258,13 @@ const DashboardContentWrapper = styled.div`
       }
 
       & > .empty-droptarget:first-child:not(.empty-droptarget--full) {
-        height: ${theme.gridUnit * 4}px;
+        height: ${theme.sizeUnit * 4}px;
         top: 0;
       }
 
       & > .empty-droptarget:last-child {
-        height: ${theme.gridUnit * 4}px;
-        bottom: ${-theme.gridUnit * 4}px;
+        height: ${theme.sizeUnit * 4}px;
+        bottom: ${-theme.sizeUnit * 4}px;
       }
     }
   `}
@@ -296,15 +291,15 @@ const StyledDashboardContent = styled.div<{
       width: 0;
       flex: 1;
       position: relative;
-      margin-top: ${theme.gridUnit * 6}px;
-      margin-right: ${theme.gridUnit * 8}px;
-      margin-bottom: ${theme.gridUnit * 6}px;
+      margin-top: ${theme.sizeUnit * 4}px;
+      margin-right: ${theme.sizeUnit * 8}px;
+      margin-bottom: ${theme.sizeUnit * 4}px;
       margin-left: ${marginLeft}px;
 
       ${editMode &&
       `
       max-width: calc(100% - ${
-        BUILDER_SIDEPANEL_WIDTH + theme.gridUnit * 16
+        BUILDER_SIDEPANEL_WIDTH + theme.sizeUnit * 16
       }px);
     `}
 
@@ -322,26 +317,22 @@ const StyledDashboardContent = styled.div<{
     .dashboard-component-chart-holder {
       width: 100%;
       height: 100%;
-      background-color: ${theme.colors.grayscale.light5};
+      background-color: ${theme.colorBgContainer};
       position: relative;
-      padding: ${theme.gridUnit * 4}px;
+      padding: ${theme.sizeUnit * 4}px;
       overflow-y: visible;
 
       // transitionable traits to show filter relevance
       transition:
-        opacity ${theme.transitionTiming}s ease-in-out,
-        border-color ${theme.transitionTiming}s ease-in-out,
-        box-shadow ${theme.transitionTiming}s ease-in-out;
+        opacity ${theme.motionDurationMid} ease-in-out,
+        border-color ${theme.motionDurationMid} ease-in-out,
+        box-shadow ${theme.motionDurationMid} ease-in-out;
 
       &.fade-in {
         border-radius: ${theme.borderRadius}px;
         box-shadow:
-          inset 0 0 0 2px ${theme.colors.primary.base},
-          0 0 0 3px
-            ${addAlpha(
-              theme.colors.primary.base,
-              parseFloat(theme.opacity.light) / 100,
-            )};
+          inset 0 0 0 2px ${theme.colorPrimary},
+          0 0 0 3px ${addAlpha(theme.colorPrimary, 0.1)};
       }
 
       &.fade-out {
@@ -357,7 +348,7 @@ const StyledDashboardContent = styled.div<{
         justify-content: center;
 
         .missing-chart-body {
-          font-size: ${theme.typography.sizes.s}px;
+          font-size: ${theme.fontSizeSM}px;
           position: relative;
           display: flex;
         }
@@ -572,7 +563,7 @@ const DashboardBuilder = () => {
     nativeFiltersEnabled &&
     filterBarOrientation !== FilterBarOrientation.Horizontal
       ? 0
-      : theme.gridUnit * 8;
+      : theme.sizeUnit * 8;
 
   const renderChild = useCallback(
     adjustedWidth => {
diff --git a/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardContainer.tsx b/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardContainer.tsx
index a336c76392c..784d6020cd1 100644
--- a/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardContainer.tsx
+++ b/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardContainer.tsx
@@ -37,7 +37,7 @@ import {
 } from '@superset-ui/core';
 import { ParentSize } from '@visx/responsive';
 import { pick } from 'lodash';
-import Tabs from 'src/components/Tabs';
+import Tabs from '@superset-ui/core/components/Tabs';
 import DashboardGrid from 'src/dashboard/containers/DashboardGrid';
 import {
   DashboardInfo,
@@ -274,40 +274,32 @@ const DashboardContainer: FC<DashboardContainerProps> = ({ topLevelTabs }) => {
   }, []);
 
   const renderParentSizeChildren = useCallback(
-    ({ width }) => (
-      /*
-      We use a TabContainer irrespective of whether top-level tabs exist to maintain
-      a consistent React component tree. This avoids expensive mounts/unmounts of
-      the entire dashboard upon adding/removing top-level tabs, which would otherwise
-      happen because of React's diffing algorithm
-    */
-      <Tabs
-        id={DASHBOARD_GRID_ID}
-        activeKey={activeKey}
-        renderTabBar={renderTabBar}
-        fullWidth={false}
-        animated={false}
-        allowOverflow
-        onFocus={handleFocus}
-      >
-        {childIds.map((id, index) => (
-          // Matching the key of the first TabPane irrespective of topLevelTabs
-          // lets us keep the same React component tree when !!topLevelTabs changes.
-          // This avoids expensive mounts/unmounts of the entire dashboard.
-          <Tabs.TabPane
-            key={index === 0 ? DASHBOARD_GRID_ID : index.toString()}
-          >
-            <DashboardGrid
-              gridComponent={dashboardLayout[id]}
-              // see isValidChild for why tabs do not increment the depth of their children
-              depth={DASHBOARD_ROOT_DEPTH + 1} // (topLevelTabs ? 0 : 1)}
-              width={width}
-              isComponentVisible={index === tabIndex}
-            />
-          </Tabs.TabPane>
-        ))}
-      </Tabs>
-    ),
+    ({ width }) => {
+      const tabItems = childIds.map((id, index) => ({
+        key: index === 0 ? DASHBOARD_GRID_ID : index.toString(),
+        label: null,
+        children: (
+          <DashboardGrid
+            gridComponent={dashboardLayout[id]}
+            depth={DASHBOARD_ROOT_DEPTH + 1}
+            width={width}
+            isComponentVisible={index === tabIndex}
+          />
+        ),
+      }));
+
+      return (
+        <Tabs
+          id={DASHBOARD_GRID_ID}
+          activeKey={activeKey}
+          renderTabBar={renderTabBar}
+          animated={false}
+          allowOverflow
+          onFocus={handleFocus}
+          items={tabItems}
+        />
+      );
+    },
     [activeKey, childIds, dashboardLayout, handleFocus, renderTabBar, tabIndex],
   );
 
diff --git a/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardWrapper.tsx b/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardWrapper.tsx
index 1cb8746598a..a7f885a6a53 100644
--- a/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardWrapper.tsx
+++ b/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardWrapper.tsx
@@ -18,7 +18,8 @@
  */
 import { FC, useEffect, useState } from 'react';
 
-import { FAST_DEBOUNCE, css, styled } from '@superset-ui/core';
+import { css, styled } from '@superset-ui/core';
+import { Constants } from '@superset-ui/core/components';
 import { RootState } from 'src/dashboard/types';
 import { useSelector } from 'react-redux';
 import { useDragDropManager } from 'react-dnd';
@@ -58,9 +59,9 @@ const StyledDiv = styled.div`
 
     /* A row within a column has inset hover menu */
     .dragdroppable-column .dragdroppable-row .hover-menu--left {
-      left: ${theme.gridUnit * -3}px;
-      background: ${theme.colors.grayscale.light5};
-      border: 1px solid ${theme.colors.grayscale.light2};
+      left: ${theme.sizeUnit * -3}px;
+      background-color: ${theme.colorBgContainer};
+      border: 1px solid ${theme.colorBorder};
     }
 
     .dashboard-component-tabs {
@@ -70,9 +71,9 @@ const StyledDiv = styled.div`
     /* A column within a column or tabs has inset hover menu */
     .dragdroppable-column .dragdroppable-column .hover-menu--top,
     .dashboard-component-tabs .dragdroppable-column .hover-menu--top {
-      top: ${theme.gridUnit * -3}px;
-      background: ${theme.colors.grayscale.light5};
-      border: 1px solid ${theme.colors.grayscale.light2};
+      top: ${theme.sizeUnit * -3}px;
+      background-color: ${theme.colorBgContainer};
+      border: 1px solid ${theme.colorBorder};
     }
 
     /* move Tabs hover menu to top near actual Tabs */
@@ -85,8 +86,8 @@ const StyledDiv = styled.div`
     /* push Chart actions to upper right */
     .dragdroppable-column .dashboard-component-chart-holder .hover-menu--top,
     .dragdroppable .dashboard-component-header .hover-menu--top {
-      right: ${theme.gridUnit * 2}px;
-      top: ${theme.gridUnit * 2}px;
+      right: ${theme.sizeUnit * 3}px;
+      top: ${theme.sizeUnit * 5}px;
       background: transparent;
       border: none;
       transform: unset;
@@ -98,15 +99,15 @@ const StyledDiv = styled.div`
     }
 
     p {
-      margin: 0 0 ${theme.gridUnit * 2}px 0;
+      margin: 0 0 ${theme.sizeUnit * 2}px 0;
     }
 
     i.danger {
-      color: ${theme.colors.error.base};
+      color: ${theme.colorError};
     }
 
     i.warning {
-      color: ${theme.colors.warning.base};
+      color: ${theme.colorWarning};
     }
   `}
 `;
@@ -124,7 +125,10 @@ const DashboardWrapper: FC<Props> = ({ children }) => {
 
   useEffect(() => {
     const monitor = dragDropManager.getMonitor();
-    const debouncedSetIsDragged = debounce(setIsDragged, FAST_DEBOUNCE);
+    const debouncedSetIsDragged = debounce(
+      setIsDragged,
+      Constants.FAST_DEBOUNCE,
+    );
     const unsub = monitor.subscribeToStateChange(() => {
       const isDragging = monitor.isDragging();
       if (isDragging) {
diff --git a/superset-frontend/src/dashboard/components/DashboardBuilder/state.ts b/superset-frontend/src/dashboard/components/DashboardBuilder/state.ts
index 2c45a799f14..d393d785cfb 100644
--- a/superset-frontend/src/dashboard/components/DashboardBuilder/state.ts
+++ b/superset-frontend/src/dashboard/components/DashboardBuilder/state.ts
@@ -30,7 +30,7 @@ import {
 export const useNativeFilters = () => {
   const [isInitialized, setIsInitialized] = useState(false);
   const showNativeFilters = useSelector<RootState, boolean>(
-    state => getUrlParam(URL_PARAMS.showFilters) ?? true,
+    () => getUrlParam(URL_PARAMS.showFilters) ?? true,
   );
   const canEdit = useSelector<RootState, boolean>(
     ({ dashboardInfo }) => dashboardInfo.dash_edit_perm,
diff --git a/superset-frontend/src/dashboard/components/DashboardGrid.jsx b/superset-frontend/src/dashboard/components/DashboardGrid.jsx
index 4a619dc7351..0f4997d24e1 100644
--- a/superset-frontend/src/dashboard/components/DashboardGrid.jsx
+++ b/superset-frontend/src/dashboard/components/DashboardGrid.jsx
@@ -21,8 +21,8 @@ import { withTheme } from '@emotion/react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import { addAlpha, css, styled, t } from '@superset-ui/core';
-import { EmptyState } from 'src/components/EmptyState';
-import { Icons } from 'src/components/Icons';
+import { EmptyState } from '@superset-ui/core/components';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { navigateTo } from 'src/utils/navigationUtils';
 import { componentShape } from '../util/propShapes';
 import DashboardComponent from '../containers/DashboardComponent';
@@ -61,36 +61,36 @@ const GridContent = styled.div`
     flex-direction: column;
     /* gutters between rows */
     & > div:not(:last-child):not(.empty-droptarget) {
-      ${!editMode && `margin-bottom: ${theme.gridUnit * 4}px`};
+      ${!editMode && `margin-bottom: ${theme.sizeUnit * 4}px`};
     }
 
     .empty-droptarget {
       width: 100%;
-      height: ${theme.gridUnit * 4}px;
+      height: ${theme.sizeUnit * 4}px;
       display: flex;
       align-items: center;
       justify-content: center;
-      border-radius: ${theme.gridUnit}px;
+      border-radius: ${theme.borderRadius}px;
       overflow: hidden;
 
       &:before {
         content: '';
         display: block;
-        width: calc(100% - ${theme.gridUnit * 2}px);
-        height: calc(100% - ${theme.gridUnit * 2}px);
+        width: calc(100% - ${theme.sizeUnit * 2}px);
+        height: calc(100% - ${theme.sizeUnit * 2}px);
         border: 1px dashed transparent;
-        border-radius: ${theme.gridUnit}px;
+        border-radius: ${theme.borderRadius}px;
         opacity: 0.5;
       }
     }
 
     & > .empty-droptarget:first-child {
-      height: ${theme.gridUnit * 4}px;
-      margin-top: ${theme.gridUnit * -4}px;
+      height: ${theme.sizeUnit * 4}px;
+      margin-top: ${theme.sizeUnit * -4}px;
     }
 
     & > .empty-droptarget:last-child {
-      height: ${theme.gridUnit * 24}px;
+      height: ${theme.sizeUnit * 24}px;
     }
 
     & > .empty-droptarget.empty-droptarget--full:only-child {
@@ -106,16 +106,9 @@ const GridColumnGuide = styled.div`
       position: absolute;
       top: 0;
       min-height: 100%;
-      background-color: ${addAlpha(
-        theme.colors.primary.base,
-        parseFloat(theme.opacity.light) / 100,
-      )};
+      background-color: ${addAlpha(theme.colorPrimary, 0.1)};
       pointer-events: none;
-      box-shadow: inset 0 0 0 1px
-        ${addAlpha(
-          theme.colors.primary.base,
-          parseFloat(theme.opacity.mediumHeavy) / 100,
-        )};
+      box-shadow: inset 0 0 0 1px ${addAlpha(theme.colorPrimary, 0.6)};
     }
   `};
 `;
@@ -217,10 +210,7 @@ class DashboardGrid extends PureComponent {
         size="large"
         buttonText={
           <>
-            <Icons.PlusOutlined
-              iconSize="m"
-              iconColor={theme.colors.primary.light5}
-            />
+            <Icons.PlusOutlined iconSize="m" color={theme.colorPrimary} />
             {t('Create a new chart')}
           </>
         }
@@ -242,10 +232,7 @@ class DashboardGrid extends PureComponent {
         )}
         buttonText={
           <>
-            <Icons.PlusOutlined
-              iconSize="m"
-              iconColor={theme.colors.primary.light5}
-            />
+            <Icons.PlusOutlined iconSize="m" color={theme.colorPrimary} />
             {t('Create a new chart')}
           </>
         }
diff --git a/superset-frontend/src/dashboard/components/DeleteComponentButton.tsx b/superset-frontend/src/dashboard/components/DeleteComponentButton.tsx
index 221d544493c..58c2b91c870 100644
--- a/superset-frontend/src/dashboard/components/DeleteComponentButton.tsx
+++ b/superset-frontend/src/dashboard/components/DeleteComponentButton.tsx
@@ -18,17 +18,23 @@
  */
 import { MouseEventHandler, FC } from 'react';
 
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
+import type { IconType } from '@superset-ui/core/components/Icons/types';
 import IconButton from './IconButton';
 
 type DeleteComponentButtonProps = {
   onDelete: MouseEventHandler<HTMLDivElement>;
+  iconSize?: IconType['iconSize'];
 };
 
 const DeleteComponentButton: FC<DeleteComponentButtonProps> = ({
   onDelete,
+  iconSize,
 }) => (
-  <IconButton onClick={onDelete} icon={<Icons.DeleteOutlined iconSize="l" />} />
+  <IconButton
+    onClick={onDelete}
+    icon={<Icons.DeleteOutlined iconSize={iconSize ?? 'l'} />}
+  />
 );
 
 export default DeleteComponentButton;
diff --git a/superset-frontend/src/dashboard/components/EmbeddedModal/EmbeddedModal.test.tsx b/superset-frontend/src/dashboard/components/EmbeddedModal/EmbeddedModal.test.tsx
index 27e570e8868..ba3eeca6b31 100644
--- a/superset-frontend/src/dashboard/components/EmbeddedModal/EmbeddedModal.test.tsx
+++ b/superset-frontend/src/dashboard/components/EmbeddedModal/EmbeddedModal.test.tsx
@@ -142,9 +142,10 @@ test('shows and hides the confirmation modal on deactivation', async () => {
 test('enables the "Save Changes" button', async () => {
   setup();
 
-  const allowedDomainsInput = await screen.findByLabelText(
-    new RegExp(/Allowed Domains/, 'i'),
-  );
+  const allowedDomainsInput = await screen.findByRole('textbox', {
+    name: /Allowed Domains/i,
+  });
+
   const saveChangesBtn = screen.getByRole('button', { name: 'Save changes' });
 
   expect(saveChangesBtn).toBeDisabled();
diff --git a/superset-frontend/src/dashboard/components/EmbeddedModal/index.tsx b/superset-frontend/src/dashboard/components/EmbeddedModal/index.tsx
index ff8cf42886c..6f0cef6e0ea 100644
--- a/superset-frontend/src/dashboard/components/EmbeddedModal/index.tsx
+++ b/superset-frontend/src/dashboard/components/EmbeddedModal/index.tsx
@@ -22,16 +22,21 @@ import {
   styled,
   SupersetApiError,
   t,
+  css,
   getExtensionsRegistry,
 } from '@superset-ui/core';
-import { InfoTooltipWithTrigger } from '@superset-ui/chart-controls';
-import Modal from 'src/components/Modal';
-import Loading from 'src/components/Loading';
-import Button from 'src/components/Button';
-import { Input } from 'src/components/Input';
+import {
+  Button,
+  FormItem,
+  InfoTooltip,
+  Input,
+  Modal,
+  Loading,
+  Form,
+} from '@superset-ui/core/components';
 import { useToasts } from 'src/components/MessageToasts/withToasts';
-import { FormItem } from 'src/components/Form';
 import { EmbeddedDashboard } from 'src/dashboard/types';
+import { Typography } from '@superset-ui/core/components/Typography';
 
 const extensionsRegistry = getExtensionsRegistry();
 
@@ -182,31 +187,41 @@ export const DashboardEmbedControls = ({ dashboardId, onHide }: Props) => {
       )}
       <p>
         {t('For further instructions, consult the')}{' '}
-        <a href={docsUrl} target="_blank" rel="noreferrer">
+        <Typography.Link href={docsUrl} target="_blank" rel="noreferrer">
           {docsDescription
             ? docsDescription()
             : t('Superset Embedded SDK documentation.')}
-        </a>
+        </Typography.Link>
       </p>
       <h3>{t('Settings')}</h3>
-      <FormItem>
-        <label htmlFor="allowed-domains">
-          {t('Allowed Domains (comma separated)')}{' '}
-          <InfoTooltipWithTrigger
-            tooltip={t(
-              'A list of domain names that can embed this dashboard. Leaving this field empty will allow embedding from any domain.',
-            )}
-          />
-        </label>
-        <Input
+      <Form layout="vertical">
+        <FormItem
           name="allowed-domains"
-          id="allowed-domains"
-          value={allowedDomains}
-          placeholder="superset.example.com"
-          onChange={event => setAllowedDomains(event.target.value)}
-        />
-      </FormItem>
-      <ButtonRow>
+          label={
+            <span>
+              {t('Allowed Domains (comma separated)')}{' '}
+              <InfoTooltip
+                placement="top"
+                tooltip={t(
+                  'A list of domain names that can embed this dashboard. Leaving this field empty will allow embedding from any domain.',
+                )}
+              />
+            </span>
+          }
+        >
+          <Input
+            id="allowed-domains"
+            value={allowedDomains}
+            placeholder="superset.example.com"
+            onChange={event => setAllowedDomains(event.target.value)}
+          />
+        </FormItem>
+      </Form>
+      <ButtonRow
+        css={theme => css`
+          margin-top: ${theme.margin}px;
+        `}
+      >
         {embedded ? (
           <>
             <Button
diff --git a/superset-frontend/src/dashboard/components/FiltersBadge/DetailsPanel/index.tsx b/superset-frontend/src/dashboard/components/FiltersBadge/DetailsPanel/index.tsx
index 65776ed915c..69ee0bbfb7b 100644
--- a/superset-frontend/src/dashboard/components/FiltersBadge/DetailsPanel/index.tsx
+++ b/superset-frontend/src/dashboard/components/FiltersBadge/DetailsPanel/index.tsx
@@ -20,7 +20,7 @@ import { RefObject, useEffect, useRef, KeyboardEvent } from 'react';
 
 import { useSelector } from 'react-redux';
 import { t, useTheme } from '@superset-ui/core';
-import Popover from 'src/components/Popover';
+import { Popover } from '@superset-ui/core/components';
 import {
   FiltersContainer,
   FiltersDetailsContainer,
diff --git a/superset-frontend/src/dashboard/components/FiltersBadge/FilterIndicator/index.tsx b/superset-frontend/src/dashboard/components/FiltersBadge/FilterIndicator/index.tsx
index 9d9509b304e..37ab2ef5590 100644
--- a/superset-frontend/src/dashboard/components/FiltersBadge/FilterIndicator/index.tsx
+++ b/superset-frontend/src/dashboard/components/FiltersBadge/FilterIndicator/index.tsx
@@ -19,7 +19,7 @@
 
 import { forwardRef } from 'react';
 import { css } from '@superset-ui/core';
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { getFilterValueForDisplay } from 'src/dashboard/components/nativeFilters/utils';
 import {
   FilterValue,
diff --git a/superset-frontend/src/dashboard/components/FiltersBadge/Styles.tsx b/superset-frontend/src/dashboard/components/FiltersBadge/Styles.tsx
index 9abd2c9ea12..92436e46e00 100644
--- a/superset-frontend/src/dashboard/components/FiltersBadge/Styles.tsx
+++ b/superset-frontend/src/dashboard/components/FiltersBadge/Styles.tsx
@@ -25,9 +25,9 @@ export const Pill = styled.div`
     background: ${theme.colors.grayscale.base};
     border-radius: 1em;
     vertical-align: text-top;
-    padding: ${theme.gridUnit}px ${theme.gridUnit * 2}px;
-    font-size: ${theme.typography.sizes.m}px;
-    font-weight: ${theme.typography.weights.bold};
+    padding: ${theme.sizeUnit}px ${theme.sizeUnit * 2}px;
+    font-size: ${theme.fontSize}px;
+    font-weight: ${theme.fontWeightStrong};
     min-width: 1em;
     min-height: 1em;
     line-height: 1em;
@@ -45,13 +45,13 @@ export const Pill = styled.div`
 
     &:hover {
       cursor: pointer;
-      background: ${theme.colors.grayscale.dark1};
+      background: ${theme.colorText};
     }
 
     &.has-cross-filters {
-      background: ${theme.colors.primary.base};
+      background: ${theme.colorPrimary};
       &:hover {
-        background: ${theme.colors.primary.dark1};
+        background: ${theme.colorPrimaryText};
       }
     }
   `}
@@ -59,15 +59,15 @@ export const Pill = styled.div`
 
 export const SectionName = styled.span`
   ${({ theme }) => css`
-    font-weight: ${theme.typography.weights.bold};
+    font-weight: ${theme.fontWeightStrong};
   `}
 `;
 export const FilterName = styled.span`
   ${({ theme }) => css`
-    padding-right: ${theme.gridUnit}px;
+    padding-right: ${theme.sizeUnit}px;
     font-style: italic;
     & > * {
-      margin-right: ${theme.gridUnit}px;
+      margin-right: ${theme.sizeUnit}px;
     }
   `}
 `;
@@ -88,9 +88,9 @@ export const FilterItem = styled.button`
     }
 
     & i svg {
-      opacity: ${theme.opacity.mediumLight};
-      margin-right: ${theme.gridUnit}px;
-      transition: opacity ease-in-out ${theme.transitionTiming};
+      opacity: 35%;
+      margin-right: ${theme.sizeUnit}px;
+      transition: opacity ease-in-out ${theme.motionDurationMid};
     }
 
     &:hover i svg,
@@ -102,9 +102,9 @@ export const FilterItem = styled.button`
 
 export const FiltersContainer = styled.div`
   ${({ theme }) => css`
-    margin-top: ${theme.gridUnit}px;
+    margin-top: ${theme.sizeUnit}px;
     &:not(:last-child) {
-      padding-bottom: ${theme.gridUnit * 3}px;
+      padding-bottom: ${theme.sizeUnit * 3}px;
     }
   `}
 `;
@@ -130,6 +130,6 @@ export const Separator = styled.div`
     width: 100%;
     height: 1px;
     background-color: ${theme.colors.grayscale.light1};
-    margin: ${theme.gridUnit * 4}px 0;
+    margin: ${theme.sizeUnit * 4}px 0;
   `}
 `;
diff --git a/superset-frontend/src/dashboard/components/FiltersBadge/index.tsx b/superset-frontend/src/dashboard/components/FiltersBadge/index.tsx
index 216dac40069..319484642bb 100644
--- a/superset-frontend/src/dashboard/components/FiltersBadge/index.tsx
+++ b/superset-frontend/src/dashboard/components/FiltersBadge/index.tsx
@@ -37,10 +37,10 @@ import {
   t,
   usePrevious,
 } from '@superset-ui/core';
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { setDirectPathToChild } from 'src/dashboard/actions/dashboardState';
 import { useChartLayoutItems } from 'src/dashboard/util/useChartLayoutItems';
-import Badge from 'src/components/Badge';
+import { Badge } from '@superset-ui/core/components';
 import DetailsPanelPopover from './DetailsPanel';
 import {
   Indicator,
@@ -60,9 +60,9 @@ const StyledFilterCount = styled.div`
     justify-items: center;
     align-items: center;
     cursor: pointer;
-    margin-right: ${theme.gridUnit}px;
-    padding-left: ${theme.gridUnit * 2}px;
-    padding-right: ${theme.gridUnit * 2}px;
+    margin-right: ${theme.sizeUnit}px;
+    padding-left: ${theme.sizeUnit * 2}px;
+    padding-right: ${theme.sizeUnit * 2}px;
     background: ${theme.colors.grayscale.light4};
     border-radius: 4px;
     height: 100%;
@@ -75,26 +75,26 @@ const StyledFilterCount = styled.div`
     }
 
     .incompatible-count {
-      font-size: ${theme.typography.sizes.s}px;
+      font-size: ${theme.fontSizeSM}px;
     }
     &:focus-visible {
-      outline: 2px solid ${theme.colors.primary.dark2};
+      outline: 2px solid ${theme.colorPrimary};
     }
   `}
 `;
 
 const StyledBadge = styled(Badge)`
   ${({ theme }) => `
-    margin-left: ${theme.gridUnit * 2}px;
-    &>sup.antd5-badge-count {
-      padding: 0 ${theme.gridUnit}px;
-      min-width: ${theme.gridUnit * 4}px;
-      height: ${theme.gridUnit * 4}px;
+    margin-left: ${theme.sizeUnit * 2}px;
+    &>sup.ant-badge-count {
+      padding: 0 ${theme.sizeUnit}px;
+      min-width: ${theme.sizeUnit * 4}px;
+      height: ${theme.sizeUnit * 4}px;
       line-height: 1.5;
-      font-weight: ${theme.typography.weights.medium};
-      font-size: ${theme.typography.sizes.s - 1}px;
+      font-weight: ${theme.fontWeightStrong};
+      font-size: ${theme.fontSizeSM - 1}px;
       box-shadow: none;
-      padding: 0 ${theme.gridUnit}px;
+      padding: 0 ${theme.sizeUnit}px;
     }
   `}
 `;
diff --git a/superset-frontend/src/dashboard/components/Header/Header.test.tsx b/superset-frontend/src/dashboard/components/Header/Header.test.tsx
index a901995a389..36ee0c7696a 100644
--- a/superset-frontend/src/dashboard/components/Header/Header.test.tsx
+++ b/superset-frontend/src/dashboard/components/Header/Header.test.tsx
@@ -17,11 +17,13 @@
  * under the License.
  */
 import * as redux from 'redux';
+import { useUnsavedChangesPrompt } from 'src/hooks/useUnsavedChangesPrompt';
 import {
   render,
   screen,
   fireEvent,
   userEvent,
+  within,
 } from 'spec/helpers/testing-library';
 import fetchMock from 'fetch-mock';
 import { getExtensionsRegistry, JsonObject } from '@superset-ui/core';
@@ -166,6 +168,10 @@ const onRefresh = jest.fn();
 const dashboardInfoChanged = jest.fn();
 const dashboardTitleChanged = jest.fn();
 
+jest.mock('src/hooks/useUnsavedChangesPrompt', () => ({
+  useUnsavedChangesPrompt: jest.fn(),
+}));
+
 beforeAll(() => {
   jest.spyOn(redux, 'bindActionCreators').mockImplementation(() => ({
     addSuccessToast,
@@ -195,9 +201,14 @@ beforeAll(() => {
 
 beforeEach(() => {
   jest.clearAllMocks();
-});
 
-beforeEach(() => {
+  (useUnsavedChangesPrompt as jest.Mock).mockReturnValue({
+    showModal: false,
+    setShowModal: jest.fn(),
+    handleConfirmNavigation: jest.fn(),
+    handleSaveAndCloseModal: jest.fn(),
+  });
+
   window.history.pushState({}, 'Test page', '/dashboard?standalone=1');
 });
 
@@ -208,7 +219,7 @@ test('should render', () => {
 
 test('should render the title', () => {
   setup();
-  expect(screen.getByTestId('editable-title')).toHaveTextContent(
+  expect(screen.getByTestId('editable-title-input')).toHaveDisplayValue(
     'Dashboard Title',
   );
 });
@@ -484,3 +495,91 @@ test('should render MetadataBar when not in edit mode and not embedded', () => {
     screen.getByText(state.dashboardInfo.changed_on_delta_humanized),
   ).toBeInTheDocument();
 });
+
+test('should show UnsavedChangesModal when there are unsaved changes and user tries to navigate', async () => {
+  (useUnsavedChangesPrompt as jest.Mock).mockReturnValue({
+    showModal: true,
+    setShowModal: jest.fn(),
+    handleConfirmNavigation: jest.fn(),
+    handleSaveAndCloseModal: jest.fn(),
+  });
+
+  setup({ ...editableState });
+
+  const modalTitle: HTMLElement = await screen.findByText(
+    'Save changes to your dashboard?',
+  );
+
+  const modalBody: HTMLElement = await screen.findByText(
+    "If you don't save, changes will be lost.",
+  );
+
+  expect(modalTitle).toBeInTheDocument();
+  expect(modalBody).toBeInTheDocument();
+});
+
+test('should call handleSaveAndCloseModal when Save is clicked in UnsavedChangesModal', async () => {
+  const handleSaveAndCloseModal = jest.fn();
+
+  (useUnsavedChangesPrompt as jest.Mock).mockReturnValue({
+    showModal: true,
+    setShowModal: jest.fn(),
+    handleConfirmNavigation: jest.fn(),
+    handleSaveAndCloseModal,
+  });
+
+  setup({ ...editableState });
+
+  const modal: HTMLElement = await screen.findByRole('dialog');
+  const saveButton: HTMLElement = within(modal).getByRole('button', {
+    name: /save/i,
+  });
+
+  userEvent.click(saveButton);
+
+  expect(handleSaveAndCloseModal).toHaveBeenCalled();
+});
+
+test('should call handleConfirmNavigation when user confirms navigation in UnsavedChangesModal', async () => {
+  const handleConfirmNavigation = jest.fn();
+
+  (useUnsavedChangesPrompt as jest.Mock).mockReturnValue({
+    showModal: true,
+    setShowModal: jest.fn(),
+    handleConfirmNavigation,
+    handleSaveAndCloseModal: jest.fn(),
+  });
+
+  setup({ ...editableState });
+
+  const modal: HTMLElement = await screen.findByRole('dialog');
+  const discardButton: HTMLElement = within(modal).getByRole('button', {
+    name: /discard/i,
+  });
+
+  userEvent.click(discardButton);
+
+  expect(handleConfirmNavigation).toHaveBeenCalled();
+});
+
+test('should call setShowUnsavedChangesModal(false) on cancel', async () => {
+  const setShowModal = jest.fn();
+
+  (useUnsavedChangesPrompt as jest.Mock).mockReturnValue({
+    showModal: true,
+    setShowModal,
+    handleConfirmNavigation: jest.fn(),
+    handleSaveAndCloseModal: jest.fn(),
+  });
+
+  setup({ ...editableState });
+
+  const modal: HTMLElement = await screen.findByRole('dialog');
+  const closeButton: HTMLElement = within(modal).getByRole('button', {
+    name: /close/i,
+  });
+
+  userEvent.click(closeButton);
+
+  expect(setShowModal).toHaveBeenCalledWith(false);
+});
diff --git a/superset-frontend/src/dashboard/components/Header/index.jsx b/superset-frontend/src/dashboard/components/Header/index.jsx
index cdc587cef03..8fa20bb7a05 100644
--- a/superset-frontend/src/dashboard/components/Header/index.jsx
+++ b/superset-frontend/src/dashboard/components/Header/index.jsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 /* eslint-env browser */
-import { extendedDayjs } from 'src/utils/dates';
+import { extendedDayjs } from '@superset-ui/core/utils/dates';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import {
   styled,
@@ -26,7 +26,6 @@ import {
   FeatureFlag,
   t,
   getExtensionsRegistry,
-  useTheme,
 } from '@superset-ui/core';
 import { Global } from '@emotion/react';
 import { shallowEqual, useDispatch, useSelector } from 'react-redux';
@@ -36,10 +35,14 @@ import {
   LOG_ACTIONS_FORCE_REFRESH_DASHBOARD,
   LOG_ACTIONS_TOGGLE_EDIT_DASHBOARD,
 } from 'src/logger/LogUtils';
-import { Icons } from 'src/components/Icons';
-import { Button } from 'src/components/';
+import { Icons } from '@superset-ui/core/components/Icons';
+import {
+  Button,
+  Tooltip,
+  DeleteModal,
+  UnsavedChangesModal,
+} from '@superset-ui/core/components';
 import { findPermission } from 'src/utils/findPermission';
-import { Tooltip } from 'src/components/Tooltip';
 import { safeStringify } from 'src/utils/safeStringify';
 import PublishedStatus from 'src/dashboard/components/PublishedStatus';
 import UndoRedoKeyListeners from 'src/dashboard/components/UndoRedoKeyListeners';
@@ -54,9 +57,9 @@ import setPeriodicRunner, {
   stopPeriodicRender,
 } from 'src/dashboard/util/setPeriodicRunner';
 import ReportModal from 'src/features/reports/ReportModal';
-import DeleteModal from 'src/components/DeleteModal';
 import { deleteActiveReport } from 'src/features/reports/ReportModal/actions';
-import { PageHeaderWithActions } from 'src/components/PageHeaderWithActions';
+import { PageHeaderWithActions } from '@superset-ui/core/components/PageHeaderWithActions';
+import { useUnsavedChangesPrompt } from 'src/hooks/useUnsavedChangesPrompt';
 import DashboardEmbedModal from '../EmbeddedModal';
 import OverwriteConfirm from '../OverwriteConfirm';
 import {
@@ -96,11 +99,11 @@ import { useHeaderActionsMenu } from './useHeaderActionsDropdownMenu';
 const extensionsRegistry = getExtensionsRegistry();
 
 const headerContainerStyle = theme => css`
-  border-bottom: 1px solid ${theme.colors.grayscale.light2};
+  border-bottom: 1px solid ${theme.colorSplit};
 `;
 
 const editButtonStyle = theme => css`
-  color: ${theme.colors.primary.dark2};
+  color: ${theme.colorPrimary};
 `;
 
 const actionButtonsStyle = theme => css`
@@ -108,12 +111,12 @@ const actionButtonsStyle = theme => css`
   align-items: center;
 
   .action-schedule-report {
-    margin-left: ${theme.gridUnit * 2}px;
+    margin-left: ${theme.sizeUnit * 2}px;
   }
 
   .undoRedo {
     display: flex;
-    margin-right: ${theme.gridUnit * 2}px;
+    margin-right: ${theme.sizeUnit * 2}px;
   }
 `;
 
@@ -141,16 +144,16 @@ const undoRedoDisabled = theme => css`
 `;
 
 const saveBtnStyle = theme => css`
-  min-width: ${theme.gridUnit * 17}px;
-  height: ${theme.gridUnit * 8}px;
+  min-width: ${theme.sizeUnit * 17}px;
+  height: ${theme.sizeUnit * 8}px;
   span > :first-of-type {
     margin-right: 0;
   }
 `;
 
 const discardBtnStyle = theme => css`
-  min-width: ${theme.gridUnit * 22}px;
-  height: ${theme.gridUnit * 8}px;
+  min-width: ${theme.sizeUnit * 22}px;
+  height: ${theme.sizeUnit * 8}px;
 `;
 
 const discardChanges = () => {
@@ -161,7 +164,6 @@ const discardChanges = () => {
 };
 
 const Header = () => {
-  const theme = useTheme();
   const dispatch = useDispatch();
   const [didNotifyMaxUndoHistoryToast, setDidNotifyMaxUndoHistoryToast] =
     useState(false);
@@ -464,6 +466,16 @@ const Header = () => {
     slug,
   ]);
 
+  const {
+    showModal: showUnsavedChangesModal,
+    setShowModal: setShowUnsavedChangesModal,
+    handleConfirmNavigation,
+    handleSaveAndCloseModal,
+  } = useUnsavedChangesPrompt({
+    hasUnsavedChanges,
+    onSave: overwriteDashboard,
+  });
+
   const showPropertiesModal = useCallback(() => {
     setShowingPropertiesModal(true);
   }, []);
@@ -637,7 +649,7 @@ const Header = () => {
                   css={discardBtnStyle}
                   buttonSize="small"
                   onClick={discardChanges}
-                  buttonStyle="default"
+                  buttonStyle="secondary"
                   data-test="discard-changes-button"
                   aria-label={t('Discard')}
                 >
@@ -652,10 +664,7 @@ const Header = () => {
                   data-test="header-save-button"
                   aria-label={t('Save')}
                 >
-                  <Icons.SaveOutlined
-                    iconColor={hasUnsavedChanges && theme.colors.primary.light5}
-                    iconSize="m"
-                  />
+                  <Icons.SaveOutlined iconSize="m" />
                   {t('Save')}
                 </Button>
               </div>
@@ -818,11 +827,20 @@ const Header = () => {
       )}
       <Global
         styles={css`
-          .antd5-menu-vertical {
+          .ant-menu-vertical {
             border-right: none;
           }
         `}
       />
+
+      <UnsavedChangesModal
+        title={t('Save changes to your dashboard?')}
+        body={t("If you don't save, changes will be lost.")}
+        showModal={showUnsavedChangesModal}
+        onHide={() => setShowUnsavedChangesModal(false)}
+        onConfirmNavigation={handleConfirmNavigation}
+        handleSave={handleSaveAndCloseModal}
+      />
     </div>
   );
 };
diff --git a/superset-frontend/src/dashboard/components/Header/useDashboardMetadataBar.tsx b/superset-frontend/src/dashboard/components/Header/useDashboardMetadataBar.tsx
index 3ded29a67a1..3379607f84b 100644
--- a/superset-frontend/src/dashboard/components/Header/useDashboardMetadataBar.tsx
+++ b/superset-frontend/src/dashboard/components/Header/useDashboardMetadataBar.tsx
@@ -19,7 +19,9 @@
 import { useMemo } from 'react';
 import { t } from '@superset-ui/core';
 import { DashboardInfo } from 'src/dashboard/types';
-import MetadataBar, { MetadataType } from 'src/components/MetadataBar';
+import MetadataBar, {
+  MetadataType,
+} from '@superset-ui/core/components/MetadataBar';
 import getOwnerName from 'src/utils/getOwnerName';
 
 export const useDashboardMetadataBar = (dashboardInfo: DashboardInfo) => {
diff --git a/superset-frontend/src/dashboard/components/Header/useHeaderActionsDropdownMenu.tsx b/superset-frontend/src/dashboard/components/Header/useHeaderActionsDropdownMenu.tsx
index ef58671faa8..6554e221958 100644
--- a/superset-frontend/src/dashboard/components/Header/useHeaderActionsDropdownMenu.tsx
+++ b/superset-frontend/src/dashboard/components/Header/useHeaderActionsDropdownMenu.tsx
@@ -18,7 +18,7 @@
  */
 import { useState, useEffect, useCallback, useMemo } from 'react';
 import { useSelector } from 'react-redux';
-import { Menu } from 'src/components/Menu';
+import { Menu } from '@superset-ui/core/components/Menu';
 import { t } from '@superset-ui/core';
 import { isEmpty } from 'lodash';
 import { URL_PARAMS } from 'src/constants';
@@ -164,7 +164,6 @@ export const useHeaderActionsMenu = ({
     const isEmbedded = !dashboardInfo?.userId;
     const refreshIntervalOptions =
       dashboardInfo.common?.conf?.DASHBOARD_AUTO_REFRESH_INTERVALS;
-
     return (
       <Menu
         selectable={false}
@@ -287,9 +286,7 @@ export const useHeaderActionsMenu = ({
         {editMode && !isEmpty(dashboardInfo?.metadata?.filter_scopes) && (
           <Menu.Item key={MenuKeys.SetFilterMapping}>
             <FilterScopeModal
-              triggerNode={
-                <div className="m-r-5">{t('Set filter mapping')}</div>
-              }
+              triggerNode={<div>{t('Set filter mapping')}</div>}
             />
           </Menu.Item>
         )}
diff --git a/superset-frontend/src/dashboard/components/IconButton.tsx b/superset-frontend/src/dashboard/components/IconButton.tsx
index 191915065df..d5c3d3059f8 100644
--- a/superset-frontend/src/dashboard/components/IconButton.tsx
+++ b/superset-frontend/src/dashboard/components/IconButton.tsx
@@ -28,14 +28,15 @@ interface IconButtonProps {
 const StyledDiv = styled.div`
   display: flex;
   align-items: center;
+  cursor: pointer;
   color: ${({ theme }) => theme.colors.grayscale.base};
   &:hover {
-    color: ${({ theme }) => theme.colors.primary.base};
+    color: ${({ theme }) => theme.colorPrimary};
   }
 `;
 
 const StyledSpan = styled.span`
-  margin-left: ${({ theme }) => theme.gridUnit * 2}px;
+  margin-left: ${({ theme }) => theme.sizeUnit * 2}px;
 `;
 
 const IconButton = ({ icon, label, onClick }: IconButtonProps) => (
diff --git a/superset-frontend/src/dashboard/components/OverwriteConfirm/OverwriteConfirmModal.tsx b/superset-frontend/src/dashboard/components/OverwriteConfirm/OverwriteConfirmModal.tsx
index fc0b12a536a..6c3e2e71e1c 100644
--- a/superset-frontend/src/dashboard/components/OverwriteConfirm/OverwriteConfirmModal.tsx
+++ b/superset-frontend/src/dashboard/components/OverwriteConfirm/OverwriteConfirmModal.tsx
@@ -17,12 +17,11 @@
  * under the License.
  */
 import { Fragment, useMemo, useCallback, RefObject, createRef } from 'react';
-import { extendedDayjs } from 'src/utils/dates';
+import { extendedDayjs } from '@superset-ui/core/utils/dates';
 import { useDispatch } from 'react-redux';
 import ReactDiffViewer from 'react-diff-viewer-continued';
 import { useInView } from 'react-intersection-observer';
-import Modal from 'src/components/Modal';
-import Button from 'src/components/Button';
+import { Button, Modal } from '@superset-ui/core/components';
 import { DashboardState } from 'src/dashboard/types';
 import {
   saveDashboardRequest,
@@ -36,14 +35,14 @@ const STICKY_HEADER_HEIGHT = 32;
 
 const StyledTitle = styled.h2`
   ${({ theme }) => `
-     color:  ${theme.colors.grayscale.dark1}
+     color:  ${theme.colorText}
    `}
 `;
 
 const StyledEditor = styled.div`
   ${({ theme }) => `
      table {
-       border: 1px ${theme.colors.grayscale.light2} solid;
+       border: 1px ${theme.colorBorder} solid;
      }
      pre {
        font-size: 11px;
@@ -67,7 +66,7 @@ const StackableHeader = styled(Button)<{ top: number }>`
      border-radius: 0px;
      width: 100%;
      justify-content: flex-start;
-     border-bottom: 1px ${theme.colors.grayscale.light1} solid;
+     border-bottom: 1px ${theme.colorSplit} solid;
      &::before {
        display: inline-block;
        position: relative;
@@ -169,7 +168,7 @@ const OverrideConfirmModal = ({ overwriteConfirmMetadata }: Props) => {
                   <div ref={anchors[index]} />
                   <StackableHeader
                     top={index * STICKY_HEADER_HEIGHT - STICKY_HEADER_TOP}
-                    buttonStyle="tertiary"
+                    buttonStyle="secondary"
                     onClick={() => onAnchorClicked(index)}
                   >
                     {keyPath}
diff --git a/superset-frontend/src/dashboard/components/OverwriteConfirm/index.tsx b/superset-frontend/src/dashboard/components/OverwriteConfirm/index.tsx
index a548cb73684..8adfc5c56ff 100644
--- a/superset-frontend/src/dashboard/components/OverwriteConfirm/index.tsx
+++ b/superset-frontend/src/dashboard/components/OverwriteConfirm/index.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { useSelector } from 'react-redux';
-import AsyncEsmComponent from 'src/components/AsyncEsmComponent';
+import { AsyncEsmComponent } from '@superset-ui/core/components';
 import { DashboardState, RootState } from 'src/dashboard/types';
 
 const Modal = AsyncEsmComponent(() => import('./OverwriteConfirmModal'));
diff --git a/superset-frontend/src/dashboard/components/PropertiesModal/PropertiesModal.test.tsx b/superset-frontend/src/dashboard/components/PropertiesModal/PropertiesModal.test.tsx
index bed0db06078..9916fc2b6e6 100644
--- a/superset-frontend/src/dashboard/components/PropertiesModal/PropertiesModal.test.tsx
+++ b/superset-frontend/src/dashboard/components/PropertiesModal/PropertiesModal.test.tsx
@@ -186,7 +186,7 @@ describe('PropertiesModal', () => {
     expect(screen.getByRole('heading', { name: 'Access' })).toBeInTheDocument();
     expect(screen.getByRole('heading', { name: 'Colors' })).toBeInTheDocument();
     expect(
-      screen.getByRole('heading', { name: 'Advanced' }),
+      screen.getByRole('heading', { name: 'Advanced down' }),
     ).toBeInTheDocument();
     expect(
       screen.getByRole('heading', { name: 'Certification' }),
@@ -195,7 +195,7 @@ describe('PropertiesModal', () => {
 
     expect(screen.getByRole('button', { name: 'Close' })).toBeInTheDocument();
     expect(
-      screen.getByRole('button', { name: 'Advanced' }),
+      screen.getByRole('button', { name: 'Advanced down' }),
     ).toBeInTheDocument();
     expect(screen.getByRole('button', { name: 'Cancel' })).toBeInTheDocument();
     expect(screen.getByRole('button', { name: 'Save' })).toBeInTheDocument();
@@ -228,7 +228,7 @@ describe('PropertiesModal', () => {
     ).toBeInTheDocument();
     expect(screen.getByRole('heading', { name: 'Access' })).toBeInTheDocument();
     expect(
-      screen.getByRole('heading', { name: 'Advanced' }),
+      screen.getByRole('heading', { name: 'Advanced down' }),
     ).toBeInTheDocument();
     expect(
       screen.getByRole('heading', { name: 'Certification' }),
@@ -239,7 +239,7 @@ describe('PropertiesModal', () => {
 
     expect(screen.getByRole('button', { name: 'Close' })).toBeInTheDocument();
     expect(
-      screen.getByRole('button', { name: 'Advanced' }),
+      screen.getByRole('button', { name: 'Advanced down' }),
     ).toBeInTheDocument();
     expect(screen.getByRole('button', { name: 'Cancel' })).toBeInTheDocument();
     expect(screen.getByRole('button', { name: 'Save' })).toBeInTheDocument();
@@ -266,7 +266,7 @@ describe('PropertiesModal', () => {
 
     expect(screen.getAllByRole('textbox')).toHaveLength(4);
     expect(screen.getAllByRole('combobox')).toHaveLength(3);
-    userEvent.click(screen.getByRole('button', { name: 'Advanced' }));
+    userEvent.click(screen.getByRole('button', { name: 'Advanced down' }));
     expect(screen.getAllByRole('textbox')).toHaveLength(5);
     expect(screen.getAllByRole('combobox')).toHaveLength(3);
   });
@@ -372,9 +372,9 @@ describe('PropertiesModal', () => {
     const props = createProps();
     const propsWithDashboardInfo = { ...props, dashboardInfo };
 
-    const open = () => waitFor(() => userEvent.click(getSelect()));
     const getSelect = () =>
       screen.getByRole('combobox', { name: SupersetCore.t('Roles') });
+    const open = () => waitFor(() => userEvent.click(getSelect()));
 
     const getElementsByClassName = (className: string) =>
       document.querySelectorAll(className)! as NodeListOf<HTMLElement>;
diff --git a/superset-frontend/src/dashboard/components/PropertiesModal/index.tsx b/superset-frontend/src/dashboard/components/PropertiesModal/index.tsx
index acf3013ceb3..79e5818cea3 100644
--- a/superset-frontend/src/dashboard/components/PropertiesModal/index.tsx
+++ b/superset-frontend/src/dashboard/components/PropertiesModal/index.tsx
@@ -18,11 +18,21 @@
  */
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { omit } from 'lodash';
-import { Input } from 'src/components/Input';
-import { FormItem } from 'src/components/Form';
 import jsonStringify from 'json-stringify-pretty-compact';
-import Button from 'src/components/Button';
-import { AntdForm, AsyncSelect, Col, Row } from 'src/components';
+import {
+  AsyncSelect,
+  Button,
+  Col,
+  Form,
+  FormItem,
+  Icons,
+  Input,
+  JsonEditor,
+  Modal,
+  Row,
+  Typography,
+} from '@superset-ui/core/components';
+import { type TagType } from 'src/components';
 import rison from 'rison';
 import {
   ensureIsArray,
@@ -36,15 +46,11 @@ import {
   css,
 } from '@superset-ui/core';
 
-import Modal from 'src/components/Modal';
-import { JsonEditor } from 'src/components/AsyncAceEditor';
-
 import ColorSchemeControlWrapper from 'src/dashboard/components/ColorSchemeControlWrapper';
 import FilterScopeModal from 'src/dashboard/components/filterscope/FilterScopeModal';
 import withToasts from 'src/components/MessageToasts/withToasts';
-import TagType from 'src/types/TagType';
 import { fetchTags, OBJECT_TYPES } from 'src/features/tags/tags';
-import { loadTags } from 'src/components/Tags/utils';
+import { loadTags } from 'src/components/Tag/utils';
 import {
   applyColors,
   getColorNamespace,
@@ -59,13 +65,9 @@ import {
 } from 'src/dashboard/actions/dashboardState';
 import { areObjectsEqual } from 'src/reduxUtils';
 
-const StyledFormItem = styled(FormItem)`
-  margin-bottom: 0;
-`;
-
 const StyledJsonEditor = styled(JsonEditor)`
   border-radius: ${({ theme }) => theme.borderRadius}px;
-  border: 1px solid ${({ theme }) => theme.colors.secondary.light2};
+  border: 1px solid ${({ theme }) => theme.colorPrimaryBorder};
 `;
 
 type PropertiesModalProps = {
@@ -111,7 +113,7 @@ const PropertiesModal = ({
   show = false,
 }: PropertiesModalProps) => {
   const dispatch = useDispatch();
-  const [form] = AntdForm.useForm();
+  const [form] = Form.useForm();
   const [isLoading, setIsLoading] = useState(false);
   const [isAdvancedOpen, setIsAdvancedOpen] = useState(false);
   const [colorScheme, setCurrentColorScheme] = useState(currentColorScheme);
@@ -382,8 +384,10 @@ const PropertiesModal = ({
     currentJsonMetadata = jsonStringify(metadata);
 
     const moreOnSubmitProps: { roles?: Roles } = {};
-    const morePutProps: { roles?: number[]; tags?: (number | undefined)[] } =
-      {};
+    const morePutProps: {
+      roles?: number[];
+      tags?: (string | number | undefined)[];
+    } = {};
     if (isFeatureEnabled(FeatureFlag.DashboardRbac)) {
       moreOnSubmitProps.roles = roles;
       morePutProps.roles = (roles || []).map(r => r.id);
@@ -438,8 +442,15 @@ const PropertiesModal = ({
     return (
       <Row gutter={16}>
         <Col xs={24} md={12}>
-          <h3 style={{ marginTop: '1em' }}>{t('Access')}</h3>
-          <StyledFormItem label={t('Owners')}>
+          <Typography.Title level={4} style={{ marginTop: '1em' }}>
+            {t('Access')}
+          </Typography.Title>
+          <FormItem
+            label={t('Owners')}
+            extra={t(
+              'Owners is a list of users who can alter the dashboard. Searchable by name or username.',
+            )}
+          >
             <AsyncSelect
               allowClear
               ariaLabel={t('Owners')}
@@ -451,15 +462,12 @@ const PropertiesModal = ({
               }
               value={handleOwnersSelectValue()}
             />
-          </StyledFormItem>
-          <p className="help-block">
-            {t(
-              'Owners is a list of users who can alter the dashboard. Searchable by name or username.',
-            )}
-          </p>
+          </FormItem>
         </Col>
         <Col xs={24} md={12}>
-          <h3 style={{ marginTop: '1em' }}>{t('Colors')}</h3>
+          <Typography.Title level={4} style={{ marginTop: '1em' }}>
+            {t('Colors')}
+          </Typography.Title>
           <ColorSchemeControlWrapper
             hasCustomLabelsColor={hasCustomLabelsColor}
             onChange={onColorSchemeChange}
@@ -480,12 +488,19 @@ const PropertiesModal = ({
       <>
         <Row>
           <Col xs={24} md={24}>
-            <h3 style={{ marginTop: '1em' }}>{t('Access')}</h3>
+            <Typography.Title level={4} style={{ marginTop: '1em' }}>
+              {t('Access')}
+            </Typography.Title>
           </Col>
         </Row>
         <Row gutter={16}>
           <Col xs={24} md={12}>
-            <StyledFormItem label={t('Owners')}>
+            <FormItem
+              label={t('Owners')}
+              extra={t(
+                'Owners is a list of users who can alter the dashboard. Searchable by name or username.',
+              )}
+            >
               <AsyncSelect
                 allowClear
                 allowNewOptions
@@ -498,15 +513,13 @@ const PropertiesModal = ({
                 }
                 value={handleOwnersSelectValue()}
               />
-            </StyledFormItem>
-            <p className="help-block">
-              {t(
-                'Owners is a list of users who can alter the dashboard. Searchable by name or username.',
-              )}
-            </p>
+            </FormItem>
           </Col>
           <Col xs={24} md={12}>
-            <StyledFormItem label={t('Roles')}>
+            <FormItem
+              label={t('Roles')}
+              extra="Roles is a list which defines access to the dashboard. Granting a role access to a dashboard will bypass dataset level checks. If no roles are defined, regular access permissions apply."
+            >
               <AsyncSelect
                 allowClear
                 ariaLabel={t('Roles')}
@@ -518,12 +531,7 @@ const PropertiesModal = ({
                 }
                 value={handleRolesSelectValue()}
               />
-            </StyledFormItem>
-            <p className="help-block">
-              {t(
-                'Roles is a list which defines access to the dashboard. Granting a role access to a dashboard will bypass dataset level checks. If no roles are defined, regular access permissions apply.',
-              )}
-            </p>
+            </FormItem>
           </Col>
         </Row>
         <Row>
@@ -602,6 +610,7 @@ const PropertiesModal = ({
           <Button
             htmlType="button"
             buttonSize="small"
+            buttonStyle="secondary"
             onClick={handleOnCancel}
             data-test="properties-modal-cancel-button"
             cta
@@ -613,7 +622,6 @@ const PropertiesModal = ({
             onClick={form.submit}
             buttonSize="small"
             buttonStyle="primary"
-            className="m-r-5"
             cta
             disabled={dashboardInfo?.isManagedExternally}
             tooltip={
@@ -630,7 +638,7 @@ const PropertiesModal = ({
       }
       responsive
     >
-      <AntdForm
+      <Form
         form={form}
         onFinish={onFinish}
         data-test="dashboard-edit-properties-form"
@@ -639,12 +647,18 @@ const PropertiesModal = ({
       >
         <Row>
           <Col xs={24} md={24}>
-            <h3>{t('Basic information')}</h3>
+            <Typography.Title level={4}>
+              {t('Basic information')}
+            </Typography.Title>
           </Col>
         </Row>
         <Row gutter={16}>
           <Col xs={24} md={12}>
-            <FormItem label={t('Name')} name="title">
+            <FormItem
+              label={t('Name')}
+              name="title"
+              extra={t('A readable URL for your dashboard')}
+            >
               <Input
                 data-test="dashboard-title-input"
                 type="text"
@@ -653,12 +667,9 @@ const PropertiesModal = ({
             </FormItem>
           </Col>
           <Col xs={24} md={12}>
-            <StyledFormItem label={t('URL slug')} name="slug">
+            <FormItem label={t('URL slug')} name="slug">
               <Input type="text" disabled={isLoading} />
-            </StyledFormItem>
-            <p className="help-block">
-              {t('A readable URL for your dashboard')}
-            </p>
+            </FormItem>
           </Col>
         </Row>
         {isFeatureEnabled(FeatureFlag.DashboardRbac)
@@ -666,41 +677,48 @@ const PropertiesModal = ({
           : getRowsWithoutRoles()}
         <Row>
           <Col xs={24} md={24}>
-            <h3>{t('Certification')}</h3>
+            <Typography.Title level={4}>{t('Certification')}</Typography.Title>
           </Col>
         </Row>
         <Row gutter={16}>
           <Col xs={24} md={12}>
-            <StyledFormItem label={t('Certified by')} name="certifiedBy">
-              <Input type="text" disabled={isLoading} />
-            </StyledFormItem>
-            <p className="help-block">
-              {t('Person or group that has certified this dashboard.')}
-            </p>
-          </Col>
-          <Col xs={24} md={12}>
-            <StyledFormItem
-              label={t('Certification details')}
-              name="certificationDetails"
+            <FormItem
+              label={t('Certified by')}
+              name="certifiedBy"
+              extra={t('Person or group that has certified this dashboard.')}
             >
               <Input type="text" disabled={isLoading} />
-            </StyledFormItem>
-            <p className="help-block">
-              {t('Any additional detail to show in the certification tooltip.')}
-            </p>
+            </FormItem>
+          </Col>
+          <Col xs={24} md={12}>
+            <FormItem
+              label={t('Certification details')}
+              name="certificationDetails"
+              extra={t(
+                'Any additional detail to show in the certification tooltip.',
+              )}
+            >
+              <Input type="text" disabled={isLoading} />
+            </FormItem>
           </Col>
         </Row>
         {isFeatureEnabled(FeatureFlag.TaggingSystem) ? (
           <Row gutter={16}>
             <Col xs={24} md={12}>
-              <h3 css={{ marginTop: '1em' }}>{t('Tags')}</h3>
+              <Typography.Title level={4} css={{ marginTop: '1em' }}>
+                {t('Tags')}
+              </Typography.Title>
             </Col>
           </Row>
         ) : null}
         {isFeatureEnabled(FeatureFlag.TaggingSystem) ? (
           <Row gutter={16}>
             <Col xs={24} md={12}>
-              <StyledFormItem>
+              <FormItem
+                extra={t(
+                  'A list of tags that have been applied to this chart.',
+                )}
+              >
                 <AsyncSelect
                   ariaLabel="Tags"
                   mode="multiple"
@@ -709,16 +727,13 @@ const PropertiesModal = ({
                   onChange={handleChangeTags}
                   allowClear
                 />
-              </StyledFormItem>
-              <p className="help-block">
-                {t('A list of tags that have been applied to this chart.')}
-              </p>
+              </FormItem>
             </Col>
           </Row>
         ) : null}
         <Row>
           <Col xs={24} md={24}>
-            <h3 style={{ marginTop: '1em' }}>
+            <Typography.Title level={4} style={{ marginTop: '1em' }}>
               <Button
                 buttonStyle="link"
                 onClick={() => setIsAdvancedOpen(!isAdvancedOpen)}
@@ -726,17 +741,41 @@ const PropertiesModal = ({
                   padding: 0;
                 `}
               >
-                {/* TODO: Remove fa-icon */}
-                <i
-                  className={`fa fa-angle-${isAdvancedOpen ? 'down' : 'right'}`}
-                  style={{ minWidth: '1em' }}
-                />
                 {t('Advanced')}
+                {isAdvancedOpen ? <Icons.UpOutlined /> : <Icons.DownOutlined />}
               </Button>
-            </h3>
+            </Typography.Title>
             {isAdvancedOpen && (
               <>
-                <StyledFormItem label={t('JSON metadata')}>
+                <FormItem
+                  label={t('JSON metadata')}
+                  extra={
+                    <div>
+                      {t(
+                        'This JSON object is generated dynamically when clicking the save ' +
+                          'or overwrite button in the dashboard view. It is exposed here for ' +
+                          'reference and for power users who may want to alter specific parameters.',
+                      )}
+                      {onlyApply && (
+                        <>
+                          {' '}
+                          {t(
+                            'Please DO NOT overwrite the "filter_scopes" key.',
+                          )}{' '}
+                          <FilterScopeModal
+                            triggerNode={
+                              <span className="alert-link">
+                                {t('Use "%(menuName)s" menu instead.', {
+                                  menuName: t('Set filter mapping'),
+                                })}
+                              </span>
+                            }
+                          />
+                        </>
+                      )}
+                    </div>
+                  }
+                >
                   <StyledJsonEditor
                     showLoadingForImport
                     name="json_metadata"
@@ -747,34 +786,12 @@ const PropertiesModal = ({
                     height="200px"
                     wrapEnabled
                   />
-                </StyledFormItem>
-                <p className="help-block">
-                  {t(
-                    'This JSON object is generated dynamically when clicking the save or overwrite button in the dashboard view. It is exposed here for reference and for power users who may want to alter specific parameters.',
-                  )}
-                  {onlyApply && (
-                    <>
-                      {' '}
-                      {t(
-                        'Please DO NOT overwrite the "filter_scopes" key.',
-                      )}{' '}
-                      <FilterScopeModal
-                        triggerNode={
-                          <span className="alert-link">
-                            {t('Use "%(menuName)s" menu instead.', {
-                              menuName: t('Set filter mapping'),
-                            })}
-                          </span>
-                        }
-                      />
-                    </>
-                  )}
-                </p>
+                </FormItem>
               </>
             )}
           </Col>
         </Row>
-      </AntdForm>
+      </Form>
     </Modal>
   );
 };
diff --git a/superset-frontend/src/dashboard/components/PublishedStatus/index.tsx b/superset-frontend/src/dashboard/components/PublishedStatus/index.tsx
index 29fb30484c9..daa4bc2a34d 100644
--- a/superset-frontend/src/dashboard/components/PublishedStatus/index.tsx
+++ b/superset-frontend/src/dashboard/components/PublishedStatus/index.tsx
@@ -18,8 +18,7 @@
  */
 import { Component } from 'react';
 import { t } from '@superset-ui/core';
-import { Tooltip } from 'src/components/Tooltip';
-import { PublishedLabel } from 'src/components/Label';
+import { Tooltip, PublishedLabel } from '@superset-ui/core/components';
 import { HeaderProps, HeaderDropdownProps } from '../Header/types';
 
 export type DashboardPublishedStatusType = {
diff --git a/superset-frontend/src/dashboard/components/RefreshIntervalModal.test.tsx b/superset-frontend/src/dashboard/components/RefreshIntervalModal.test.tsx
index 6ef0299665c..5ac75d01a31 100644
--- a/superset-frontend/src/dashboard/components/RefreshIntervalModal.test.tsx
+++ b/superset-frontend/src/dashboard/components/RefreshIntervalModal.test.tsx
@@ -19,6 +19,7 @@
 import { isValidElement } from 'react';
 import { render, screen, userEvent } from 'spec/helpers/testing-library';
 import fetchMock from 'fetch-mock';
+import { Icons } from '@superset-ui/core/components/Icons';
 
 import RefreshIntervalModal from 'src/dashboard/components/RefreshIntervalModal';
 import { Provider } from 'react-redux';
@@ -30,7 +31,7 @@ const createProps = () => ({
   addSuccessToast: jest.fn(),
   addDangerToast: jest.fn(),
   customCss:
-    '.header-with-actions .right-button-panel .antd5-dropdown-trigger{margin-left: 100px;}',
+    '.header-with-actions .right-button-panel .ant-dropdown-trigger{margin-left: 100px;}',
   dashboardId: 1,
   dashboardInfo: {
     id: 1,
@@ -117,7 +118,7 @@ const displayOptions = async () => {
 };
 
 const defaultRefreshIntervalModalProps = {
-  triggerNode: <i className="fa fa-edit" />,
+  triggerNode: <Icons.EditOutlined />,
   refreshFrequency: 0,
   onChange: jest.fn(),
   editMode: true,
diff --git a/superset-frontend/src/dashboard/components/RefreshIntervalModal.tsx b/superset-frontend/src/dashboard/components/RefreshIntervalModal.tsx
index 637ccde7bd4..d10daf6be4c 100644
--- a/superset-frontend/src/dashboard/components/RefreshIntervalModal.tsx
+++ b/superset-frontend/src/dashboard/components/RefreshIntervalModal.tsx
@@ -17,29 +17,34 @@
  * under the License.
  */
 import { createRef, PureComponent } from 'react';
-import Select from 'src/components/Select/Select';
+import {
+  FormLabel,
+  Alert,
+  Button,
+  Input,
+  Select,
+} from '@superset-ui/core/components';
 import { t, styled } from '@superset-ui/core';
-import Alert from 'src/components/Alert';
-import Button from 'src/components/Button';
-import { Input } from 'src/components/Input';
 
-import ModalTrigger, { ModalTriggerRef } from 'src/components/ModalTrigger';
-import { FormLabel } from 'src/components/Form';
-import { propertyComparator } from 'src/components/Select/utils';
+import {
+  ModalTrigger,
+  ModalTriggerRef,
+} from '@superset-ui/core/components/ModalTrigger';
+import { propertyComparator } from '@superset-ui/core/components/Select/utils';
 
 const StyledModalTrigger = styled(ModalTrigger)`
-  .antd5-modal-body {
+  .ant-modal-body {
     overflow: visible;
   }
 `;
 
 const RefreshWarningContainer = styled.div`
-  margin-top: ${({ theme }) => theme.gridUnit * 6}px;
+  margin-top: ${({ theme }) => theme.sizeUnit * 6}px;
 `;
 
 const StyledDiv = styled.div`
   display: flex;
-  margin-top: ${({ theme }) => theme.gridUnit * 3}px;
+  margin-top: ${({ theme }) => theme.sizeUnit * 3}px;
 `;
 
 const InnerStyledDiv = styled.div`
@@ -301,7 +306,11 @@ class RefreshIntervalModal extends PureComponent<
         }
         modalFooter={
           <>
-            <Button onClick={this.onCancel} buttonSize="small">
+            <Button
+              onClick={this.onCancel}
+              buttonSize="small"
+              buttonStyle="secondary"
+            >
               {t('Cancel')}
             </Button>
             <Button
diff --git a/superset-frontend/src/dashboard/components/SaveModal.tsx b/superset-frontend/src/dashboard/components/SaveModal.tsx
index 2126cff46e8..3c908f7eab8 100644
--- a/superset-frontend/src/dashboard/components/SaveModal.tsx
+++ b/superset-frontend/src/dashboard/components/SaveModal.tsx
@@ -18,14 +18,21 @@
  */
 /* eslint-env browser */
 import { createRef, PureComponent } from 'react';
-import { Radio } from 'src/components/Radio';
-import { RadioChangeEvent } from 'src/components';
-import { Input } from 'src/components/Input';
-import Button from 'src/components/Button';
-import { t, JsonResponse } from '@superset-ui/core';
+import { Radio, RadioChangeEvent } from '@superset-ui/core/components/Radio';
+import {
+  Button,
+  Checkbox,
+  Form,
+  Input,
+  Divider,
+  Space,
+} from '@superset-ui/core/components';
+import { t, themeObject, JsonResponse } from '@superset-ui/core';
 
-import ModalTrigger, { ModalTriggerRef } from 'src/components/ModalTrigger';
-import Checkbox from 'src/components/Checkbox';
+import {
+  ModalTrigger,
+  ModalTriggerRef,
+} from '@superset-ui/core/components/ModalTrigger';
 import {
   SAVE_TYPE_OVERWRITE,
   SAVE_TYPE_NEWDASHBOARD,
@@ -163,55 +170,66 @@ class SaveModal extends PureComponent<SaveModalProps, SaveModalState> {
   }
 
   render() {
+    const { theme } = themeObject;
     return (
       <ModalTrigger
         ref={this.modal}
         triggerNode={this.props.triggerNode}
         modalTitle={t('Save dashboard')}
         modalBody={
-          <div>
-            <Radio
-              value={SAVE_TYPE_OVERWRITE}
-              onChange={this.handleSaveTypeChange}
-              checked={this.state.saveType === SAVE_TYPE_OVERWRITE}
-              disabled={!this.props.canOverwrite}
-            >
-              {t('Overwrite Dashboard [%s]', this.props.dashboardTitle)}
-            </Radio>
-            <hr />
-            <Radio
-              value={SAVE_TYPE_NEWDASHBOARD}
-              onChange={this.handleSaveTypeChange}
-              checked={this.state.saveType === SAVE_TYPE_NEWDASHBOARD}
-            >
-              {t('Save as:')}
-            </Radio>
-            <Input
-              type="text"
-              placeholder={t('[dashboard name]')}
-              value={this.state.newDashName}
-              onFocus={e => this.handleNameChange(e.target.value)}
-              onChange={e => this.handleNameChange(e.target.value)}
-            />
-            <div className="m-l-25 m-t-5">
+          <Form layout="vertical">
+            <Form.Item>
+              <Radio
+                value={SAVE_TYPE_OVERWRITE}
+                onChange={this.handleSaveTypeChange}
+                checked={this.state.saveType === SAVE_TYPE_OVERWRITE}
+                disabled={!this.props.canOverwrite}
+              >
+                {t('Overwrite Dashboard [%s]', this.props.dashboardTitle)}
+              </Radio>
+            </Form.Item>
+
+            <Divider />
+
+            <Form.Item style={{ marginBottom: theme.sizeUnit }}>
+              <Radio
+                value={SAVE_TYPE_NEWDASHBOARD}
+                onChange={this.handleSaveTypeChange}
+                checked={this.state.saveType === SAVE_TYPE_NEWDASHBOARD}
+              >
+                {t('Save as:')}
+              </Radio>
+            </Form.Item>
+
+            <Form.Item style={{ marginBottom: theme.sizeUnit }}>
+              <Input
+                placeholder={t('[dashboard name]')}
+                value={this.state.newDashName}
+                onFocus={e => this.handleNameChange(e.target.value)}
+                onChange={e => this.handleNameChange(e.target.value)}
+              />
+            </Form.Item>
+
+            <Form.Item>
               <Checkbox
                 checked={this.state.duplicateSlices}
                 onChange={() => this.toggleDuplicateSlices()}
-              />
-              <span className="m-l-5">{t('also copy (duplicate) charts')}</span>
-            </div>
-          </div>
+              >
+                {t('also copy (duplicate) charts')}
+              </Checkbox>
+            </Form.Item>
+          </Form>
         }
         modalFooter={
-          <div>
+          <Space style={{ display: 'flex', justifyContent: 'flex-end' }}>
             <Button
+              type="primary"
               data-test="modal-save-dashboard-button"
-              buttonStyle="primary"
               onClick={this.saveDashboard}
             >
               {t('Save')}
             </Button>
-          </div>
+          </Space>
         }
       />
     );
diff --git a/superset-frontend/src/dashboard/components/SliceAdder.tsx b/superset-frontend/src/dashboard/components/SliceAdder.tsx
index 3e8d310c360..dfde8ec7a87 100644
--- a/superset-frontend/src/dashboard/components/SliceAdder.tsx
+++ b/superset-frontend/src/dashboard/components/SliceAdder.tsx
@@ -23,11 +23,15 @@ import { FixedSizeList as List } from 'react-window';
 // @ts-ignore
 import { createFilter } from 'react-search-input';
 import { t, styled, css } from '@superset-ui/core';
-import { Input } from 'src/components/Input';
-import { Select } from 'src/components';
-import Loading from 'src/components/Loading';
-import Button from 'src/components/Button';
-import { Icons } from 'src/components/Icons';
+import {
+  Button,
+  Checkbox,
+  InfoTooltip,
+  Input,
+  Loading,
+  Select,
+} from '@superset-ui/core/components';
+import { Icons } from '@superset-ui/core/components/Icons';
 import {
   LocalStorageKeys,
   getItem,
@@ -42,8 +46,6 @@ import {
   NEW_COMPONENTS_SOURCE_ID,
 } from 'src/dashboard/util/constants';
 import { debounce, pickBy } from 'lodash';
-import Checkbox from 'src/components/Checkbox';
-import { InfoTooltipWithTrigger } from '@superset-ui/chart-controls';
 import { Dispatch } from 'redux';
 import { Slice } from 'src/dashboard/types';
 import { withTheme, Theme } from '@emotion/react';
@@ -97,15 +99,15 @@ const Controls = styled.div`
     display: flex;
     flex-direction: row;
     padding:
-      ${theme.gridUnit * 4}px
-      ${theme.gridUnit * 3}px
-      ${theme.gridUnit * 4}px
-      ${theme.gridUnit * 3}px;
+      ${theme.sizeUnit * 4}px
+      ${theme.sizeUnit * 3}px
+      ${theme.sizeUnit * 4}px
+      ${theme.sizeUnit * 3}px;
   `}
 `;
 
 const StyledSelect = styled(Select)<{ id?: string }>`
-  margin-left: ${({ theme }) => theme.gridUnit * 2}px;
+  margin-left: ${({ theme }) => theme.sizeUnit * 2}px;
   min-width: 150px;
 `;
 
@@ -113,7 +115,7 @@ const NewChartButtonContainer = styled.div`
   ${({ theme }) => css`
     display: flex;
     justify-content: flex-end;
-    padding-right: ${theme.gridUnit * 2}px;
+    padding-right: ${theme.sizeUnit * 2}px;
   `}
 `;
 
@@ -121,7 +123,7 @@ const NewChartButton = styled(Button)`
   ${({ theme }) => css`
     height: auto;
     & > .anticon > span {
-      margin: auto -${theme.gridUnit}px auto 0;
+      margin: auto -${theme.sizeUnit}px auto 0;
     }
     & > [role='img']:first-of-type {
       padding-bottom: 1px;
@@ -327,7 +329,7 @@ class SliceAdder extends Component<SliceAdderProps, SliceAdderState> {
     );
   }
 
-  onShowOnlyMyCharts(showOnlyMyCharts: boolean) {
+  onShowOnlyMyCharts = (showOnlyMyCharts: boolean) => {
     if (!showOnlyMyCharts) {
       this.slicesRequest = this.props.fetchSlices(
         undefined,
@@ -345,7 +347,7 @@ class SliceAdder extends Component<SliceAdderProps, SliceAdderState> {
       ),
     }));
     setItem(LocalStorageKeys.DashboardEditorShowOnlyMyCharts, showOnlyMyCharts);
-  }
+  };
 
   render() {
     const { theme } = this.props;
@@ -364,16 +366,15 @@ class SliceAdder extends Component<SliceAdderProps, SliceAdderState> {
           <NewChartButton
             buttonStyle="link"
             buttonSize="xsmall"
+            icon={
+              <Icons.PlusOutlined iconSize="m" iconColor={theme.colorPrimary} />
+            }
             onClick={() =>
               navigateTo(`/chart/add?dashboard_id=${this.props.dashboardId}`, {
                 newWindow: true,
               })
             }
           >
-            <Icons.PlusOutlined
-              iconSize="m"
-              iconColor={theme.colors.primary.dark1}
-            />
             {t('Create new chart')}
           </NewChartButton>
         </NewChartButtonContainer>
@@ -405,17 +406,17 @@ class SliceAdder extends Component<SliceAdderProps, SliceAdderState> {
             flex-direction: row;
             justify-content: flex-start;
             align-items: center;
-            gap: ${theme.gridUnit}px;
-            padding: 0 ${theme.gridUnit * 3}px ${theme.gridUnit * 4}px
-              ${theme.gridUnit * 3}px;
+            gap: ${theme.sizeUnit}px;
+            padding: 0 ${theme.sizeUnit * 3}px ${theme.sizeUnit * 4}px
+              ${theme.sizeUnit * 3}px;
           `}
         >
           <Checkbox
-            onChange={this.onShowOnlyMyCharts}
+            onChange={e => this.onShowOnlyMyCharts(e.target.checked)}
             checked={this.state.showOnlyMyCharts}
           />
           {t('Show only my charts')}
-          <InfoTooltipWithTrigger
+          <InfoTooltip
             placement="top"
             tooltip={t(
               `You can choose to display all charts that you have access to or only the ones you own.
diff --git a/superset-frontend/src/dashboard/components/SliceHeader/SliceHeader.test.tsx b/superset-frontend/src/dashboard/components/SliceHeader/SliceHeader.test.tsx
index b48ed93596e..2ff9da080a3 100644
--- a/superset-frontend/src/dashboard/components/SliceHeader/SliceHeader.test.tsx
+++ b/superset-frontend/src/dashboard/components/SliceHeader/SliceHeader.test.tsx
@@ -100,6 +100,22 @@ jest.mock('src/dashboard/components/FiltersBadge', () => ({
   ),
 }));
 
+const MOCKED_CHART_ID = 312;
+
+const initialState = {
+  charts: {
+    [MOCKED_CHART_ID]: {
+      id: MOCKED_CHART_ID,
+      chartStatus: 'rendered',
+      queriesResponse: [{ sql_rowcount: 0 }],
+    },
+  },
+  dashboardInfo: {
+    crossFiltersEnabled: false,
+  },
+  dataMask: {},
+};
+
 const createProps = (overrides: any = {}) => ({
   filters: {}, // is in typing but not being used
   editMode: false,
@@ -113,8 +129,8 @@ const createProps = (overrides: any = {}) => ({
   supersetCanExplore: true,
   supersetCanCSV: true,
   slice: {
-    slice_id: 312,
-    slice_url: '/explore/?form_data=%7B%22slice_id%22%3A%20312%7D',
+    slice_id: MOCKED_CHART_ID,
+    slice_url: `/explore/?form_data=%7B%22slice_id%22%3A%20${MOCKED_CHART_ID}%7D`,
     slice_name: 'Vaccine Candidates per Phase',
     form_data: {
       adhoc_filters: [],
@@ -131,7 +147,7 @@ const createProps = (overrides: any = {}) => ({
       viz_type: VizType.Bar,
       x_ticks_layout: 'auto',
       y_axis_format: 'SMART_NUMBER',
-      slice_id: 312,
+      slice_id: MOCKED_CHART_ID,
     },
     viz_type: VizType.Bar,
     datasource: '58__table',
@@ -163,7 +179,11 @@ const createProps = (overrides: any = {}) => ({
 
 test('Should render', () => {
   const props = createProps();
-  render(<SliceHeader {...props} />, { useRedux: true, useRouter: true });
+  render(<SliceHeader {...props} />, {
+    useRedux: true,
+    useRouter: true,
+    initialState,
+  });
   expect(screen.getByTestId('slice-header')).toBeInTheDocument();
 });
 
@@ -203,7 +223,11 @@ test('Should render - default props', () => {
   // @ts-ignore
   delete props.supersetCanCSV;
 
-  render(<SliceHeader {...props} />, { useRedux: true, useRouter: true });
+  render(<SliceHeader {...props} />, {
+    useRedux: true,
+    useRouter: true,
+    initialState,
+  });
   expect(screen.getByTestId('slice-header')).toBeInTheDocument();
 });
 
@@ -243,7 +267,11 @@ test('Should render default props and "call" actions', () => {
   // @ts-ignore
   delete props.supersetCanCSV;
 
-  render(<SliceHeader {...props} />, { useRedux: true, useRouter: true });
+  render(<SliceHeader {...props} />, {
+    useRedux: true,
+    useRouter: true,
+    initialState,
+  });
   userEvent.click(screen.getByTestId('toggleExpandSlice'));
   userEvent.click(screen.getByTestId('forceRefresh'));
   userEvent.click(screen.getByTestId('exploreChart'));
@@ -256,7 +284,11 @@ test('Should render default props and "call" actions', () => {
 
 test('Should render title', () => {
   const props = createProps();
-  render(<SliceHeader {...props} />, { useRedux: true, useRouter: true });
+  render(<SliceHeader {...props} />, {
+    useRedux: true,
+    useRouter: true,
+    initialState,
+  });
   expect(screen.getByText('Vaccine Candidates per Phase')).toBeInTheDocument();
 });
 
@@ -269,7 +301,7 @@ test('Should render click to edit prompt and run onExploreChart on click', async
     <Router history={history}>
       <SliceHeader {...props} />
     </Router>,
-    { useRedux: true },
+    { useRedux: true, initialState },
   );
   userEvent.hover(screen.getByText('Vaccine Candidates per Phase'));
   expect(
@@ -286,7 +318,11 @@ test('Should render click to edit prompt and run onExploreChart on click', async
 test('Display cmd button in tooltip if running on MacOS', async () => {
   jest.spyOn(window.navigator, 'appVersion', 'get').mockReturnValue('Mac');
   const props = createProps();
-  render(<SliceHeader {...props} />, { useRedux: true, useRouter: true });
+  render(<SliceHeader {...props} />, {
+    useRedux: true,
+    useRouter: true,
+    initialState,
+  });
   userEvent.hover(screen.getByText('Vaccine Candidates per Phase'));
   expect(
     await screen.findByText('Click to edit Vaccine Candidates per Phase.'),
@@ -305,7 +341,7 @@ test('Should not render click to edit prompt and run onExploreChart on click if
     <Router history={history}>
       <SliceHeader {...props} />
     </Router>,
-    { useRedux: true },
+    { useRedux: true, initialState },
   );
   userEvent.hover(screen.getByText('Vaccine Candidates per Phase'));
   expect(
@@ -327,7 +363,7 @@ test('Should not render click to edit prompt and run onExploreChart on click if
     <Router history={history}>
       <SliceHeader {...props} />
     </Router>,
-    { useRedux: true },
+    { useRedux: true, initialState },
   );
   userEvent.hover(screen.getByText('Vaccine Candidates per Phase'));
   expect(
@@ -342,7 +378,11 @@ test('Should not render click to edit prompt and run onExploreChart on click if
 
 test('Should render "annotationsLoading"', () => {
   const props = createProps();
-  render(<SliceHeader {...props} />, { useRedux: true, useRouter: true });
+  render(<SliceHeader {...props} />, {
+    useRedux: true,
+    useRouter: true,
+    initialState,
+  });
   expect(
     screen.getByRole('img', {
       name: 'Annotation layers are still loading.',
@@ -352,7 +392,11 @@ test('Should render "annotationsLoading"', () => {
 
 test('Should render "annotationsError"', () => {
   const props = createProps();
-  render(<SliceHeader {...props} />, { useRedux: true, useRouter: true });
+  render(<SliceHeader {...props} />, {
+    useRedux: true,
+    useRouter: true,
+    initialState,
+  });
   expect(
     screen.getByRole('img', {
       name: 'One or more annotation layers failed loading.',
@@ -364,7 +408,11 @@ test('Should not render "annotationsError" and "annotationsLoading"', () => {
   const props = createProps();
   props.annotationQuery = {};
   props.annotationError = {};
-  render(<SliceHeader {...props} />, { useRedux: true, useRouter: true });
+  render(<SliceHeader {...props} />, {
+    useRedux: true,
+    useRouter: true,
+    initialState,
+  });
   expect(
     screen.queryByRole('img', {
       name: 'One or more annotation layers failed loading.',
@@ -379,16 +427,24 @@ test('Should not render "annotationsError" and "annotationsLoading"', () => {
 
 test('Correct props to "FiltersBadge"', () => {
   const props = createProps();
-  render(<SliceHeader {...props} />, { useRedux: true, useRouter: true });
+  render(<SliceHeader {...props} />, {
+    useRedux: true,
+    useRouter: true,
+    initialState,
+  });
   expect(screen.getByTestId('FiltersBadge')).toHaveAttribute(
     'data-chart-id',
-    '312',
+    `${MOCKED_CHART_ID}`,
   );
 });
 
 test('Correct props to "SliceHeaderControls"', () => {
   const props = createProps();
-  render(<SliceHeader {...props} />, { useRedux: true, useRouter: true });
+  render(<SliceHeader {...props} />, {
+    useRedux: true,
+    useRouter: true,
+    initialState,
+  });
   expect(screen.getByTestId('SliceHeaderControls')).toHaveAttribute(
     'data-cached-dttm',
     '',
@@ -441,7 +497,11 @@ test('Correct props to "SliceHeaderControls"', () => {
 
 test('Correct actions to "SliceHeaderControls"', () => {
   const props = createProps();
-  render(<SliceHeader {...props} />, { useRedux: true, useRouter: true });
+  render(<SliceHeader {...props} />, {
+    useRedux: true,
+    useRouter: true,
+    initialState,
+  });
 
   expect(props.toggleExpandSlice).toHaveBeenCalledTimes(0);
   userEvent.click(screen.getByTestId('toggleExpandSlice'));
@@ -479,7 +539,48 @@ test('Add extension to SliceHeader', () => {
   ));
 
   const props = createProps();
-  render(<SliceHeader {...props} />, { useRedux: true, useRouter: true });
+  render(<SliceHeader {...props} />, {
+    useRedux: true,
+    useRouter: true,
+    initialState,
+  });
 
   expect(screen.getByText('This is an extension')).toBeInTheDocument();
 });
+
+test('Should render RowCountLabel when row limit is hit, and hide it otherwise', () => {
+  const props = createProps({
+    formData: {
+      ...createProps().formData,
+      row_limit: 10,
+    },
+  });
+  const rowCountState = {
+    ...initialState,
+    charts: {
+      [props.slice.slice_id]: {
+        queriesResponse: [
+          {
+            sql_rowcount: 10,
+          },
+        ],
+      },
+    },
+  };
+
+  const { rerender } = render(<SliceHeader {...props} />, {
+    useRedux: true,
+    useRouter: true,
+    initialState: rowCountState,
+  });
+
+  expect(screen.getByTestId('warning')).toBeInTheDocument();
+  rerender(
+    <SliceHeader
+      {...props}
+      formData={{ ...props.formData, row_limit: 1000 }}
+    />,
+  );
+
+  expect(screen.queryByTestId('warning')).not.toBeInTheDocument();
+});
diff --git a/superset-frontend/src/dashboard/components/SliceHeader/index.tsx b/superset-frontend/src/dashboard/components/SliceHeader/index.tsx
index 3de12966105..16201655e34 100644
--- a/superset-frontend/src/dashboard/components/SliceHeader/index.tsx
+++ b/superset-frontend/src/dashboard/components/SliceHeader/index.tsx
@@ -24,18 +24,26 @@ import {
   useRef,
   useState,
 } from 'react';
-import { css, getExtensionsRegistry, styled, t } from '@superset-ui/core';
+import {
+  css,
+  getExtensionsRegistry,
+  QueryData,
+  styled,
+  SupersetTheme,
+  t,
+  useTheme,
+} from '@superset-ui/core';
 import { useUiConfig } from 'src/components/UiConfigContext';
-import { Tooltip } from 'src/components/Tooltip';
+import { Tooltip, EditableTitle, Icons } from '@superset-ui/core/components';
 import { useSelector } from 'react-redux';
-import EditableTitle from 'src/components/EditableTitle';
 import SliceHeaderControls from 'src/dashboard/components/SliceHeaderControls';
 import { SliceHeaderControlsProps } from 'src/dashboard/components/SliceHeaderControls/types';
 import FiltersBadge from 'src/dashboard/components/FiltersBadge';
-import { Icons } from 'src/components/Icons';
 import { RootState } from 'src/dashboard/types';
 import { getSliceHeaderTooltip } from 'src/dashboard/util/getSliceHeaderTooltip';
 import { DashboardPageIdContext } from 'src/dashboard/containers/DashboardPage';
+import RowCountLabel from 'src/components/RowCountLabel';
+import { Link } from 'react-router-dom';
 
 const extensionsRegistry = getExtensionsRegistry();
 
@@ -57,16 +65,16 @@ const annotationsError = t('One or more annotation layers failed loading.');
 const CrossFilterIcon = styled(Icons.ApartmentOutlined)`
   ${({ theme }) => `
     cursor: default;
-    color: ${theme.colors.primary.base};
+    color: ${theme.colorPrimary};
     line-height: 1.8;
   `}
 `;
 
 const ChartHeaderStyles = styled.div`
   ${({ theme }) => css`
-    font-size: ${theme.typography.sizes.l}px;
-    font-weight: ${theme.typography.weights.bold};
-    margin-bottom: ${theme.gridUnit}px;
+    font-size: ${theme.fontSizeLG}px;
+    font-weight: ${theme.fontWeightStrong};
+    margin-bottom: ${theme.sizeUnit}px;
     display: flex;
     max-width: 100%;
     align-items: flex-start;
@@ -81,7 +89,7 @@ const ChartHeaderStyles = styled.div`
       -webkit-line-clamp: 2;
       -webkit-box-orient: vertical;
 
-      & > span.antd5-tooltip-open {
+      & > span.ant-tooltip-open {
         display: inline;
       }
     }
@@ -107,18 +115,18 @@ const ChartHeaderStyles = styled.div`
     }
 
     .dropdown-menu.dropdown-menu-right {
-      top: ${theme.gridUnit * 5}px;
+      top: ${theme.sizeUnit * 5}px;
     }
 
     .divider {
-      margin: ${theme.gridUnit}px 0;
+      margin: ${theme.sizeUnit}px 0;
     }
 
     .refresh-tooltip {
       display: block;
-      height: ${theme.gridUnit * 4}px;
-      margin: ${theme.gridUnit}px 0;
-      color: ${theme.colors.text.label};
+      height: ${theme.sizeUnit * 4}px;
+      margin: ${theme.sizeUnit}px 0;
+      color: ${theme.colorTextLabel};
     }
   `}
 `;
@@ -176,6 +184,15 @@ const SliceHeader = forwardRef<HTMLDivElement, SliceHeaderProps>(
       ({ dashboardInfo }) => dashboardInfo.crossFiltersEnabled,
     );
 
+    const firstQueryResponse = useSelector<RootState, QueryData | undefined>(
+      state => state.charts[slice.slice_id].queriesResponse?.[0],
+    );
+
+    const theme = useTheme();
+
+    const rowLimit = Number(formData.row_limit || -1);
+    const sqlRowCount = Number(firstQueryResponse?.sql_rowcount || 0);
+
     const canExplore = !editMode && supersetCanExplore;
 
     useEffect(() => {
@@ -195,6 +212,22 @@ const SliceHeader = forwardRef<HTMLDivElement, SliceHeaderProps>(
 
     const exploreUrl = `/explore/?dashboard_page_id=${dashboardPageId}&slice_id=${slice.slice_id}`;
 
+    const renderExploreLink = (title: string) => (
+      <Link
+        to={exploreUrl}
+        css={(theme: SupersetTheme) => css`
+          color: ${theme.colorText};
+          text-decoration: none;
+          :hover {
+            text-decoration: underline;
+          }
+          display: inline-block;
+        `}
+      >
+        {title}
+      </Link>
+    );
+
     return (
       <ChartHeaderStyles data-test="slice-header" ref={ref}>
         <div className="header-title" ref={headerRef}>
@@ -209,7 +242,9 @@ const SliceHeader = forwardRef<HTMLDivElement, SliceHeaderProps>(
               canEdit={editMode}
               onSaveTitle={updateSliceName}
               showTooltip={false}
-              url={canExplore ? exploreUrl : undefined}
+              renderLink={
+                canExplore && exploreUrl ? renderExploreLink : undefined
+              }
             />
           </Tooltip>
           {!!Object.values(annotationQuery).length && (
@@ -218,12 +253,9 @@ const SliceHeader = forwardRef<HTMLDivElement, SliceHeaderProps>(
               placement="top"
               title={annotationsLoading}
             >
-              {/* TODO: Remove fa-icon */}
-              {/* eslint-disable-next-line icons/no-fa-icons-usage */}
-              <i
-                role="img"
+              <Icons.ReloadOutlined
+                className="warning"
                 aria-label={annotationsLoading}
-                className="fa fa-refresh warning"
               />
             </Tooltip>
           )}
@@ -233,12 +265,9 @@ const SliceHeader = forwardRef<HTMLDivElement, SliceHeaderProps>(
               placement="top"
               title={annotationsError}
             >
-              {/* TODO: Remove fa-icon */}
-              {/* eslint-disable-next-line icons/no-fa-icons-usage */}
-              <i
-                role="img"
+              <Icons.ExclamationCircleOutlined
+                className="danger"
                 aria-label={annotationsError}
-                className="fa fa-exclamation-circle danger"
               />
             </Tooltip>
           )}
@@ -262,9 +291,26 @@ const SliceHeader = forwardRef<HTMLDivElement, SliceHeaderProps>(
                   <CrossFilterIcon iconSize="m" />
                 </Tooltip>
               )}
+
               {!uiConfig.hideChartControls && (
                 <FiltersBadge chartId={slice.slice_id} />
               )}
+
+              {sqlRowCount === rowLimit && (
+                <RowCountLabel
+                  rowcount={sqlRowCount}
+                  limit={rowLimit}
+                  label={
+                    <Icons.WarningOutlined
+                      iconSize="l"
+                      iconColor={theme.colorWarning}
+                      css={theme => css`
+                        padding: ${theme.sizeUnit}px;
+                      `}
+                    />
+                  }
+                />
+              )}
               {!uiConfig.hideChartControls && (
                 <SliceHeaderControls
                   slice={slice}
diff --git a/superset-frontend/src/dashboard/components/SliceHeaderControls/ViewResultsModalTrigger.tsx b/superset-frontend/src/dashboard/components/SliceHeaderControls/ViewResultsModalTrigger.tsx
index b27d3be2d7d..61e6364a7e3 100644
--- a/superset-frontend/src/dashboard/components/SliceHeaderControls/ViewResultsModalTrigger.tsx
+++ b/superset-frontend/src/dashboard/components/SliceHeaderControls/ViewResultsModalTrigger.tsx
@@ -19,8 +19,7 @@
 import { ReactChild, RefObject, useCallback } from 'react';
 import { useHistory } from 'react-router-dom';
 import { css, t, useTheme } from '@superset-ui/core';
-import Button from 'src/components/Button';
-import ModalTrigger from 'src/components/ModalTrigger';
+import { Button, ModalTrigger } from '@superset-ui/core/components';
 
 export const ViewResultsModalTrigger = ({
   canExplore,
@@ -52,15 +51,15 @@ export const ViewResultsModalTrigger = ({
       responsive
       resizable
       resizableConfig={{
-        minHeight: theme.gridUnit * 128,
-        minWidth: theme.gridUnit * 128,
+        minHeight: theme.sizeUnit * 128,
+        minWidth: theme.sizeUnit * 128,
         defaultSize: {
           width: 'auto',
           height: '75vh',
         },
       }}
       draggable
-      destroyOnClose
+      destroyOnHidden
       modalFooter={
         <>
           <Button
@@ -81,7 +80,7 @@ export const ViewResultsModalTrigger = ({
             buttonSize="small"
             onClick={handleCloseModal}
             css={css`
-              margin-left: ${theme.gridUnit * 2}px;
+              margin-left: ${theme.sizeUnit * 2}px;
             `}
           >
             {t('Close')}
diff --git a/superset-frontend/src/dashboard/components/SliceHeaderControls/index.tsx b/superset-frontend/src/dashboard/components/SliceHeaderControls/index.tsx
index 83b16392789..5d9293a1c46 100644
--- a/superset-frontend/src/dashboard/components/SliceHeaderControls/index.tsx
+++ b/superset-frontend/src/dashboard/components/SliceHeaderControls/index.tsx
@@ -26,12 +26,13 @@ import {
 } from 'react';
 
 import { RouteComponentProps, useHistory } from 'react-router-dom';
-import { extendedDayjs } from 'src/utils/dates';
+import { extendedDayjs } from '@superset-ui/core/utils/dates';
 import {
   Behavior,
   css,
   isFeatureEnabled,
   FeatureFlag,
+  useTheme,
   getChartMetadataRegistry,
   styled,
   t,
@@ -40,14 +41,17 @@ import {
   QueryFormData,
 } from '@superset-ui/core';
 import { useSelector } from 'react-redux';
-import { Menu } from 'src/components/Menu';
-import { NoAnimationDropdown } from 'src/components/Dropdown';
+import { Menu } from '@superset-ui/core/components/Menu';
+import {
+  NoAnimationDropdown,
+  Tooltip,
+  Button,
+  ModalTrigger,
+} from '@superset-ui/core/components';
 import ShareMenuItems from 'src/dashboard/components/menu/ShareMenuItems';
 import downloadAsImage from 'src/utils/downloadAsImage';
 import { getSliceHeaderTooltip } from 'src/dashboard/util/getSliceHeaderTooltip';
-import { Tooltip } from 'src/components/Tooltip';
-import { Icons } from 'src/components/Icons';
-import ModalTrigger from 'src/components/ModalTrigger';
+import { Icons } from '@superset-ui/core/components/Icons';
 import ViewQueryModal from 'src/explore/components/controls/ViewQueryModal';
 import { ResultsPaneOnDashboard } from 'src/explore/components/DataTablesPane';
 import { DrillDetailMenuItems } from 'src/components/Chart/DrillDetail';
@@ -55,52 +59,41 @@ import { LOG_ACTIONS_CHART_DOWNLOAD_AS_IMAGE } from 'src/logger/LogUtils';
 import { MenuKeys, RootState } from 'src/dashboard/types';
 import DrillDetailModal from 'src/components/Chart/DrillDetail/DrillDetailModal';
 import { usePermissions } from 'src/hooks/usePermissions';
-import Button from 'src/components/Button';
 import { useCrossFiltersScopingModal } from '../nativeFilters/FilterBar/CrossFilters/ScopingModal/useCrossFiltersScopingModal';
 import { ViewResultsModalTrigger } from './ViewResultsModalTrigger';
 
-// TODO: replace 3 dots with an icon
-const VerticalDotsContainer = styled.div`
-  padding: ${({ theme }) => theme.gridUnit / 4}px
-    ${({ theme }) => theme.gridUnit * 1.5}px;
-
-  .dot {
-    display: block;
-
-    height: ${({ theme }) => theme.gridUnit}px;
-    width: ${({ theme }) => theme.gridUnit}px;
-    border-radius: 50%;
-    margin: ${({ theme }) => theme.gridUnit / 2}px 0;
-
-    background-color: ${({ theme }) => theme.colors.text.label};
-  }
-
-  &:hover {
-    cursor: pointer;
-  }
-`;
-
 const RefreshTooltip = styled.div`
-  height: auto;
-  margin: ${({ theme }) => theme.gridUnit}px 0;
-  color: ${({ theme }) => theme.colors.grayscale.base};
-  line-height: 21px;
-  display: flex;
-  flex-direction: column;
-  align-items: flex-start;
-  justify-content: flex-start;
+  ${({ theme }) => css`
+    height: auto;
+    margin: ${theme.sizeUnit}px 0;
+    color: ${theme.colorTextLabel};
+    line-height: 21px;
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    justify-content: flex-start;
+  `}
 `;
 
 const getScreenshotNodeSelector = (chartId: string | number) =>
   `.dashboard-chart-id-${chartId}`;
 
-const VerticalDotsTrigger = () => (
-  <VerticalDotsContainer>
-    <span className="dot" />
-    <span className="dot" />
-    <span className="dot" />
-  </VerticalDotsContainer>
-);
+const VerticalDotsTrigger = () => {
+  const theme = useTheme();
+  return (
+    <Icons.EllipsisOutlined
+      css={css`
+        transform: rotate(90deg);
+        &:hover {
+          cursor: pointer;
+        }
+      `}
+      iconSize="xl"
+      iconColor={theme.colorTextLabel}
+      className="dot"
+    />
+  );
+};
 
 export interface SliceHeaderControlsProps {
   slice: {
@@ -172,6 +165,7 @@ const SliceHeaderControls = (
   const [modalFilters, setFilters] = useState<BinaryQueryObjectFilterClause[]>(
     [],
   );
+  const theme = useTheme();
 
   const canEditCrossFilters =
     useSelector<RootState, boolean>(
@@ -241,7 +235,7 @@ const SliceHeaderControls = (
         // menu closes with a delay, we need to hide it manually,
         // so that we don't capture it on the screenshot
         const menu = document.querySelector(
-          '.antd5-dropdown:not(.antd5-dropdown-hidden)',
+          '.ant-dropdown:not(.ant-dropdown-hidden)',
         ) as HTMLElement;
         if (menu) {
           menu.style.visibility = 'hidden';
@@ -250,7 +244,7 @@ const SliceHeaderControls = (
           getScreenshotNodeSelector(props.slice.slice_id),
           props.slice.slice_name,
           true,
-          // @ts-ignore
+          theme,
         )(domEvent).then(() => {
           if (menu) {
             menu.style.visibility = 'visible';
@@ -503,7 +497,6 @@ const SliceHeaderControls = (
       )}
     </Menu>
   );
-
   return (
     <>
       {isFullSize && (
@@ -515,7 +508,7 @@ const SliceHeaderControls = (
         />
       )}
       <NoAnimationDropdown
-        dropdownRender={() => menu}
+        popupRender={() => menu}
         overlayStyle={dropdownOverlayStyle}
         trigger={['click']}
         placement="bottomRight"
@@ -523,10 +516,14 @@ const SliceHeaderControls = (
         onOpenChange={visible => setIsDropdownVisible(visible)}
       >
         <Button
-          type="link"
           id={`slice_${slice.slice_id}-controls`}
+          buttonStyle="link"
           aria-label="More Options"
           aria-haspopup="true"
+          css={theme => css`
+            padding: ${theme.sizeUnit * 2}px;
+            padding-right: 0px;
+          `}
         >
           <VerticalDotsTrigger />
         </Button>
diff --git a/superset-frontend/src/dashboard/components/URLShortLinkButton/index.tsx b/superset-frontend/src/dashboard/components/URLShortLinkButton/index.tsx
index 106e240d627..a0c24f51f3d 100644
--- a/superset-frontend/src/dashboard/components/URLShortLinkButton/index.tsx
+++ b/superset-frontend/src/dashboard/components/URLShortLinkButton/index.tsx
@@ -18,13 +18,18 @@
  */
 import { useState } from 'react';
 import { getClientErrorObject, t, useTheme } from '@superset-ui/core';
-import Popover, { PopoverProps } from 'src/components/Popover';
-import CopyToClipboard from 'src/components/CopyToClipboard';
+import {
+  Button,
+  Icons,
+  Popover,
+  type PopoverProps,
+} from '@superset-ui/core/components';
+import { CopyToClipboard } from 'src/components';
 import { getDashboardPermalink } from 'src/utils/urlUtils';
 import { useToasts } from 'src/components/MessageToasts/withToasts';
 import { shallowEqual, useSelector } from 'react-redux';
 import { RootState } from 'src/dashboard/types';
-import { Icons } from 'src/components/Icons';
+import { Typography } from '@superset-ui/core/components/Typography';
 
 export type URLShortLinkButtonProps = {
   dashboardId: number;
@@ -90,35 +95,28 @@ export default function URLShortLinkButton({
           <CopyToClipboard
             text={shortUrl}
             copyNode={
-              <Icons.CopyOutlined
-                iconSize="m"
-                iconColor={theme.colors.primary.dark1}
-              />
+              <Icons.CopyOutlined iconSize="m" iconColor={theme.colorPrimary} />
             }
           />
           &nbsp;&nbsp;
-          <a href={emailLink} aria-label="Email link">
-            <Icons.MailOutlined
-              iconSize="m"
-              iconColor={theme.colors.primary.dark1}
-            />
-          </a>
+          <Typography.Link href={emailLink} aria-label="Email link">
+            <Icons.MailOutlined iconSize="m" iconColor={theme.colorPrimary} />
+          </Typography.Link>
         </div>
       }
     >
-      <span
-        className="short-link-trigger btn btn-default btn-sm"
+      <Button
         tabIndex={-1}
-        role="button"
+        buttonStyle="link"
+        icon={
+          <Icons.LinkOutlined iconSize="m" className="short-link-trigger" />
+        }
         onClick={e => {
           e.stopPropagation();
           getCopyUrl();
         }}
         aria-label={t('Copy URL')}
-      >
-        <Icons.LinkOutlined iconSize="m" className="short-link-trigger" />
-        &nbsp;
-      </span>
+      />
     </Popover>
   );
 }
diff --git a/superset-frontend/src/dashboard/components/dnd/DragDroppable.jsx b/superset-frontend/src/dashboard/components/dnd/DragDroppable.jsx
index b9225628c23..1cd2dbfa766 100644
--- a/superset-frontend/src/dashboard/components/dnd/DragDroppable.jsx
+++ b/superset-frontend/src/dashboard/components/dnd/DragDroppable.jsx
@@ -105,14 +105,14 @@ const DragDroppableStyles = styled.div`
     & {
       .drop-indicator {
         display: block;
-        background-color: ${theme.colors.primary.base};
+        background-color: ${theme.colorPrimary};
         position: absolute;
         z-index: 10;
         opacity: 0.3;
         width: 100%;
         height: 100%;
         &.drop-indicator--forbidden {
-          background-color: ${theme.colors.error.light1};
+          background-color: ${theme.colorErrorBg};
         }
       }
     }
diff --git a/superset-frontend/src/dashboard/components/dnd/DragHandle.tsx b/superset-frontend/src/dashboard/components/dnd/DragHandle.tsx
index ab941a6386c..a9418bbe441 100644
--- a/superset-frontend/src/dashboard/components/dnd/DragHandle.tsx
+++ b/superset-frontend/src/dashboard/components/dnd/DragHandle.tsx
@@ -18,7 +18,7 @@
  */
 import { LegacyRef } from 'react';
 import { css, styled } from '@superset-ui/core';
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
 
 interface DragHandleProps {
   position: 'left' | 'top';
@@ -27,7 +27,7 @@ interface DragHandleProps {
 
 const DragHandleContainer = styled.div<{ position: 'left' | 'top' }>`
   ${({ theme, position }) => css`
-    height: ${theme.gridUnit * 5}px;
+    height: ${theme.sizeUnit * 5}px;
     overflow: hidden;
     cursor: move;
     ${position === 'top' &&
diff --git a/superset-frontend/src/dashboard/components/filterscope/FilterFieldItem.jsx b/superset-frontend/src/dashboard/components/filterscope/FilterFieldItem.jsx
index ffa64d4267c..6beb78c894c 100644
--- a/superset-frontend/src/dashboard/components/filterscope/FilterFieldItem.jsx
+++ b/superset-frontend/src/dashboard/components/filterscope/FilterFieldItem.jsx
@@ -18,7 +18,7 @@
  */
 import PropTypes from 'prop-types';
 import cx from 'classnames';
-import { FormLabel } from 'src/components/Form';
+import { FormLabel } from '@superset-ui/core/components';
 
 const propTypes = {
   label: PropTypes.string.isRequired,
diff --git a/superset-frontend/src/dashboard/components/filterscope/FilterScope.test.tsx b/superset-frontend/src/dashboard/components/filterscope/FilterScope.test.tsx
index d14ffe00734..fdca5bdbabe 100644
--- a/superset-frontend/src/dashboard/components/filterscope/FilterScope.test.tsx
+++ b/superset-frontend/src/dashboard/components/filterscope/FilterScope.test.tsx
@@ -168,7 +168,7 @@ function getCheckboxState(name: string): CheckboxState {
   const element = screen.getByRole('link', { name });
   const svgPath = getCheckboxIcon(element).children[1].children[0].children[0];
   const fill = svgPath.getAttribute('fill');
-  return fill === supersetTheme.colors.primary.base
+  return fill === supersetTheme.colorPrimary
     ? CHECKED
     : fill === supersetTheme.colors.grayscale.light1
       ? INDETERMINATE
diff --git a/superset-frontend/src/dashboard/components/filterscope/FilterScopeModal.tsx b/superset-frontend/src/dashboard/components/filterscope/FilterScopeModal.tsx
index 92057767dc8..0695bb125ff 100644
--- a/superset-frontend/src/dashboard/components/filterscope/FilterScopeModal.tsx
+++ b/superset-frontend/src/dashboard/components/filterscope/FilterScopeModal.tsx
@@ -18,16 +18,19 @@
  */
 import { createRef, PureComponent } from 'react';
 import { styled } from '@superset-ui/core';
-import ModalTrigger, { ModalTriggerRef } from 'src/components/ModalTrigger';
+import {
+  ModalTrigger,
+  ModalTriggerRef,
+} from '@superset-ui/core/components/ModalTrigger';
 import FilterScope from 'src/dashboard/containers/FilterScope';
 
 type FilterScopeModalProps = {
   triggerNode: JSX.Element;
 };
 
-const FilterScopeModalBody = styled.div(({ theme: { gridUnit } }) => ({
-  padding: gridUnit * 2,
-  paddingBottom: gridUnit * 3,
+const FilterScopeModalBody = styled.div(({ theme: { sizeUnit } }) => ({
+  padding: sizeUnit * 2,
+  paddingBottom: sizeUnit * 3,
 }));
 
 export default class FilterScopeModal extends PureComponent<
diff --git a/superset-frontend/src/dashboard/components/filterscope/FilterScopeSelector.jsx b/superset-frontend/src/dashboard/components/filterscope/FilterScopeSelector.jsx
index b271f622470..c834911c336 100644
--- a/superset-frontend/src/dashboard/components/filterscope/FilterScopeSelector.jsx
+++ b/superset-frontend/src/dashboard/components/filterscope/FilterScopeSelector.jsx
@@ -19,7 +19,7 @@
 import { PureComponent } from 'react';
 import PropTypes from 'prop-types';
 import cx from 'classnames';
-import Button from 'src/components/Button';
+import { Button, Input } from '@superset-ui/core/components';
 import { css, t, styled } from '@superset-ui/core';
 
 import buildFilterScopeTreeEntry from 'src/dashboard/util/buildFilterScopeTreeEntry';
@@ -54,8 +54,8 @@ const ScopeContainer = styled.div`
     display: flex;
     flex-direction: column;
     height: 80%;
-    margin-right: ${theme.gridUnit * -6}px;
-    font-size: ${theme.typography.sizes.m}px;
+    margin-right: ${theme.sizeUnit * -6}px;
+    font-size: ${theme.fontSize}px;
 
     & .nav.nav-tabs {
       border: none;
@@ -63,7 +63,7 @@ const ScopeContainer = styled.div`
 
     & .filter-scope-body {
       flex: 1;
-      max-height: calc(100% - ${theme.gridUnit * 32}px);
+      max-height: calc(100% - ${theme.sizeUnit * 32}px);
 
       .filter-field-pane,
       .filter-scope-pane {
@@ -72,7 +72,7 @@ const ScopeContainer = styled.div`
     }
 
     & .warning-message {
-      padding: ${theme.gridUnit * 6}px;
+      padding: ${theme.sizeUnit * 6}px;
     }
   `}
 `;
@@ -81,7 +81,7 @@ const ScopeBody = styled.div`
   ${({ theme }) => css`
     &.filter-scope-body {
       flex: 1;
-      max-height: calc(100% - ${theme.gridUnit * 32}px);
+      max-height: calc(100% - ${theme.sizeUnit * 32}px);
 
       .filter-field-pane,
       .filter-scope-pane {
@@ -93,17 +93,17 @@ const ScopeBody = styled.div`
 
 const ScopeHeader = styled.div`
   ${({ theme }) => css`
-    height: ${theme.gridUnit * 16}px;
-    border-bottom: 1px solid ${theme.colors.grayscale.light2};
-    padding-left: ${theme.gridUnit * 6}px;
-    margin-left: ${theme.gridUnit * -6}px;
+    height: ${theme.sizeUnit * 16}px;
+    border-bottom: 1px solid ${theme.colorSplit};
+    padding-left: ${theme.sizeUnit * 6}px;
+    margin-left: ${theme.sizeUnit * -6}px;
 
     h4 {
       margin-top: 0;
     }
 
     .selected-fields {
-      margin: ${theme.gridUnit * 3}px 0 ${theme.gridUnit * 4}px;
+      margin: ${theme.sizeUnit * 3}px 0 ${theme.sizeUnit * 4}px;
       visibility: hidden;
 
       &.multi-edit-mode {
@@ -111,7 +111,7 @@ const ScopeHeader = styled.div`
       }
 
       .selected-scopes {
-        padding-left: ${theme.gridUnit}px;
+        padding-left: ${theme.sizeUnit}px;
       }
     }
   `}
@@ -134,9 +134,9 @@ const ScopeSelector = styled.div`
 
       .react-checkbox-tree .rct-icon.rct-icon-expand-all,
       .react-checkbox-tree .rct-icon.rct-icon-collapse-all {
-        font-family: ${theme.typography.families.sansSerif};
-        font-size: ${theme.typography.sizes.m}px;
-        color: ${theme.colors.primary.base};
+        font-family: ${theme.fontFamily};
+        font-size: ${theme.fontSize}px;
+        color: ${theme.colorPrimary};
 
         &::before {
           content: '';
@@ -154,39 +154,39 @@ const ScopeSelector = styled.div`
       .filter-field-pane {
         position: relative;
         width: 40%;
-        padding: ${theme.gridUnit * 4}px;
+        padding: ${theme.sizeUnit * 4}px;
         padding-left: 0;
-        border-right: 1px solid ${theme.colors.grayscale.light2};
+        border-right: 1px solid ${theme.colorBorder};
 
         .filter-container label {
-          font-weight: ${theme.typography.weights.normal};
-          margin: 0 0 0 ${theme.gridUnit * 4}px;
+          font-weight: ${theme.fontWeightNormal};
+          margin: 0 0 0 ${theme.sizeUnit * 4}px;
           word-break: break-all;
         }
 
         .filter-field-item {
-          height: ${theme.gridUnit * 9}px;
+          height: ${theme.sizeUnit * 9}px;
           display: flex;
           align-items: center;
           justify-content: center;
-          padding: 0 ${theme.gridUnit * 6}px;
-          margin-left: ${theme.gridUnit * -6}px;
+          padding: 0 ${theme.sizeUnit * 6}px;
+          margin-left: ${theme.sizeUnit * -6}px;
 
           &.is-selected {
-            border: 1px solid ${theme.colors.text.label};
+            border: 1px solid ${theme.colorBorder};
             border-radius: ${theme.borderRadius}px;
-            background-color: ${theme.colors.grayscale.light4};
-            margin-left: ${theme.gridUnit * -6}px;
+            background-color: ${theme.colorBgContainer};
+            margin-left: ${theme.sizeUnit * -6}px;
           }
         }
 
         .react-checkbox-tree {
           .rct-title .root {
-            font-weight: ${theme.typography.weights.bold};
+            font-weight: ${theme.fontWeightStrong};
           }
 
           .rct-text {
-            height: ${theme.gridUnit * 10}px;
+            height: ${theme.sizeUnit * 10}px;
           }
         }
       }
@@ -194,45 +194,45 @@ const ScopeSelector = styled.div`
       .filter-scope-pane {
         position: relative;
         flex: 1;
-        padding: ${theme.gridUnit * 4}px;
-        padding-right: ${theme.gridUnit * 6}px;
+        padding: ${theme.sizeUnit * 4}px;
+        padding-right: ${theme.sizeUnit * 6}px;
       }
 
       .react-checkbox-tree {
         flex-direction: column;
-        color: ${theme.colors.grayscale.dark1};
-        font-size: ${theme.typography.sizes.m}px;
+        color: ${theme.colorText};
+        font-size: ${theme.fontSize}px;
 
         .filter-scope-type {
-          padding: ${theme.gridUnit * 2}px 0;
+          padding: ${theme.sizeUnit * 2}px 0;
           display: flex;
           align-items: center;
 
           &.chart {
-            font-weight: ${theme.typography.weights.normal};
+            font-weight: ${theme.fontWeightNormal};
           }
 
           &.selected-filter {
-            padding-left: ${theme.gridUnit * 7}px;
+            padding-left: ${theme.sizeUnit * 7}px;
             position: relative;
-            color: ${theme.colors.text.label};
+            color: ${theme.colorBgContainerTextActive};
 
             &::before {
               content: ' ';
               position: absolute;
               left: 0;
               top: 50%;
-              width: ${theme.gridUnit * 4}px;
-              height: ${theme.gridUnit * 4}px;
+              width: ${theme.sizeUnit * 4}px;
+              height: ${theme.sizeUnit * 4}px;
               border-radius: ${theme.borderRadius}px;
-              margin-top: ${theme.gridUnit * -2}px;
-              box-shadow: inset 0 0 0 2px ${theme.colors.grayscale.light2};
+              margin-top: ${theme.sizeUnit * -2}px;
+              box-shadow: inset 0 0 0 2px ${theme.colorBorder};
               background: ${theme.colors.grayscale.light3};
             }
           }
 
           &.root {
-            font-weight: ${theme.typography.weights.bold};
+            font-weight: ${theme.fontWeightStrong};
           }
         }
 
@@ -240,14 +240,14 @@ const ScopeSelector = styled.div`
           svg {
             position: relative;
             top: 3px;
-            width: ${theme.gridUnit * 4.5}px;
+            width: ${theme.sizeUnit * 4.5}px;
           }
         }
 
         .rct-node-leaf {
           .rct-bare-label {
             &::before {
-              padding-left: ${theme.gridUnit}px;
+              padding-left: ${theme.sizeUnit}px;
             }
           }
         }
@@ -255,7 +255,7 @@ const ScopeSelector = styled.div`
         .rct-options {
           text-align: left;
           margin-left: 0;
-          margin-bottom: ${theme.gridUnit * 2}px;
+          margin-bottom: ${theme.sizeUnit * 2}px;
         }
 
         .rct-text {
@@ -278,27 +278,27 @@ const ScopeSelector = styled.div`
 
       .multi-edit-mode {
         .filter-field-item {
-          padding: 0 ${theme.gridUnit * 4}px 0 ${theme.gridUnit * 12}px;
-          margin-left: ${theme.gridUnit * -12}px;
+          padding: 0 ${theme.sizeUnit * 4}px 0 ${theme.sizeUnit * 12}px;
+          margin-left: ${theme.sizeUnit * -12}px;
 
           &.is-selected {
-            margin-left: ${theme.gridUnit * -13}px;
+            margin-left: ${theme.sizeUnit * -13}px;
           }
         }
       }
 
       .scope-search {
         position: absolute;
-        right: ${theme.gridUnit * 4}px;
-        top: ${theme.gridUnit * 4}px;
+        right: ${theme.sizeUnit * 4}px;
+        top: ${theme.sizeUnit * 4}px;
         border-radius: ${theme.borderRadius}px;
-        border: 1px solid ${theme.colors.grayscale.light2};
-        padding: ${theme.gridUnit}px ${theme.gridUnit * 2}px;
-        font-size: ${theme.typography.sizes.m}px;
+        border: 1px solid ${theme.colorBorder};
+        padding: ${theme.sizeUnit}px ${theme.sizeUnit * 2}px;
+        font-size: ${theme.fontSize}px;
         outline: none;
 
         &:focus {
-          border: 1px solid ${theme.colors.primary.base};
+          border: 1px solid ${theme.colorPrimary};
         }
       }
     }
@@ -307,15 +307,15 @@ const ScopeSelector = styled.div`
 
 const ActionsContainer = styled.div`
   ${({ theme }) => `
-    height: ${theme.gridUnit * 16}px;
+    height: ${theme.sizeUnit * 16}px;
 
-    border-top: ${theme.gridUnit / 4}px solid ${theme.colors.primary.light3};
-    padding: ${theme.gridUnit * 6}px;
-    margin: 0 0 0 ${-theme.gridUnit * 6}px;
+    border-top: ${theme.sizeUnit / 4}px solid ${theme.colors.primary.light3};
+    padding: ${theme.sizeUnit * 6}px;
+    margin: 0 0 0 ${-theme.sizeUnit * 6}px;
     text-align: right;
 
     .btn {
-      margin-right: ${theme.gridUnit * 4}px;
+      margin-right: ${theme.sizeUnit * 4}px;
 
       &:last-child {
         margin-right: 0;
@@ -703,7 +703,7 @@ export default class FilterScopeSelector extends PureComponent {
     });
     return (
       <>
-        <input
+        <Input
           className="filter-text scope-search multi-edit-mode"
           placeholder={t('Search...')}
           type="text"
diff --git a/superset-frontend/src/dashboard/components/filterscope/renderFilterScopeTreeNodes.jsx b/superset-frontend/src/dashboard/components/filterscope/renderFilterScopeTreeNodes.jsx
index 38d720fc464..bb52ef24402 100644
--- a/superset-frontend/src/dashboard/components/filterscope/renderFilterScopeTreeNodes.jsx
+++ b/superset-frontend/src/dashboard/components/filterscope/renderFilterScopeTreeNodes.jsx
@@ -18,15 +18,15 @@
  */
 import cx from 'classnames';
 import { styled } from '@superset-ui/core';
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { CHART_TYPE } from 'src/dashboard/util/componentTypes';
 
 const ChartIcon = styled(Icons.BarChartOutlined)`
   ${({ theme }) => `
     position: relative;
-    top: ${theme.gridUnit - 1}px;
-    color: ${theme.colors.primary.base};
-    margin-right: ${theme.gridUnit * 2}px;
+    top: ${theme.sizeUnit - 1}px;
+    color: ${theme.colorPrimary};
+    margin-right: ${theme.sizeUnit * 2}px;
   `}
 `;
 
diff --git a/superset-frontend/src/dashboard/components/filterscope/treeIcons.jsx b/superset-frontend/src/dashboard/components/filterscope/treeIcons.jsx
index 9e6ab6382ae..6ed6ced8704 100644
--- a/superset-frontend/src/dashboard/components/filterscope/treeIcons.jsx
+++ b/superset-frontend/src/dashboard/components/filterscope/treeIcons.jsx
@@ -23,7 +23,7 @@ import {
   CheckboxChecked,
   CheckboxUnchecked,
   CheckboxHalfChecked,
-} from 'src/components/Checkbox/CheckboxIcons';
+} from '@superset-ui/core/components/Checkbox/CheckboxIcons';
 
 const treeIcons = {
   check: <CheckboxChecked />,
diff --git a/superset-frontend/src/dashboard/components/gridComponents/ChartHolder.tsx b/superset-frontend/src/dashboard/components/gridComponents/ChartHolder.tsx
index b78b217aad9..2e92b12b51d 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/ChartHolder.tsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/ChartHolder.tsx
@@ -100,7 +100,7 @@ const ChartHolder = ({
       z-index: 3000;
       left: 0;
       top: 0;
-      padding: ${theme.gridUnit * 2}px;
+      padding: ${theme.sizeUnit * 2}px;
     }
   `;
   const { chartId } = component.meta;
diff --git a/superset-frontend/src/dashboard/components/gridComponents/Column.jsx b/superset-frontend/src/dashboard/components/gridComponents/Column.jsx
index 612b8d5ef68..62112fed5fd 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/Column.jsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/Column.jsx
@@ -20,7 +20,7 @@ import { Fragment, useCallback, useState, useMemo, memo } from 'react';
 import PropTypes from 'prop-types';
 import cx from 'classnames';
 import { css, styled, t } from '@superset-ui/core';
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
 import DashboardComponent from 'src/dashboard/containers/DashboardComponent';
 import DeleteComponentButton from 'src/dashboard/components/DeleteComponentButton';
 import {
@@ -70,7 +70,7 @@ const ColumnStyles = styled.div`
       position: relative;
 
       & > :not(.hover-menu):not(:last-child) {
-        ${!editMode && `margin-bottom: ${theme.gridUnit * 4}px;`}
+        ${!editMode && `margin-bottom: ${theme.sizeUnit * 4}px;`}
       }
     }
 
@@ -83,11 +83,11 @@ const ColumnStyles = styled.div`
       left: 0;
       z-index: 1;
       pointer-events: none;
-      border: 1px dashed ${theme.colors.grayscale.light2};
+      border: 1px dashed ${theme.colorBorder};
     }
     .dashboard--editing .resizable-container--resizing:hover > &:after,
     .dashboard--editing .hover-menu:hover + &:after {
-      border: 1px dashed ${theme.colors.primary.base};
+      border: 1px dashed ${theme.colorPrimary};
       z-index: 2;
     }
 
@@ -110,13 +110,13 @@ const ColumnStyles = styled.div`
 `;
 
 const emptyColumnContentStyles = theme => css`
-  min-height: ${theme.gridUnit * 25}px;
+  min-height: ${theme.sizeUnit * 25}px;
   width: 100%;
   height: 100%;
   display: flex;
   align-items: center;
   justify-content: center;
-  color: ${theme.colors.text.label};
+  color: ${theme.colorTextLabel};
 `;
 
 const Column = props => {
@@ -212,10 +212,13 @@ const Column = props => {
           {editMode && (
             <HoverMenu innerRef={dragSourceRef} position="top">
               <DragHandle position="top" />
-              <DeleteComponentButton onDelete={handleDeleteComponent} />
+              <DeleteComponentButton
+                iconSize="m"
+                onDelete={handleDeleteComponent}
+              />
               <IconButton
                 onClick={handleChangeFocus}
-                icon={<Icons.SettingOutlined iconSize="xl" />}
+                icon={<Icons.SettingOutlined iconSize="m" />}
               />
             </HoverMenu>
           )}
diff --git a/superset-frontend/src/dashboard/components/gridComponents/Divider.jsx b/superset-frontend/src/dashboard/components/gridComponents/Divider.jsx
index 48eb4270ea3..5ba5b926ba5 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/Divider.jsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/Divider.jsx
@@ -40,7 +40,7 @@ const propTypes = {
 const DividerLine = styled.div`
   ${({ theme }) => css`
     width: 100%;
-    padding: ${theme.gridUnit * 2}px 0; /* this is padding not margin to enable a larger mouse target */
+    padding: ${theme.sizeUnit * 2}px 0; /* this is padding not margin to enable a larger mouse target */
     background-color: transparent;
 
     &:after {
@@ -56,8 +56,8 @@ const DividerLine = styled.div`
     }
 
     .dashboard-component-tabs & {
-      padding-left: ${theme.gridUnit * 4}px;
-      padding-right: ${theme.gridUnit * 4}px;
+      padding-left: ${theme.sizeUnit * 4}px;
+      padding-right: ${theme.sizeUnit * 4}px;
     }
   `}
 `;
diff --git a/superset-frontend/src/dashboard/components/gridComponents/Header.jsx b/superset-frontend/src/dashboard/components/gridComponents/Header.jsx
index c786a9cf5c1..6c2e304c58b 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/Header.jsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/Header.jsx
@@ -21,8 +21,8 @@ import PropTypes from 'prop-types';
 import cx from 'classnames';
 import { css, styled } from '@superset-ui/core';
 
-import PopoverDropdown from 'src/components/PopoverDropdown';
-import EditableTitle from 'src/components/EditableTitle';
+import PopoverDropdown from '@superset-ui/core/components/PopoverDropdown';
+import { EditableTitle } from '@superset-ui/core/components';
 import { Draggable } from 'src/dashboard/components/dnd/DragDroppable';
 import DragHandle from 'src/dashboard/components/dnd/DragHandle';
 import AnchorLink from 'src/dashboard/components/AnchorLink';
@@ -59,20 +59,20 @@ const defaultProps = {};
 
 const HeaderStyles = styled.div`
   ${({ theme }) => css`
-    font-weight: ${theme.typography.weights.bold};
+    font-weight: ${theme.fontWeightStrong};
     width: 100%;
-    padding: ${theme.gridUnit * 4}px 0;
+    padding: ${theme.sizeUnit * 4}px 0;
 
     &.header-small {
-      font-size: ${theme.typography.sizes.l}px;
+      font-size: ${theme.fontSizeLG}px;
     }
 
     &.header-medium {
-      font-size: ${theme.typography.sizes.xl}px;
+      font-size: ${theme.fontSizeXL}px;
     }
 
     &.header-large {
-      font-size: ${theme.typography.sizes.xxl}px;
+      font-size: ${theme.fontSizeXXL}px;
     }
 
     .dashboard--editing .dashboard-grid & {
@@ -89,7 +89,7 @@ const HeaderStyles = styled.div`
       }
 
       &:hover:after {
-        border: 1px dashed ${theme.colors.primary.base};
+        border: 1px dashed ${theme.colorPrimary};
         z-index: 2;
       }
     }
@@ -103,14 +103,14 @@ const HeaderStyles = styled.div`
    * we'll not worry about double padding on top as it can serve as a visual separator
    */
     .grid-column > :not(:last-child) & {
-      margin-bottom: ${theme.gridUnit * -4}px;
+      margin-bottom: ${theme.sizeUnit * -4}px;
     }
 
     .background--white &,
     &.background--white,
     .dashboard-component-tabs & {
-      padding-left: ${theme.gridUnit * 4}px;
-      padding-right: ${theme.gridUnit * 4}px;
+      padding-left: ${theme.sizeUnit * 4}px;
+      padding-right: ${theme.sizeUnit * 4}px;
     }
   `}
 `;
diff --git a/superset-frontend/src/dashboard/components/gridComponents/Header.test.jsx b/superset-frontend/src/dashboard/components/gridComponents/Header.test.jsx
index ef3bb1dc6d1..48c969bb9b5 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/Header.test.jsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/Header.test.jsx
@@ -78,7 +78,7 @@ describe('Header', () => {
 
   it('should render an EditableTitle with meta.text', () => {
     setup();
-    const titleElement = screen.getByTestId('editable-title-input');
+    const titleElement = screen.getByTestId('editable-title');
     expect(titleElement).toBeInTheDocument();
     expect(titleElement).toHaveTextContent(props.component.meta.text);
   });
@@ -88,11 +88,11 @@ describe('Header', () => {
     setup({ editMode: true, updateComponents });
 
     // First click to enter edit mode
-    const titleButton = screen.getByTestId('editable-title-input');
+    const titleButton = screen.getByTestId('textarea-editable-title-input');
     fireEvent.click(titleButton);
 
     // Then change the input value and blur to trigger save
-    const titleInput = screen.getByTestId('editable-title-input');
+    const titleInput = screen.getByTestId('textarea-editable-title-input');
     fireEvent.change(titleInput, { target: { value: 'New title' } });
     fireEvent.blur(titleInput);
 
diff --git a/superset-frontend/src/dashboard/components/gridComponents/Markdown.jsx b/superset-frontend/src/dashboard/components/gridComponents/Markdown.jsx
index 3faa420b326..a546244d1aa 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/Markdown.jsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/Markdown.jsx
@@ -21,9 +21,9 @@ import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import cx from 'classnames';
 
-import { css, styled, t, SafeMarkdown } from '@superset-ui/core';
+import { css, styled, t } from '@superset-ui/core';
+import { SafeMarkdown, MarkdownEditor } from '@superset-ui/core/components';
 import { Logger, LOG_ACTIONS_RENDER_CHART } from 'src/logger/LogUtils';
-import { MarkdownEditor } from 'src/components/AsyncAceEditor';
 
 import DeleteComponentButton from 'src/dashboard/components/DeleteComponentButton';
 import { Draggable } from 'src/dashboard/components/dnd/DragDroppable';
@@ -88,24 +88,22 @@ const MarkdownStyles = styled.div`
   ${({ theme }) => css`
     &.dashboard-markdown {
       overflow: hidden;
+      color: ${theme.colorText};
 
       h4,
       h5,
       h6 {
-        font-weight: ${theme.typography.weights.normal};
-      }
-
-      h5 {
-        color: ${theme.colors.grayscale.base};
+        font-weight: ${theme.fontWeightNormal};
       }
 
       h6 {
-        font-size: ${theme.typography.sizes.s}px;
+        font-size: ${theme.fontSizeSM}px;
       }
 
       .dashboard-component-chart-holder {
         overflow-y: auto;
         overflow-x: hidden;
+        border-radius: ${theme.borderRadius}px;
       }
 
       .dashboard--editing & {
diff --git a/superset-frontend/src/dashboard/components/gridComponents/Row.jsx b/superset-frontend/src/dashboard/components/gridComponents/Row.jsx
index 1025e4101d4..64fedfef150 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/Row.jsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/Row.jsx
@@ -29,12 +29,12 @@ import PropTypes from 'prop-types';
 import cx from 'classnames';
 import {
   css,
-  FAST_DEBOUNCE,
   FeatureFlag,
   isFeatureEnabled,
   styled,
   t,
 } from '@superset-ui/core';
+import { Icons, Constants } from '@superset-ui/core/components';
 
 import {
   Draggable,
@@ -44,7 +44,6 @@ import DragHandle from 'src/dashboard/components/dnd/DragHandle';
 import DashboardComponent from 'src/dashboard/containers/DashboardComponent';
 import DeleteComponentButton from 'src/dashboard/components/DeleteComponentButton';
 import HoverMenu from 'src/dashboard/components/menu/HoverMenu';
-import { Icons } from 'src/components/Icons';
 import IconButton from 'src/dashboard/components/IconButton';
 import BackgroundStyleDropdown from 'src/dashboard/components/menu/BackgroundStyleDropdown';
 import WithPopoverMenu from 'src/dashboard/components/menu/WithPopoverMenu';
@@ -91,16 +90,16 @@ const GridRow = styled.div`
     height: fit-content;
 
     & > :not(:last-child):not(.hover-menu) {
-      ${!editMode && `margin-right: ${theme.gridUnit * 4}px;`}
+      ${!editMode && `margin-right: ${theme.sizeUnit * 4}px;`}
     }
 
     & .empty-droptarget {
       position: relative;
       align-self: center;
       &.empty-droptarget--vertical {
-        min-width: ${theme.gridUnit * 4}px;
+        min-width: ${theme.sizeUnit * 4}px;
         &:not(:last-child) {
-          width: ${theme.gridUnit * 4}px;
+          width: ${theme.sizeUnit * 4}px;
         }
         &:first-child:not(.droptarget-side) {
           z-index: ${EMPTY_CONTAINER_Z_INDEX};
@@ -112,7 +111,7 @@ const GridRow = styled.div`
       &.droptarget-side {
         z-index: ${EMPTY_CONTAINER_Z_INDEX};
         position: absolute;
-        width: ${theme.gridUnit * 4}px;
+        width: ${theme.sizeUnit * 4}px;
         &:first-child {
           inset-inline-start: 0;
         }
@@ -120,7 +119,7 @@ const GridRow = styled.div`
     }
 
     &.grid-row--empty {
-      min-height: ${theme.gridUnit * 25}px;
+      min-height: ${theme.sizeUnit * 25}px;
     }
   `}
 `;
@@ -132,7 +131,7 @@ const emptyRowContentStyles = theme => css`
   display: flex;
   align-items: center;
   justify-content: center;
-  color: ${theme.colors.text.label};
+  color: ${theme.colorTextLabel};
 `;
 
 const Row = props => {
@@ -222,7 +221,7 @@ const Row = props => {
         setContainerHeight(updatedHeight);
       }
     },
-    FAST_DEBOUNCE,
+    Constants.FAST_DEBOUNCE,
     [editMode, containerHeight],
   );
 
@@ -292,7 +291,7 @@ const Row = props => {
             <DeleteComponentButton onDelete={handleDeleteComponent} />
             <IconButton
               onClick={handleChangeFocus}
-              icon={<Icons.SettingOutlined iconSize="xl" />}
+              icon={<Icons.SettingOutlined iconSize="l" />}
             />
           </HoverMenu>
         )}
diff --git a/superset-frontend/src/dashboard/components/gridComponents/Tab.jsx b/superset-frontend/src/dashboard/components/gridComponents/Tab.jsx
index 335417f0c62..5c9229cbddf 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/Tab.jsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/Tab.jsx
@@ -22,8 +22,7 @@ import classNames from 'classnames';
 import { useDispatch, useSelector } from 'react-redux';
 import { styled, t } from '@superset-ui/core';
 
-import { EmptyState } from 'src/components/EmptyState';
-import EditableTitle from 'src/components/EditableTitle';
+import { EditableTitle, EmptyState } from '@superset-ui/core/components';
 import { setEditMode } from 'src/dashboard/actions/dashboardState';
 import DashboardComponent from 'src/dashboard/containers/DashboardComponent';
 import AnchorLink from 'src/dashboard/components/AnchorLink';
@@ -79,12 +78,12 @@ const defaultProps = {
 };
 
 const TabTitleContainer = styled.div`
-  ${({ isHighlighted, theme: { gridUnit, colors } }) => `
-    padding: ${gridUnit}px ${gridUnit * 2}px;
-    margin: ${-gridUnit}px ${gridUnit * -2}px;
+  ${({ isHighlighted, theme: { sizeUnit, colors } }) => `
+    padding: ${sizeUnit}px ${sizeUnit * 2}px;
+    margin: ${-sizeUnit}px ${sizeUnit * -2}px;
     transition: box-shadow 0.2s ease-in-out;
     ${
-      isHighlighted && `box-shadow: 0 0 ${gridUnit}px ${colors.primary.light1};`
+      isHighlighted && `box-shadow: 0 0 ${sizeUnit}px ${colors.primary.light1};`
     }
   `}
 `;
diff --git a/superset-frontend/src/dashboard/components/gridComponents/Tab.test.jsx b/superset-frontend/src/dashboard/components/gridComponents/Tab.test.jsx
index 3a88ad2e68e..74c5f4813ae 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/Tab.test.jsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/Tab.test.jsx
@@ -104,7 +104,9 @@ describe('Tabs', () => {
       const titleElement = screen.getByTestId('editable-title');
       fireEvent.click(titleElement);
 
-      const titleInput = await screen.findByTestId('editable-title-input');
+      const titleInput = await screen.findByTestId(
+        'textarea-editable-title-input',
+      );
       fireEvent.change(titleInput, { target: { value: 'New title' } });
       fireEvent.blur(titleInput);
 
diff --git a/superset-frontend/src/dashboard/components/gridComponents/Tab.test.tsx b/superset-frontend/src/dashboard/components/gridComponents/Tab.test.tsx
index 3b0fe2f1737..05ceb7e0cc4 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/Tab.test.tsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/Tab.test.tsx
@@ -25,7 +25,7 @@ import {
   userEvent,
 } from 'spec/helpers/testing-library';
 import DashboardComponent from 'src/dashboard/containers/DashboardComponent';
-import EditableTitle from 'src/components/EditableTitle';
+import { EditableTitle } from '@superset-ui/core/components';
 import { setEditMode } from 'src/dashboard/actions/dashboardState';
 
 import Tab from './Tab';
@@ -34,13 +34,15 @@ import Markdown from './Markdown';
 jest.mock('src/dashboard/containers/DashboardComponent', () =>
   jest.fn(() => <div data-test="DashboardComponent" />),
 );
-jest.mock('src/components/EditableTitle', () =>
-  jest.fn(props => (
+jest.mock('@superset-ui/core/components/EditableTitle', () => ({
+  __esModule: true,
+  EditableTitle: jest.fn(props => (
     <button type="button" data-test="EditableTitle" onClick={props.onSaveTitle}>
       {props.title}
     </button>
   )),
-);
+}));
+
 jest.mock('src/dashboard/components/dnd/DragDroppable', () => ({
   ...jest.requireActual('src/dashboard/components/dnd/DragDroppable'),
   Droppable: jest.fn(props => {
diff --git a/superset-frontend/src/dashboard/components/gridComponents/Tabs.jsx b/superset-frontend/src/dashboard/components/gridComponents/Tabs.jsx
index 0a699bc33ee..b81bfeaf28a 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/Tabs.jsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/Tabs.jsx
@@ -20,10 +20,10 @@ import { useCallback, useEffect, useMemo, useState, memo } from 'react';
 import PropTypes from 'prop-types';
 import { styled, t, usePrevious, css } from '@superset-ui/core';
 import { useSelector } from 'react-redux';
-import { LineEditableTabs } from 'src/components/Tabs';
-import { Icons } from 'src/components/Icons';
+import { LineEditableTabs } from '@superset-ui/core/components/Tabs';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { LOG_ACTIONS_SELECT_DASHBOARD_TAB } from 'src/logger/LogUtils';
-import Modal from 'src/components/Modal';
+import { Modal } from '@superset-ui/core/components';
 import { DROP_LEFT, DROP_RIGHT } from 'src/dashboard/util/getDropPosition';
 import { Draggable } from '../dnd/DragDroppable';
 import DragHandle from '../dnd/DragHandle';
@@ -82,8 +82,8 @@ const StyledTabsContainer = styled.div`
     background-color: ${theme.colors.grayscale.light5};
 
     .dashboard-component-tabs-content {
-      min-height: ${theme.gridUnit * 12}px;
-      margin-top: ${theme.gridUnit / 4}px;
+      min-height: ${theme.sizeUnit * 12}px;
+      margin-top: ${theme.sizeUnit / 4}px;
       position: relative;
     }
 
@@ -91,11 +91,12 @@ const StyledTabsContainer = styled.div`
       overflow: visible;
 
       .ant-tabs-nav-wrap {
-        min-height: ${theme.gridUnit * 12.5}px;
+        min-height: ${theme.sizeUnit * 12.5}px;
       }
 
       .ant-tabs-content-holder {
         overflow: visible;
+        margin-top: ${theme.sizeUnit * 4}px;
       }
     }
 
@@ -105,7 +106,7 @@ const StyledTabsContainer = styled.div`
   `}
 `;
 const DropIndicator = styled.div`
-  border: 2px solid ${({ theme }) => theme.colors.primary.base};
+  border: 2px solid ${({ theme }) => theme.colorPrimary};
   width: 5px;
   height: 100%;
   position: absolute;
@@ -410,97 +411,90 @@ const Tabs = props => {
   }
 
   const renderChild = useCallback(
-    ({ dragSourceRef: tabsDragSourceRef }) => (
-      <StyledTabsContainer
-        className="dashboard-component dashboard-component-tabs"
-        data-test="dashboard-component-tabs"
-      >
-        {editMode && renderHoverMenu && (
-          <HoverMenu innerRef={tabsDragSourceRef} position="left">
-            <DragHandle position="left" />
-            <DeleteComponentButton onDelete={handleDeleteComponent} />
-          </HoverMenu>
-        )}
+    ({ dragSourceRef: tabsDragSourceRef }) => {
+      const tabItems = tabIds.map((tabId, tabIndex) => ({
+        key: tabId,
+        label: removeDraggedTab(tabId) ? (
+          <></>
+        ) : (
+          <>
+            {showDropIndicators(tabIndex).left && (
+              <DropIndicator className="drop-indicator-left" pos="left" />
+            )}
+            <DashboardComponent
+              id={tabId}
+              parentId={tabsComponent.id}
+              depth={depth}
+              index={tabIndex}
+              renderType={RENDER_TAB}
+              availableColumnCount={availableColumnCount}
+              columnWidth={columnWidth}
+              onDropOnTab={handleDropOnTab}
+              onDropPositionChange={handleGetDropPosition}
+              onDragTab={handleDragggingTab}
+              onHoverTab={() => handleClickTab(tabIndex)}
+              isFocused={activeKey === tabId}
+              isHighlighted={
+                activeKey !== tabId && tabsToHighlight?.includes(tabId)
+              }
+            />
+          </>
+        ),
+        closeIcon: removeDraggedTab(tabId) ? (
+          <></>
+        ) : (
+          <CloseIconWithDropIndicator
+            role="button"
+            tabIndex={tabIndex}
+            showDropIndicators={showDropIndicators(tabIndex)}
+          />
+        ),
+        children: renderTabContent && (
+          <DashboardComponent
+            id={tabId}
+            parentId={tabsComponent.id}
+            depth={depth} // see isValidChild.js for why tabs don't increment child depth
+            index={tabIndex}
+            renderType={RENDER_TAB_CONTENT}
+            availableColumnCount={availableColumnCount}
+            columnWidth={columnWidth}
+            onResizeStart={onResizeStart}
+            onResize={onResize}
+            onResizeStop={onResizeStop}
+            onDropOnTab={handleDropOnTab}
+            isComponentVisible={
+              selectedTabIndex === tabIndex && isCurrentTabVisible
+            }
+          />
+        ),
+      }));
 
-        <LineEditableTabs
-          id={tabsComponent.id}
-          activeKey={activeKey}
-          onChange={key => {
-            handleClickTab(tabIds.indexOf(key));
-          }}
-          onEdit={handleEdit}
-          data-test="nav-list"
-          type={editMode ? 'editable-card' : 'card'}
+      return (
+        <StyledTabsContainer
+          className="dashboard-component dashboard-component-tabs"
+          data-test="dashboard-component-tabs"
         >
-          {tabIds.map((tabId, tabIndex) => (
-            <LineEditableTabs.TabPane
-              key={tabId}
-              tab={
-                removeDraggedTab(tabId) ? (
-                  <></>
-                ) : (
-                  <>
-                    {showDropIndicators(tabIndex).left && (
-                      <DropIndicator
-                        className="drop-indicator-left"
-                        pos="left"
-                      />
-                    )}
-                    <DashboardComponent
-                      id={tabId}
-                      parentId={tabsComponent.id}
-                      depth={depth}
-                      index={tabIndex}
-                      renderType={RENDER_TAB}
-                      availableColumnCount={availableColumnCount}
-                      columnWidth={columnWidth}
-                      onDropOnTab={handleDropOnTab}
-                      onDropPositionChange={handleGetDropPosition}
-                      onDragTab={handleDragggingTab}
-                      onHoverTab={() => handleClickTab(tabIndex)}
-                      isFocused={activeKey === tabId}
-                      isHighlighted={
-                        activeKey !== tabId && tabsToHighlight?.includes(tabId)
-                      }
-                    />
-                  </>
-                )
-              }
-              closeIcon={
-                removeDraggedTab(tabId) ? (
-                  <></>
-                ) : (
-                  <CloseIconWithDropIndicator
-                    role="button"
-                    tabIndex={tabIndex}
-                    showDropIndicators={showDropIndicators(tabIndex)}
-                  />
-                )
-              }
-            >
-              {renderTabContent && (
-                <DashboardComponent
-                  id={tabId}
-                  parentId={tabsComponent.id}
-                  depth={depth} // see isValidChild.js for why tabs don't increment child depth
-                  index={tabIndex}
-                  renderType={RENDER_TAB_CONTENT}
-                  availableColumnCount={availableColumnCount}
-                  columnWidth={columnWidth}
-                  onResizeStart={onResizeStart}
-                  onResize={onResize}
-                  onResizeStop={onResizeStop}
-                  onDropOnTab={handleDropOnTab}
-                  isComponentVisible={
-                    selectedTabIndex === tabIndex && isCurrentTabVisible
-                  }
-                />
-              )}
-            </LineEditableTabs.TabPane>
-          ))}
-        </LineEditableTabs>
-      </StyledTabsContainer>
-    ),
+          {editMode && renderHoverMenu && (
+            <HoverMenu innerRef={tabsDragSourceRef} position="left">
+              <DragHandle position="left" />
+              <DeleteComponentButton onDelete={handleDeleteComponent} />
+            </HoverMenu>
+          )}
+
+          <LineEditableTabs
+            id={tabsComponent.id}
+            activeKey={activeKey}
+            onChange={key => {
+              handleClickTab(tabIds.indexOf(key));
+            }}
+            onEdit={handleEdit}
+            data-test="nav-list"
+            type={editMode ? 'editable-card' : 'card'}
+            items={tabItems} // Pass the dynamically generated items array
+          />
+        </StyledTabsContainer>
+      );
+    },
     [
       editMode,
       renderHoverMenu,
diff --git a/superset-frontend/src/dashboard/components/gridComponents/Tabs.test.jsx b/superset-frontend/src/dashboard/components/gridComponents/Tabs.test.jsx
index c8bef9d7358..0f2d4cc6111 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/Tabs.test.jsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/Tabs.test.jsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { fireEvent, render } from 'spec/helpers/testing-library';
-import Modal from 'src/components/Modal';
+import { Modal } from '@superset-ui/core/components';
 import fetchMock from 'fetch-mock';
 import Tabs from 'src/dashboard/components/gridComponents/Tabs';
 import { DASHBOARD_ROOT_ID } from 'src/dashboard/util/constants';
diff --git a/superset-frontend/src/dashboard/components/gridComponents/Tabs.test.tsx b/superset-frontend/src/dashboard/components/gridComponents/Tabs.test.tsx
index 2eb799d22e1..9fdf935d2af 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/Tabs.test.tsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/Tabs.test.tsx
@@ -124,9 +124,13 @@ beforeEach(() => {
 test('Should render editMode:true', () => {
   const props = createProps();
   render(<Tabs {...props} />, { useRedux: true, useDnd: true });
-  expect(screen.getAllByRole('tab')).toHaveLength(3);
-  expect(screen.getAllByRole('button', { name: 'remove' })).toHaveLength(3);
-  expect(screen.getAllByRole('button', { name: 'Add tab' })).toHaveLength(2);
+  expect(
+    screen
+      .getAllByRole('tab')
+      .filter(tab => !tab.classList.contains('ant-tabs-tab-remove')),
+  ).toHaveLength(3);
+  expect(screen.getAllByRole('tab', { name: 'remove' })).toHaveLength(3);
+  expect(screen.getAllByRole('button', { name: 'Add tab' })).toHaveLength(1);
   expect(DashboardComponent).toHaveBeenCalledTimes(4);
   expect(DeleteComponentButton).toHaveBeenCalledTimes(1);
 });
@@ -200,7 +204,7 @@ test('Removing a tab', async () => {
 
   expect(props.deleteComponent).not.toHaveBeenCalled();
   expect(screen.queryByText('Delete dashboard tab?')).not.toBeInTheDocument();
-  userEvent.click(screen.getAllByRole('button', { name: 'remove' })[0]);
+  userEvent.click(screen.getAllByRole('tab', { name: 'remove' })[0]);
   expect(props.deleteComponent).not.toHaveBeenCalled();
 
   expect(await screen.findByText('Delete dashboard tab?')).toBeInTheDocument();
diff --git a/superset-frontend/src/dashboard/components/gridComponents/new/DraggableNewComponent.jsx b/superset-frontend/src/dashboard/components/gridComponents/new/DraggableNewComponent.tsx
similarity index 68%
rename from superset-frontend/src/dashboard/components/gridComponents/new/DraggableNewComponent.jsx
rename to superset-frontend/src/dashboard/components/gridComponents/new/DraggableNewComponent.tsx
index acc5de6d8e1..cb757f8079a 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/new/DraggableNewComponent.jsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/new/DraggableNewComponent.tsx
@@ -17,24 +17,21 @@
  * under the License.
  */
 import { PureComponent } from 'react';
-import PropTypes from 'prop-types';
 import cx from 'classnames';
 import { css, styled } from '@superset-ui/core';
-
 import { DragDroppable } from 'src/dashboard/components/dnd/DragDroppable';
 import { NEW_COMPONENTS_SOURCE_ID } from 'src/dashboard/util/constants';
 import { NEW_COMPONENT_SOURCE_TYPE } from 'src/dashboard/util/componentTypes';
 
-const propTypes = {
-  id: PropTypes.string.isRequired,
-  type: PropTypes.string.isRequired,
-  label: PropTypes.string.isRequired,
-  className: PropTypes.string,
-};
-
-const defaultProps = {
-  className: null,
-};
+// Define types for component props
+interface DraggableNewComponentProps {
+  id: string;
+  type: string;
+  label: string;
+  className?: string;
+  meta?: Record<string, any>;
+  IconComponent?: any;
+}
 
 const NewComponent = styled.div`
   ${({ theme }) => css`
@@ -42,10 +39,9 @@ const NewComponent = styled.div`
     flex-direction: row;
     flex-wrap: nowrap;
     align-items: center;
-    padding: ${theme.gridUnit * 4}px;
+    padding: ${theme.sizeUnit * 4}px;
     background: ${theme.colors.grayscale.light5};
     cursor: move;
-
     &:not(.static):hover {
       background: ${theme.colors.grayscale.light4};
     }
@@ -55,37 +51,25 @@ const NewComponent = styled.div`
 const NewComponentPlaceholder = styled.div`
   ${({ theme }) => css`
     position: relative;
-    background: ${theme.colors.grayscale.light4};
-    width: ${theme.gridUnit * 10}px;
-    height: ${theme.gridUnit * 10}px;
-    margin-right: ${theme.gridUnit * 4}px;
-    border: 1px solid ${theme.colors.grayscale.light5};
+    width: ${theme.sizeUnit * 10}px;
+    height: ${theme.sizeUnit * 10}px;
+    margin-right: ${theme.sizeUnit * 4}px;
     display: flex;
     align-items: center;
     justify-content: center;
-    color: ${theme.colors.text.label};
-    font-size: ${theme.typography.sizes.xxl}px;
-
-    &.fa-window-restore {
-      font-size: ${theme.typography.sizes.l}px;
-    }
-
-    &.fa-area-chart {
-      font-size: ${theme.typography.sizes.xl}px;
-    }
-
-    &.divider-placeholder:after {
-      content: '';
-      height: 2px;
-      width: 100%;
-      background-color: ${theme.colors.grayscale.light2};
-    }
+    color: ${theme.colorTextLabel};
   `}
 `;
 
-export default class DraggableNewComponent extends PureComponent {
+export default class DraggableNewComponent extends PureComponent<DraggableNewComponentProps> {
+  static defaultProps = {
+    className: null,
+    IconComponent: undefined,
+  };
+
   render() {
-    const { label, id, type, className, meta } = this.props;
+    const { label, id, type, className, meta, IconComponent } = this.props;
+
     return (
       <DragDroppable
         component={{ type, id, meta }}
@@ -101,7 +85,9 @@ export default class DraggableNewComponent extends PureComponent {
           <NewComponent ref={dragSourceRef} data-test="new-component">
             <NewComponentPlaceholder
               className={cx('new-component-placeholder', className)}
-            />
+            >
+              {IconComponent && <IconComponent iconSize="xl" />}
+            </NewComponentPlaceholder>
             {label}
           </NewComponent>
         )}
@@ -109,6 +95,3 @@ export default class DraggableNewComponent extends PureComponent {
     );
   }
 }
-
-DraggableNewComponent.propTypes = propTypes;
-DraggableNewComponent.defaultProps = defaultProps;
diff --git a/superset-frontend/src/dashboard/components/gridComponents/new/NewColumn.jsx b/superset-frontend/src/dashboard/components/gridComponents/new/NewColumn.jsx
index a933c21424a..b7e09e45ba2 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/new/NewColumn.jsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/new/NewColumn.jsx
@@ -18,6 +18,7 @@
  */
 import { t } from '@superset-ui/core';
 
+import { Icons } from '@superset-ui/core/components';
 import { COLUMN_TYPE } from '../../../util/componentTypes';
 import { NEW_COLUMN_ID } from '../../../util/constants';
 import DraggableNewComponent from './DraggableNewComponent';
@@ -28,7 +29,7 @@ export default function DraggableNewColumn() {
       id={NEW_COLUMN_ID}
       type={COLUMN_TYPE}
       label={t('Column')}
-      className="fa fa-long-arrow-down"
+      IconComponent={Icons.ColumnWidthOutlined}
     />
   );
 }
diff --git a/superset-frontend/src/dashboard/components/gridComponents/new/NewDivider.jsx b/superset-frontend/src/dashboard/components/gridComponents/new/NewDivider.jsx
index b7a30472391..8d3a745bb81 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/new/NewDivider.jsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/new/NewDivider.jsx
@@ -18,6 +18,7 @@
  */
 import { t } from '@superset-ui/core';
 
+import { Icons } from '@superset-ui/core/components';
 import { DIVIDER_TYPE } from '../../../util/componentTypes';
 import { NEW_DIVIDER_ID } from '../../../util/constants';
 import DraggableNewComponent from './DraggableNewComponent';
@@ -28,7 +29,7 @@ export default function DraggableNewDivider() {
       id={NEW_DIVIDER_ID}
       type={DIVIDER_TYPE}
       label={t('Divider')}
-      className="divider-placeholder"
+      IconComponent={Icons.LineOutlined}
     />
   );
 }
diff --git a/superset-frontend/src/dashboard/components/gridComponents/new/NewDynamicComponent.tsx b/superset-frontend/src/dashboard/components/gridComponents/new/NewDynamicComponent.tsx
index 014d5b6e945..1ded6538967 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/new/NewDynamicComponent.tsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/new/NewDynamicComponent.tsx
@@ -36,7 +36,6 @@ const DraggableNewDynamicComponent: FC<DraggableNewDynamicComponent> = ({
     type={DYNAMIC_TYPE}
     label={metadata.name}
     meta={{ metadata, componentKey }}
-    className={`fa fa-${metadata.iconName}`}
   />
 );
 
diff --git a/superset-frontend/src/dashboard/components/gridComponents/new/NewHeader.jsx b/superset-frontend/src/dashboard/components/gridComponents/new/NewHeader.jsx
index 36a0e5c274f..ceb74dafba3 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/new/NewHeader.jsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/new/NewHeader.jsx
@@ -18,6 +18,7 @@
  */
 import { t } from '@superset-ui/core';
 
+import { Icons } from '@superset-ui/core/components';
 import { HEADER_TYPE } from '../../../util/componentTypes';
 import { NEW_HEADER_ID } from '../../../util/constants';
 import DraggableNewComponent from './DraggableNewComponent';
@@ -28,7 +29,7 @@ export default function DraggableNewHeader() {
       id={NEW_HEADER_ID}
       type={HEADER_TYPE}
       label={t('Header')}
-      className="fa fa-header"
+      IconComponent={Icons.FontColorsOutlined}
     />
   );
 }
diff --git a/superset-frontend/src/dashboard/components/gridComponents/new/NewMarkdown.jsx b/superset-frontend/src/dashboard/components/gridComponents/new/NewMarkdown.jsx
index 98d2ac819a9..100f3f38333 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/new/NewMarkdown.jsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/new/NewMarkdown.jsx
@@ -18,6 +18,7 @@
  */
 import { t } from '@superset-ui/core';
 
+import { Icons } from '@superset-ui/core/components';
 import { MARKDOWN_TYPE } from '../../../util/componentTypes';
 import { NEW_MARKDOWN_ID } from '../../../util/constants';
 import DraggableNewComponent from './DraggableNewComponent';
@@ -28,7 +29,7 @@ export default function DraggableNewDivider() {
       id={NEW_MARKDOWN_ID}
       type={MARKDOWN_TYPE}
       label={t('Text / Markdown')}
-      className="fa fa-font"
+      IconComponent={Icons.FileMarkdownOutlined}
     />
   );
 }
diff --git a/superset-frontend/src/dashboard/components/gridComponents/new/NewRow.jsx b/superset-frontend/src/dashboard/components/gridComponents/new/NewRow.jsx
index 3bae437d945..8f735cadbf9 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/new/NewRow.jsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/new/NewRow.jsx
@@ -18,6 +18,7 @@
  */
 import { t } from '@superset-ui/core';
 
+import { Icons } from '@superset-ui/core/components';
 import { ROW_TYPE } from '../../../util/componentTypes';
 import { NEW_ROW_ID } from '../../../util/constants';
 import DraggableNewComponent from './DraggableNewComponent';
@@ -28,7 +29,7 @@ export default function DraggableNewRow() {
       id={NEW_ROW_ID}
       type={ROW_TYPE}
       label={t('Row')}
-      className="fa fa-long-arrow-right"
+      IconComponent={Icons.ColumnHeightOutlined}
     />
   );
 }
diff --git a/superset-frontend/src/dashboard/components/gridComponents/new/NewTabs.jsx b/superset-frontend/src/dashboard/components/gridComponents/new/NewTabs.jsx
index 0faf9d111bc..237dfb96b45 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/new/NewTabs.jsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/new/NewTabs.jsx
@@ -18,6 +18,7 @@
  */
 import { t } from '@superset-ui/core';
 
+import { Icons } from '@superset-ui/core/components';
 import { TABS_TYPE } from '../../../util/componentTypes';
 import { NEW_TABS_ID } from '../../../util/constants';
 import DraggableNewComponent from './DraggableNewComponent';
@@ -28,7 +29,7 @@ export default function DraggableNewTabs() {
       id={NEW_TABS_ID}
       type={TABS_TYPE}
       label={t('Tabs')}
-      className="fa fa-window-restore"
+      IconComponent={Icons.DownSquareOutlined}
     />
   );
 }
diff --git a/superset-frontend/src/dashboard/components/menu/BackgroundStyleDropdown.tsx b/superset-frontend/src/dashboard/components/menu/BackgroundStyleDropdown.tsx
index 700c6f9e399..f37acf7e193 100644
--- a/superset-frontend/src/dashboard/components/menu/BackgroundStyleDropdown.tsx
+++ b/superset-frontend/src/dashboard/components/menu/BackgroundStyleDropdown.tsx
@@ -24,7 +24,7 @@ import backgroundStyleOptions from 'src/dashboard/util/backgroundStyleOptions';
 import PopoverDropdown, {
   OptionProps,
   OnChangeHandler,
-} from 'src/components/PopoverDropdown';
+} from '@superset-ui/core/components/PopoverDropdown';
 
 interface BackgroundStyleDropdownProps {
   id: string;
@@ -39,7 +39,7 @@ const BackgroundStyleOption = styled.div`
       content: '';
       width: 1em;
       height: 1em;
-      margin-right: ${theme.gridUnit * 2}px;
+      margin-right: ${theme.sizeUnit * 2}px;
       display: inline-block;
       vertical-align: middle;
     }
@@ -48,26 +48,22 @@ const BackgroundStyleOption = styled.div`
       background: transparent;
       &:before {
         background: ${theme.colors.grayscale.light5};
-        border: 1px solid ${theme.colors.grayscale.light2};
+        border: 1px solid ${theme.colorBorder};
       }
     }
     /* Create the transparent rect icon */
     &.background--transparent:before {
       background-image:
-        linear-gradient(45deg, ${theme.colors.text.label} 25%, transparent 25%),
-        linear-gradient(
-          -45deg,
-          ${theme.colors.text.label} 25%,
-          transparent 25%
-        ),
-        linear-gradient(45deg, transparent 75%, ${theme.colors.text.label} 75%),
-        linear-gradient(-45deg, transparent 75%, ${theme.colors.text.label} 75%);
-      background-size: ${theme.gridUnit * 2}px ${theme.gridUnit * 2}px;
+        linear-gradient(45deg, ${theme.colorTextLabel} 25%, transparent 25%),
+        linear-gradient(-45deg, ${theme.colorTextLabel} 25%, transparent 25%),
+        linear-gradient(45deg, transparent 75%, ${theme.colorTextLabel} 75%),
+        linear-gradient(-45deg, transparent 75%, ${theme.colorTextLabel} 75%);
+      background-size: ${theme.sizeUnit * 2}px ${theme.sizeUnit * 2}px;
       background-position:
         0 0,
-        0 ${theme.gridUnit}px,
-        ${theme.gridUnit}px ${-theme.gridUnit}px,
-        ${-theme.gridUnit}px 0px;
+        0 ${theme.sizeUnit}px,
+        ${theme.sizeUnit}px ${-theme.sizeUnit}px,
+        ${-theme.sizeUnit}px 0px;
     }
   `}
 `;
diff --git a/superset-frontend/src/dashboard/components/menu/DownloadMenuItems/DownloadAsImage.test.tsx b/superset-frontend/src/dashboard/components/menu/DownloadMenuItems/DownloadAsImage.test.tsx
index 2885fa7affa..c015f263567 100644
--- a/superset-frontend/src/dashboard/components/menu/DownloadMenuItems/DownloadAsImage.test.tsx
+++ b/superset-frontend/src/dashboard/components/menu/DownloadMenuItems/DownloadAsImage.test.tsx
@@ -23,7 +23,7 @@ import {
   userEvent,
   waitFor,
 } from 'spec/helpers/testing-library';
-import { Menu } from 'src/components/Menu';
+import { Menu } from '@superset-ui/core/components/Menu';
 import downloadAsImage from 'src/utils/downloadAsImage';
 import DownloadAsImage from './DownloadAsImage';
 
@@ -31,7 +31,7 @@ const mockAddDangerToast = jest.fn();
 
 jest.mock('src/utils/downloadAsImage', () => ({
   __esModule: true,
-  default: jest.fn(() => (_e: SyntheticEvent) => {}),
+  default: jest.fn(() => (_e: SyntheticEvent) => console.log(_e)),
 }));
 
 jest.mock('src/components/MessageToasts/withToasts', () => ({
diff --git a/superset-frontend/src/dashboard/components/menu/DownloadMenuItems/DownloadAsImage.tsx b/superset-frontend/src/dashboard/components/menu/DownloadMenuItems/DownloadAsImage.tsx
index 5490d7b8059..1d98b47a205 100644
--- a/superset-frontend/src/dashboard/components/menu/DownloadMenuItems/DownloadAsImage.tsx
+++ b/superset-frontend/src/dashboard/components/menu/DownloadMenuItems/DownloadAsImage.tsx
@@ -18,7 +18,7 @@
  */
 import { SyntheticEvent } from 'react';
 import { logging, t } from '@superset-ui/core';
-import { Menu } from 'src/components/Menu';
+import { Menu } from '@superset-ui/core/components/Menu';
 import { LOG_ACTIONS_DASHBOARD_DOWNLOAD_AS_IMAGE } from 'src/logger/LogUtils';
 import downloadAsImage from 'src/utils/downloadAsImage';
 import { useToasts } from 'src/components/MessageToasts/withToasts';
diff --git a/superset-frontend/src/dashboard/components/menu/DownloadMenuItems/DownloadAsPdf.test.tsx b/superset-frontend/src/dashboard/components/menu/DownloadMenuItems/DownloadAsPdf.test.tsx
index fddd33cc1e4..cead7cf4473 100644
--- a/superset-frontend/src/dashboard/components/menu/DownloadMenuItems/DownloadAsPdf.test.tsx
+++ b/superset-frontend/src/dashboard/components/menu/DownloadMenuItems/DownloadAsPdf.test.tsx
@@ -23,7 +23,7 @@ import {
   userEvent,
   waitFor,
 } from 'spec/helpers/testing-library';
-import { Menu } from 'src/components/Menu';
+import { Menu } from '@superset-ui/core/components/Menu';
 import downloadAsPdf from 'src/utils/downloadAsPdf';
 import DownloadAsPdf from './DownloadAsPdf';
 
@@ -31,7 +31,7 @@ const mockAddDangerToast = jest.fn();
 
 jest.mock('src/utils/downloadAsPdf', () => ({
   __esModule: true,
-  default: jest.fn(() => (_e: SyntheticEvent) => {}),
+  default: jest.fn(() => (_e: SyntheticEvent) => console.log(_e)),
 }));
 
 jest.mock('src/components/MessageToasts/withToasts', () => ({
diff --git a/superset-frontend/src/dashboard/components/menu/DownloadMenuItems/DownloadAsPdf.tsx b/superset-frontend/src/dashboard/components/menu/DownloadMenuItems/DownloadAsPdf.tsx
index 47309b842a9..d7ed81b7d5c 100644
--- a/superset-frontend/src/dashboard/components/menu/DownloadMenuItems/DownloadAsPdf.tsx
+++ b/superset-frontend/src/dashboard/components/menu/DownloadMenuItems/DownloadAsPdf.tsx
@@ -18,7 +18,7 @@
  */
 import { SyntheticEvent } from 'react';
 import { logging, t } from '@superset-ui/core';
-import { Menu } from 'src/components/Menu';
+import { Menu } from '@superset-ui/core/components/Menu';
 import downloadAsPdf from 'src/utils/downloadAsPdf';
 import { LOG_ACTIONS_DASHBOARD_DOWNLOAD_AS_PDF } from 'src/logger/LogUtils';
 import { useToasts } from 'src/components/MessageToasts/withToasts';
diff --git a/superset-frontend/src/dashboard/components/menu/DownloadMenuItems/DownloadMenuItems.test.tsx b/superset-frontend/src/dashboard/components/menu/DownloadMenuItems/DownloadMenuItems.test.tsx
index 2bd3a2cd9d0..1f45af9722d 100644
--- a/superset-frontend/src/dashboard/components/menu/DownloadMenuItems/DownloadMenuItems.test.tsx
+++ b/superset-frontend/src/dashboard/components/menu/DownloadMenuItems/DownloadMenuItems.test.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { render, screen } from 'spec/helpers/testing-library';
-import { Menu } from 'src/components/Menu';
+import { Menu } from '@superset-ui/core/components/Menu';
 import DownloadMenuItems from '.';
 
 const createProps = () => ({
diff --git a/superset-frontend/src/dashboard/components/menu/DownloadMenuItems/DownloadScreenshot.test.tsx b/superset-frontend/src/dashboard/components/menu/DownloadMenuItems/DownloadScreenshot.test.tsx
index 57e996ec710..5707c6734a8 100644
--- a/superset-frontend/src/dashboard/components/menu/DownloadMenuItems/DownloadScreenshot.test.tsx
+++ b/superset-frontend/src/dashboard/components/menu/DownloadMenuItems/DownloadScreenshot.test.tsx
@@ -23,7 +23,7 @@ import {
   userEvent,
   waitFor,
 } from 'spec/helpers/testing-library';
-import { Menu } from 'src/components/Menu';
+import { Menu } from '@superset-ui/core/components/Menu';
 import fetchMock from 'fetch-mock';
 import { logging } from '@superset-ui/core';
 import { DownloadScreenshotFormat } from './types';
diff --git a/superset-frontend/src/dashboard/components/menu/DownloadMenuItems/DownloadScreenshot.tsx b/superset-frontend/src/dashboard/components/menu/DownloadMenuItems/DownloadScreenshot.tsx
index e70a634c498..8a47e042223 100644
--- a/superset-frontend/src/dashboard/components/menu/DownloadMenuItems/DownloadScreenshot.tsx
+++ b/superset-frontend/src/dashboard/components/menu/DownloadMenuItems/DownloadScreenshot.tsx
@@ -23,7 +23,7 @@ import {
   SupersetClient,
   SupersetApiError,
 } from '@superset-ui/core';
-import { Menu } from 'src/components/Menu';
+import { Menu } from '@superset-ui/core/components/Menu';
 import {
   LOG_ACTIONS_DASHBOARD_DOWNLOAD_AS_IMAGE,
   LOG_ACTIONS_DASHBOARD_DOWNLOAD_AS_PDF,
diff --git a/superset-frontend/src/dashboard/components/menu/DownloadMenuItems/index.tsx b/superset-frontend/src/dashboard/components/menu/DownloadMenuItems/index.tsx
index cdb73d5e17b..cbbc6823b71 100644
--- a/superset-frontend/src/dashboard/components/menu/DownloadMenuItems/index.tsx
+++ b/superset-frontend/src/dashboard/components/menu/DownloadMenuItems/index.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { FeatureFlag, isFeatureEnabled } from '@superset-ui/core';
-import { Menu } from 'src/components/Menu';
+import { Menu } from '@superset-ui/core/components/Menu';
 import { useDownloadScreenshot } from 'src/dashboard/hooks/useDownloadScreenshot';
 import { ComponentProps } from 'react';
 import { DownloadScreenshotFormat } from './types';
diff --git a/superset-frontend/src/dashboard/components/menu/HoverMenu.tsx b/superset-frontend/src/dashboard/components/menu/HoverMenu.tsx
index 2af9faa8d47..959b27778e2 100644
--- a/superset-frontend/src/dashboard/components/menu/HoverMenu.tsx
+++ b/superset-frontend/src/dashboard/components/menu/HoverMenu.tsx
@@ -34,15 +34,15 @@ const HoverStyleOverrides = styled.div`
     opacity: 0;
     position: absolute;
     z-index: 11; // one more than DragDroppable
-    font-size: ${({ theme }) => theme.typography.sizes.m};
+    font-size: ${({ theme }) => theme.fontSize};
   }
 
   .hover-menu--left {
-    width: ${({ theme }) => theme.gridUnit * 6}px;
+    width: ${({ theme }) => theme.sizeUnit * 6}px;
     top: 50%;
     transform: translate(0, -50%);
-    left: ${({ theme }) => theme.gridUnit * -7}px;
-    padding: ${({ theme }) => theme.gridUnit * 2}px 0;
+    left: ${({ theme }) => theme.sizeUnit * -7}px;
+    padding: ${({ theme }) => theme.sizeUnit * 2}px 0;
     display: flex;
     flex-direction: column;
     justify-content: center;
@@ -50,15 +50,15 @@ const HoverStyleOverrides = styled.div`
   }
 
   .hover-menu--left > :nth-child(n):not(:only-child):not(:last-child) {
-    margin-bottom: ${({ theme }) => theme.gridUnit * 3}px;
+    margin-bottom: ${({ theme }) => theme.sizeUnit * 3}px;
   }
 
   .hover-menu--top {
-    height: ${({ theme }) => theme.gridUnit * 6}px;
-    top: ${({ theme }) => theme.gridUnit * -6}px;
+    height: ${({ theme }) => theme.sizeUnit * 6}px;
+    top: ${({ theme }) => theme.sizeUnit * -6}px;
     left: 50%;
     transform: translate(-50%);
-    padding: 0 ${({ theme }) => theme.gridUnit * 2}px;
+    padding: 0 ${({ theme }) => theme.sizeUnit * 2}px;
     display: flex;
     flex-direction: row;
     justify-content: center;
diff --git a/superset-frontend/src/dashboard/components/menu/MarkdownModeDropdown.tsx b/superset-frontend/src/dashboard/components/menu/MarkdownModeDropdown.tsx
index 78fe2e047a8..e0c7b2cc0ec 100644
--- a/superset-frontend/src/dashboard/components/menu/MarkdownModeDropdown.tsx
+++ b/superset-frontend/src/dashboard/components/menu/MarkdownModeDropdown.tsx
@@ -21,7 +21,7 @@ import { t } from '@superset-ui/core';
 
 import PopoverDropdown, {
   OnChangeHandler,
-} from 'src/components/PopoverDropdown';
+} from '@superset-ui/core/components/PopoverDropdown';
 
 interface MarkdownModeDropdownProps {
   id: string;
diff --git a/superset-frontend/src/dashboard/components/menu/ShareMenuItems/ShareMenuItems.test.tsx b/superset-frontend/src/dashboard/components/menu/ShareMenuItems/ShareMenuItems.test.tsx
index 8a4a3f036d3..4b6db260302 100644
--- a/superset-frontend/src/dashboard/components/menu/ShareMenuItems/ShareMenuItems.test.tsx
+++ b/superset-frontend/src/dashboard/components/menu/ShareMenuItems/ShareMenuItems.test.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { Menu } from 'src/components/Menu';
+import { Menu } from '@superset-ui/core/components/Menu';
 import {
   render,
   screen,
diff --git a/superset-frontend/src/dashboard/components/menu/ShareMenuItems/index.tsx b/superset-frontend/src/dashboard/components/menu/ShareMenuItems/index.tsx
index 4fb191a0676..9d663958e38 100644
--- a/superset-frontend/src/dashboard/components/menu/ShareMenuItems/index.tsx
+++ b/superset-frontend/src/dashboard/components/menu/ShareMenuItems/index.tsx
@@ -19,7 +19,7 @@
 import { ComponentProps, RefObject } from 'react';
 import copyTextToClipboard from 'src/utils/copy';
 import { t, logging } from '@superset-ui/core';
-import { Menu } from 'src/components/Menu';
+import { Menu } from '@superset-ui/core/components/Menu';
 import { getDashboardPermalink } from 'src/utils/urlUtils';
 import { MenuKeys, RootState } from 'src/dashboard/types';
 import { shallowEqual, useSelector } from 'react-redux';
diff --git a/superset-frontend/src/dashboard/components/menu/WithPopoverMenu.tsx b/superset-frontend/src/dashboard/components/menu/WithPopoverMenu.tsx
index 7081445c9d0..741058263fb 100644
--- a/superset-frontend/src/dashboard/components/menu/WithPopoverMenu.tsx
+++ b/superset-frontend/src/dashboard/components/menu/WithPopoverMenu.tsx
@@ -54,15 +54,15 @@ const WithPopoverMenuStyles = styled.div`
       left: 0;
       width: 100%;
       height: 100%;
-      border: 2px solid ${theme.colors.primary.base};
+      border: 2px solid ${theme.colorPrimary};
       pointer-events: none;
     }
 
     .dashboard-component-tabs li &.with-popover-menu--focused:after {
-      top: ${theme.gridUnit * -3}px;
-      left: ${theme.gridUnit * -2}px;
-      width: calc(100% + ${theme.gridUnit * 4}px);
-      height: calc(100% + ${theme.gridUnit * 7}px);
+      top: ${theme.sizeUnit * -3}px;
+      left: ${theme.sizeUnit * -2}px;
+      width: calc(100% + ${theme.sizeUnit * 4}px);
+      height: calc(100% + ${theme.sizeUnit * 7}px);
     }
   `}
 `;
@@ -73,15 +73,11 @@ const PopoverMenuStyles = styled.div`
     flex-wrap: nowrap;
     left: 1px;
     top: -42px;
-    height: ${theme.gridUnit * 10}px;
-    padding: 0 ${theme.gridUnit * 4}px;
+    height: ${theme.sizeUnit * 10}px;
+    padding: 0 ${theme.sizeUnit * 4}px;
     background: ${theme.colors.grayscale.light5};
-    box-shadow: 0 1px 2px 1px
-      ${addAlpha(
-        theme.colors.grayscale.dark2,
-        parseFloat(theme.opacity.mediumLight) / 100,
-      )};
-    font-size: ${theme.typography.sizes.m}px;
+    box-shadow: 0 1px 2px 1px ${addAlpha(theme.colors.grayscale.dark2, 0.35)};
+    font-size: ${theme.fontSize}px;
     cursor: default;
     z-index: 3000;
 
@@ -98,7 +94,7 @@ const PopoverMenuStyles = styled.div`
       width: 1px;
       height: 100%;
       background: ${theme.colors.grayscale.light2};
-      margin: 0 ${theme.gridUnit * 4}px;
+      margin: 0 ${theme.sizeUnit * 4}px;
     }
   `}
 `;
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/ActionButtons/index.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/ActionButtons/index.tsx
index f61c4063c70..0397e0b2d89 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/ActionButtons/index.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/ActionButtons/index.tsx
@@ -26,7 +26,7 @@ import {
   SupersetTheme,
   styled,
 } from '@superset-ui/core';
-import Button from 'src/components/Button';
+import { Button } from '@superset-ui/core/components';
 import { OPEN_FILTER_BAR_WIDTH } from 'src/dashboard/constants';
 import { rgba } from 'emotion-rgba';
 import { FilterBarOrientation } from 'src/dashboard/types';
@@ -49,7 +49,7 @@ const containerStyle = (theme: SupersetTheme) => css`
     color: ${theme.colors.grayscale.base};
     margin-left: 0;
     &:hover {
-      color: ${theme.colors.primary.dark1};
+      color: ${theme.colorPrimaryText};
     }
 
     &[disabled],
@@ -70,12 +70,12 @@ const verticalStyle = (theme: SupersetTheme, width: number) => css`
   width: ${width - 1}px;
   bottom: 0;
 
-  padding: ${theme.gridUnit * 4}px;
-  padding-top: ${theme.gridUnit * 6}px;
+  padding: ${theme.sizeUnit * 4}px;
+  padding-top: ${theme.sizeUnit * 6}px;
 
   background: linear-gradient(
     ${rgba(theme.colors.grayscale.light5, 0)},
-    ${theme.colors.grayscale.light5} ${theme.opacity.mediumLight}
+    ${theme.colors.grayscale.light5} 60%
   );
 
   & > button {
@@ -83,7 +83,7 @@ const verticalStyle = (theme: SupersetTheme, width: number) => css`
   }
 
   & > .filter-apply-button {
-    margin-bottom: ${theme.gridUnit * 3}px;
+    margin-bottom: ${theme.sizeUnit * 3}px;
   }
 `;
 
@@ -92,7 +92,7 @@ const horizontalStyle = (theme: SupersetTheme) => css`
   margin-left: auto;
   && > .filter-clear-all-button {
     text-transform: capitalize;
-    font-weight: ${theme.typography.weights.normal};
+    font-weight: ${theme.fontWeightNormal};
   }
   & > .filter-apply-button {
     &[disabled],
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/CrossFilter.test.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/CrossFilter.test.tsx
index fd04d7a38b4..15aa0e07f4b 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/CrossFilter.test.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/CrossFilter.test.tsx
@@ -64,7 +64,7 @@ test('Column and value should be visible', () => {
 
 test('Tag should be closable', () => {
   setup(mockedProps);
-  expect(screen.getByRole('button', { name: 'close' })).toBeInTheDocument();
+  expect(screen.getByRole('img', { name: 'Close' })).toBeInTheDocument();
 });
 
 test('Divider should not be visible', () => {
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/CrossFilter.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/CrossFilter.tsx
index 541fa34080c..a4b5ab2fc25 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/CrossFilter.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/CrossFilter.tsx
@@ -66,7 +66,7 @@ const CrossFilter = (props: {
         ${orientation === FilterBarOrientation.Vertical
           ? `
             display: block;
-            margin-bottom: ${theme.gridUnit * 4}px;
+            margin-bottom: ${theme.sizeUnit * 4}px;
           `
           : `
             display: flex;
@@ -93,15 +93,15 @@ const CrossFilter = (props: {
               ? `
                 width: 1px;
                 height: 22px;
-                margin-left: ${theme.gridUnit * 4}px;
-                margin-right: ${theme.gridUnit}px;
+                margin-left: ${theme.sizeUnit * 4}px;
+                margin-right: ${theme.sizeUnit}px;
               `
               : `
                 width: 100%;
                 height: 1px;
                 display: block;
-                margin-bottom: ${theme.gridUnit * 4}px;
-                margin-top: ${theme.gridUnit * 4}px;
+                margin-bottom: ${theme.sizeUnit * 4}px;
+                margin-top: ${theme.sizeUnit * 4}px;
             `}
             background: ${theme.colors.grayscale.light2};
           `}
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/CrossFilterTag.test.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/CrossFilterTag.test.tsx
index afa1f6cb178..0636ed536e1 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/CrossFilterTag.test.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/CrossFilterTag.test.tsx
@@ -76,7 +76,7 @@ test('Column and value should be visible', () => {
 
 test('Tag should be closable', () => {
   setup(mockedProps);
-  const close = screen.getByRole('button', { name: 'close' });
+  const close = screen.getByLabelText('Close');
   expect(close).toBeInTheDocument();
   userEvent.click(close);
   expect(mockedProps.removeCrossFilter).toHaveBeenCalledWith(1);
@@ -87,6 +87,6 @@ test('Close icon should have role="button"', () => {
     ...mockedProps,
     onClick: jest.fn(),
   });
-  const button = screen.getByRole('button');
+  const button = screen.getByLabelText('Close');
   expect(button).toBeInTheDocument();
 });
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/CrossFilterTag.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/CrossFilterTag.tsx
index 14917fb3ac3..8200ace103c 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/CrossFilterTag.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/CrossFilterTag.tsx
@@ -25,30 +25,29 @@ import {
   useCSSTextTruncation,
 } from '@superset-ui/core';
 import { CrossFilterIndicator } from 'src/dashboard/components/nativeFilters/selectors';
-import { Tag } from 'src/components';
-import { Tooltip } from 'src/components/Tooltip';
+import { Tag } from 'src/components/Tag';
+import { Tooltip } from '@superset-ui/core/components';
 import { FilterBarOrientation } from 'src/dashboard/types';
-import { CustomCloseIcon } from 'src/components/Tags/Tag';
 import { ellipsisCss } from './styles';
 
 const StyledCrossFilterValue = styled.b`
   ${({ theme }) => `
-    max-width: ${theme.gridUnit * 25}px;
+    max-width: ${theme.sizeUnit * 25}px;
   `}
   ${ellipsisCss}
 `;
 
 const StyledCrossFilterColumn = styled('span')`
   ${({ theme }) => `
-    max-width: ${theme.gridUnit * 25}px;
-    padding-right: ${theme.gridUnit}px;
+    max-width: ${theme.sizeUnit * 25}px;
+    padding-right: ${theme.sizeUnit}px;
   `}
   ${ellipsisCss}
 `;
 
 const StyledTag = styled(Tag)`
   ${({ theme }) => `
-    border: 1px solid ${theme.colors.grayscale.light3};
+    border: 1px solid ${theme.colorBorder};
     border-radius: 2px;
     .anticon-close {
       vertical-align: middle;
@@ -74,15 +73,15 @@ const CrossFilterTag = (props: {
       css={css`
         ${orientation === FilterBarOrientation.Vertical
           ? `
-            margin-top: ${theme.gridUnit * 2}px;
+            margin-top: ${theme.sizeUnit * 2}px;
           `
           : `
-            margin-left: ${theme.gridUnit * 2}px;
+            margin-left: ${theme.sizeUnit * 2}px;
           `}
       `}
       closable
       onClose={() => removeCrossFilter(filter.emitterId)}
-      closeIcon={CustomCloseIcon}
+      editable
     >
       <Tooltip title={columnIsTruncated ? columnLabel : null}>
         <StyledCrossFilterColumn ref={columnRef}>
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/CrossFilterTitle.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/CrossFilterTitle.tsx
index be3797d0283..e217e1dd143 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/CrossFilterTitle.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/CrossFilterTitle.tsx
@@ -24,15 +24,15 @@ import {
   useTheme,
   useCSSTextTruncation,
 } from '@superset-ui/core';
-import { Tooltip } from 'src/components/Tooltip';
+import { Tooltip } from '@superset-ui/core/components';
 import { FilterBarOrientation } from 'src/dashboard/types';
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { ellipsisCss } from './styles';
 
 const StyledCrossFilterTitle = styled.div`
   ${({ theme }) => `
     display: flex;
-    font-size: ${theme.typography.sizes.s}px;
+    font-size: ${theme.fontSizeSM}px;
     color: ${theme.colors.grayscale.base};
     vertical-align: middle;
     align-items: center;
@@ -43,7 +43,7 @@ const StyledIconSearch = styled(Icons.SearchOutlined)`
   ${({ theme }) => `
     & > span.anticon.anticon-search {
       color: ${theme.colors.grayscale.light1};
-      margin-left: ${theme.gridUnit}px;
+      margin-left: ${theme.sizeUnit}px;
       transition: 0.3s;
       vertical-align: middle;
       line-height: 0;
@@ -68,8 +68,8 @@ const CrossFilterChartTitle = (props: {
         <span
           css={css`
             max-width: ${orientation === FilterBarOrientation.Vertical
-              ? `${theme.gridUnit * 45}px`
-              : `${theme.gridUnit * 15}px`};
+              ? `${theme.sizeUnit * 45}px`
+              : `${theme.sizeUnit * 15}px`};
             line-height: 1.4;
             ${ellipsisCss}
           `}
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/ScopingModal/ChartsScopingListPanel.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/ScopingModal/ChartsScopingListPanel.tsx
index 85506affe0a..9d0a62b2b9f 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/ScopingModal/ChartsScopingListPanel.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/ScopingModal/ChartsScopingListPanel.tsx
@@ -27,14 +27,14 @@ import {
 } from 'src/dashboard/types';
 import { useSelector } from 'react-redux';
 import { CHART_TYPE } from 'src/dashboard/util/componentTypes';
-import { Icons } from 'src/components/Icons';
-import Button from 'src/components/Button';
+import { Icons } from '@superset-ui/core/components/Icons';
+import { Button } from '@superset-ui/core/components';
 import { FilterTitle } from 'src/dashboard/components/nativeFilters/FiltersConfigModal/FilterTitleContainer';
 import { NEW_CHART_SCOPING_ID } from './constants';
 
 const AddButtonContainer = styled.div`
   ${({ theme }) => css`
-    margin-top: ${theme.gridUnit * 2}px;
+    margin-top: ${theme.sizeUnit * 2}px;
     & button > [role='img']:first-of-type {
       line-height: 0;
     }
@@ -44,7 +44,7 @@ const AddButtonContainer = styled.div`
     button > span > :first-of-type {
       margin-right: 0;
     }
-    .antd5-btn > .anticon + span {
+    .ant-btn > .anticon + span {
       margin-left: 0;
     }
   `}
@@ -73,12 +73,12 @@ const ScopingTitle = ({
       <Icons.DeleteOutlined
         iconColor={theme.colors.grayscale.light3}
         iconSize="xl"
-        onClick={event => {
+        onClick={(event: React.MouseEvent<HTMLElement>) => {
           event.stopPropagation();
           onRemove(id);
         }}
         css={css`
-          margin: auto auto auto ${theme.gridUnit}px;
+          margin: auto auto auto ${theme.sizeUnit}px;
         `}
       />
     </FilterTitle>
@@ -151,7 +151,7 @@ export const ChartsScopingListPanel = ({
           width: 100%;
           height: 1px;
           background-color: ${theme.colors.grayscale.light3};
-          margin: ${theme.gridUnit * 3}px 0;
+          margin: ${theme.sizeUnit * 3}px 0;
         `}
       />
       {customScopedCharts.map(chartInfo => (
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/ScopingModal/ScopingModal.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/ScopingModal/ScopingModal.tsx
index 40e9d6d395f..0e27a6d2401 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/ScopingModal/ScopingModal.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/ScopingModal/ScopingModal.tsx
@@ -19,7 +19,7 @@
 import { useCallback, useMemo, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { isDefined, NativeFilterScope, t } from '@superset-ui/core';
-import Modal from 'src/components/Modal';
+import { Modal } from '@superset-ui/core/components';
 import {
   ChartConfiguration,
   RootState,
@@ -312,7 +312,7 @@ export const ScopingModal = ({
       onHandledPrimaryAction={saveScoping}
       primaryButtonName={t('Save')}
       responsive
-      destroyOnClose
+      destroyOnHidden
       bodyStyle={{
         padding: 0,
         height: 700,
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/ScopingModal/ScopingModalContent.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/ScopingModal/ScopingModalContent.tsx
index 7eed3c7b75e..d2e56685fc6 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/ScopingModal/ScopingModalContent.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/ScopingModal/ScopingModalContent.tsx
@@ -37,7 +37,7 @@ const ModalContentContainer = styled.div`
     display: flex;
     height: 100%;
     & > div {
-      padding: ${theme.gridUnit * 4}px;
+      padding: ${theme.sizeUnit * 4}px;
     }
   `}
 `;
@@ -58,7 +58,7 @@ export const ScopingModalContent = ({
       <div
         css={css`
           width: 35%;
-          border-right: 1px solid ${theme.colors.grayscale.light2};
+          border-right: 1px solid ${theme.colorSplit};
         `}
         data-test="scoping-list-panel"
       >
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/ScopingModal/ScopingTreePanel.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/ScopingModal/ScopingTreePanel.tsx
index bd1012caa0d..d0669b2c551 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/ScopingModal/ScopingTreePanel.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/ScopingModal/ScopingTreePanel.tsx
@@ -26,7 +26,7 @@ import {
   t,
   useTheme,
 } from '@superset-ui/core';
-import { Select } from 'src/components';
+import { Select, Tooltip, Alert } from '@superset-ui/core/components';
 import { noOp } from 'src/utils/common';
 import ScopingTree from 'src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/ScopingTree';
 import {
@@ -36,10 +36,8 @@ import {
   RootState,
 } from 'src/dashboard/types';
 import { CHART_TYPE } from 'src/dashboard/util/componentTypes';
-import { SelectOptionsType } from 'src/components/Select/types';
-import { Icons } from 'src/components/Icons';
-import { Tooltip } from 'src/components/Tooltip';
-import Alert from 'src/components/Alert';
+import type { SelectOptionsType } from '@superset-ui/core/components';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { NEW_CHART_SCOPING_ID } from './constants';
 
 interface ScopingTreePanelProps {
@@ -52,9 +50,9 @@ interface ScopingTreePanelProps {
 
 const InfoText = styled.div`
   ${({ theme }) => css`
-    font-size: ${theme.typography.sizes.s}px;
+    font-size: ${theme.fontSizeSM}px;
     color: ${theme.colors.grayscale.base};
-    margin-bottom: ${theme.gridUnit * 7}px;
+    margin-bottom: ${theme.sizeUnit * 7}px;
   `}
 `;
 
@@ -98,20 +96,20 @@ const ChartSelect = ({
   return (
     <div
       css={css`
-        margin-bottom: ${theme.gridUnit * 6}px;
+        margin-bottom: ${theme.sizeUnit * 6}px;
       `}
     >
       <div
         css={css`
           display: flex;
           align-items: center;
-          margin-bottom: ${theme.gridUnit}px;
+          margin-bottom: ${theme.sizeUnit}px;
         `}
       >
         <InfoText
           css={css`
-            color: ${theme.colors.grayscale.dark1};
-            margin-right: ${theme.gridUnit}px;
+            color: ${theme.colorText};
+            margin-right: ${theme.sizeUnit}px;
             margin-bottom: 0;
           `}
         >{`${t('Chart')} *`}</InfoText>
@@ -162,7 +160,7 @@ export const ScopingTreePanel = ({
           message={
             <span
               css={css`
-                font-weight: ${theme.typography.weights.bold};
+                font-weight: ${theme.fontWeightStrong};
               `}
             >
               {t('Cross-filtering is not enabled in this dashboard')}
@@ -171,7 +169,7 @@ export const ScopingTreePanel = ({
           type="info"
           closable={false}
           css={css`
-            margin-bottom: ${theme.gridUnit * 6}px;
+            margin-bottom: ${theme.sizeUnit * 6}px;
           `}
         />
       )}
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/VerticalCollapse.test.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/VerticalCollapse.test.tsx
index 8ea4c572fd8..ca331fc78e7 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/VerticalCollapse.test.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/VerticalCollapse.test.tsx
@@ -97,7 +97,7 @@ test('Tags should be visible', () => {
 
 test('Tags should be closable', () => {
   setup(mockedProps);
-  expect(screen.getAllByRole('button', { name: 'close' })).toHaveLength(2);
+  expect(screen.getAllByLabelText('Close')).toHaveLength(2);
 });
 
 test('Divider should be visible', () => {
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/VerticalCollapse.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/VerticalCollapse.tsx
index 38494c6680e..130afffb7fd 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/VerticalCollapse.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/VerticalCollapse.tsx
@@ -18,41 +18,16 @@
  */
 
 import { useMemo } from 'react';
-import Collapse from 'src/components/Collapse';
-import { styled, t, useTheme, css } from '@superset-ui/core';
+import { Collapse, Divider } from '@superset-ui/core/components';
+import { t } from '@superset-ui/core';
 import { FilterBarOrientation } from 'src/dashboard/types';
 import CrossFilter from './CrossFilter';
 import { CrossFilterIndicator } from '../../selectors';
 
-const StyledCollapse = styled(Collapse)`
-  ${({ theme }) => `
-    .ant-collapse-header {
-      margin-bottom: ${theme.gridUnit * 4}px;
-    }
-    .ant-collapse-item > .ant-collapse-header {
-      padding-bottom: 0;
-    }
-    .ant-collapse-item > .ant-collapse-header > .ant-collapse-arrow {
-      font-size: ${theme.typography.sizes.xs}px;
-      padding-top: ${theme.gridUnit * 3}px;
-    }
-    .ant-collapse-item > .ant-collapse-content > .ant-collapse-content-box {
-      padding-top: 0;
-    }
-  `}
-`;
-
-const StyledCrossFiltersTitle = styled.span`
-  ${({ theme }) => `
-    font-size: ${theme.typography.sizes.s}px;
-  `}
-`;
-
 const CrossFiltersVerticalCollapse = (props: {
   crossFilters: CrossFilterIndicator[];
 }) => {
   const { crossFilters } = props;
-  const theme = useTheme();
   const crossFiltersIndicators = useMemo(
     () =>
       crossFilters.map(filter => (
@@ -70,32 +45,23 @@ const CrossFiltersVerticalCollapse = (props: {
   }
 
   return (
-    <StyledCollapse
+    <Collapse
       ghost
       defaultActiveKey="crossFilters"
-      expandIconPosition="right"
-    >
-      <Collapse.Panel
-        key="crossFilters"
-        header={
-          <StyledCrossFiltersTitle>
-            {t('Cross-filters')}
-          </StyledCrossFiltersTitle>
-        }
-      >
-        {crossFiltersIndicators}
-        <span
-          data-test="cross-filters-divider"
-          css={css`
-            width: 100%;
-            height: 1px;
-            display: block;
-            background: ${theme.colors.grayscale.light3};
-            margin: ${theme.gridUnit * 8}px auto 0 auto;
-          `}
-        />
-      </Collapse.Panel>
-    </StyledCollapse>
+      expandIconPosition="end"
+      items={[
+        {
+          key: 'crossFilters',
+          label: t('Cross-filters'),
+          children: (
+            <>
+              {crossFiltersIndicators}
+              <Divider data-test="cross-filters-divider" />
+            </>
+          ),
+        },
+      ]}
+    />
   );
 };
 
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBar.test.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBar.test.tsx
index 5cca08fd913..261706c1df4 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBar.test.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBar.test.tsx
@@ -303,4 +303,50 @@ describe('FilterBar', () => {
 
     expect(screen.getByTestId(getTestId('apply-button'))).toBeDisabled();
   });
+
+  it('should render without errors with proper state setup', () => {
+    const stateWithFilter = {
+      ...stateWithoutNativeFilters,
+      dashboardInfo: {
+        id: 1,
+      },
+      dataMask: {
+        'test-filter': {
+          id: 'test-filter',
+          filterState: { value: undefined },
+          extraFormData: {},
+        },
+      },
+      nativeFilters: {
+        filters: {
+          'test-filter': {
+            id: 'test-filter',
+            name: 'Test Filter',
+            filterType: 'filter_select',
+            targets: [{ datasetId: 1, column: { name: 'test_column' } }],
+            defaultDataMask: {
+              filterState: { value: undefined },
+              extraFormData: {},
+            },
+            controlValues: {
+              enableEmptyFilter: true,
+            },
+            cascadeParentIds: [],
+            scope: {
+              rootPath: ['ROOT_ID'],
+              excluded: [],
+            },
+            type: 'NATIVE_FILTER',
+            description: '',
+            chartsInScope: [],
+            tabsInScope: [],
+          },
+        },
+        filtersState: {},
+      },
+    };
+
+    const { container } = renderWrapper(openedBarProps, stateWithFilter);
+    expect(container).toBeInTheDocument();
+  });
 });
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBarSettings/FilterBarSettings.test.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBarSettings/FilterBarSettings.test.tsx
index 9c566410e91..35486f6ef69 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBarSettings/FilterBarSettings.test.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBarSettings/FilterBarSettings.test.tsx
@@ -18,9 +18,8 @@
  */
 
 import fetchMock from 'fetch-mock';
-import { waitFor } from '@testing-library/react';
+import { waitFor, render, screen, within } from 'spec/helpers/testing-library';
 import userEvent from '@testing-library/user-event';
-import { render, screen, within } from 'spec/helpers/testing-library';
 import { DashboardInfo, FilterBarOrientation } from 'src/dashboard/types';
 import * as mockedMessageActions from 'src/components/MessageToasts/actions';
 import FilterBarSettings from '.';
@@ -241,7 +240,7 @@ test('On failed request, restore previous selection', async () => {
   // Verify error toast
   await waitFor(() => {
     expect(dangerToastSpy).toHaveBeenCalledWith(
-      'Sorry, there was an error saving this dashboard: Unknown Error',
+      'Sorry, there was an error saving this dashboard: Bad Request',
     );
   });
 
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBarSettings/index.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBarSettings/index.tsx
index ee940f068d4..ce5c3efd16d 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBarSettings/index.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBarSettings/index.tsx
@@ -20,17 +20,15 @@
 import { useCallback, useMemo, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { styled, t, useTheme, css } from '@superset-ui/core';
-import { MenuProps } from 'src/components/Menu';
+import { MenuProps } from '@superset-ui/core/components/Menu';
 import { FilterBarOrientation, RootState } from 'src/dashboard/types';
 import {
   saveFilterBarOrientation,
   saveCrossFiltersSetting,
 } from 'src/dashboard/actions/dashboardInfo';
-import { Icons } from 'src/components/Icons';
-import Checkbox from 'src/components/Checkbox';
-import { Dropdown } from 'src/components/Dropdown';
-import { Button } from 'src/components';
-import { Space } from 'src/components/Space';
+import { Icons } from '@superset-ui/core/components/Icons';
+import { Button, Checkbox, Dropdown } from '@superset-ui/core/components';
+import { Space } from '@superset-ui/core/components/Space';
 import { clearDataMaskState } from 'src/dataMask/actions';
 import { useFilters } from 'src/dashboard/components/nativeFilters/FilterBar/state';
 import { useFilterConfigModal } from 'src/dashboard/components/nativeFilters/FilterBar/FilterConfigurationLink/useFilterConfigModal';
@@ -45,21 +43,10 @@ const StyledMenuLabel = styled.span`
   justify-content: space-between;
 
   .enable-cross-filters-text {
-    padding-left: ${({ theme }) => `${theme.gridUnit * 2}px`};
+    padding-left: ${({ theme }) => `${theme.sizeUnit * 2}px`};
   }
 `;
 
-const StyledCheckbox = styled(Checkbox)`
-  ${({ theme }) => `
-  &,
-  svg {
-    display: inline-block;
-    width: ${theme.gridUnit * 4}px;
-    height: ${theme.gridUnit * 4}px;
-  }
-`}
-`;
-
 const CROSS_FILTERS_MENU_KEY = 'cross-filters-menu-key';
 const CROSS_FILTERS_SCOPING_MENU_KEY = 'cross-filters-scoping-menu-key';
 const ADD_EDIT_FILTERS_MENU_KEY = 'add-edit-filters-menu-key';
@@ -160,14 +147,13 @@ const FilterBarSettings = () => {
   const crossFiltersMenuItem = useMemo(
     () => (
       <StyledMenuLabel>
-        <StyledCheckbox
-          className="enable-cross-filters"
+        <Checkbox
+          name="enable-cross-filters"
           checked={crossFiltersEnabled}
-          onChange={checked => setCrossFiltersEnabled(checked || false)}
-        />{' '}
-        <span className="enable-cross-filters-text">
+          onChange={e => setCrossFiltersEnabled(e.target.checked)}
+        >
           {t('Enable cross-filtering')}
-        </span>
+        </Checkbox>
       </StyledMenuLabel>
     ),
     [crossFiltersEnabled],
@@ -213,9 +199,9 @@ const FilterBarSettings = () => {
                 {selectedFilterBarOrientation ===
                   FilterBarOrientation.Vertical && (
                   <Icons.CheckOutlined
-                    iconColor={theme.colors.primary.base}
+                    iconColor={theme.colorPrimary}
                     css={css`
-                      vertical-align: -${theme.gridUnit * 0.03125}em;
+                      vertical-align: -${theme.sizeUnit * 0.03125}em;
                     `}
                     iconSize="m"
                   />
@@ -268,7 +254,7 @@ const FilterBarSettings = () => {
         trigger={['click']}
       >
         <Button
-          type="link"
+          buttonStyle="link"
           css={css`
             padding: 0;
           `}
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControl.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControl.tsx
index 4a0de520e69..99a94c88d28 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControl.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControl.tsx
@@ -23,8 +23,12 @@ import {
   OutPortal,
 } from 'react-reverse-portal';
 import { styled, SupersetTheme, truncationCSS } from '@superset-ui/core';
-import { FormItem as StyledFormItem, Form } from 'src/components/Form';
-import { Tooltip } from 'src/components/Tooltip';
+import {
+  FormItem as StyledFormItem,
+  Form,
+  Icons,
+  Tooltip,
+} from '@superset-ui/core/components';
 import { FilterBarOrientation } from 'src/dashboard/types';
 import { checkIsMissingRequiredValue } from '../utils';
 import FilterValue from './FilterValue';
@@ -40,15 +44,14 @@ const FilterStyledIcon = styled.div`
 `;
 
 const VerticalFilterControlTitle = styled.h4`
-  font-size: ${({ theme }) => theme.typography.sizes.s}px;
-  color: ${({ theme }) => theme.colors.grayscale.dark1};
-  margin: 0;
+  font-size: ${({ theme }) => theme.fontSizeSM}px;
+  color: ${({ theme }) => theme.colorText};
   overflow-wrap: anywhere;
 `;
 
 const HorizontalFilterControlTitle = styled(VerticalFilterControlTitle)`
-  font-weight: ${({ theme }) => theme.typography.weights.normal};
-  color: ${({ theme }) => theme.colors.grayscale.base};
+  font-weight: ${({ theme }) => theme.fontWeightNormal};
+  color: ${({ theme }) => theme.colorText};
   ${truncationCSS};
 `;
 
@@ -63,7 +66,6 @@ const VerticalFilterControlTitleBox = styled.div`
   flex-direction: row;
   align-items: center;
   justify-content: space-between;
-  margin-bottom: ${({ theme }) => theme.gridUnit}px;
 `;
 
 const HorizontalFilterControlTitleBox = styled(VerticalFilterControlTitleBox)`
@@ -76,25 +78,38 @@ const HorizontalOverflowFilterControlTitleBox = styled(
   width: 100%;
 `;
 
-const VerticalFilterControlContainer = styled(Form)`
-  width: 100%;
-  && .ant-form-item-label > label {
-    text-transform: none;
-    width: 100%;
-    padding-right: ${({ theme }) => theme.gridUnit * 11}px;
-  }
-  .ant-form-item-tooltip {
-    margin-bottom: ${({ theme }) => theme.gridUnit}px;
+const AllFilterControlContainer = styled(Form)`
+  // TODO this is a hack related to having form items inside others which is not
+  // normal antd-expected usage
+  .ant-form-item .ant-form-item {
+    margin-bottom: 0 !important;
   }
 `;
 
-const HorizontalFilterControlContainer = styled(Form)`
+const VerticalFilterControlContainer = styled(AllFilterControlContainer)`
+  width: 100%;
+
+  .ant-form-item {
+    margin-bottom: ${({ theme }) => theme.sizeUnit * 2}px;
+  }
+
+  && .ant-form-item-label > label {
+    text-transform: none;
+    width: 100%;
+    padding-right: ${({ theme }) => theme.sizeUnit * 11}px;
+  }
+  .ant-form-item-tooltip {
+    margin-bottom: ${({ theme }) => theme.sizeUnit}px;
+  }
+`;
+
+const HorizontalFilterControlContainer = styled(AllFilterControlContainer)`
   && .ant-form-item-label > label {
     margin-bottom: 0;
     text-transform: none;
   }
   .ant-form-item-tooltip {
-    margin-bottom: ${({ theme }) => theme.gridUnit}px;
+    margin-bottom: ${({ theme }) => theme.sizeUnit}px;
   }
 `;
 
@@ -147,9 +162,11 @@ const HorizontalFormItem = styled(StyledFormItem)<{
   }
 
   .ant-form-item-label {
+    display: flex;
+    align-items: center;
     overflow: visible;
     padding-bottom: 0;
-    margin-right: ${({ theme }) => theme.gridUnit * 2}px;
+    margin-right: ${({ theme }) => theme.sizeUnit * 2}px;
     label.ant-form-item-required:not(.ant-form-item-required-mark-optional) {
       &::after {
         display: none;
@@ -162,11 +179,11 @@ const HorizontalFormItem = styled(StyledFormItem)<{
   }
 
   .ant-form-item-control {
-    width: ${({ inverseSelection }) => (inverseSelection ? 252 : 164)}px;
+    min-width: ${({ inverseSelection }) => (inverseSelection ? 252 : 164)}px;
   }
 
   .select-container {
-    ${({ inverseSelection, theme }) =>
+    ${({ inverseSelection }) =>
       inverseSelection &&
       `
       width: 164px;
@@ -220,15 +237,15 @@ const useFilterControlDisplay = (
   }, [orientation, overflow, inverseSelection]);
 
 const ToolTipContainer = styled.div`
-  font-size: ${({ theme }) => theme.typography.sizes.m}px;
+  font-size: ${({ theme }) => theme.fontSize}px;
   display: flex;
 `;
 
 const RequiredFieldIndicator = () => (
   <span
     css={(theme: SupersetTheme) => ({
-      color: theme.colors.error.base,
-      fontSize: `${theme.typography.sizes.s}px`,
+      color: theme.colorError,
+      fontSize: `${theme.fontSizeSM}px`,
       paddingLeft: '1px',
     })}
   >
@@ -250,13 +267,11 @@ const DescriptionToolTip = ({ description }: { description: string }) => (
         whiteSpace: 'normal',
       }}
     >
-      {/* TODO: Remove fa-icon */}
-      {/* eslint-disable-next-line icons/no-fa-icons-usage */}
-      <i
-        className="fa fa-info-circle text-muted"
+      <Icons.InfoCircleOutlined
+        className="text-muted"
+        role="button"
         css={(theme: SupersetTheme) => ({
-          paddingLeft: `${theme.gridUnit}px`,
-          cursor: 'pointer',
+          paddingLeft: `${theme.sizeUnit}px`,
         })}
       />
     </Tooltip>
@@ -273,6 +288,8 @@ const FilterControl = ({
   parentRef,
   orientation = FilterBarOrientation.Vertical,
   overflow = false,
+  clearAllTrigger,
+  onClearAllComplete,
 }: FilterControlProps) => {
   const portalNode = useMemo(() => createHtmlPortalNode(), []);
   const [isFilterActive, setIsFilterActive] = useState(false);
@@ -345,6 +362,8 @@ const FilterControl = ({
           orientation={orientation}
           overflow={overflow}
           validateStatus={validateStatus}
+          clearAllTrigger={clearAllTrigger}
+          onClearAllComplete={onClearAllComplete}
         />
       </InPortal>
       <FilterControlContainer
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControls.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControls.tsx
index 7f1e7fded0b..df5d9793aee 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControls.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControls.tsx
@@ -47,10 +47,11 @@ import {
   useSelectFiltersInScope,
 } from 'src/dashboard/components/nativeFilters/state';
 import { FilterBarOrientation, RootState } from 'src/dashboard/types';
-import DropdownContainer, {
-  Ref as DropdownContainerRef,
-} from 'src/components/DropdownContainer';
-import { Icons } from 'src/components/Icons';
+import {
+  DropdownContainer,
+  type DropdownRef as DropdownContainerRef,
+} from '@superset-ui/core/components';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { useChartIds } from 'src/dashboard/util/charts/useChartIds';
 import { useChartLayoutItems } from 'src/dashboard/util/useChartLayoutItems';
 import { FiltersOutOfScopeCollapsible } from '../FiltersOutOfScopeCollapsible';
@@ -64,11 +65,15 @@ import { useChartsVerboseMaps } from '../utils';
 type FilterControlsProps = {
   dataMaskSelected: DataMaskStateWithId;
   onFilterSelectionChange: (filter: Filter, dataMask: DataMask) => void;
+  clearAllTriggers?: Record<string, boolean>;
+  onClearAllComplete?: (filterId: string) => void;
 };
 
 const FilterControls: FC<FilterControlsProps> = ({
   dataMaskSelected,
   onFilterSelectionChange,
+  clearAllTriggers,
+  onClearAllComplete,
 }) => {
   const filterBarOrientation = useSelector<RootState, FilterBarOrientation>(
     ({ dashboardInfo }) => dashboardInfo.filterBarOrientation,
@@ -99,6 +104,8 @@ const FilterControls: FC<FilterControlsProps> = ({
   const { filterControlFactory, filtersWithValues } = useFilterControlFactory(
     dataMaskSelected,
     onFilterSelectionChange,
+    clearAllTriggers,
+    onClearAllComplete,
   );
   const portalNodes = useMemo(() => {
     const nodes = new Array(filtersWithValues.length);
@@ -145,7 +152,6 @@ const FilterControls: FC<FilterControlsProps> = ({
           <FiltersOutOfScopeCollapsible
             filtersOutOfScope={filtersOutOfScope}
             forceRender={hasRequiredFirst}
-            hasTopMargin={filtersInScope.length > 0}
             renderer={renderer}
           />
         )}
@@ -226,7 +232,7 @@ const FilterControls: FC<FilterControlsProps> = ({
     () => (
       <div
         css={(theme: SupersetTheme) => css`
-          padding: 0 ${theme.gridUnit * 4}px;
+          padding: 0 ${theme.sizeUnit * 4}px;
           min-width: 0;
           flex: 1;
         `}
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterDivider.stories.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterDivider.stories.tsx
index 69f0de40b55..2c4c92d8896 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterDivider.stories.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterDivider.stories.tsx
@@ -23,7 +23,7 @@ import FilterDivider from './FilterDivider';
 import { FilterDividerProps } from './types';
 
 export default {
-  title: 'FilterDivider',
+  title: 'Components/FilterDivider',
   component: FilterDivider,
 };
 
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterDivider.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterDivider.tsx
index ea55624cd2a..f77c574e209 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterDivider.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterDivider.tsx
@@ -23,8 +23,8 @@ import {
   useCSSTextTruncation,
   truncationCSS,
 } from '@superset-ui/core';
-import { Icons } from 'src/components/Icons';
-import { Tooltip } from 'src/components/Tooltip';
+import { Icons } from '@superset-ui/core/components/Icons';
+import { Tooltip } from '@superset-ui/core/components';
 import { FilterBarOrientation } from 'src/dashboard/types';
 import { FilterDividerProps } from './types';
 
@@ -45,9 +45,9 @@ const HorizontalDivider = ({ title, description }: FilterDividerProps) => {
       css={css`
         display: flex;
         align-items: center;
-        height: ${6 * theme.gridUnit}px;
-        border-left: 1px solid ${theme.colors.grayscale.light2};
-        padding-left: ${4 * theme.gridUnit}px;
+        height: ${6 * theme.sizeUnit}px;
+        border-left: 1px solid ${theme.colorSplit};
+        padding-left: ${4 * theme.sizeUnit}px;
 
         .filter-item-wrapper:first-child & {
           border-left: none;
@@ -60,11 +60,11 @@ const HorizontalDivider = ({ title, description }: FilterDividerProps) => {
           ref={titleRef}
           css={css`
             ${truncationCSS};
-            max-width: ${theme.gridUnit * 32.5}px;
-            font-size: ${theme.typography.sizes.m}px;
-            font-weight: ${theme.typography.weights.normal};
+            max-width: ${theme.sizeUnit * 32.5}px;
+            font-size: ${theme.fontSize}px;
+            font-weight: ${theme.fontWeightNormal};
             margin: 0;
-            color: ${theme.colors.grayscale.dark1};
+            color: ${theme.colorText};
           `}
         >
           {title}
@@ -76,7 +76,7 @@ const HorizontalDivider = ({ title, description }: FilterDividerProps) => {
             data-test="divider-description-icon"
             iconSize="l"
             css={css`
-              margin: 0 ${theme.gridUnit * 1.5}px;
+              margin: 0 ${theme.sizeUnit * 1.5}px;
               vertical-align: unset;
               line-height: unset;
             `}
@@ -101,9 +101,9 @@ const HorizontalOverflowDivider = ({
   return (
     <div
       css={css`
-        border-top: 1px solid ${theme.colors.grayscale.light2};
-        padding-top: ${theme.gridUnit * 4}px;
-        margin-bottom: ${theme.gridUnit * 4}px;
+        border-top: 1px solid ${theme.colorSplit};
+        padding-top: ${theme.sizeUnit * 4}px;
+        margin-bottom: ${theme.sizeUnit * 4}px;
       `}
     >
       <Tooltip overlay={titleIsTruncated ? <strong>{title}</strong> : null}>
@@ -112,10 +112,10 @@ const HorizontalOverflowDivider = ({
           css={css`
             ${truncationCSS};
             display: block;
-            color: ${theme.colors.grayscale.dark1};
-            font-weight: ${theme.typography.weights.normal};
-            font-size: ${theme.typography.sizes.m}px;
-            margin: 0 0 ${theme.gridUnit}px 0;
+            color: ${theme.colorText};
+            font-weight: ${theme.fontWeightNormal};
+            font-size: ${theme.fontSize}px;
+            margin: 0 0 ${theme.sizeUnit}px 0;
           `}
         >
           {title}
@@ -129,9 +129,9 @@ const HorizontalOverflowDivider = ({
             css={css`
               ${truncationCSS};
               display: block;
-              font-size: ${theme.typography.sizes.s}px;
+              font-size: ${theme.fontSizeSM}px;
               color: ${theme.colors.grayscale.base};
-              margin: ${theme.gridUnit}px 0 0 0;
+              margin: ${theme.sizeUnit}px 0 0 0;
             `}
           >
             {description}
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterValue.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterValue.tsx
index 31722a63ead..16263024d29 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterValue.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterValue.tsx
@@ -44,8 +44,8 @@ import {
 import { useDispatch, useSelector } from 'react-redux';
 import { isEqual, isEqualWith } from 'lodash';
 import { getChartDataRequest } from 'src/components/Chart/chartAction';
-import Loading from 'src/components/Loading';
-import ErrorMessageWithStackTrace from 'src/components/ErrorMessage/ErrorMessageWithStackTrace';
+import { ErrorAlert, ErrorMessageWithStackTrace } from 'src/components';
+import { Loading, Constants } from '@superset-ui/core/components';
 import { waitForAsyncData } from 'src/middleware/asyncEvent';
 import { FilterBarOrientation, RootState } from 'src/dashboard/types';
 import {
@@ -53,8 +53,6 @@ import {
   setDirectPathToChild,
 } from 'src/dashboard/actions/dashboardState';
 import { RESPONSIVE_WIDTH } from 'src/filters/components/common';
-import { FAST_DEBOUNCE } from 'src/constants';
-import ErrorAlert from 'src/components/ErrorMessage/ErrorAlert';
 import { dispatchHoverAction, dispatchFocusAction } from './utils';
 import { FilterControlProps } from './types';
 import { getFormData } from '../../utils';
@@ -97,6 +95,8 @@ const FilterValue: FC<FilterControlProps> = ({
   orientation = FilterBarOrientation.Vertical,
   overflow = false,
   validateStatus,
+  clearAllTrigger,
+  onClearAllComplete,
 }) => {
   const { id, targets, filterType, adhoc_filters, time_range } = filter;
   const metadata = getChartMetadataRegistry().get(filterType);
@@ -234,7 +234,7 @@ const FilterValue: FC<FilterControlProps> = ({
         () => {
           inputRef?.current?.focus();
         },
-        overflow ? FAST_DEBOUNCE : 0,
+        overflow ? Constants.FAST_DEBOUNCE : 0,
       );
     }
   }, [inputRef, outlinedFilterId, lastUpdated, filter.id, overflow]);
@@ -275,6 +275,8 @@ const FilterValue: FC<FilterControlProps> = ({
       setFocusedFilter,
       unsetFocusedFilter,
       setFilterActive,
+      clearAllTrigger,
+      onClearAllComplete,
     }),
     [
       setDataMask,
@@ -283,13 +285,15 @@ const FilterValue: FC<FilterControlProps> = ({
       unsetHoveredFilter,
       setFocusedFilter,
       unsetFocusedFilter,
+      clearAllTrigger,
+      onClearAllComplete,
     ],
   );
 
   const filterState = useMemo(
     () => ({
-      validateStatus,
       ...filter.dataMask?.filterState,
+      validateStatus,
     }),
     [filter.dataMask?.filterState, validateStatus],
   );
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/types.ts b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/types.ts
index 855b6f03716..32150984dec 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/types.ts
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/types.ts
@@ -44,4 +44,6 @@ export interface FilterControlProps extends BaseFilterProps {
   parentRef?: RefObject<any>;
   setFilterActive?: (isActive: boolean) => void;
   validateStatus?: string;
+  clearAllTrigger?: boolean;
+  onClearAllComplete?: () => void;
 }
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/utils.ts b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/utils.ts
index 5e0e159d118..ad052d4784b 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/utils.ts
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/utils.ts
@@ -24,7 +24,7 @@ import {
   setHoveredNativeFilter,
   unsetHoveredNativeFilter,
 } from 'src/dashboard/actions/nativeFilters';
-import { FAST_DEBOUNCE } from 'src/constants';
+import { Constants } from '@superset-ui/core/components';
 
 export const dispatchHoverAction = debounce(
   (dispatch: Dispatch<any>, id?: string) => {
@@ -34,7 +34,7 @@ export const dispatchHoverAction = debounce(
       dispatch(unsetHoveredNativeFilter());
     }
   },
-  FAST_DEBOUNCE,
+  Constants.FAST_DEBOUNCE,
 );
 
 export const dispatchFocusAction = debounce(
@@ -45,5 +45,5 @@ export const dispatchFocusAction = debounce(
       dispatch(unsetFocusedNativeFilter());
     }
   },
-  FAST_DEBOUNCE,
+  Constants.FAST_DEBOUNCE,
 );
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FiltersDropdownContent/index.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FiltersDropdownContent/index.tsx
index 3fbead5d472..b52f7dfb0f3 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FiltersDropdownContent/index.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FiltersDropdownContent/index.tsx
@@ -48,8 +48,8 @@ export const FiltersDropdownContent = ({
 }: FiltersDropdownContentProps) => (
   <div
     css={(theme: SupersetTheme) => css`
-      width: ${theme.gridUnit * 56}px;
-      padding: ${theme.gridUnit}px 0;
+      width: ${theme.sizeUnit * 56}px;
+      padding: ${theme.sizeUnit}px 0;
     `}
   >
     {overflowedCrossFilters.map(crossFilter =>
@@ -65,7 +65,6 @@ export const FiltersDropdownContent = ({
         filtersOutOfScope={filtersOutOfScope}
         renderer={renderer}
         forceRender={forceRenderOutOfScope}
-        horizontalOverflow
       />
     )}
   </div>
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FiltersOutOfScopeCollapsible/index.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FiltersOutOfScopeCollapsible/index.tsx
index 605d5f5e69f..a0d6dccc9cf 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FiltersOutOfScopeCollapsible/index.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FiltersOutOfScopeCollapsible/index.tsx
@@ -18,82 +18,39 @@
  */
 import { ReactNode } from 'react';
 import { css, Divider, Filter, SupersetTheme, t } from '@superset-ui/core';
-import { AntdCollapse } from 'src/components';
+import { Collapse } from '@superset-ui/core/components';
 
 export interface FiltersOutOfScopeCollapsibleProps {
   filtersOutOfScope: (Filter | Divider)[];
   renderer: (filter: Filter | Divider, index: number) => ReactNode;
-  hasTopMargin?: boolean;
-  horizontalOverflow?: boolean;
   forceRender?: boolean;
 }
 
 export const FiltersOutOfScopeCollapsible = ({
   filtersOutOfScope,
   renderer,
-  hasTopMargin,
-  horizontalOverflow,
   forceRender = false,
 }: FiltersOutOfScopeCollapsibleProps) => (
-  <AntdCollapse
+  <Collapse
     ghost
     bordered
-    expandIconPosition="right"
+    expandIconPosition="end"
     collapsible={filtersOutOfScope.length === 0 ? 'disabled' : undefined}
-    css={(theme: SupersetTheme) =>
-      horizontalOverflow
-        ? css`
-            &.ant-collapse > .ant-collapse-item {
-              & > .ant-collapse-header {
-                padding: 0;
-
-                & > .ant-collapse-arrow {
-                  right: 0;
-                  padding: 0;
-                }
-              }
-
-              & .ant-collapse-content-box {
-                padding: ${theme.gridUnit * 4}px 0 0;
-                margin-bottom: ${theme.gridUnit * -4}px;
-              }
-            }
-          `
-        : css`
-            &.ant-collapse {
-              margin-top: ${hasTopMargin ? theme.gridUnit * 6 : 0}px;
-              & > .ant-collapse-item {
-                & > .ant-collapse-header {
-                  padding-left: 0;
-                  padding-bottom: ${theme.gridUnit * 2}px;
-
-                  & > .ant-collapse-arrow {
-                    right: ${theme.gridUnit}px;
-                  }
-                }
-
-                & .ant-collapse-content-box {
-                  padding: ${theme.gridUnit * 4}px 0 0;
-                }
-              }
-            }
-          `
-    }
-  >
-    <AntdCollapse.Panel
-      forceRender={forceRender}
-      header={
-        <span
-          css={(theme: SupersetTheme) => css`
-            font-size: ${theme.typography.sizes.s}px;
-          `}
-        >
-          {t('Filters out of scope (%d)', filtersOutOfScope.length)}
-        </span>
-      }
-      key="1"
-    >
-      {filtersOutOfScope.map(renderer)}
-    </AntdCollapse.Panel>
-  </AntdCollapse>
+    items={[
+      {
+        key: 'out-of-scope-filters',
+        label: (
+          <span
+            css={(theme: SupersetTheme) => css`
+              font-size: ${theme.fontSizeSM}px;
+            `}
+          >
+            {t('Filters out of scope (%d)', filtersOutOfScope.length)}
+          </span>
+        ),
+        children: filtersOutOfScope.map(renderer),
+        forceRender,
+      },
+    ]}
+  />
 );
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/Header/index.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/Header/index.tsx
index 6e9a3f1c688..7c113c2902b 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/Header/index.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/Header/index.tsx
@@ -19,8 +19,8 @@
 /* eslint-disable no-param-reassign */
 import { css, styled, t } from '@superset-ui/core';
 import { memo, FC } from 'react';
-import { Icons } from 'src/components/Icons';
-import Button from 'src/components/Button';
+import { Icons } from '@superset-ui/core/components/Icons';
+import { Button } from '@superset-ui/core/components';
 import { getFilterBarTestId } from '../utils';
 import FilterBarSettings from '../FilterBarSettings';
 
@@ -31,12 +31,12 @@ const TitleArea = styled.div`
     flex-direction: row;
     justify-content: space-between;
     margin: 0;
-    padding: 0 ${theme.gridUnit * 2}px ${theme.gridUnit * 2}px;
+    padding: 0 ${theme.sizeUnit * 2}px ${theme.sizeUnit * 2}px;
 
     & > span {
-      font-size: ${theme.typography.sizes.l}px;
+      font-size: ${theme.fontSizeLG}px;
       flex-grow: 1;
-      font-weight: ${theme.typography.weights.bold};
+      font-weight: ${theme.fontWeightStrong};
     }
 
     & > div:first-of-type {
@@ -55,8 +55,8 @@ const HeaderButton = styled(Button)`
 
 const Wrapper = styled.div`
   ${({ theme }) => `
-    padding: ${theme.gridUnit * 3}px ${theme.gridUnit * 2}px ${
-      theme.gridUnit
+    padding: ${theme.sizeUnit * 3}px ${theme.sizeUnit * 2}px ${
+      theme.sizeUnit
     }px;
   `}
 `;
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/Horizontal.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/Horizontal.tsx
index 13761afc4a9..c58ca06d879 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/Horizontal.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/Horizontal.tsx
@@ -19,7 +19,7 @@
 
 import { FC, memo, useMemo } from 'react';
 import { DataMaskStateWithId, styled, t } from '@superset-ui/core';
-import Loading from 'src/components/Loading';
+import { Loading } from '@superset-ui/core/components';
 import { RootState } from 'src/dashboard/types';
 import { useChartLayoutItems } from 'src/dashboard/util/useChartLayoutItems';
 import { useChartIds } from 'src/dashboard/util/charts/useChartIds';
@@ -32,10 +32,10 @@ import crossFiltersSelector from './CrossFilters/selectors';
 
 const HorizontalBar = styled.div`
   ${({ theme }) => `
-    padding: ${theme.gridUnit * 3}px ${theme.gridUnit * 2}px ${
-      theme.gridUnit * 3
-    }px ${theme.gridUnit * 4}px;
-    background: ${theme.colors.grayscale.light5};
+    padding: ${theme.sizeUnit * 3}px ${theme.sizeUnit * 2}px ${
+      theme.sizeUnit * 3
+    }px ${theme.sizeUnit * 4}px;
+    background: ${theme.colorBgBase};
     box-shadow: inset 0px -2px 2px -1px ${theme.colors.grayscale.light2};
   `}
 `;
@@ -47,10 +47,8 @@ const HorizontalBarContent = styled.div`
     flex-wrap: nowrap;
     align-items: center;
     justify-content: flex-start;
-    line-height: 0;
-
     .loading {
-      margin: ${theme.gridUnit * 2}px auto ${theme.gridUnit * 2}px;
+      margin: ${theme.sizeUnit * 2}px auto ${theme.sizeUnit * 2}px;
       padding: 0;
     }
   `}
@@ -58,10 +56,10 @@ const HorizontalBarContent = styled.div`
 
 const FilterBarEmptyStateContainer = styled.div`
   ${({ theme }) => `
-    font-weight: ${theme.typography.weights.bold};
+    font-weight: ${theme.fontWeightStrong};
     color: ${theme.colors.grayscale.base};
-    font-size: ${theme.typography.sizes.s}px;
-    padding-left: ${theme.gridUnit * 2}px;
+    font-size: ${theme.fontSizeSM}px;
+    padding-left: ${theme.sizeUnit * 2}px;
   `}
 `;
 
@@ -71,6 +69,8 @@ const HorizontalFilterBar: FC<HorizontalBarProps> = ({
   filterValues,
   isInitialized,
   onSelectionChange,
+  clearAllTriggers,
+  onClearAllComplete,
 }) => {
   const dataMask = useSelector<RootState, DataMaskStateWithId>(
     state => state.dataMask,
@@ -109,6 +109,8 @@ const HorizontalFilterBar: FC<HorizontalBarProps> = ({
               <FilterControls
                 dataMaskSelected={dataMaskSelected}
                 onFilterSelectionChange={onSelectionChange}
+                clearAllTriggers={clearAllTriggers}
+                onClearAllComplete={onClearAllComplete}
               />
             )}
             {actions}
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/Vertical.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/Vertical.tsx
index 417c4256484..e67f0fcbd05 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/Vertical.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/Vertical.tsx
@@ -31,9 +31,8 @@ import {
 } from 'react';
 import cx from 'classnames';
 import { styled, t, useTheme } from '@superset-ui/core';
-import { Icons } from 'src/components/Icons';
-import Loading from 'src/components/Loading';
-import { EmptyState } from 'src/components/EmptyState';
+import { Icons } from '@superset-ui/core/components/Icons';
+import { EmptyState, Loading } from '@superset-ui/core/components';
 import { getFilterBarTestId } from './utils';
 import { VerticalBarProps } from './types';
 import Header from './Header';
@@ -41,7 +40,7 @@ import FilterControls from './FilterControls/FilterControls';
 import CrossFiltersVertical from './CrossFilters/Vertical';
 
 const BarWrapper = styled.div<{ width: number }>`
-  width: ${({ theme }) => theme.gridUnit * 8}px;
+  width: ${({ theme }) => theme.sizeUnit * 8}px;
 
   & .ant-tabs-top > .ant-tabs-nav {
     margin: 0;
@@ -65,12 +64,13 @@ const Bar = styled.div<{ width: number }>`
     flex-grow: 1;
     width: ${width}px;
     background: ${theme.colors.grayscale.light5};
-    border-right: 1px solid ${theme.colors.grayscale.light2};
-    border-bottom: 1px solid ${theme.colors.grayscale.light2};
+    border-right: 1px solid ${theme.colorSplit};
+    border-bottom: 1px solid ${theme.colorSplit};
     min-height: 100%;
     display: none;
     &.open {
       display: flex;
+      background-color: ${theme.colorBgBase};
     }
   `}
 `;
@@ -81,15 +81,15 @@ const CollapsedBar = styled.div<{ offset: number }>`
     top: ${offset}px;
     left: 0;
     height: 100%;
-    width: ${theme.gridUnit * 8}px;
-    padding-top: ${theme.gridUnit * 2}px;
+    width: ${theme.sizeUnit * 8}px;
+    padding-top: ${theme.sizeUnit * 2}px;
     display: none;
     text-align: center;
     &.open {
       display: flex;
       flex-direction: column;
       align-items: center;
-      padding: ${theme.gridUnit * 2}px;
+      padding: ${theme.sizeUnit * 2}px;
     }
     svg {
       cursor: pointer;
@@ -98,13 +98,18 @@ const CollapsedBar = styled.div<{ offset: number }>`
 `;
 
 const FilterBarEmptyStateContainer = styled.div`
-  margin-top: ${({ theme }) => theme.gridUnit * 8}px;
+  margin-top: ${({ theme }) => theme.sizeUnit * 8}px;
 `;
 
 const FilterControlsWrapper = styled.div`
-  padding: ${({ theme }) => theme.gridUnit * 4}px;
-  // 108px padding to make room for buttons with position: absolute
-  padding-bottom: ${({ theme }) => theme.gridUnit * 27}px;
+  ${({ theme }) => `
+    display: flex;
+    flex-direction: column;
+    gap: ${theme.sizeUnit * 2}px;
+    padding: ${theme.sizeUnit * 4}px;
+    // 108px padding to make room for buttons with position: absolute
+    padding-bottom: ${theme.sizeUnit * 27}px;
+  `}
 `;
 
 export const FilterBarScrollContext = createContext(false);
@@ -120,6 +125,8 @@ const VerticalFilterBar: FC<VerticalBarProps> = ({
   onSelectionChange,
   toggleFiltersBar,
   width,
+  clearAllTriggers,
+  onClearAllComplete,
 }) => {
   const theme = useTheme();
   const [isScrolling, setIsScrolling] = useState(false);
@@ -175,6 +182,8 @@ const VerticalFilterBar: FC<VerticalBarProps> = ({
           <FilterControls
             dataMaskSelected={dataMaskSelected}
             onFilterSelectionChange={onSelectionChange}
+            clearAllTriggers={clearAllTriggers}
+            onClearAllComplete={onClearAllComplete}
           />
         </FilterControlsWrapper>
       ),
@@ -199,14 +208,15 @@ const VerticalFilterBar: FC<VerticalBarProps> = ({
             iconSize="l"
             css={{
               transform: 'rotate(90deg)',
-              marginBottom: `${theme.gridUnit * 3}px`,
+              marginBottom: `${theme.sizeUnit * 3}px`,
             }}
             className="collapse-icon"
-            iconColor={theme.colors.primary.base}
+            iconColor={theme.colorPrimary}
             {...getFilterBarTestId('expand-button')}
           />
           <Icons.FilterOutlined
             {...getFilterBarTestId('filter-icon')}
+            iconColor={theme.colorTextTertiary}
             iconSize="l"
           />
         </CollapsedBar>
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/index.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/index.tsx
index 4083755b8d3..f69ff6fcefa 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/index.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/index.tsx
@@ -34,13 +34,13 @@ import {
   DataMaskWithId,
   Filter,
   DataMask,
-  SLOW_DEBOUNCE,
   isNativeFilter,
   usePrevious,
   styled,
 } from '@superset-ui/core';
+import { Constants } from '@superset-ui/core/components';
 import { useHistory } from 'react-router-dom';
-import { updateDataMask, clearDataMask } from 'src/dataMask/actions';
+import { updateDataMask } from 'src/dataMask/actions';
 import { useImmer } from 'use-immer';
 import { isEmpty, isEqual, debounce } from 'lodash';
 import { getInitialDataMask } from 'src/dataMask/reducer';
@@ -136,7 +136,7 @@ const publishDataMask = debounce(
       });
     }
   },
-  SLOW_DEBOUNCE,
+  Constants.SLOW_DEBOUNCE,
 );
 
 const FilterBar: FC<FiltersBarProps> = ({
@@ -171,6 +171,12 @@ const FilterBar: FC<FiltersBarProps> = ({
   >(state => state.user);
 
   const [filtersInScope] = useSelectFiltersInScope(nativeFilterValues);
+  const [clearAllTriggers, setClearAllTriggers] = useState<
+    Record<string, boolean>
+  >({});
+  const [initializedFilters, setInitializedFilters] = useState<Set<string>>(
+    new Set(),
+  );
 
   const dataMaskSelectedRef = useRef(dataMaskSelected);
   dataMaskSelectedRef.current = dataMaskSelected;
@@ -180,23 +186,49 @@ const FilterBar: FC<FiltersBarProps> = ({
       dataMask: Partial<DataMask>,
     ) => {
       setDataMaskSelected(draft => {
+        const isFirstTimeInitialization =
+          !initializedFilters.has(filter.id) &&
+          dataMaskSelectedRef.current[filter.id]?.filterState?.value ===
+            undefined;
+
         // force instant updating on initialization for filters with `requiredFirst` is true or instant filters
         if (
           // filterState.value === undefined - means that value not initialized
           dataMask.filterState?.value !== undefined &&
-          dataMaskSelectedRef.current[filter.id]?.filterState?.value ===
-            undefined &&
+          isFirstTimeInitialization &&
           filter.requiredFirst
         ) {
           dispatch(updateDataMask(filter.id, dataMask));
         }
-        draft[filter.id] = {
+
+        // Mark filter as initialized after getting its first value
+        if (
+          dataMask.filterState?.value !== undefined &&
+          !initializedFilters.has(filter.id)
+        ) {
+          setInitializedFilters(prev => new Set(prev).add(filter.id));
+        }
+
+        const baseDataMask = {
           ...(getInitialDataMask(filter.id) as DataMaskWithId),
           ...dataMask,
         };
+
+        // Recalculate validation status
+        const hasRequiredValue =
+          filter.controlValues?.enableEmptyFilter &&
+          baseDataMask.filterState?.value == null;
+
+        draft[filter.id] = {
+          ...baseDataMask,
+          filterState: {
+            ...baseDataMask.filterState,
+            validateStatus: hasRequiredValue ? 'error' : undefined,
+          },
+        };
       });
     },
-    [dispatch, setDataMaskSelected],
+    [dispatch, setDataMaskSelected, initializedFilters, setInitializedFilters],
   );
 
   useEffect(() => {
@@ -256,26 +288,29 @@ const FilterBar: FC<FiltersBarProps> = ({
   }, [dataMaskSelected, dispatch]);
 
   const handleClearAll = useCallback(() => {
-    const clearDataMaskIds: string[] = [];
-    let dispatchAllowed = false;
+    const newClearAllTriggers = { ...clearAllTriggers };
     filtersInScope.filter(isNativeFilter).forEach(filter => {
       const { id } = filter;
       if (dataMaskSelected[id]) {
-        if (filter.controlValues?.enableEmptyFilter) {
-          dispatchAllowed = false;
-        }
-        clearDataMaskIds.push(id);
         setDataMaskSelected(draft => {
           if (draft[id].filterState?.value !== undefined) {
             draft[id].filterState!.value = undefined;
           }
+          draft[id].extraFormData = {};
         });
+        newClearAllTriggers[id] = true;
       }
     });
-    if (dispatchAllowed) {
-      clearDataMaskIds.forEach(id => dispatch(clearDataMask(id)));
-    }
-  }, [dataMaskSelected, dispatch, filtersInScope, setDataMaskSelected]);
+    setClearAllTriggers(newClearAllTriggers);
+  }, [dataMaskSelected, filtersInScope, setDataMaskSelected, clearAllTriggers]);
+
+  const handleClearAllComplete = useCallback((filterId: string) => {
+    setClearAllTriggers(prev => {
+      const newTriggers = { ...prev };
+      delete newTriggers[filterId];
+      return newTriggers;
+    });
+  }, []);
 
   useFilterUpdates(dataMaskSelected, setDataMaskSelected);
   const isApplyDisabled = checkIsApplyDisabled(
@@ -318,6 +353,8 @@ const FilterBar: FC<FiltersBarProps> = ({
         filterValues={filterValues}
         isInitialized={isInitialized}
         onSelectionChange={handleFilterSelectionChange}
+        clearAllTriggers={clearAllTriggers}
+        onClearAllComplete={handleClearAllComplete}
       />
     ) : verticalConfig ? (
       <Vertical
@@ -332,6 +369,8 @@ const FilterBar: FC<FiltersBarProps> = ({
         onSelectionChange={handleFilterSelectionChange}
         toggleFiltersBar={verticalConfig.toggleFiltersBar}
         width={verticalConfig.width}
+        clearAllTriggers={clearAllTriggers}
+        onClearAllComplete={handleClearAllComplete}
       />
     ) : null;
 
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/types.ts b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/types.ts
index 828badf50e0..6d552d94015 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/types.ts
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/types.ts
@@ -36,6 +36,8 @@ interface CommonFiltersBarProps {
     filter: Pick<Filter, 'id'> & Partial<Filter>,
     dataMask: Partial<DataMask>,
   ) => void;
+  clearAllTriggers?: Record<string, boolean>;
+  onClearAllComplete?: (filterId: string) => void;
 }
 
 interface VerticalBarConfig {
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/useFilterControlFactory.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/useFilterControlFactory.tsx
index d13cfb88f1b..5253eb8f9bb 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/useFilterControlFactory.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/useFilterControlFactory.tsx
@@ -33,6 +33,8 @@ import FilterDivider from './FilterControls/FilterDivider';
 export const useFilterControlFactory = (
   dataMaskSelected: DataMaskStateWithId,
   onFilterSelectionChange: (filter: Filter, dataMask: DataMask) => void,
+  clearAllTriggers?: Record<string, boolean>,
+  onClearAllComplete?: (filterId: string) => void,
 ) => {
   const filters = useFilters();
   const filterValues = useMemo(() => Object.values(filters), [filters]);
@@ -70,10 +72,18 @@ export const useFilterControlFactory = (
           inView={false}
           orientation={filterBarOrientation}
           overflow={overflow}
+          clearAllTrigger={clearAllTriggers?.[filter.id]}
+          onClearAllComplete={() => onClearAllComplete?.(filter.id)}
         />
       );
     },
-    [filtersWithValues, dataMaskSelected, onFilterSelectionChange],
+    [
+      filtersWithValues,
+      dataMaskSelected,
+      onFilterSelectionChange,
+      clearAllTriggers,
+      onClearAllComplete,
+    ],
   );
 
   return { filterControlFactory, filtersWithValues };
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/utils.test.ts b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/utils.test.ts
new file mode 100644
index 00000000000..37c20e1e7cd
--- /dev/null
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/utils.test.ts
@@ -0,0 +1,414 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { DataMaskStateWithId, Filter } from '@superset-ui/core';
+import {
+  checkIsApplyDisabled,
+  checkIsValidateError,
+  checkIsMissingRequiredValue,
+} from './utils';
+
+describe('FilterBar Utils - Validation and Apply Logic', () => {
+  describe('checkIsValidateError', () => {
+    test('should return true when no filters have validation errors', () => {
+      const dataMask: DataMaskStateWithId = {
+        'filter-1': {
+          id: 'filter-1',
+          filterState: {
+            validateStatus: undefined,
+            value: ['CA'],
+          },
+          extraFormData: {},
+        },
+        'filter-2': {
+          id: 'filter-2',
+          filterState: {
+            validateStatus: undefined,
+            value: ['NY'],
+          },
+          extraFormData: {},
+        },
+      };
+
+      expect(checkIsValidateError(dataMask)).toBe(true);
+    });
+
+    test('should return false when any filter has validation error', () => {
+      const dataMask: DataMaskStateWithId = {
+        'filter-1': {
+          id: 'filter-1',
+          filterState: {
+            validateStatus: 'error',
+            value: undefined,
+          },
+          extraFormData: {},
+        },
+        'filter-2': {
+          id: 'filter-2',
+          filterState: {
+            validateStatus: undefined,
+            value: ['NY'],
+          },
+          extraFormData: {},
+        },
+      };
+
+      expect(checkIsValidateError(dataMask)).toBe(false);
+    });
+
+    test('should handle empty dataMask', () => {
+      const dataMask: DataMaskStateWithId = {};
+      expect(checkIsValidateError(dataMask)).toBe(true);
+    });
+
+    test('should handle filters without filterState', () => {
+      const dataMask: DataMaskStateWithId = {
+        'filter-1': {
+          id: 'filter-1',
+          extraFormData: {},
+        },
+      };
+
+      expect(checkIsValidateError(dataMask)).toBe(true);
+    });
+  });
+
+  describe('checkIsMissingRequiredValue', () => {
+    test('should return true for required filter with undefined value', () => {
+      const filter = {
+        id: 'test-filter',
+        controlValues: {
+          enableEmptyFilter: true,
+        },
+      } as unknown as Filter;
+
+      const filterState = {
+        value: undefined,
+      };
+
+      expect(checkIsMissingRequiredValue(filter, filterState)).toBe(true);
+    });
+
+    test('should return true for required filter with null value', () => {
+      const filter = {
+        id: 'test-filter',
+        controlValues: {
+          enableEmptyFilter: true,
+        },
+      } as unknown as Filter;
+
+      const filterState = {
+        value: null,
+      };
+
+      expect(checkIsMissingRequiredValue(filter, filterState)).toBe(true);
+    });
+
+    test('should return false for required filter with valid value', () => {
+      const filter = {
+        id: 'test-filter',
+        controlValues: {
+          enableEmptyFilter: true,
+        },
+      } as unknown as Filter;
+
+      const filterState = {
+        value: ['CA'],
+      };
+
+      expect(checkIsMissingRequiredValue(filter, filterState)).toBe(false);
+    });
+
+    test('should return false for non-required filter with undefined value', () => {
+      const filter = {
+        id: 'test-filter',
+        controlValues: {
+          enableEmptyFilter: false,
+        },
+      } as unknown as Filter;
+
+      const filterState = {
+        value: undefined,
+      };
+
+      expect(checkIsMissingRequiredValue(filter, filterState)).toBe(false);
+    });
+
+    test('should return false for filter without controlValues', () => {
+      const filter = {
+        id: 'test-filter',
+      } as Filter;
+
+      const filterState = {
+        value: undefined,
+      };
+
+      // checkIsMissingRequiredValue returns undefined when controlValues is missing
+      // undefined is falsy, so we check for truthiness instead of exact false
+      expect(checkIsMissingRequiredValue(filter, filterState)).toBeFalsy();
+    });
+  });
+
+  describe('checkIsApplyDisabled', () => {
+    test('should return true when filters have validation errors', () => {
+      const dataMaskSelected: DataMaskStateWithId = {
+        'filter-1': {
+          id: 'filter-1',
+          filterState: {
+            validateStatus: 'error',
+            value: undefined,
+          },
+          extraFormData: {},
+        },
+      };
+
+      const dataMaskApplied: DataMaskStateWithId = {
+        'filter-1': {
+          id: 'filter-1',
+          filterState: {
+            value: ['CA'],
+          },
+          extraFormData: {
+            filters: [{ col: 'state', op: 'IN', val: ['CA'] }],
+          },
+        },
+      };
+
+      const filters: Filter[] = [
+        {
+          id: 'filter-1',
+          controlValues: {
+            enableEmptyFilter: true,
+          },
+        } as unknown as Filter,
+      ];
+
+      expect(
+        checkIsApplyDisabled(dataMaskSelected, dataMaskApplied, filters),
+      ).toBe(true);
+    });
+
+    test('should return false when selected and applied states differ', () => {
+      const dataMaskSelected: DataMaskStateWithId = {
+        'filter-1': {
+          id: 'filter-1',
+          filterState: {
+            validateStatus: undefined,
+            value: ['NY'],
+          },
+          extraFormData: {
+            filters: [{ col: 'state', op: 'IN', val: ['NY'] }],
+          },
+        },
+      };
+
+      const dataMaskApplied: DataMaskStateWithId = {
+        'filter-1': {
+          id: 'filter-1',
+          filterState: {
+            value: ['CA'],
+          },
+          extraFormData: {
+            filters: [{ col: 'state', op: 'IN', val: ['CA'] }],
+          },
+        },
+      };
+
+      const filters: Filter[] = [
+        {
+          id: 'filter-1',
+          controlValues: {
+            enableEmptyFilter: false,
+          },
+        } as unknown as Filter,
+      ];
+
+      expect(
+        checkIsApplyDisabled(dataMaskSelected, dataMaskApplied, filters),
+      ).toBe(false);
+    });
+
+    test('should return true when selected and applied states are identical', () => {
+      const dataMaskSelected: DataMaskStateWithId = {
+        'filter-1': {
+          id: 'filter-1',
+          filterState: {
+            validateStatus: undefined,
+            value: ['CA'],
+          },
+          extraFormData: {
+            filters: [{ col: 'state', op: 'IN', val: ['CA'] }],
+          },
+        },
+      };
+
+      const dataMaskApplied: DataMaskStateWithId = {
+        'filter-1': {
+          id: 'filter-1',
+          filterState: {
+            value: ['CA'],
+          },
+          extraFormData: {
+            filters: [{ col: 'state', op: 'IN', val: ['CA'] }],
+          },
+        },
+      };
+
+      const filters: Filter[] = [
+        {
+          id: 'filter-1',
+          controlValues: {
+            enableEmptyFilter: false,
+          },
+        } as unknown as Filter,
+      ];
+
+      expect(
+        checkIsApplyDisabled(dataMaskSelected, dataMaskApplied, filters),
+      ).toBe(true);
+    });
+
+    test('should return true when required filter is missing value in selected state', () => {
+      const dataMaskSelected: DataMaskStateWithId = {
+        'filter-1': {
+          id: 'filter-1',
+          filterState: {
+            validateStatus: undefined,
+            value: undefined,
+          },
+          extraFormData: {},
+        },
+      };
+
+      const dataMaskApplied: DataMaskStateWithId = {
+        'filter-1': {
+          id: 'filter-1',
+          filterState: {
+            value: ['CA'],
+          },
+          extraFormData: {
+            filters: [{ col: 'state', op: 'IN', val: ['CA'] }],
+          },
+        },
+      };
+
+      const filters: Filter[] = [
+        {
+          id: 'filter-1',
+          controlValues: {
+            enableEmptyFilter: true, // Required filter
+          },
+        } as unknown as Filter,
+      ];
+
+      expect(
+        checkIsApplyDisabled(dataMaskSelected, dataMaskApplied, filters),
+      ).toBe(true);
+    });
+
+    test('should handle filter count mismatch', () => {
+      const dataMaskSelected: DataMaskStateWithId = {
+        'filter-1': {
+          id: 'filter-1',
+          filterState: {
+            validateStatus: undefined,
+            value: ['CA'],
+          },
+          extraFormData: {
+            filters: [{ col: 'state', op: 'IN', val: ['CA'] }],
+          },
+        },
+        'filter-2': {
+          id: 'filter-2',
+          filterState: {
+            validateStatus: undefined,
+            value: ['Product A'],
+          },
+          extraFormData: {
+            filters: [{ col: 'product', op: 'IN', val: ['Product A'] }],
+          },
+        },
+      };
+
+      const dataMaskApplied: DataMaskStateWithId = {
+        'filter-1': {
+          id: 'filter-1',
+          filterState: {
+            value: ['CA'],
+          },
+          extraFormData: {
+            filters: [{ col: 'state', op: 'IN', val: ['CA'] }],
+          },
+        },
+        // Missing filter-2
+      };
+
+      const filters: Filter[] = [
+        { id: 'filter-1', controlValues: {} } as unknown as Filter,
+        { id: 'filter-2', controlValues: {} } as unknown as Filter,
+      ];
+
+      expect(
+        checkIsApplyDisabled(dataMaskSelected, dataMaskApplied, filters),
+      ).toBe(true);
+    });
+
+    test('should handle validation status recalculation scenario', () => {
+      // Scenario: Filter was required and had error, then user selected value
+      // The validateStatus should be cleared and Apply should be enabled
+
+      const dataMaskSelected: DataMaskStateWithId = {
+        'filter-1': {
+          id: 'filter-1',
+          filterState: {
+            validateStatus: undefined, // Error cleared after selection
+            value: ['CA'],
+          },
+          extraFormData: {
+            filters: [{ col: 'state', op: 'IN', val: ['CA'] }],
+          },
+        },
+      };
+
+      const dataMaskApplied: DataMaskStateWithId = {
+        'filter-1': {
+          id: 'filter-1',
+          filterState: {
+            value: undefined, // Previously cleared
+          },
+          extraFormData: {},
+        },
+      };
+
+      const filters: Filter[] = [
+        {
+          id: 'filter-1',
+          controlValues: {
+            enableEmptyFilter: true,
+          },
+        } as unknown as Filter,
+      ];
+
+      // Should be enabled because states differ and no validation errors
+      expect(
+        checkIsApplyDisabled(dataMaskSelected, dataMaskApplied, filters),
+      ).toBe(false);
+    });
+  });
+});
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterCard/DependenciesRow.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterCard/DependenciesRow.tsx
index a58ee02414b..c0d94463997 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterCard/DependenciesRow.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterCard/DependenciesRow.tsx
@@ -19,15 +19,15 @@
 import { memo, useCallback, useMemo } from 'react';
 import { useDispatch } from 'react-redux';
 import { css, t, useTheme, useTruncation } from '@superset-ui/core';
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { setDirectPathToChild } from 'src/dashboard/actions/dashboardState';
+import { List } from '@superset-ui/core/components/List';
 import {
   DependencyItem,
   Row,
   RowLabel,
   RowTruncationCount,
   RowValue,
-  TooltipList,
 } from './Styles';
 import { useFilterDependencies } from './useFilterDependencies';
 import { DependencyValueProps, FilterCardRowProps } from './types';
@@ -60,13 +60,24 @@ export const DependenciesRow = memo(({ filter }: FilterCardRowProps) => {
   const tooltipText = useMemo(
     () =>
       elementsTruncated > 0 && dependencies ? (
-        <TooltipList>
-          {dependencies.map(dependency => (
-            <li>
-              <DependencyValue dependency={dependency} />
-            </li>
-          ))}
-        </TooltipList>
+        <List
+          split={false}
+          dataSource={dependencies}
+          renderItem={dependency => (
+            <List.Item
+              compact
+              css={theme => css`
+                && .dependency-item {
+                  color: ${theme.colorWhite};
+                }
+              `}
+            >
+              <span className="dependency-item">
+                • <DependencyValue dependency={dependency} />
+              </span>
+            </List.Item>
+          )}
+        />
       ) : null,
     [elementsTruncated, dependencies],
   );
@@ -92,7 +103,7 @@ export const DependenciesRow = memo(({ filter }: FilterCardRowProps) => {
             iconSize="m"
             iconColor={theme.colors.grayscale.light1}
             css={css`
-              margin-left: ${theme.gridUnit}px;
+              margin-left: ${theme.sizeUnit}px;
             `}
           />
         </TooltipWithTruncation>
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterCard/NameRow.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterCard/NameRow.tsx
index 0773e328cb0..2fc3f100835 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterCard/NameRow.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterCard/NameRow.tsx
@@ -18,7 +18,7 @@
  */
 import { useSelector } from 'react-redux';
 import { css, SupersetTheme, useTheme, useTruncation } from '@superset-ui/core';
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { useFilterConfigModal } from 'src/dashboard/components/nativeFilters/FilterBar/FilterConfigurationLink/useFilterConfigModal';
 import { RootState } from 'src/dashboard/types';
 import { Row, FilterName, InternalRow } from './Styles';
@@ -49,7 +49,7 @@ export const NameRow = ({
   return (
     <Row
       css={(theme: SupersetTheme) => css`
-        margin-bottom: ${theme.gridUnit * 3}px;
+        margin-bottom: ${theme.sizeUnit * 3}px;
         justify-content: space-between;
       `}
     >
@@ -57,7 +57,7 @@ export const NameRow = ({
         <Icons.FilterOutlined
           iconSize="s"
           css={(theme: SupersetTheme) => css`
-            margin-right: ${theme.gridUnit}px;
+            margin-right: ${theme.sizeUnit}px;
           `}
         />
         <TooltipWithTruncation title={elementsTruncated ? filter.name : null}>
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterCard/ScopeRow.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterCard/ScopeRow.tsx
index 507f9d1d6f9..e816f50013a 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterCard/ScopeRow.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterCard/ScopeRow.tsx
@@ -17,31 +17,42 @@
  * under the License.
  */
 import { memo, useMemo } from 'react';
-import { t, useTruncation } from '@superset-ui/core';
+import { t, useTruncation, css } from '@superset-ui/core';
+import { List } from '@superset-ui/core/components/List';
 import { useFilterScope } from './useFilterScope';
-import {
-  Row,
-  RowLabel,
-  RowTruncationCount,
-  RowValue,
-  TooltipList,
-  TooltipSectionLabel,
-} from './Styles';
+import { Row, RowLabel, RowTruncationCount, RowValue } from './Styles';
 import { FilterCardRowProps } from './types';
 import { TooltipWithTruncation } from './TooltipWithTruncation';
 
 const getTooltipSection = (items: string[] | undefined, label: string) =>
   Array.isArray(items) && items.length > 0 ? (
     <>
-      <TooltipSectionLabel>{label}:</TooltipSectionLabel>
-      <TooltipList>
-        {items.map(item => (
-          <li>{item}</li>
-        ))}
-      </TooltipList>
+      <span
+        css={theme => css`
+          font-weight: ${theme.fontWeightStrong};
+        `}
+      >
+        {label}:
+      </span>
+      <List
+        size="small"
+        split={false}
+        dataSource={items}
+        renderItem={item => (
+          <List.Item
+            compact
+            css={theme => css`
+              && .scope-item {
+                color: ${theme.colorWhite};
+              }
+            `}
+          >
+            <span className="scope-item">• {item} </span>
+          </List.Item>
+        )}
+      />
     </>
   ) : null;
-
 export const ScopeRow = memo(({ filter }: FilterCardRowProps) => {
   const scope = useFilterScope(filter);
 
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterCard/Styles.ts b/superset-frontend/src/dashboard/components/nativeFilters/FilterCard/Styles.ts
index 695b48d4fa7..319f9151824 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterCard/Styles.ts
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterCard/Styles.ts
@@ -22,8 +22,8 @@ export const Row = styled.div`
   ${({ theme }) => css`
     display: flex;
     align-items: center;
-    margin: ${theme.gridUnit}px 0;
-    font-size: ${theme.typography.sizes.s}px;
+    margin: ${theme.sizeUnit}px 0;
+    font-size: ${theme.fontSizeSM}px;
 
     &:first-of-type {
       margin-top: 0;
@@ -33,7 +33,7 @@ export const Row = styled.div`
       margin-bottom: 0;
     }
 
-    & .antd5-tooltip-open {
+    & .ant-tooltip-open {
       display: inline-flex;
     }
   `};
@@ -42,7 +42,7 @@ export const Row = styled.div`
 export const RowLabel = styled.span`
   ${({ theme }) => css`
     color: ${theme.colors.grayscale.base};
-    padding-right: ${theme.gridUnit * 4}px;
+    padding-right: ${theme.sizeUnit * 4}px;
     margin-right: auto;
     white-space: nowrap;
   `};
@@ -50,7 +50,7 @@ export const RowLabel = styled.span`
 
 export const RowValue = styled.div`
   ${({ theme }) => css`
-    color: ${theme.colors.grayscale.dark1};
+    color: ${theme.colorText};
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
@@ -71,21 +71,10 @@ export const DependencyItem = styled.span`
 
 export const RowTruncationCount = styled.span`
   ${({ theme }) => css`
-    color: ${theme.colors.primary.base};
+    color: ${theme.colorPrimary};
   `}
 `;
 
-export const TooltipList = styled.ul`
-  ${({ theme }) => css`
-    padding-left: ${theme.gridUnit * 3}px;
-    margin-bottom: 0;
-  `};
-`;
-
-export const TooltipSectionLabel = styled.span`
-  font-weight: ${({ theme }) => theme.typography.weights.bold};
-`;
-
 export const TooltipTrigger = styled.div`
   min-width: 0;
   display: inline-flex;
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterCard/TooltipWithTruncation.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterCard/TooltipWithTruncation.tsx
index 4e3d887cd1d..d70ab650632 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterCard/TooltipWithTruncation.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterCard/TooltipWithTruncation.tsx
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { Tooltip, TooltipProps } from 'src/components/Tooltip';
+import { Tooltip, type TooltipProps } from '@superset-ui/core/components';
 import { TooltipTrigger } from './Styles';
 
 export const TooltipWithTruncation = ({
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterCard/index.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterCard/index.tsx
index dd5847e7b86..a4e9f2339ed 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterCard/index.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterCard/index.tsx
@@ -18,7 +18,7 @@
  */
 
 import { useEffect, useState } from 'react';
-import Popover from 'src/components/Popover';
+import { Popover } from '@superset-ui/core/components';
 import { FilterCardContent } from './FilterCardContent';
 import { FilterCardProps } from './types';
 
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/DividerConfigForm.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/DividerConfigForm.tsx
index e1f2cf4edf6..84a2ba8d619 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/DividerConfigForm.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/DividerConfigForm.tsx
@@ -17,8 +17,7 @@
  * under the License.
  */
 import { FC } from 'react';
-import { FormItem } from 'src/components/Form';
-import { Input, TextArea } from 'src/components/Input';
+import { FormItem, Input } from '@superset-ui/core/components';
 import { NativeFilterType, styled, t } from '@superset-ui/core';
 
 interface Props {
@@ -30,7 +29,7 @@ interface Props {
 }
 const Container = styled.div`
   ${({ theme }) => `
-    padding: ${theme.gridUnit * 4}px;
+    padding: ${theme.sizeUnit * 4}px;
   `}
 `;
 
@@ -51,7 +50,7 @@ const DividerConfigForm: FC<Props> = ({ componentId, divider }) => (
       label={t('Description')}
       name={['filters', componentId, 'description']}
     >
-      <TextArea rows={4} />
+      <Input.TextArea rows={4} />
     </FormItem>
     <FormItem
       hidden
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/DraggableFilter.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/DraggableFilter.tsx
index 59b109dfb3a..117e5545c2d 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/DraggableFilter.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/DraggableFilter.tsx
@@ -25,7 +25,8 @@ import {
   useDrop,
   XYCoord,
 } from 'react-dnd';
-import { Icons, IconType } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
+import type { IconType } from '@superset-ui/core/components/Icons/types';
 
 interface TitleContainerProps {
   readonly isDragging: boolean;
@@ -39,7 +40,6 @@ const Container = styled.div<TitleContainerProps>`
     cursor: ${isDragging ? 'grabbing' : 'pointer'};
     width: 100%;
     display: flex;
-    padding:  ${theme.gridUnit}px;
   `}
 `;
 
@@ -47,9 +47,9 @@ const DragIcon = styled(Icons.Drag, {
   shouldForwardProp: propName => propName !== 'isDragging',
 })<IconType & { isDragging: boolean }>`
   ${({ isDragging, theme }) => `
-    font-size: ${theme.typography.sizes.m}px;
+    font-size: ${theme.fontSize}px;
     cursor: ${isDragging ? 'grabbing' : 'grab'};
-    padding-left: ${theme.gridUnit}px;
+    padding-left: ${theme.sizeUnit}px;
   `}
 `;
 
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FilterConfigurePane.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FilterConfigurePane.tsx
index 48c6d0b97f9..b17c36634b9 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FilterConfigurePane.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FilterConfigurePane.tsx
@@ -42,13 +42,12 @@ const Container = styled.div`
 
 const ContentHolder = styled.div`
   flex-grow: 3;
-  margin-left: ${({ theme }) => theme.gridUnit * -1 - 1};
 `;
 
 const TitlesContainer = styled.div`
-  min-width: 300px;
-  max-width: 300px;
-  border-right: 1px solid ${({ theme }) => theme.colors.grayscale.light2};
+  min-width: 290px;
+  max-width: 290px;
+  border-right: 1px solid ${({ theme }) => theme.colorSplit};
 `;
 
 const FilterConfigurePane: FC<Props> = ({
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FilterTitleContainer.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FilterTitleContainer.tsx
index 4d928df76a9..ab4bff10c80 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FilterTitleContainer.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FilterTitleContainer.tsx
@@ -18,8 +18,8 @@
  */
 import { forwardRef, ReactNode } from 'react';
 
-import { styled, t, useTheme } from '@superset-ui/core';
-import { Icons } from 'src/components/Icons';
+import { styled, t } from '@superset-ui/core';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { FilterRemoval } from './types';
 import DraggableFilter from './DraggableFilter';
 
@@ -27,33 +27,31 @@ export const FilterTitle = styled.div`
   ${({ theme }) => `
       display: flex;
       align-items: center;
-      padding: ${theme.gridUnit * 2}px;
-      width: 100%;
+      padding: ${theme.sizeUnit * 2}px;
       border-radius: ${theme.borderRadius}px;
       cursor: pointer;
       &.active {
-        color: ${theme.colors.grayscale.dark1};
+        color: ${theme.colorPrimaryActive};
         border-radius: ${theme.borderRadius}px;
-        background-color: ${theme.colors.secondary.light4};
+        background-color: ${theme.colorPrimaryBg};
         span, .anticon {
-          color: ${theme.colors.grayscale.dark1};
+          color: ${theme.colorIcon};
         }
       }
       &:hover {
-        color: ${theme.colors.primary.light1};
+        color: ${theme.colorPrimaryHover};
         span, .anticon {
-          color: ${theme.colors.primary.light1};
+          color: ${theme.colorPrimaryHover};
         }
       }
       &.errored div, &.errored .warning {
-        align-items: center;
-        color: ${theme.colors.error.base};
+        color: ${theme.colorError};
       }
   `}
 `;
 
 const StyledWarning = styled(Icons.ExclamationCircleOutlined)`
-  color: ${({ theme }) => theme.colors.error.base};
+  color: ${({ theme }) => theme.colorErrorText};
   &.anticon {
     margin-left: auto;
   }
@@ -91,7 +89,6 @@ const FilterTitleContainer = forwardRef<HTMLDivElement, Props>(
     },
     ref,
   ) => {
-    const theme = useTheme();
     const renderComponent = (id: string) => {
       const isRemoved = !!removedFilters[id];
       const isErrored = erroredFilters.includes(id);
@@ -110,7 +107,7 @@ const FilterTitleContainer = forwardRef<HTMLDivElement, Props>(
           onClick={() => onChange(id)}
           className={classNames.join(' ')}
         >
-          <div css={{ display: 'flex', width: '100%' }}>
+          <div css={{ display: 'flex', width: '100%', alignItems: 'center' }}>
             <div
               css={{
                 alignItems: 'center',
@@ -141,9 +138,8 @@ const FilterTitleContainer = forwardRef<HTMLDivElement, Props>(
           <div css={{ alignSelf: 'flex-start', marginLeft: 'auto' }}>
             {isRemoved ? null : (
               <Icons.DeleteOutlined
-                iconColor={theme.colors.grayscale.light3}
-                iconSize="m"
-                onClick={event => {
+                iconSize="l"
+                onClick={(event: React.MouseEvent<HTMLElement>) => {
                   event.stopPropagation();
                   onRemove(id);
                 }}
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FilterTitlePane.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FilterTitlePane.tsx
index 2c4b4ba0c34..8b1b32e017d 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FilterTitlePane.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FilterTitlePane.tsx
@@ -19,8 +19,8 @@
 import { useRef, FC } from 'react';
 
 import { NativeFilterType, styled, t, useTheme } from '@superset-ui/core';
-import { Button } from 'src/components';
-import { Icons } from 'src/components/Icons';
+import { Button } from '@superset-ui/core/components';
+import { Icons } from '@superset-ui/core/components/Icons';
 
 import FilterTitleContainer from './FilterTitleContainer';
 import { FilterRemoval } from './types';
@@ -42,7 +42,7 @@ const TabsContainer = styled.div`
   height: 100%;
   display: flex;
   flex-direction: column;
-  padding: ${({ theme }) => theme.gridUnit * 3}px;
+  padding: ${({ theme }) => theme.sizeUnit * 3}px;
   padding-top: 2px;
 `;
 
@@ -65,12 +65,6 @@ const FilterTitlePane: FC<Props> = ({
   const handleOnAdd = (type: NativeFilterType) => {
     onAdd(type);
     setTimeout(() => {
-      const element = document.getElementById('native-filters-tabs');
-      if (element) {
-        const navList = element.getElementsByClassName('ant-tabs-nav-list')[0];
-        navList.scrollTop = navList.scrollHeight;
-      }
-
       filtersContainerRef?.current?.scroll?.({
         top: filtersContainerRef.current.scrollHeight,
         behavior: 'smooth',
@@ -103,17 +97,16 @@ const FilterTitlePane: FC<Props> = ({
           display: 'flex',
           justifyContent: 'space-around',
           alignItems: 'flex-start',
-          paddingTop: theme.gridUnit * 3,
+          paddingTop: theme.sizeUnit * 3,
+          position: 'sticky',
+          bottom: theme.sizeUnit * 3,
         }}
       >
         <Button
           buttonSize="default"
           buttonStyle="secondary"
           icon={
-            <Icons.FilterOutlined
-              iconColor={theme.colors.primary.dark1}
-              iconSize="m"
-            />
+            <Icons.FilterOutlined iconColor={theme.colorPrimary} iconSize="m" />
           }
           data-test="add-new-filter-button"
           onClick={() => handleOnAdd(NativeFilterType.NativeFilter)}
@@ -125,7 +118,7 @@ const FilterTitlePane: FC<Props> = ({
           buttonStyle="secondary"
           icon={
             <Icons.PicCenterOutlined
-              iconColor={theme.colors.primary.dark1}
+              iconColor={theme.colorPrimary}
               iconSize="m"
             />
           }
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/CollapsibleControl.test.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/CollapsibleControl.test.tsx
new file mode 100644
index 00000000000..ef15caafca0
--- /dev/null
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/CollapsibleControl.test.tsx
@@ -0,0 +1,118 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { render, screen } from 'spec/helpers/testing-library';
+import userEvent from '@testing-library/user-event';
+import '@testing-library/jest-dom';
+import { CollapsibleControl } from './CollapsibleControl';
+
+const defaultProps = {
+  title: 'Test Control',
+  children: <div data-test="child-content">Child Content</div>,
+};
+
+const renderCollapsibleControl = (props = {}) =>
+  render(<CollapsibleControl {...defaultProps} {...props} />);
+
+describe('CollapsibleControl', () => {
+  it('renders title correctly', () => {
+    const { getByRole } = renderCollapsibleControl();
+    expect(
+      getByRole('checkbox', { name: /test control/i }),
+    ).toBeInTheDocument();
+  });
+
+  it('renders tooltip when provided', () => {
+    const tooltipText = 'Test tooltip';
+    renderCollapsibleControl({ tooltip: tooltipText });
+
+    const tooltip = screen.getByRole('button', { name: 'Show info tooltip' });
+    expect(tooltip).toBeInTheDocument();
+  });
+
+  it('starts collapsed when initialValue is false', () => {
+    renderCollapsibleControl({ initialValue: false });
+    expect(screen.queryByTestId('child-content')).not.toBeInTheDocument();
+  });
+
+  it('starts expanded when initialValue is true', () => {
+    renderCollapsibleControl({ initialValue: true });
+
+    expect(screen.getByTestId('child-content')).toBeInTheDocument();
+  });
+
+  it('toggles content when clicked', async () => {
+    renderCollapsibleControl();
+    const checkbox = screen.getByRole('checkbox', { name: /Test Control/i });
+
+    expect(screen.queryByTestId('child-content')).not.toBeInTheDocument();
+
+    await userEvent.click(checkbox);
+    expect(screen.getByTestId('child-content')).toBeInTheDocument();
+
+    await userEvent.click(checkbox);
+    expect(screen.queryByTestId('child-content')).not.toBeInTheDocument();
+  });
+
+  it('calls onChange handler when toggled', async () => {
+    const onChangeMock = jest.fn();
+    renderCollapsibleControl({ onChange: onChangeMock });
+    const checkbox = screen.getByRole('checkbox', { name: /Test Control/i });
+
+    await userEvent.click(checkbox);
+    expect(onChangeMock).toHaveBeenCalledWith(true);
+
+    await userEvent.click(checkbox);
+    expect(onChangeMock).toHaveBeenCalledWith(false);
+  });
+
+  it('respects disabled prop', async () => {
+    const onChangeMock = jest.fn();
+    renderCollapsibleControl({
+      disabled: true,
+      onChange: onChangeMock,
+    });
+
+    const checkbox = screen.getByRole('checkbox', { name: /Test Control/i });
+    expect(checkbox).toBeDisabled();
+
+    await userEvent.click(checkbox);
+    expect(onChangeMock).not.toHaveBeenCalled();
+  });
+
+  it('updates when controlled checked prop changes', () => {
+    const { rerender } = renderCollapsibleControl({ checked: false });
+    expect(screen.queryByTestId('child-content')).not.toBeInTheDocument();
+
+    rerender(<CollapsibleControl {...defaultProps} checked />);
+    expect(screen.getByTestId('child-content')).toBeInTheDocument();
+  });
+
+  it('maintains local state when in uncontrolled mode', async () => {
+    renderCollapsibleControl({ initialValue: false });
+    const checkbox = screen.getByRole('checkbox', { name: /Test Control/i });
+
+    expect(screen.queryByTestId('child-content')).not.toBeInTheDocument();
+
+    await userEvent.click(checkbox);
+    expect(screen.getByTestId('child-content')).toBeInTheDocument();
+
+    await userEvent.click(checkbox);
+    expect(screen.queryByTestId('child-content')).not.toBeInTheDocument();
+  });
+});
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/CollapsibleControl.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/CollapsibleControl.tsx
index db6756a5805..61bc0e4408d 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/CollapsibleControl.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/CollapsibleControl.tsx
@@ -18,8 +18,7 @@
  */
 import { ReactNode, useEffect, useState } from 'react';
 import { styled } from '@superset-ui/core';
-import { AntdCheckbox } from 'src/components';
-import { InfoTooltipWithTrigger } from '@superset-ui/chart-controls';
+import { Checkbox, InfoTooltip } from '@superset-ui/core/components';
 
 interface CollapsibleControlProps {
   initialValue?: boolean;
@@ -36,20 +35,14 @@ const StyledContainer = styled.div<{ checked: boolean }>`
   display: flex;
   flex-direction: column;
   align-items: flex-start;
-  min-height: ${({ theme }) => theme.gridUnit * 10}px;
-  padding-top: ${({ theme }) => theme.gridUnit * 2 + 2}px;
-
-  .checkbox {
-    margin-bottom: ${({ theme, checked }) => (checked ? theme.gridUnit : 0)}px;
-  }
 
   & > div {
-    margin-bottom: ${({ theme }) => theme.gridUnit * 2}px;
+    margin-bottom: ${({ theme }) => theme.sizeUnit * 2}px;
   }
 `;
 
 const ChildrenContainer = styled.div`
-  margin-left: ${({ theme }) => theme.gridUnit * 6}px;
+  margin-left: ${({ theme }) => theme.sizeUnit * 6}px;
 `;
 
 const CollapsibleControl = (props: CollapsibleControlProps) => {
@@ -65,8 +58,6 @@ const CollapsibleControl = (props: CollapsibleControlProps) => {
   const [isChecked, setIsChecked] = useState(initialValue);
 
   useEffect(() => {
-    // if external `checked` changed to `undefined`, it means that we work now in uncontrolled mode with local state
-    // and we need ignore external value
     if (checked !== undefined) {
       setIsChecked(checked);
     }
@@ -74,15 +65,12 @@ const CollapsibleControl = (props: CollapsibleControlProps) => {
 
   return (
     <StyledContainer checked={isChecked}>
-      <AntdCheckbox
-        className="checkbox"
+      <Checkbox
         checked={isChecked}
         disabled={disabled}
         onChange={e => {
           const value = e.target.checked;
-          // external `checked` value has more priority then local state
           if (checked === undefined) {
-            // uncontrolled mode
             setIsChecked(value);
           }
           onChange(value);
@@ -90,11 +78,9 @@ const CollapsibleControl = (props: CollapsibleControlProps) => {
       >
         <>
           {title}&nbsp;
-          {tooltip && (
-            <InfoTooltipWithTrigger placement="top" tooltip={tooltip} />
-          )}
+          {tooltip && <InfoTooltip placement="top" tooltip={tooltip} />}
         </>
-      </AntdCheckbox>
+      </Checkbox>
       {isChecked && <ChildrenContainer>{children}</ChildrenContainer>}
     </StyledContainer>
   );
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/ColumnSelect.test.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/ColumnSelect.test.tsx
index 8fa46963713..50cfc43962c 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/ColumnSelect.test.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/ColumnSelect.test.tsx
@@ -79,7 +79,11 @@ test('Should render', async () => {
   expect(container.children).toHaveLength(1);
   userEvent.type(screen.getByRole('combobox'), 'column_name');
   await waitFor(() => {
-    expect(screen.getByTitle('column_name_01')).toBeInTheDocument();
+    expect(
+      screen.getByRole('option', {
+        name: 'column_name_01',
+      }),
+    ).toBeInTheDocument();
   });
   await waitFor(() => {
     expect(screen.getByTitle('column_name_02')).toBeInTheDocument();
@@ -126,7 +130,11 @@ test('Should filter results', async () => {
   expect(container.children).toHaveLength(1);
   userEvent.type(screen.getByRole('combobox'), 'column_name');
   await waitFor(() => {
-    expect(screen.getByTitle('column_name_01')).toBeInTheDocument();
+    expect(
+      screen.getByRole('option', {
+        name: 'column_name_01',
+      }),
+    ).toBeInTheDocument();
   });
   await waitFor(() => {
     expect(screen.queryByTitle('column_name_02')).not.toBeInTheDocument();
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/ColumnSelect.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/ColumnSelect.tsx
index 888e230350c..148cfa44197 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/ColumnSelect.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/ColumnSelect.tsx
@@ -25,16 +25,16 @@ import {
   useChangeEffect,
   getClientErrorObject,
 } from '@superset-ui/core';
-import { Select, FormInstance } from 'src/components';
+import { type FormInstance, Select } from '@superset-ui/core/components';
 import { useToasts } from 'src/components/MessageToasts/withToasts';
 import { cachedSupersetGet } from 'src/utils/cachedSupersetGet';
-import { NativeFiltersForm } from '../types';
+import { NativeFiltersForm, NativeFiltersFormItem } from '../types';
 
 interface ColumnSelectProps {
   allowClear?: boolean;
   filterValues?: (column: Column) => boolean;
   form: FormInstance<NativeFiltersForm>;
-  formField?: string;
+  formField?: keyof NativeFiltersFormItem;
   filterId: string;
   datasetId?: number;
   value?: string | string[];
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/DatasetSelect.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/DatasetSelect.tsx
index 4683a69ec5d..b6e3495dbff 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/DatasetSelect.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/DatasetSelect.tsx
@@ -24,7 +24,7 @@ import {
   ClientErrorObject,
   getClientErrorObject,
 } from '@superset-ui/core';
-import { AsyncSelect } from 'src/components';
+import { AsyncSelect } from '@superset-ui/core/components';
 import { cachedSupersetGet } from 'src/utils/cachedSupersetGet';
 import {
   Dataset,
@@ -66,12 +66,10 @@ const DatasetSelect = ({ onChange, value }: DatasetSelectProps) => {
     })
       .then((response: JsonResponse) => {
         const list: {
-          customLabel: ReactNode;
-          label: string;
+          label: string | ReactNode;
           value: string | number;
         }[] = response.json.result.map((item: Dataset) => ({
-          customLabel: DatasetSelectLabel(item),
-          label: item.table_name,
+          label: DatasetSelectLabel(item),
           value: item.id,
         }));
         return {
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/DefaultValue.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/DefaultValue.tsx
index 1fbda8cd24e..341df0489d4 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/DefaultValue.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/DefaultValue.tsx
@@ -24,8 +24,7 @@ import {
   AppSection,
   t,
 } from '@superset-ui/core';
-import { FormInstance } from 'src/components';
-import Loading from 'src/components/Loading';
+import { Loading, type FormInstance } from '@superset-ui/core/components';
 import { NativeFiltersForm } from '../types';
 import { getFormData } from '../../utils';
 import {
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/DependencyList.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/DependencyList.tsx
index 74571397df4..9114ebe12af 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/DependencyList.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/DependencyList.tsx
@@ -18,8 +18,8 @@
  */
 import { useState } from 'react';
 import { styled, t } from '@superset-ui/core';
-import { Icons } from 'src/components/Icons';
-import { Select } from 'src/components';
+import { Icons } from '@superset-ui/core/components/Icons';
+import { Select } from '@superset-ui/core/components';
 import { CollapsibleControl } from './CollapsibleControl';
 import { INPUT_WIDTH } from './constants';
 
@@ -46,9 +46,9 @@ const AddFilter = styled.div`
     flex-direction: row;
     align-items: center;
     cursor: pointer;
-    color: ${theme.colors.primary.base};
+    color: ${theme.colorPrimary};
     &:hover {
-      color: ${theme.colors.primary.dark1};
+      color: ${theme.colorPrimaryText};
     }
   `}
 `;
@@ -56,10 +56,10 @@ const AddFilter = styled.div`
 const DeleteFilter = styled(Icons.DeleteOutlined)`
   ${({ theme }) => `
     cursor: pointer;
-    margin-left: ${theme.gridUnit * 2}px;
+    margin-left: ${theme.sizeUnit * 2}px;
     color: ${theme.colors.grayscale.base};
     &:hover {
-      color: ${theme.colors.grayscale.dark1};
+      color: ${theme.colorText};
     }
   `}
 `;
@@ -69,7 +69,7 @@ const RowPanel = styled.div`
     display: flex;
     flex-direction: row;
     align-items: center;
-    margin-bottom: ${theme.gridUnit}px;
+    margin-bottom: ${theme.sizeUnit}px;
 
     & > div {
       width: ${INPUT_WIDTH}px;
@@ -78,9 +78,9 @@ const RowPanel = styled.div`
 `;
 
 const Label = styled.div`
-  font-size: ${({ theme }) => theme.typography.sizes.s}px;
+  font-size: ${({ theme }) => theme.fontSizeSM}px;
   color: ${({ theme }) => theme.colors.grayscale.base};
-  margin-bottom: ${({ theme }) => theme.gridUnit}px;
+  margin-bottom: ${({ theme }) => theme.sizeUnit}px;
 `;
 
 const Row = ({
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/FilterScope.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/FilterScope.tsx
index d175f50bccf..a8f6d7c7935 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/FilterScope.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/FilterScope.tsx
@@ -19,7 +19,7 @@
 
 import { FC, useCallback, useEffect, useMemo, useState } from 'react';
 import { NativeFilterScope, styled } from '@superset-ui/core';
-import { AntdForm } from 'src/components';
+import { FormItem } from '@superset-ui/core/components';
 import ScopingTree from './ScopingTree';
 import { getDefaultScopeValue } from './utils';
 
@@ -37,12 +37,12 @@ const Wrapper = styled.div`
   display: flex;
   flex-direction: column;
   & > * {
-    margin-bottom: ${({ theme }) => theme.gridUnit}px;
+    margin-bottom: ${({ theme }) => theme.sizeUnit}px;
   }
-  padding: 0px ${({ theme }) => theme.gridUnit * 4}px;
+  padding: 0px ${({ theme }) => theme.sizeUnit * 4}px;
 `;
 
-const CleanFormItem = styled(AntdForm.Item)`
+const CleanFormItem = styled(FormItem)`
   margin-bottom: 0;
 `;
 
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/ScopingTree.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/ScopingTree.tsx
index 6ad9e5e4f0c..96a31d81704 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/ScopingTree.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/ScopingTree.tsx
@@ -19,10 +19,10 @@
 
 import { FC, useMemo, useState, memo } from 'react';
 import { NativeFilterScope } from '@superset-ui/core';
-import { Tree } from 'src/components';
+import Tree from '@superset-ui/core/components/Tree';
 import { DASHBOARD_ROOT_ID } from 'src/dashboard/util/constants';
-import { Tooltip } from 'src/components/Tooltip';
-import { Icons } from 'src/components/Icons';
+import { Tooltip } from '@superset-ui/core/components';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { useFilterScopeTree } from './state';
 import { findFilterScope, getTreeCheckedItems } from './utils';
 
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/__tests__/TreeInitialization.test.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/__tests__/TreeInitialization.test.tsx
index bd611519e95..1fc26df2657 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/__tests__/TreeInitialization.test.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/__tests__/TreeInitialization.test.tsx
@@ -23,7 +23,7 @@ import {
   waitFor,
   cleanup,
 } from 'spec/helpers/testing-library';
-import { FormInstance } from 'antd/lib/form';
+import type { FormInstance } from '@superset-ui/core/components';
 import { createMockModal } from './utils';
 
 describe('FilterScope TreeInitialization', () => {
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/__tests__/TreeSelection.test.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/__tests__/TreeSelection.test.tsx
index 0d1e8e65356..842761eb609 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/__tests__/TreeSelection.test.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/__tests__/TreeSelection.test.tsx
@@ -23,7 +23,7 @@ import {
   waitFor,
   cleanup,
 } from 'spec/helpers/testing-library';
-import { FormInstance } from 'antd/lib/form';
+import type { FormInstance } from '@superset-ui/core/components';
 import { createMockModal, getTreeSwitcher } from './utils';
 
 describe('FilterScope TreeSelection', () => {
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/__tests__/utils.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/__tests__/utils.tsx
index 2f6aaf51a99..37f33132e55 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/__tests__/utils.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/__tests__/utils.tsx
@@ -18,11 +18,11 @@
  */
 import { useEffect } from 'react';
 import { Provider } from 'react-redux';
-import { AntdForm, FormInstance } from 'src/components';
 import FiltersConfigForm, {
   FilterPanels,
 } from 'src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm';
 import { mockStoreWithChartsInTabsAndRoot } from 'spec/fixtures/mockStore';
+import { Form, type FormInstance } from '@superset-ui/core/components';
 
 export const createMockedProps = () => ({
   expanded: false,
@@ -48,7 +48,7 @@ interface MockModalProps {
 
 export const createMockModal = ({ scope, formRef }: MockModalProps) => {
   const MockModalComponent = () => {
-    const [form] = AntdForm.useForm();
+    const [form] = Form.useForm();
 
     useEffect(() => {
       // Create a new ref object instead of modifying the parameter
@@ -71,9 +71,9 @@ export const createMockModal = ({ scope, formRef }: MockModalProps) => {
 
     return (
       <Provider store={mockStoreWithChartsInTabsAndRoot}>
-        <AntdForm form={form}>
+        <Form form={form}>
           <FiltersConfigForm form={form} {...createMockedProps()} />
-        </AntdForm>
+        </Form>
       </Provider>
     );
   };
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx
index 01effc9aa1a..e0a330d394b 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx
@@ -17,11 +17,7 @@
  * under the License.
  */
 /* eslint-disable react-hooks/rules-of-hooks */
-import {
-  ColumnMeta,
-  InfoTooltipWithTrigger,
-  Metric,
-} from '@superset-ui/chart-controls';
+import { ColumnMeta, Metric } from '@superset-ui/chart-controls';
 import {
   AdhocFilter,
   Behavior,
@@ -39,9 +35,9 @@ import {
   t,
   ClientErrorObject,
   getClientErrorObject,
-  SLOW_DEBOUNCE,
   useTheme,
   css,
+  getExtensionsRegistry,
 } from '@superset-ui/core';
 import { debounce, isEqual } from 'lodash';
 import {
@@ -58,18 +54,23 @@ import rison from 'rison';
 import { PluginFilterSelectCustomizeProps } from 'src/filters/components/Select/types';
 import { useSelector } from 'react-redux';
 import { getChartDataRequest } from 'src/components/Chart/chartAction';
-import { Input, TextArea } from 'src/components/Input';
-import { Select, FormInstance } from 'src/components';
-import Collapse from 'src/components/Collapse';
-import BasicErrorAlert from 'src/components/ErrorMessage/BasicErrorAlert';
-import ErrorMessageWithStackTrace from 'src/components/ErrorMessage/ErrorMessageWithStackTrace';
-import { FormItem } from 'src/components/Form';
-import { Icons } from 'src/components/Icons';
-import Loading from 'src/components/Loading';
+import {
+  Constants,
+  FormItem,
+  type FormInstance,
+  Collapse,
+  Icons,
+  Select,
+  Tooltip,
+  InfoTooltip,
+  Flex,
+  Input,
+  Loading,
+} from '@superset-ui/core/components';
+import { BasicErrorAlert, ErrorMessageWithStackTrace } from 'src/components';
 import { addDangerToast } from 'src/components/MessageToasts/actions';
-import { Radio } from 'src/components/Radio';
-import Tabs from 'src/components/Tabs';
-import { Tooltip } from 'src/components/Tooltip';
+import { Radio } from '@superset-ui/core/components/Radio';
+import Tabs from '@superset-ui/core/components/Tabs';
 import { cachedSupersetGet } from 'src/utils/cachedSupersetGet';
 import {
   Chart,
@@ -81,6 +82,7 @@ import DateFilterControl from 'src/explore/components/controls/DateFilterControl
 import AdhocFilterControl from 'src/explore/components/controls/FilterControl/AdhocFilterControl';
 import { waitForAsyncData } from 'src/middleware/asyncEvent';
 import { SingleValueType } from 'src/filters/components/Range/SingleValueType';
+import { RangeDisplayMode } from 'src/filters/components/Range/types';
 import {
   getFormData,
   mergeExtraFormData,
@@ -110,25 +112,24 @@ import DependencyList from './DependencyList';
 
 const FORM_ITEM_WIDTH = 260;
 
-const TabPane = styled(Tabs.TabPane)`
-  padding: ${({ theme }) => theme.gridUnit * 4}px 0px;
+const StyledSettings = styled.div`
+  ${({ theme }) => `
+    .ant-form-item {
+      margin-bottom: ${theme.sizeUnit * 2}px;
+    }
+  `}
 `;
-
 const StyledContainer = styled.div`
   ${({ theme }) => `
     display: flex;
     flex-direction: row-reverse;
     justify-content: space-between;
-    padding: 0px ${theme.gridUnit * 4}px;
+    padding: 0px ${theme.sizeUnit * 4}px;
   `}
 `;
 
-const StyledRowContainer = styled.div`
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  width: 100%;
-  padding: 0px ${({ theme }) => theme.gridUnit * 4}px;
+const StyledRowContainer = styled(Flex)`
+  padding: ${({ theme }) => theme.sizeUnit * 4}px;
 `;
 
 type ControlKey = keyof PluginFilterSelectCustomizeProps;
@@ -144,66 +145,21 @@ const controlsOrder: ControlKey[] = [
 
 export const StyledFormItem = styled(FormItem)<{ expanded: boolean }>`
   width: ${({ expanded }) => (expanded ? '49%' : `${FORM_ITEM_WIDTH}px`)};
-  margin-bottom: ${({ theme }) => theme.gridUnit * 4}px;
-
-  & .ant-form-item-label {
-    padding-bottom: 0;
-  }
-
-  & .ant-form-item-control-input {
-    min-height: ${({ theme }) => theme.gridUnit * 10}px;
-  }
 `;
 
 export const StyledRowFormItem = styled(FormItem)<{ expanded: boolean }>`
-  margin-bottom: 0;
-  padding-bottom: 0;
   min-width: ${({ expanded }) => (expanded ? '50%' : `${FORM_ITEM_WIDTH}px`)};
-
-  & .ant-form-item-label {
-    padding-bottom: 0;
-  }
-
-  .ant-form-item-control-input-content > div > div {
-    height: auto;
-  }
-
-  & .ant-form-item-control-input {
-    min-height: ${({ theme }) => theme.gridUnit * 10}px;
-  }
 `;
 
 export const StyledRowSubFormItem = styled(FormItem)<{ expanded: boolean }>`
   min-width: ${({ expanded }) => (expanded ? '50%' : `${FORM_ITEM_WIDTH}px`)};
-
-  & .ant-form-item-label {
-    padding-bottom: 0;
-  }
-
-  .ant-form-item {
-    margin-bottom: 0;
-  }
-
-  .ant-form-item-control-input-content > div > div {
-    height: auto;
-  }
-
-  .ant-form-item-extra {
-    display: none;
-  }
-
-  & .ant-form-item-control-input {
-    height: auto;
-  }
 `;
 
 export const StyledLabel = styled.span`
-  color: ${({ theme }) => theme.colors.grayscale.base};
-  font-size: ${({ theme }) => theme.typography.sizes.s}px;
-`;
-
-const CleanFormItem = styled(FormItem)`
-  margin-bottom: 0;
+  ${({ theme }) => `
+    font-size: ${theme.fontSizeSM}px;
+    color: ${theme.colorTextSecondary};
+  `}
 `;
 
 const DefaultValueContainer = styled.div`
@@ -212,68 +168,27 @@ const DefaultValueContainer = styled.div`
   align-items: center;
 `;
 
-const StyledCollapse = styled(Collapse)`
-  border-left: 0;
-  border-top: 1px solid ${({ theme }) => theme.colors.grayscale.light2};
-  border-radius: 0;
-
-  .ant-collapse-header {
-    border-bottom: 1px solid ${({ theme }) => theme.colors.grayscale.light2};
-    border-top: 1px solid ${({ theme }) => theme.colors.grayscale.light2};
-    margin-top: -1px;
-    border-radius: 0;
-  }
-
-  .ant-collapse-content {
-    border: 0;
-  }
-
-  .ant-collapse-content-box {
-    padding-top: ${({ theme }) => theme.gridUnit * 2}px;
-  }
-
-  &.ant-collapse > .ant-collapse-item {
-    border: 0;
-    border-radius: 0;
-  }
-`;
-
-const StyledTabs = styled(Tabs)`
-  .ant-tabs-nav {
-    position: sticky;
-    top: 0;
-    background: ${({ theme }) => theme.colors.grayscale.light5};
-    z-index: 1;
-  }
-
-  .ant-tabs-nav-list {
-    padding: 0;
-  }
-
-  .ant-form-item-label {
-    padding-bottom: 0;
-  }
-`;
-
 const StyledAsterisk = styled.span`
-  color: ${({ theme }) => theme.colors.error.base};
-  font-size: ${({ theme }) => theme.typography.sizes.s}px;
-  margin-left: ${({ theme }) => theme.gridUnit - 1}px;
+  ${({ theme }) => `
+  color: ${theme.colorError};
+  font-size: ${theme.fontSizeSM}px;
+  margin-left: ${theme.sizeUnit - 1}px;
+
   &:before {
     content: '*';
-  }
+  `}
 `;
 
 const FilterTypeInfo = styled.div<{ expanded: boolean }>`
   ${({ theme, expanded }) => `
     width: ${expanded ? '49%' : `${FORM_ITEM_WIDTH}px`};
-    font-size: ${theme.typography.sizes.s}px;
+    font-size: ${theme.fontSizeSM}px;
     color: ${theme.colors.grayscale.light1};
     margin:
-      ${-theme.gridUnit * 2}px
+      ${theme.sizeUnit * 2}px
       0px
-      ${theme.gridUnit * 4}px
-      ${theme.gridUnit * 4}px;
+      ${theme.sizeUnit * 4}px
+      ${theme.sizeUnit * 4}px;
   `}
 `;
 
@@ -431,7 +346,7 @@ const FiltersConfigForm = (
   }, [form, handleModifyFilter]);
 
   const debouncedFormChanged = useCallback(
-    debounce(formChanged, SLOW_DEBOUNCE),
+    debounce(formChanged, Constants.SLOW_DEBOUNCE),
     [],
   );
 
@@ -675,6 +590,14 @@ const FiltersConfigForm = (
     .filter(filter => filter.type === 'filter_time')
     .some(filter => dependencies?.includes(filter.value));
 
+  const extensionsRegistry = getExtensionsRegistry();
+
+  const DateFilterControlExtension = extensionsRegistry.get(
+    'filter.dateFilterControl',
+  );
+
+  const DateFilterComponent = DateFilterControlExtension ?? DateFilterControl;
+
   useEffect(() => {
     if (datasetId) {
       cachedSupersetGet({
@@ -784,7 +707,7 @@ const FiltersConfigForm = (
       label={
         <>
           <StyledLabel>{t('Time column')}</StyledLabel>&nbsp;
-          <InfoTooltipWithTrigger
+          <InfoTooltip
             placement="top"
             tooltip={
               hasTimeDependency
@@ -814,557 +737,829 @@ const FiltersConfigForm = (
       />
     </StyledRowFormItem>
   );
-
+  const isValidFilterValue = (value: any, isRangeFilter: boolean) => {
+    if (isRangeFilter) {
+      return Array.isArray(value) && (value[0] !== null || value[1] !== null);
+    }
+    return !!value;
+  };
   return (
-    <StyledTabs
+    <Tabs
       activeKey={activeTabKey}
       onChange={activeKey => setActiveTabKey(activeKey)}
-      centered
-    >
-      <TabPane
-        tab={FilterTabs.configuration.name}
-        key={FilterTabs.configuration.key}
-        forceRender
-      >
-        <StyledContainer>
-          <StyledFormItem
-            expanded={expanded}
-            name={['filters', filterId, 'type']}
-            hidden
-            initialValue={NativeFilterType.NativeFilter}
-          >
-            <Input onChange={formChanged} />
-          </StyledFormItem>
-          <StyledFormItem
-            expanded={expanded}
-            name={['filters', filterId, 'name']}
-            label={<StyledLabel>{t('Filter name')}</StyledLabel>}
-            initialValue={filterToEdit?.name}
-            rules={[{ required: !isRemoved, message: t('Name is required') }]}
-          >
-            <Input
-              {...getFiltersConfigModalTestId('name-input')}
-              onChange={debouncedFormChanged}
-            />
-          </StyledFormItem>
-          <StyledFormItem
-            expanded={expanded}
-            name={['filters', filterId, 'filterType']}
-            rules={[{ required: !isRemoved, message: t('Name is required') }]}
-            initialValue={filterToEdit?.filterType || 'filter_select'}
-            label={<StyledLabel>{t('Filter Type')}</StyledLabel>}
-            {...getFiltersConfigModalTestId('filter-type')}
-          >
-            <Select
-              ariaLabel={t('Filter type')}
-              options={nativeFilterVizTypes.map(filterType => {
-                // @ts-ignore
-                const name = nativeFilterItems[filterType]?.value.name;
-                const mappedName = name
-                  ? FILTER_TYPE_NAME_MAPPING[name]
-                  : undefined;
-                const isDisabled =
-                  FILTER_SUPPORTED_TYPES[filterType]?.length === 1 &&
-                  FILTER_SUPPORTED_TYPES[filterType]?.includes(
-                    GenericDataType.Temporal,
-                  ) &&
-                  !doLoadedDatasetsHaveTemporalColumns;
-                return {
-                  value: filterType,
-                  label: mappedName || name,
-                  customLabel: isDisabled ? (
-                    <Tooltip
-                      title={t('Datasets do not contain a temporal column')}
-                    >
-                      {mappedName || name}
-                    </Tooltip>
-                  ) : undefined,
-                  disabled: isDisabled,
-                };
-              })}
-              onChange={value => {
-                setNativeFilterFieldValues(form, filterId, {
-                  filterType: value,
-                  defaultDataMask: null,
-                  column: null,
-                });
-                forceUpdate();
-                formChanged();
-              }}
-            />
-          </StyledFormItem>
-        </StyledContainer>
-        {formFilter?.filterType === 'filter_time' && (
-          <FilterTypeInfo expanded={expanded}>
-            {t(`Dashboard time range filters apply to temporal columns defined in
+      items={[
+        {
+          key: FilterTabs.configuration.key,
+          label: FilterTabs.configuration.name,
+          forceRender: true,
+          children: (
+            <>
+              <StyledSettings>
+                <StyledContainer>
+                  <StyledFormItem
+                    expanded={expanded}
+                    name={['filters', filterId, 'type']}
+                    hidden
+                    initialValue={NativeFilterType.NativeFilter}
+                  >
+                    <Input onChange={formChanged} />
+                  </StyledFormItem>
+                  <StyledFormItem
+                    expanded={expanded}
+                    name={['filters', filterId, 'name']}
+                    label={<StyledLabel>{t('Filter name')}</StyledLabel>}
+                    initialValue={filterToEdit?.name}
+                    rules={[
+                      { required: !isRemoved, message: t('Name is required') },
+                    ]}
+                  >
+                    <Input
+                      {...getFiltersConfigModalTestId('name-input')}
+                      onChange={debouncedFormChanged}
+                    />
+                  </StyledFormItem>
+                  <StyledFormItem
+                    expanded={expanded}
+                    name={['filters', filterId, 'filterType']}
+                    rules={[
+                      { required: !isRemoved, message: t('Name is required') },
+                    ]}
+                    initialValue={filterToEdit?.filterType || 'filter_select'}
+                    label={<StyledLabel>{t('Filter Type')}</StyledLabel>}
+                    {...getFiltersConfigModalTestId('filter-type')}
+                  >
+                    <Select
+                      ariaLabel={t('Filter type')}
+                      options={nativeFilterVizTypes.map(filterType => {
+                        // @ts-ignore
+                        const name = nativeFilterItems[filterType]?.value.name;
+                        const mappedName = name
+                          ? FILTER_TYPE_NAME_MAPPING[name]
+                          : undefined;
+                        const isDisabled =
+                          FILTER_SUPPORTED_TYPES[filterType]?.length === 1 &&
+                          FILTER_SUPPORTED_TYPES[filterType]?.includes(
+                            GenericDataType.Temporal,
+                          ) &&
+                          !doLoadedDatasetsHaveTemporalColumns;
+                        return {
+                          value: filterType,
+                          label: isDisabled ? (
+                            <Tooltip
+                              title={t(
+                                'Datasets do not contain a temporal column',
+                              )}
+                            >
+                              {mappedName || name}
+                            </Tooltip>
+                          ) : (
+                            mappedName || name
+                          ),
+                          disabled: isDisabled,
+                        };
+                      })}
+                      onChange={value => {
+                        setNativeFilterFieldValues(form, filterId, {
+                          filterType: value,
+                          defaultDataMask: null,
+                          column: null,
+                        });
+                        forceUpdate();
+                        formChanged();
+                      }}
+                    />
+                  </StyledFormItem>
+                </StyledContainer>
+                {formFilter?.filterType === 'filter_time' && (
+                  <FilterTypeInfo expanded={expanded}>
+                    {t(`Dashboard time range filters apply to temporal columns defined in
           the filter section of each chart. Add temporal columns to the chart
           filters to have this dashboard filter impact those charts.`)}
-          </FilterTypeInfo>
-        )}
-        {hasDataset && (
-          <StyledRowContainer>
-            {showDataset ? (
-              <StyledFormItem
-                expanded={expanded}
-                name={['filters', filterId, 'dataset']}
-                label={<StyledLabel>{t('Dataset')}</StyledLabel>}
-                initialValue={
-                  datasetDetails
-                    ? {
-                        label: DatasetSelectLabel({
-                          id: datasetDetails.id,
-                          table_name: datasetDetails.table_name,
-                          schema: datasetDetails.schema,
-                          database: {
-                            database_name:
-                              datasetDetails.database.database_name,
+                  </FilterTypeInfo>
+                )}
+                {hasDataset && (
+                  <StyledRowContainer justify="space-between">
+                    {showDataset ? (
+                      <StyledFormItem
+                        expanded={expanded}
+                        name={['filters', filterId, 'dataset']}
+                        label={<StyledLabel>{t('Dataset')}</StyledLabel>}
+                        initialValue={
+                          datasetDetails
+                            ? {
+                                label: DatasetSelectLabel({
+                                  id: datasetDetails.id,
+                                  table_name: datasetDetails.table_name,
+                                  schema: datasetDetails.schema,
+                                  database: {
+                                    database_name:
+                                      datasetDetails.database.database_name,
+                                  },
+                                }),
+                                value: datasetDetails.id,
+                              }
+                            : undefined
+                        }
+                        rules={[
+                          {
+                            required: !isRemoved,
+                            message: t('Dataset is required'),
                           },
-                        }),
-                        value: datasetDetails.id,
-                      }
-                    : undefined
-                }
-                rules={[
-                  { required: !isRemoved, message: t('Dataset is required') },
-                ]}
-                {...getFiltersConfigModalTestId('datasource-input')}
-              >
-                <DatasetSelect
-                  onChange={(value: { label: string; value: number }) => {
-                    // We need to reset the column when the dataset has changed
-                    if (value.value !== datasetId) {
-                      setNativeFilterFieldValues(form, filterId, {
-                        dataset: value,
-                        defaultDataMask: null,
-                        column: null,
-                      });
-                    }
-                    forceUpdate();
-                    formChanged();
+                        ]}
+                        {...getFiltersConfigModalTestId('datasource-input')}
+                      >
+                        <DatasetSelect
+                          onChange={(value: {
+                            label: string;
+                            value: number;
+                          }) => {
+                            // We need to reset the column when the dataset has changed
+                            if (value.value !== datasetId) {
+                              setNativeFilterFieldValues(form, filterId, {
+                                dataset: value,
+                                defaultDataMask: null,
+                                column: null,
+                              });
+                            }
+                            forceUpdate();
+                            formChanged();
+                          }}
+                        />
+                      </StyledFormItem>
+                    ) : (
+                      <StyledFormItem
+                        expanded={expanded}
+                        label={<StyledLabel>{t('Dataset')}</StyledLabel>}
+                      >
+                        <Loading position="inline-centered" />
+                      </StyledFormItem>
+                    )}
+                    {hasDataset &&
+                      Object.keys(mainControlItems).map(
+                        key => mainControlItems[key].element,
+                      )}
+                  </StyledRowContainer>
+                )}
+                <Collapse
+                  modalMode
+                  defaultActiveKey={activeFilterPanelKeys}
+                  onChange={key => {
+                    handleActiveFilterPanelChange(key);
                   }}
-                />
-              </StyledFormItem>
-            ) : (
-              <StyledFormItem
-                expanded={expanded}
-                label={<StyledLabel>{t('Dataset')}</StyledLabel>}
-              >
-                <Loading position="inline-centered" />
-              </StyledFormItem>
-            )}
-            {hasDataset &&
-              Object.keys(mainControlItems).map(
-                key => mainControlItems[key].element,
-              )}
-          </StyledRowContainer>
-        )}
-        <StyledCollapse
-          defaultActiveKey={activeFilterPanelKeys}
-          onChange={key => {
-            handleActiveFilterPanelChange(key);
-          }}
-          expandIconPosition="right"
-          key={`native-filter-config-${filterId}`}
-        >
-          {formFilter?.filterType !== 'filter_time' && (
-            <Collapse.Panel
-              forceRender
-              header={FilterPanels.configuration.name}
-              key={`${filterId}-${FilterPanels.configuration.key}`}
-            >
-              {canDependOnOtherFilters && hasAvailableFilters && (
-                <StyledRowFormItem
-                  expanded={expanded}
-                  name={['filters', filterId, 'dependencies']}
-                  initialValue={dependencies}
-                >
-                  <DependencyList
-                    availableFilters={availableFilters}
-                    dependencies={dependencies}
-                    onDependenciesChange={dependencies => {
-                      setNativeFilterFieldValues(form, filterId, {
-                        dependencies,
-                      });
-                      forceUpdate();
-                      validateDependencies();
-                      formChanged();
-                    }}
-                    getDependencySuggestion={() =>
-                      getDependencySuggestion(filterId)
-                    }
-                  >
-                    {hasTimeDependency ? timeColumn : undefined}
-                  </DependencyList>
-                </StyledRowFormItem>
-              )}
-              {hasDataset && hasAdditionalFilters && (
-                <CleanFormItem name={['filters', filterId, 'preFilter']}>
-                  <CollapsibleControl
-                    initialValue={hasPreFilter}
-                    title={t('Pre-filter available values')}
-                    tooltip={t(`Add filter clauses to control the filter's source query,
+                  expandIconPosition="end"
+                  key={`native-filter-config-${filterId}`}
+                  items={[
+                    ...(formFilter?.filterType !== 'filter_time'
+                      ? [
+                          {
+                            key: `${filterId}-${FilterPanels.configuration.key}`,
+                            forceRender: true,
+                            label: FilterPanels.configuration.name,
+                            children: (
+                              <>
+                                {canDependOnOtherFilters &&
+                                  hasAvailableFilters && (
+                                    <StyledRowFormItem
+                                      expanded={expanded}
+                                      name={[
+                                        'filters',
+                                        filterId,
+                                        'dependencies',
+                                      ]}
+                                      initialValue={dependencies}
+                                    >
+                                      <DependencyList
+                                        availableFilters={availableFilters}
+                                        dependencies={dependencies}
+                                        onDependenciesChange={dependencies => {
+                                          setNativeFilterFieldValues(
+                                            form,
+                                            filterId,
+                                            {
+                                              dependencies,
+                                            },
+                                          );
+                                          forceUpdate();
+                                          validateDependencies();
+                                          formChanged();
+                                        }}
+                                        getDependencySuggestion={() =>
+                                          getDependencySuggestion(filterId)
+                                        }
+                                      >
+                                        {hasTimeDependency
+                                          ? timeColumn
+                                          : undefined}
+                                      </DependencyList>
+                                    </StyledRowFormItem>
+                                  )}
+                                {hasDataset && hasAdditionalFilters && (
+                                  <FormItem
+                                    name={['filters', filterId, 'preFilter']}
+                                  >
+                                    <CollapsibleControl
+                                      initialValue={hasPreFilter}
+                                      title={t('Pre-filter available values')}
+                                      tooltip={t(`Add filter clauses to control the filter's source query,
                     though only in the context of the autocomplete i.e., these conditions
                     do not impact how the filter is applied to the dashboard. This is useful
                     when you want to improve the query's performance by only scanning a subset
                     of the underlying data or limit the available values displayed in the filter.`)}
-                    onChange={checked => {
-                      formChanged();
-                      if (checked) {
-                        validatePreFilter();
-                      }
-                    }}
-                  >
-                    <StyledRowSubFormItem
-                      expanded={expanded}
-                      name={['filters', filterId, 'adhoc_filters']}
-                      css={{ width: INPUT_WIDTH }}
-                      initialValue={filterToEdit?.adhoc_filters}
-                      required
-                      rules={[
-                        {
-                          validator: preFilterValidator,
-                        },
-                      ]}
-                    >
-                      <AdhocFilterControl
-                        columns={
-                          datasetDetails?.columns?.filter(
-                            (c: ColumnMeta) => c.filterable,
-                          ) || []
-                        }
-                        savedMetrics={datasetDetails?.metrics || []}
-                        datasource={datasetDetails}
-                        onChange={(filters: AdhocFilter[]) => {
-                          setNativeFilterFieldValues(form, filterId, {
-                            adhoc_filters: filters,
-                          });
-                          forceUpdate();
-                          formChanged();
-                          validatePreFilter();
-                        }}
-                        label={
-                          <span>
-                            <StyledLabel>{t('Pre-filter')}</StyledLabel>
-                            {!hasTimeRange && <StyledAsterisk />}
-                          </span>
-                        }
-                      />
-                    </StyledRowSubFormItem>
-                    {showTimeRangePicker && (
-                      <StyledRowFormItem
-                        expanded={expanded}
-                        name={['filters', filterId, 'time_range']}
-                        label={<StyledLabel>{t('Time range')}</StyledLabel>}
-                        initialValue={
-                          filterToEdit?.time_range || t('No filter')
-                        }
-                        required={!hasAdhoc}
-                        rules={[
-                          {
-                            validator: preFilterValidator,
+                                      onChange={checked => {
+                                        formChanged();
+                                        if (checked) {
+                                          validatePreFilter();
+                                        }
+                                      }}
+                                    >
+                                      <StyledRowSubFormItem
+                                        expanded={expanded}
+                                        name={[
+                                          'filters',
+                                          filterId,
+                                          'adhoc_filters',
+                                        ]}
+                                        css={{ width: INPUT_WIDTH }}
+                                        initialValue={
+                                          filterToEdit?.adhoc_filters
+                                        }
+                                        required
+                                        rules={[
+                                          {
+                                            validator: preFilterValidator,
+                                          },
+                                        ]}
+                                      >
+                                        <AdhocFilterControl
+                                          columns={
+                                            datasetDetails?.columns?.filter(
+                                              (c: ColumnMeta) => c.filterable,
+                                            ) || []
+                                          }
+                                          savedMetrics={
+                                            datasetDetails?.metrics || []
+                                          }
+                                          datasource={datasetDetails}
+                                          onChange={(
+                                            filters: AdhocFilter[],
+                                          ) => {
+                                            setNativeFilterFieldValues(
+                                              form,
+                                              filterId,
+                                              {
+                                                adhoc_filters: filters,
+                                              },
+                                            );
+                                            forceUpdate();
+                                            formChanged();
+                                            validatePreFilter();
+                                          }}
+                                          label={
+                                            <span>
+                                              <StyledLabel>
+                                                {t('Pre-filter')}
+                                              </StyledLabel>
+                                              {!hasTimeRange && (
+                                                <StyledAsterisk />
+                                              )}
+                                            </span>
+                                          }
+                                        />
+                                      </StyledRowSubFormItem>
+                                      {showTimeRangePicker && (
+                                        <StyledRowFormItem
+                                          expanded={expanded}
+                                          name={[
+                                            'filters',
+                                            filterId,
+                                            'time_range',
+                                          ]}
+                                          label={
+                                            <StyledLabel>
+                                              {t('Time range')}
+                                            </StyledLabel>
+                                          }
+                                          initialValue={
+                                            filterToEdit?.time_range ||
+                                            t('No filter')
+                                          }
+                                          required={!hasAdhoc}
+                                          rules={[
+                                            {
+                                              validator: preFilterValidator,
+                                            },
+                                          ]}
+                                        >
+                                          <DateFilterComponent
+                                            name="time_range"
+                                            onChange={timeRange => {
+                                              setNativeFilterFieldValues(
+                                                form,
+                                                filterId,
+                                                {
+                                                  time_range: timeRange,
+                                                },
+                                              );
+                                              forceUpdate();
+                                              formChanged();
+                                              validatePreFilter();
+                                            }}
+                                          />
+                                        </StyledRowFormItem>
+                                      )}
+                                      {hasTimeRange && !hasTimeDependency
+                                        ? timeColumn
+                                        : undefined}
+                                    </CollapsibleControl>
+                                  </FormItem>
+                                )}
+                                {formFilter?.filterType !== 'filter_range' ? (
+                                  <FormItem
+                                    name={['filters', filterId, 'sortFilter']}
+                                  >
+                                    <CollapsibleControl
+                                      initialValue={hasSorting}
+                                      title={t('Sort filter values')}
+                                      onChange={checked => {
+                                        onSortChanged(checked || undefined);
+                                        formChanged();
+                                      }}
+                                    >
+                                      <StyledRowFormItem
+                                        expanded={expanded}
+                                        name={[
+                                          'filters',
+                                          filterId,
+                                          'controlValues',
+                                          'sortAscending',
+                                        ]}
+                                        initialValue={sort}
+                                        label={
+                                          <StyledLabel>
+                                            {t('Sort type')}
+                                          </StyledLabel>
+                                        }
+                                      >
+                                        <Radio.GroupWrapper
+                                          options={[
+                                            {
+                                              value: true,
+                                              label: t('Sort ascending'),
+                                            },
+                                            {
+                                              value: false,
+                                              label: t('Sort descending'),
+                                            },
+                                          ]}
+                                          onChange={value => {
+                                            onSortChanged(value.target.value);
+                                            formChanged();
+                                          }}
+                                        />
+                                      </StyledRowFormItem>
+                                      {hasMetrics && (
+                                        <StyledRowSubFormItem
+                                          expanded={expanded}
+                                          name={[
+                                            'filters',
+                                            filterId,
+                                            'sortMetric',
+                                          ]}
+                                          initialValue={
+                                            filterToEdit?.sortMetric
+                                          }
+                                          label={
+                                            <>
+                                              <StyledLabel>
+                                                {t('Sort Metric')}
+                                              </StyledLabel>
+                                              &nbsp;
+                                              <InfoTooltip
+                                                placement="top"
+                                                tooltip={t(
+                                                  'If a metric is specified, sorting will be done based on the metric value',
+                                                )}
+                                              />
+                                            </>
+                                          }
+                                          data-test="field-input"
+                                        >
+                                          <Select
+                                            allowClear
+                                            ariaLabel={t('Sort metric')}
+                                            name="sortMetric"
+                                            options={metrics.map(
+                                              (metric: Metric) => ({
+                                                value: metric.metric_name,
+                                                label:
+                                                  metric.verbose_name ??
+                                                  metric.metric_name,
+                                              }),
+                                            )}
+                                            onChange={value => {
+                                              if (value !== undefined) {
+                                                setNativeFilterFieldValues(
+                                                  form,
+                                                  filterId,
+                                                  {
+                                                    sortMetric: value,
+                                                  },
+                                                );
+                                                forceUpdate();
+                                              }
+                                              formChanged();
+                                            }}
+                                          />
+                                        </StyledRowSubFormItem>
+                                      )}
+                                    </CollapsibleControl>
+                                  </FormItem>
+                                ) : (
+                                  <>
+                                    <FormItem
+                                      name={[
+                                        'filters',
+                                        filterId,
+                                        'rangeFilter',
+                                      ]}
+                                    >
+                                      <CollapsibleControl
+                                        initialValue={hasEnableSingleValue}
+                                        title={t('Single Value')}
+                                        onChange={checked => {
+                                          onEnableSingleValueChanged(
+                                            checked
+                                              ? SingleValueType.Exact
+                                              : undefined,
+                                          );
+                                          formChanged();
+                                        }}
+                                      >
+                                        <StyledRowFormItem
+                                          expanded={expanded}
+                                          name={[
+                                            'filters',
+                                            filterId,
+                                            'controlValues',
+                                            'enableSingleValue',
+                                          ]}
+                                          initialValue={enableSingleValue}
+                                          label={
+                                            <StyledLabel>
+                                              {t('Single value type')}
+                                            </StyledLabel>
+                                          }
+                                        >
+                                          <Radio.GroupWrapper
+                                            onChange={value => {
+                                              onEnableSingleValueChanged(
+                                                value.target.value,
+                                              );
+                                              formChanged();
+                                            }}
+                                            options={[
+                                              {
+                                                label: t('Minimum'),
+                                                value: SingleValueType.Minimum,
+                                              },
+                                              {
+                                                label: t('Exact'),
+                                                value: SingleValueType.Exact,
+                                              },
+                                              {
+                                                label: t('Maximum'),
+                                                value: SingleValueType.Maximum,
+                                              },
+                                            ]}
+                                          />
+                                        </StyledRowFormItem>
+                                      </CollapsibleControl>
+                                    </FormItem>
+
+                                    <FormItem
+                                      name={['filters', filterId, 'rangeType']}
+                                    >
+                                      <StyledRowFormItem
+                                        expanded={expanded}
+                                        name={[
+                                          'filters',
+                                          filterId,
+                                          'controlValues',
+                                          'rangeDisplayMode',
+                                        ]}
+                                        initialValue={
+                                          formFilter?.controlValues
+                                            ?.rangeDisplayMode ||
+                                          filterToEdit?.controlValues
+                                            ?.rangeDisplayMode ||
+                                          RangeDisplayMode.SliderAndInput
+                                        }
+                                        label={
+                                          <StyledLabel>
+                                            {t('Range Type')}
+                                          </StyledLabel>
+                                        }
+                                      >
+                                        <Select
+                                          ariaLabel={t('Range Type')}
+                                          options={[
+                                            {
+                                              value: RangeDisplayMode.Slider,
+                                              label: t('Slider'),
+                                            },
+                                            {
+                                              value: RangeDisplayMode.Input,
+                                              label: t('Range Inputs'),
+                                            },
+                                            {
+                                              value:
+                                                RangeDisplayMode.SliderAndInput,
+                                              label: t(
+                                                'Slider and range input',
+                                              ),
+                                            },
+                                          ]}
+                                          onChange={value => {
+                                            const previous =
+                                              form.getFieldValue('filters')?.[
+                                                filterId
+                                              ].controlValues || {};
+                                            const rangeDisplayMode =
+                                              value ||
+                                              RangeDisplayMode.SliderAndInput;
+                                            setNativeFilterFieldValues(
+                                              form,
+                                              filterId,
+                                              {
+                                                controlValues: {
+                                                  ...previous,
+                                                  rangeDisplayMode,
+                                                },
+                                              },
+                                            );
+
+                                            forceUpdate();
+                                            formChanged();
+                                          }}
+                                        />
+                                      </StyledRowFormItem>
+                                    </FormItem>
+                                  </>
+                                )}
+                              </>
+                            ),
                           },
-                        ]}
-                      >
-                        <DateFilterControl
-                          name="time_range"
-                          onChange={timeRange => {
-                            setNativeFilterFieldValues(form, filterId, {
-                              time_range: timeRange,
-                            });
-                            forceUpdate();
-                            formChanged();
-                            validatePreFilter();
-                          }}
-                        />
-                      </StyledRowFormItem>
-                    )}
-                    {hasTimeRange && !hasTimeDependency
-                      ? timeColumn
-                      : undefined}
-                  </CollapsibleControl>
-                </CleanFormItem>
-              )}
-              {formFilter?.filterType !== 'filter_range' ? (
-                <CleanFormItem name={['filters', filterId, 'sortFilter']}>
-                  <CollapsibleControl
-                    initialValue={hasSorting}
-                    title={t('Sort filter values')}
-                    onChange={checked => {
-                      onSortChanged(checked || undefined);
-                      formChanged();
-                    }}
-                  >
-                    <StyledRowFormItem
-                      expanded={expanded}
-                      name={[
-                        'filters',
-                        filterId,
-                        'controlValues',
-                        'sortAscending',
-                      ]}
-                      initialValue={sort}
-                      label={<StyledLabel>{t('Sort type')}</StyledLabel>}
-                    >
-                      <Radio.GroupWrapper
-                        options={[
-                          { value: true, label: t('Sort ascending') },
-                          { value: false, label: t('Sort descending') },
-                        ]}
-                        onChange={value => {
-                          onSortChanged(value.target.value);
-                          formChanged();
-                        }}
-                      />
-                    </StyledRowFormItem>
-                    {hasMetrics && (
-                      <StyledRowSubFormItem
-                        expanded={expanded}
-                        name={['filters', filterId, 'sortMetric']}
-                        initialValue={filterToEdit?.sortMetric}
-                        label={
-                          <>
-                            <StyledLabel>{t('Sort Metric')}</StyledLabel>&nbsp;
-                            <InfoTooltipWithTrigger
-                              placement="top"
-                              tooltip={t(
-                                'If a metric is specified, sorting will be done based on the metric value',
-                              )}
-                            />
-                          </>
-                        }
-                        data-test="field-input"
-                      >
-                        <Select
-                          allowClear
-                          ariaLabel={t('Sort metric')}
-                          name="sortMetric"
-                          options={metrics.map((metric: Metric) => ({
-                            value: metric.metric_name,
-                            label: metric.verbose_name ?? metric.metric_name,
-                          }))}
-                          onChange={value => {
-                            if (value !== undefined) {
-                              setNativeFilterFieldValues(form, filterId, {
-                                sortMetric: value,
-                              });
-                              forceUpdate();
-                            }
-                            formChanged();
-                          }}
-                        />
-                      </StyledRowSubFormItem>
-                    )}
-                  </CollapsibleControl>
-                </CleanFormItem>
-              ) : (
-                <CleanFormItem name={['filters', filterId, 'rangeFilter']}>
-                  <CollapsibleControl
-                    initialValue={hasEnableSingleValue}
-                    title={t('Single Value')}
-                    onChange={checked => {
-                      onEnableSingleValueChanged(
-                        checked ? SingleValueType.Exact : undefined,
-                      );
-                      formChanged();
-                    }}
-                  >
-                    <StyledRowFormItem
-                      expanded={expanded}
-                      name={[
-                        'filters',
-                        filterId,
-                        'controlValues',
-                        'enableSingleValue',
-                      ]}
-                      initialValue={enableSingleValue}
-                      label={
-                        <StyledLabel>{t('Single value type')}</StyledLabel>
-                      }
-                    >
-                      <Radio.GroupWrapper
-                        onChange={value => {
-                          onEnableSingleValueChanged(value.target.value);
-                          formChanged();
-                        }}
-                        options={[
-                          {
-                            label: t('Minimum'),
-                            value: SingleValueType.Minimum,
-                          },
-                          { label: t('Exact'), value: SingleValueType.Exact },
-                          {
-                            label: t('Maximum'),
-                            value: SingleValueType.Maximum,
-                          },
-                        ]}
-                      />
-                    </StyledRowFormItem>
-                  </CollapsibleControl>
-                </CleanFormItem>
-              )}
-            </Collapse.Panel>
-          )}
-          <Collapse.Panel
-            forceRender
-            header={FilterPanels.settings.name}
-            key={`${filterId}-${FilterPanels.settings.key}`}
-          >
-            <StyledFormItem
-              expanded={expanded}
-              name={['filters', filterId, 'description']}
-              initialValue={filterToEdit?.description}
-              label={<StyledLabel>{t('Description')}</StyledLabel>}
-            >
-              <TextArea onChange={debouncedFormChanged} />
-            </StyledFormItem>
-            <CleanFormItem
-              name={['filters', filterId, 'defaultValueQueriesData']}
-              hidden
-              initialValue={null}
-            />
-            <CleanFormItem name={['filters', filterId, 'defaultValue']}>
-              <CollapsibleControl
-                checked={hasDefaultValue}
-                disabled={isRequired || defaultToFirstItem}
-                initialValue={hasDefaultValue}
-                title={t('Filter has default value')}
-                tooltip={defaultValueTooltip}
-                onChange={value => {
-                  setHasDefaultValue(value);
-                  if (!value) {
-                    setNativeFilterFieldValues(form, filterId, {
-                      defaultDataMask: null,
-                    });
-                  }
-                  formChanged();
-                }}
-              >
-                {!isRemoved && (
-                  <StyledRowSubFormItem
-                    expanded={expanded}
-                    name={['filters', filterId, 'defaultDataMask']}
-                    initialValue={initialDefaultValue}
-                    data-test="default-input"
-                    label={<StyledLabel>{t('Default Value')}</StyledLabel>}
-                    required={hasDefaultValue}
-                    rules={[
-                      {
-                        validator: () => {
-                          if (formFilter?.defaultDataMask?.filterState?.value) {
-                            // requires managing the error as the DefaultValue
-                            // component does not use an Antdesign compatible input
-                            const formValidationFields = form.getFieldsError();
-                            setErroredFilters(prevErroredFilters => {
-                              if (
-                                prevErroredFilters.length &&
-                                !formValidationFields.find(
-                                  f => f.errors.length > 0,
-                                )
-                              ) {
-                                return [];
-                              }
-                              return prevErroredFilters;
-                            });
-                            return Promise.resolve();
-                          }
-                          setErroredFilters(prevErroredFilters => {
-                            if (prevErroredFilters.includes(filterId)) {
-                              return prevErroredFilters;
-                            }
-                            return [...prevErroredFilters, filterId];
-                          });
-                          return Promise.reject(
-                            new Error(t('Please choose a valid value')),
-                          );
-                        },
-                      },
-                    ]}
-                  >
-                    {error || showDefaultValue ? (
-                      <DefaultValueContainer>
-                        {error ? (
-                          <ErrorMessageWithStackTrace
-                            error={error.errors?.[0]}
-                            fallback={
-                              <BasicErrorAlert
-                                title={t('Cannot load filter')}
-                                body={error.error}
-                                level="error"
-                              />
+                        ]
+                      : []),
+                    {
+                      label: FilterPanels.settings.name,
+                      key: `${filterId}-${FilterPanels.settings.key}`,
+                      forceRender: true,
+                      children: (
+                        <>
+                          <StyledFormItem
+                            expanded={expanded}
+                            name={['filters', filterId, 'description']}
+                            initialValue={filterToEdit?.description}
+                            label={
+                              <StyledLabel>{t('Description')}</StyledLabel>
                             }
+                          >
+                            <Input.TextArea onChange={debouncedFormChanged} />
+                          </StyledFormItem>
+                          <FormItem
+                            name={[
+                              'filters',
+                              filterId,
+                              'defaultValueQueriesData',
+                            ]}
+                            hidden
+                            initialValue={null}
                           />
-                        ) : (
-                          <DefaultValue
-                            setDataMask={dataMask => {
-                              if (
-                                !isEqual(
-                                  initialDefaultValue?.filterState?.value,
-                                  dataMask?.filterState?.value,
-                                )
-                              ) {
+                          <FormItem
+                            name={['filters', filterId, 'defaultValue']}
+                          >
+                            <CollapsibleControl
+                              checked={hasDefaultValue}
+                              disabled={isRequired || defaultToFirstItem}
+                              initialValue={hasDefaultValue}
+                              title={t('Filter has default value')}
+                              tooltip={defaultValueTooltip}
+                              onChange={value => {
+                                setHasDefaultValue(value);
+                                if (!value) {
+                                  setNativeFilterFieldValues(form, filterId, {
+                                    defaultDataMask: null,
+                                  });
+                                } else {
+                                  // When the checkbox is checked, explicitly set an empty default data mask
+                                  // for range filters to trigger validation
+                                  if (
+                                    formFilter?.filterType === 'filter_range'
+                                  ) {
+                                    setNativeFilterFieldValues(form, filterId, {
+                                      defaultDataMask: {
+                                        extraFormData: {},
+                                        filterState: {
+                                          value: [null, null],
+                                        },
+                                      },
+                                    });
+                                  }
+                                  // Validate immediately when the checkbox is checked
+                                  form.validateFields([
+                                    ['filters', filterId, 'defaultDataMask'],
+                                  ]);
+                                }
                                 formChanged();
-                              }
-                              setNativeFilterFieldValues(form, filterId, {
-                                defaultDataMask: dataMask,
-                              });
-                              form.validateFields([
-                                ['filters', filterId, 'defaultDataMask'],
-                              ]);
-                              forceUpdate();
-                            }}
-                            hasDefaultValue={hasDefaultValue}
-                            filterId={filterId}
-                            hasDataset={hasDataset}
-                            form={form}
-                            formData={newFormData}
-                            enableNoResults={enableNoResults}
-                          />
-                        )}
-                        {hasDataset && datasetId && (
-                          <Tooltip title={t('Refresh the default values')}>
-                            <Icons.SyncOutlined
-                              iconSize="xl"
-                              iconColor={theme.colors.primary.base}
-                              css={css`
-                                margin-left: ${theme.gridUnit * 2}px;
-                              `}
-                              onClick={() => refreshHandler(true)}
-                            />
-                          </Tooltip>
-                        )}
-                      </DefaultValueContainer>
-                    ) : (
-                      t('Fill all required fields to enable "Default Value"')
-                    )}
-                  </StyledRowSubFormItem>
-                )}
-              </CollapsibleControl>
-            </CleanFormItem>
-            {Object.keys(controlItems)
-              .sort(
-                (a, b) =>
-                  controlsOrder.indexOf(a as ControlKey) -
-                  controlsOrder.indexOf(b as ControlKey),
-              )
-              .map(key => controlItems[key].element)}
-          </Collapse.Panel>
-        </StyledCollapse>
-      </TabPane>
-      <TabPane
-        tab={FilterTabs.scoping.name}
-        key={FilterTabs.scoping.key}
-        forceRender
-      >
-        <FilterScope
-          updateFormValues={updateFormValues}
-          pathToFormValue={['filters', filterId]}
-          forceUpdate={forceUpdate}
-          filterScope={filterToEdit?.scope}
-          formFilterScope={formFilter?.scope}
-          initiallyExcludedCharts={initiallyExcludedCharts}
-        />
-      </TabPane>
-    </StyledTabs>
+                              }}
+                            >
+                              {!isRemoved && (
+                                <StyledRowSubFormItem
+                                  expanded={expanded}
+                                  name={[
+                                    'filters',
+                                    filterId,
+                                    'defaultDataMask',
+                                  ]}
+                                  initialValue={initialDefaultValue}
+                                  data-test="default-input"
+                                  label={
+                                    <StyledLabel>
+                                      {t('Default Value')}
+                                    </StyledLabel>
+                                  }
+                                  required={hasDefaultValue}
+                                  rules={[
+                                    {
+                                      validator: () => {
+                                        // For range filters, check if at least one of the values in the array is non-null
+                                        const value =
+                                          formFilter?.defaultDataMask
+                                            ?.filterState?.value;
+                                        const isRangeFilter =
+                                          formFilter?.filterType ===
+                                          'filter_range';
+
+                                        // Check if value exists and is valid
+                                        const hasValidValue =
+                                          isValidFilterValue(
+                                            value,
+                                            isRangeFilter,
+                                          );
+
+                                        if (hasValidValue) {
+                                          const formValidationFields =
+                                            form.getFieldsError();
+                                          setErroredFilters(
+                                            prevErroredFilters => {
+                                              if (
+                                                prevErroredFilters.length &&
+                                                !formValidationFields.find(
+                                                  f => f.errors.length > 0,
+                                                )
+                                              ) {
+                                                return [];
+                                              }
+                                              return prevErroredFilters;
+                                            },
+                                          );
+                                          return Promise.resolve();
+                                        }
+
+                                        setErroredFilters(
+                                          prevErroredFilters => {
+                                            if (
+                                              prevErroredFilters.includes(
+                                                filterId,
+                                              )
+                                            ) {
+                                              return prevErroredFilters;
+                                            }
+                                            return [
+                                              ...prevErroredFilters,
+                                              filterId,
+                                            ];
+                                          },
+                                        );
+                                        return Promise.reject(
+                                          new Error(
+                                            t('Please choose a valid value'),
+                                          ),
+                                        );
+                                      },
+                                    },
+                                  ]}
+                                >
+                                  {error || showDefaultValue ? (
+                                    <DefaultValueContainer>
+                                      {error ? (
+                                        <ErrorMessageWithStackTrace
+                                          error={error.errors?.[0]}
+                                          fallback={
+                                            <BasicErrorAlert
+                                              title={t('Cannot load filter')}
+                                              body={error.error}
+                                              level="error"
+                                            />
+                                          }
+                                        />
+                                      ) : (
+                                        <DefaultValue
+                                          setDataMask={dataMask => {
+                                            if (
+                                              !isEqual(
+                                                initialDefaultValue?.filterState
+                                                  ?.value,
+                                                dataMask?.filterState?.value,
+                                              )
+                                            ) {
+                                              formChanged();
+                                            }
+                                            setNativeFilterFieldValues(
+                                              form,
+                                              filterId,
+                                              {
+                                                defaultDataMask: dataMask,
+                                              },
+                                            );
+                                            form.validateFields([
+                                              [
+                                                'filters',
+                                                filterId,
+                                                'defaultDataMask',
+                                              ],
+                                            ]);
+                                            forceUpdate();
+                                          }}
+                                          hasDefaultValue={hasDefaultValue}
+                                          filterId={filterId}
+                                          hasDataset={hasDataset}
+                                          form={form}
+                                          formData={newFormData}
+                                          enableNoResults={enableNoResults}
+                                        />
+                                      )}
+                                      {hasDataset && datasetId && (
+                                        <Tooltip
+                                          title={t(
+                                            'Refresh the default values',
+                                          )}
+                                        >
+                                          <Icons.SyncOutlined
+                                            iconSize="xl"
+                                            iconColor={theme.colorPrimary}
+                                            css={css`
+                                              margin-left: ${theme.sizeUnit *
+                                              2}px;
+                                            `}
+                                            onClick={() => refreshHandler(true)}
+                                          />
+                                        </Tooltip>
+                                      )}
+                                    </DefaultValueContainer>
+                                  ) : (
+                                    t(
+                                      'Fill all required fields to enable "Default Value"',
+                                    )
+                                  )}
+                                </StyledRowSubFormItem>
+                              )}
+                            </CollapsibleControl>
+                          </FormItem>
+                          {Object.keys(controlItems)
+                            .sort(
+                              (a, b) =>
+                                controlsOrder.indexOf(a as ControlKey) -
+                                controlsOrder.indexOf(b as ControlKey),
+                            )
+                            .map(key => controlItems[key].element)}
+                        </>
+                      ),
+                    },
+                  ]}
+                />
+              </StyledSettings>
+            </>
+          ),
+        },
+        {
+          key: FilterTabs.scoping.key,
+          label: FilterTabs.scoping.name,
+          forceRender: true,
+          children: (
+            <FilterScope
+              updateFormValues={updateFormValues}
+              pathToFormValue={['filters', filterId]}
+              forceUpdate={forceUpdate}
+              filterScope={filterToEdit?.scope}
+              formFilterScope={formFilter?.scope}
+              initiallyExcludedCharts={initiallyExcludedCharts}
+            />
+          ),
+        },
+      ]}
+    />
   );
 };
 
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/RemovedFilter.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/RemovedFilter.tsx
index 0cd39cfb4bc..edad5dfe240 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/RemovedFilter.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/RemovedFilter.tsx
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import Button, { OnClickHandler } from 'src/components/Button';
+import { Button, type OnClickHandler } from '@superset-ui/core/components';
 import { FC } from 'react';
 import { styled, t } from '@superset-ui/core';
 
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/getControlItemsMap.test.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/getControlItemsMap.test.tsx
index 65f3aa08437..6be6b3e0517 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/getControlItemsMap.test.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/getControlItemsMap.test.tsx
@@ -18,7 +18,7 @@
  */
 import { Filter, NativeFilterType } from '@superset-ui/core';
 import { render, screen, userEvent } from 'spec/helpers/testing-library';
-import { FormInstance } from 'src/components';
+import type { FormInstance } from '@superset-ui/core/components';
 import getControlItemsMap, { ControlItemsProps } from './getControlItemsMap';
 import {
   getControlItems,
@@ -55,7 +55,9 @@ jest.mock('./ColumnSelect', () => ({
 }));
 
 const formMock: FormInstance = {
-  __INTERNAL__: { itemRef: () => () => {} },
+  focusField: () => {},
+  getFieldWarning: () => [],
+  setFieldValue: () => {},
   scrollToField: () => {},
   getFieldInstance: () => {},
   getFieldValue: () => {},
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/getControlItemsMap.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/getControlItemsMap.tsx
index cad2f825f18..640b795f9af 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/getControlItemsMap.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/getControlItemsMap.tsx
@@ -16,20 +16,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import {
-  CustomControlItem,
-  InfoTooltipWithTrigger,
-} from '@superset-ui/chart-controls';
+import { CustomControlItem } from '@superset-ui/chart-controls';
 import { ReactNode } from 'react';
-import { AntdCheckbox, FormInstance } from 'src/components';
+import {
+  Checkbox,
+  FormItem,
+  InfoTooltip,
+  Tooltip,
+  type FormInstance,
+} from '@superset-ui/core/components';
 import {
   Filter,
   getChartControlPanelRegistry,
   styled,
   t,
 } from '@superset-ui/core';
-import { Tooltip } from 'src/components/Tooltip';
-import { FormItem } from 'src/components/Form';
 import {
   doesColumnMatchFilterType,
   getControlItems,
@@ -190,9 +191,9 @@ export default function getControlItemsMap({
               valuePropName="checked"
               colon={false}
             >
-              <AntdCheckbox
+              <Checkbox
                 disabled={controlItem.config.affectsDataMask && disabled}
-                onChange={({ target: { checked } }) => {
+                onChange={checked => {
                   if (controlItem.config.requiredFirst) {
                     setNativeFilterFieldValues(form, filterId, {
                       requiredFirst: {
@@ -210,15 +211,16 @@ export default function getControlItemsMap({
                   forceUpdate();
                 }}
               >
-                {controlItem.config.label}&nbsp;
-                {controlItem.config.description && (
-                  <InfoTooltipWithTrigger
-                    placement="top"
-                    label={controlItem.config.name}
-                    tooltip={controlItem.config.description}
-                  />
-                )}
-              </AntdCheckbox>
+                <>
+                  {controlItem.config.label}&nbsp;
+                  {controlItem.config.description && (
+                    <InfoTooltip
+                      placement="top"
+                      tooltip={controlItem.config.description}
+                    />
+                  )}
+                </>
+              </Checkbox>
             </StyledRowFormItem>
           </Tooltip>
         </>
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/state.ts b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/state.ts
index f71d60a134d..ac558d1f623 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/state.ts
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/state.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { useEffect, useState } from 'react';
-import { FormInstance } from 'src/components';
+import type { FormInstance } from '@superset-ui/core/components';
 import { Filter, t } from '@superset-ui/core';
 import { NativeFiltersForm, NativeFiltersFormItem } from '../types';
 import { setNativeFilterFieldValues, useForceUpdate } from './utils';
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/utils.ts b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/utils.ts
index 09f515b63ee..4f75f0371ec 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/utils.ts
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/utils.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { flatMapDeep } from 'lodash';
-import { FormInstance } from 'src/components';
+import type { FormInstance } from '@superset-ui/core/components';
 import { useState, useCallback } from 'react';
 import { CustomControlItem, Dataset } from '@superset-ui/chart-controls';
 import { Column, ensureIsArray, GenericDataType } from '@superset-ui/core';
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigModal.test.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigModal.test.tsx
index 9c7585c9efa..886aee28d6f 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigModal.test.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigModal.test.tsx
@@ -126,12 +126,12 @@ const TIME_GRAIN_REGEX = /^time grain$/i;
 const FILTER_SETTINGS_REGEX = /^filter settings$/i;
 const DEFAULT_VALUE_REGEX = /^filter has default value$/i;
 const MULTIPLE_REGEX = /^can select multiple values$/i;
-const REQUIRED_REGEX = /^filter value is required$/i;
+const FILTER_REQUIRED_REGEX = /^filter value is required/i;
 const DEPENDENCIES_REGEX = /^values are dependent on other filters$/i;
-const FIRST_VALUE_REGEX = /^select first filter value by default$/i;
-const INVERSE_SELECTION_REGEX = /^inverse selection$/i;
-const SEARCH_ALL_REGEX = /^dynamically search all filter values$/i;
-const PRE_FILTER_REGEX = /^pre-filter available values$/i;
+const FIRST_VALUE_REGEX = /^select first filter value by default/i;
+const INVERSE_SELECTION_REGEX = /^inverse selection/i;
+const SEARCH_ALL_REGEX = /^dynamically search all filter values/i;
+const PRE_FILTER_REGEX = /^pre-filter available values/i;
 const SORT_REGEX = /^sort filter values$/i;
 const SAVE_REGEX = /^save$/i;
 const NAME_REQUIRED_REGEX = /^name is required$/i;
@@ -175,15 +175,13 @@ function queryCheckbox(name: RegExp) {
 test('renders a value filter type', () => {
   defaultRender();
 
-  userEvent.click(screen.getByText(FILTER_SETTINGS_REGEX));
-
   expect(screen.getByText(FILTER_TYPE_REGEX)).toBeInTheDocument();
   expect(screen.getByText(FILTER_NAME_REGEX)).toBeInTheDocument();
   expect(screen.getByText(DATASET_REGEX)).toBeInTheDocument();
   expect(screen.getByText(COLUMN_REGEX)).toBeInTheDocument();
 
   expect(getCheckbox(DEFAULT_VALUE_REGEX)).not.toBeChecked();
-  expect(getCheckbox(REQUIRED_REGEX)).not.toBeChecked();
+  expect(getCheckbox(FILTER_REQUIRED_REGEX)).not.toBeChecked();
   expect(queryCheckbox(DEPENDENCIES_REGEX)).not.toBeInTheDocument();
   expect(getCheckbox(FIRST_VALUE_REGEX)).not.toBeChecked();
   expect(getCheckbox(INVERSE_SELECTION_REGEX)).not.toBeChecked();
@@ -201,13 +199,11 @@ test('renders a numerical range filter type', async () => {
 
   await waitFor(() => userEvent.click(screen.getByText(NUMERICAL_RANGE_REGEX)));
 
-  userEvent.click(screen.getByText(FILTER_SETTINGS_REGEX));
-
   expect(screen.getByText(FILTER_TYPE_REGEX)).toBeInTheDocument();
   expect(screen.getByText(FILTER_NAME_REGEX)).toBeInTheDocument();
   expect(screen.getByText(DATASET_REGEX)).toBeInTheDocument();
   expect(screen.getByText(COLUMN_REGEX)).toBeInTheDocument();
-  expect(screen.getByText(REQUIRED_REGEX)).toBeInTheDocument();
+  expect(screen.getByText(FILTER_REQUIRED_REGEX)).toBeInTheDocument();
 
   expect(getCheckbox(DEFAULT_VALUE_REGEX)).not.toBeChecked();
   expect(getCheckbox(PRE_FILTER_REGEX)).not.toBeChecked();
@@ -309,12 +305,19 @@ test.skip('validates the default value', async () => {
 });
 
 test('validates the pre-filter value', async () => {
+  jest.useFakeTimers();
+
   defaultRender();
+
   userEvent.click(screen.getByText(FILTER_SETTINGS_REGEX));
   userEvent.click(getCheckbox(PRE_FILTER_REGEX));
-  expect(
-    await screen.findByText(PRE_FILTER_REQUIRED_REGEX),
-  ).toBeInTheDocument();
+
+  jest.runOnlyPendingTimers();
+  jest.useRealTimers();
+
+  await waitFor(() => {
+    expect(screen.getByText(PRE_FILTER_REQUIRED_REGEX)).toBeInTheDocument();
+  });
 });
 
 // eslint-disable-next-line jest/no-disabled-tests
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigModal.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigModal.tsx
index cc06eb08335..7e47cd95d24 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigModal.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigModal.tsx
@@ -23,16 +23,18 @@ import {
   NativeFilterType,
   Divider,
   styled,
-  SLOW_DEBOUNCE,
   t,
   css,
   useTheme,
 } from '@superset-ui/core';
 import { useDispatch } from 'react-redux';
-import { AntdForm } from 'src/components';
-import { Icons } from 'src/components/Icons';
-import ErrorBoundary from 'src/components/ErrorBoundary';
-import { StyledModal } from 'src/components/Modal';
+import {
+  Constants,
+  Form,
+  Icons,
+  StyledModal,
+} from '@superset-ui/core/components';
+import { ErrorBoundary } from 'src/components';
 import { testWithId } from 'src/utils/testUtils';
 import { updateCascadeParentIds } from 'src/dashboard/actions/nativeFilters';
 import useEffectEvent from 'src/hooks/useEffectEvent';
@@ -72,8 +74,9 @@ const StyledModalWrapper = styled(StyledModal)<{ expanded: boolean }>`
     min-width: auto;
   }
 
-  .antd5-modal-body {
+  .ant-modal-body {
     padding: 0px;
+    overflow: auto;
   }
 
   ${({ expanded }) =>
@@ -81,10 +84,10 @@ const StyledModalWrapper = styled(StyledModal)<{ expanded: boolean }>`
     css`
       height: 100%;
 
-      .antd5-modal-body {
+      .ant-modal-body {
         flex: 1 1 auto;
       }
-      .antd5-modal-content {
+      .ant-modal-content {
         height: 100%;
       }
     `}
@@ -96,17 +99,17 @@ export const StyledModalBody = styled.div<{ expanded: boolean }>`
   flex-direction: row;
   flex: 1;
   .filters-list {
-    width: ${({ theme }) => theme.gridUnit * 50}px;
+    width: ${({ theme }) => theme.sizeUnit * 50}px;
     overflow: auto;
   }
 `;
 
-export const StyledForm = styled(AntdForm)`
+export const StyledForm = styled(Form)`
   width: 100%;
 `;
 
 export const StyledExpandButtonWrapper = styled.div`
-  margin-left: ${({ theme }) => theme.gridUnit * 4}px;
+  margin-left: ${({ theme }) => theme.sizeUnit * 4}px;
 `;
 
 export const FILTERS_CONFIG_MODAL_TEST_ID = 'filters-config-modal';
@@ -156,7 +159,7 @@ function FiltersConfigModal({
   const dispatch = useDispatch();
   const theme = useTheme();
 
-  const [form] = AntdForm.useForm<NativeFiltersForm>();
+  const [form] = Form.useForm<NativeFiltersForm>();
 
   const configFormRef = useRef<any>();
 
@@ -554,7 +557,11 @@ function FiltersConfigModal({
       .forEach(filterId => {
         const result = hasCircularDependency(dependencyMap, filterId);
         const field = {
-          name: ['filters', filterId, 'dependencies'],
+          name: ['filters', filterId, 'dependencies'] as [
+            'filters',
+            string,
+            'dependencies',
+          ],
           errors: result ? [t('Cyclic dependency detected')] : [],
         };
         form.setFields([field]);
@@ -615,7 +622,7 @@ function FiltersConfigModal({
         }
         setSaveAlertVisible(false);
         handleErroredFilters();
-      }, SLOW_DEBOUNCE),
+      }, Constants.SLOW_DEBOUNCE),
     [handleErroredFilters],
   );
 
@@ -709,7 +716,7 @@ function FiltersConfigModal({
       maskClosable={false}
       title={t('Add and edit filters')}
       expanded={expanded}
-      destroyOnClose
+      destroyOnHidden
       onCancel={handleCancel}
       onOk={handleSave}
       centered
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/Footer/CancelConfirmationAlert.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/Footer/CancelConfirmationAlert.tsx
index 813322ccdfa..b11457105c6 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/Footer/CancelConfirmationAlert.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/Footer/CancelConfirmationAlert.tsx
@@ -18,8 +18,11 @@
  */
 import { ReactNode } from 'react';
 import { t } from '@superset-ui/core';
-import Alert from 'src/components/Alert';
-import Button, { OnClickHandler } from 'src/components/Button';
+import {
+  Alert,
+  Button,
+  type OnClickHandler,
+} from '@superset-ui/core/components';
 
 export interface ConfirmationAlertProps {
   title: string;
@@ -43,7 +46,7 @@ export function CancelConfirmationAlert({
       css={{
         textAlign: 'left',
         flex: 1,
-        '& .antd5-alert-action': { alignSelf: 'center' },
+        '& .ant-alert-action': { alignSelf: 'center' },
       }}
       description={children}
       action={
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/Footer/Footer.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/Footer/Footer.tsx
index 76b2fcb6a11..1fe1a977bc6 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/Footer/Footer.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/Footer/Footer.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { FC } from 'react';
-import Button, { OnClickHandler } from 'src/components/Button';
+import { Button, type OnClickHandler } from '@superset-ui/core/components';
 import { t } from '@superset-ui/core';
 import { CancelConfirmationAlert } from './CancelConfirmationAlert';
 
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/utils.ts b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/utils.ts
index af51dedbe6d..6c6a65f8c20 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/utils.ts
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/utils.ts
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { FormInstance } from 'src/components';
+import type { FormInstance } from '@superset-ui/core/components';
 import { nanoid } from 'nanoid';
 import { getInitialDataMask } from 'src/dataMask/reducer';
 import {
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/selectors.ts b/superset-frontend/src/dashboard/components/nativeFilters/selectors.ts
index 40b362e86c1..066737d7a13 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/selectors.ts
+++ b/superset-frontend/src/dashboard/components/nativeFilters/selectors.ts
@@ -342,6 +342,7 @@ const cachedNativeFilterDataForChart: Record<
     rejectedColumns: Set<string>;
   }
 > = {};
+
 export const selectNativeIndicatorsForChart = (
   nativeFilters: Filters,
   dataMask: DataMaskStateWithId,
@@ -355,17 +356,16 @@ export const selectNativeIndicatorsForChart = (
 
   const cachedFilterData = cachedNativeFilterDataForChart[chartId];
   if (
-    cachedNativeIndicatorsForChart[chartId] &&
-    areObjectsEqual(cachedFilterData?.appliedColumns, appliedColumns) &&
-    areObjectsEqual(cachedFilterData?.rejectedColumns, rejectedColumns) &&
-    cachedFilterData?.nativeFilters === nativeFilters &&
-    cachedFilterData?.chartLayoutItems === chartLayoutItems &&
-    cachedFilterData?.chartConfiguration === chartConfiguration &&
-    cachedFilterData?.dataMask === dataMask
+    cachedNativeIndicatorsForChart[chartId]?.length &&
+    areObjectsEqual(cachedFilterData.appliedColumns, appliedColumns) &&
+    areObjectsEqual(cachedFilterData.rejectedColumns, rejectedColumns) &&
+    areObjectsEqual(cachedFilterData.nativeFilters, nativeFilters) &&
+    areObjectsEqual(cachedFilterData.chartLayoutItems, chartLayoutItems) &&
+    areObjectsEqual(cachedFilterData.chartConfiguration, chartConfiguration) &&
+    areObjectsEqual(cachedFilterData.dataMask, dataMask)
   ) {
     return cachedNativeIndicatorsForChart[chartId];
   }
-
   const nativeFilterIndicators =
     nativeFilters &&
     Object.values(nativeFilters)
diff --git a/superset-frontend/src/dashboard/components/resizable/ResizableContainer.tsx b/superset-frontend/src/dashboard/components/resizable/ResizableContainer.tsx
index 318516366b1..f4d48cf2080 100644
--- a/superset-frontend/src/dashboard/components/resizable/ResizableContainer.tsx
+++ b/superset-frontend/src/dashboard/components/resizable/ResizableContainer.tsx
@@ -88,11 +88,11 @@ const StyledResizable = styled(Resizable)`
         left: 0;
         width: 100%;
         height: 100%;
-        box-shadow: inset 0 0 0 2px ${theme.colors.primary.base};
+        box-shadow: inset 0 0 0 2px ${theme.colorPrimary};
       }
 
       & > span .resize-handle {
-        border-color: ${theme.colors.primary.base};
+        border-color: ${theme.colorPrimary};
       }
     }
 
@@ -102,34 +102,34 @@ const StyledResizable = styled(Resizable)`
 
       &--bottom-right {
         position: absolute;
-        border-right: 1px solid ${theme.colors.text.label};
-        border-bottom: 1px solid ${theme.colors.text.label};
-        right: ${theme.gridUnit * 4}px;
-        bottom: ${theme.gridUnit * 4}px;
-        width: ${theme.gridUnit * 2}px;
-        height: ${theme.gridUnit * 2}px;
+        border-right: 1px solid ${theme.colorSplit};
+        border-bottom: 1px solid ${theme.colorSplit};
+        right: ${theme.sizeUnit * 4}px;
+        bottom: ${theme.sizeUnit * 4}px;
+        width: ${theme.sizeUnit * 2}px;
+        height: ${theme.sizeUnit * 2}px;
       }
 
       &--right {
-        width: ${theme.gridUnit / 2}px;
-        height: ${theme.gridUnit * 5}px;
-        right: ${theme.gridUnit}px;
+        width: ${theme.sizeUnit / 2}px;
+        height: ${theme.sizeUnit * 5}px;
+        right: ${theme.sizeUnit}px;
         top: 50%;
         transform: translate(0, -50%);
         position: absolute;
-        border-left: 1px solid ${theme.colors.text.label};
-        border-right: 1px solid ${theme.colors.text.label};
+        border-left: 1px solid ${theme.colorSplit};
+        border-right: 1px solid ${theme.colorSplit};
       }
 
       &--bottom {
-        height: ${theme.gridUnit / 2}px;
-        width: ${theme.gridUnit * 5}px;
-        bottom: ${theme.gridUnit}px;
+        height: ${theme.sizeUnit / 2}px;
+        width: ${theme.sizeUnit * 5}px;
+        bottom: ${theme.sizeUnit}px;
         left: 50%;
         transform: translate(-50%);
         position: absolute;
-        border-top: 1px solid ${theme.colors.text.label};
-        border-bottom: 1px solid ${theme.colors.text.label};
+        border-top: 1px solid ${theme.colorSplit};
+        border-bottom: 1px solid ${theme.colorSplit};
       }
     }
   `}
diff --git a/superset-frontend/src/dashboard/containers/DashboardPage.tsx b/superset-frontend/src/dashboard/containers/DashboardPage.tsx
index fb8bb6c05d8..26b0cceb450 100644
--- a/superset-frontend/src/dashboard/containers/DashboardPage.tsx
+++ b/superset-frontend/src/dashboard/containers/DashboardPage.tsx
@@ -23,7 +23,7 @@ import { t, useTheme } from '@superset-ui/core';
 import { useDispatch, useSelector } from 'react-redux';
 import { createSelector } from '@reduxjs/toolkit';
 import { useToasts } from 'src/components/MessageToasts/withToasts';
-import Loading from 'src/components/Loading';
+import { Loading } from '@superset-ui/core/components';
 import {
   useDashboard,
   useDashboardCharts,
@@ -71,8 +71,6 @@ const DashboardBuilder = lazy(
     ),
 );
 
-const originalDocumentTitle = document.title;
-
 type PageProps = {
   idOrSlug: string;
 };
@@ -204,7 +202,7 @@ export const DashboardPage: FC<PageProps> = ({ idOrSlug }: PageProps) => {
       document.title = dashboard_title;
     }
     return () => {
-      document.title = originalDocumentTitle;
+      document.title = 'Superset';
     };
   }, [dashboard_title]);
 
@@ -234,7 +232,7 @@ export const DashboardPage: FC<PageProps> = ({ idOrSlug }: PageProps) => {
 
   const globalStyles = useMemo(
     () => [
-      filterCardPopoverStyle(theme),
+      filterCardPopoverStyle(),
       headerStyles(theme),
       chartContextMenuStyles(theme),
       focusStyle(theme),
diff --git a/superset-frontend/src/dashboard/styles.ts b/superset-frontend/src/dashboard/styles.ts
index 1ac9a2ee2ae..94ccecdecc4 100644
--- a/superset-frontend/src/dashboard/styles.ts
+++ b/superset-frontend/src/dashboard/styles.ts
@@ -21,32 +21,32 @@ import { css, SupersetTheme } from '@superset-ui/core';
 export const headerStyles = (theme: SupersetTheme) => css`
   body {
     h1 {
-      font-weight: ${theme.typography.weights.bold};
+      font-weight: ${theme.fontWeightStrong};
       line-height: 1.4;
-      font-size: ${theme.typography.sizes.xxl}px;
+      font-size: ${theme.fontSizeXXL}px;
       letter-spacing: -0.2px;
-      margin-top: ${theme.gridUnit * 3}px;
-      margin-bottom: ${theme.gridUnit * 3}px;
+      margin-top: ${theme.sizeUnit * 3}px;
+      margin-bottom: ${theme.sizeUnit * 3}px;
     }
 
     h2 {
-      font-weight: ${theme.typography.weights.bold};
+      font-weight: ${theme.fontWeightStrong};
       line-height: 1.4;
-      font-size: ${theme.typography.sizes.xl}px;
-      margin-top: ${theme.gridUnit * 3}px;
-      margin-bottom: ${theme.gridUnit * 2}px;
+      font-size: ${theme.fontSizeXL}px;
+      margin-top: ${theme.sizeUnit * 3}px;
+      margin-bottom: ${theme.sizeUnit * 2}px;
     }
 
     h3,
     h4,
     h5,
     h6 {
-      font-weight: ${theme.typography.weights.bold};
+      font-weight: ${theme.fontWeightStrong};
       line-height: 1.4;
-      font-size: ${theme.typography.sizes.l}px;
+      font-size: ${theme.fontSizeLG}px;
       letter-spacing: 0.2px;
-      margin-top: ${theme.gridUnit * 2}px;
-      margin-bottom: ${theme.gridUnit}px;
+      margin-top: ${theme.sizeUnit * 2}px;
+      margin-bottom: ${theme.sizeUnit}px;
     }
   }
 `;
@@ -54,22 +54,22 @@ export const headerStyles = (theme: SupersetTheme) => css`
 // adds enough margin and padding so that the focus outline styles will fit
 export const chartHeaderStyles = (theme: SupersetTheme) => css`
   .header-title a {
-    margin: ${theme.gridUnit / 2}px;
-    padding: ${theme.gridUnit / 2}px;
+    margin: ${theme.sizeUnit / 2}px;
+    padding: ${theme.sizeUnit / 2}px;
   }
   .header-controls {
     &,
     &:hover {
-      margin-top: ${theme.gridUnit}px;
+      margin-top: ${theme.sizeUnit}px;
     }
   }
 `;
 
-export const filterCardPopoverStyle = (theme: SupersetTheme) => css`
+export const filterCardPopoverStyle = () => css`
   .filter-card-tooltip {
-    &.antd5-tooltip-placement-bottom {
+    &.ant-tooltip-placement-bottom {
       padding-top: 0;
-      & .antd5-tooltip-arrow {
+      & .ant-tooltip-arrow {
         top: -13px;
       }
     }
@@ -77,12 +77,12 @@ export const filterCardPopoverStyle = (theme: SupersetTheme) => css`
 `;
 
 export const chartContextMenuStyles = (theme: SupersetTheme) => css`
-  .antd5-dropdown-menu.chart-context-menu {
-    min-width: ${theme.gridUnit * 43}px;
+  .ant-dropdown-menu.chart-context-menu {
+    min-width: ${theme.sizeUnit * 43}px;
   }
-  .antd5-dropdown-menu-submenu.chart-context-submenu {
-    max-width: ${theme.gridUnit * 60}px;
-    min-width: ${theme.gridUnit * 40}px;
+  .ant-dropdown-menu-submenu.chart-context-submenu {
+    max-width: ${theme.sizeUnit * 60}px;
+    min-width: ${theme.sizeUnit * 40}px;
   }
 `;
 
@@ -91,24 +91,24 @@ export const focusStyle = (theme: SupersetTheme) => css`
   .ant-tabs-tabpane,
   .ant-tabs-tab-btn,
   .superset-button,
-  .superset-button.antd5-dropdown-trigger,
+  .superset-button.ant-dropdown-trigger,
   .header-controls span {
     &:focus-visible {
-      box-shadow: 0 0 0 2px ${theme.colors.primary.dark1};
-      border-radius: ${theme.gridUnit / 2}px;
+      box-shadow: 0 0 0 2px ${theme.colorPrimaryText};
+      border-radius: ${theme.borderRadius}px;
       outline: none;
       text-decoration: none;
     }
     &:not(
         .superset-button,
-        .antd5-menu-item,
+        .ant-menu-item,
         a,
         .fave-unfave-icon,
         .ant-tabs-tabpane,
         .header-controls span
       ) {
       &:focus-visible {
-        padding: ${theme.gridUnit / 2}px;
+        padding: ${theme.sizeUnit / 2}px;
       }
     }
   }
diff --git a/superset-frontend/src/dashboard/util/extractUrlParams.ts b/superset-frontend/src/dashboard/util/extractUrlParams.ts
index 7ef7dd9faa8..07d9fdb6f30 100644
--- a/superset-frontend/src/dashboard/util/extractUrlParams.ts
+++ b/superset-frontend/src/dashboard/util/extractUrlParams.ts
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import querystring from 'query-string';
 import { JsonObject } from '@superset-ui/core';
 
 const reservedQueryParams = new Set(['standalone', 'edit']);
@@ -29,8 +28,8 @@ export type UrlParamType = 'reserved' | 'regular' | 'all';
 export default function extractUrlParams(
   urlParamType: UrlParamType,
 ): JsonObject {
-  const queryParams = querystring.parse(window.location.search);
-  return Object.entries(queryParams).reduce((acc, [key, value]) => {
+  const queryParams = new URLSearchParams(window.location.search);
+  return [...queryParams.entries()].reduce((acc, [key, value]) => {
     if (
       (urlParamType === 'regular' && reservedQueryParams.has(key)) ||
       (urlParamType === 'reserved' && !reservedQueryParams.has(key))
diff --git a/superset-frontend/src/dashboard/util/getChartAndLabelComponentIdFromPath.js b/superset-frontend/src/dashboard/util/getChartAndLabelComponentIdFromPath.js
index 7949612eb3c..ac31b58aafd 100644
--- a/superset-frontend/src/dashboard/util/getChartAndLabelComponentIdFromPath.js
+++ b/superset-frontend/src/dashboard/util/getChartAndLabelComponentIdFromPath.js
@@ -22,8 +22,7 @@ export default function getChartAndLabelComponentIdFromPath(directPathToChild) {
   const result = {};
 
   if (directPathToChild.length > 0) {
-    const currentPath = directPathToChild.slice();
-
+    const currentPath = directPathToChild.slice().filter(x => x !== undefined);
     while (currentPath.length) {
       const componentId = currentPath.pop();
       const componentType = componentId.split('-')[0];
diff --git a/superset-frontend/src/dashboard/util/useFilterFocusHighlightStyles.ts b/superset-frontend/src/dashboard/util/useFilterFocusHighlightStyles.ts
index 3dea0d54ac1..0ab38fabbc5 100644
--- a/superset-frontend/src/dashboard/util/useFilterFocusHighlightStyles.ts
+++ b/superset-frontend/src/dashboard/util/useFilterFocusHighlightStyles.ts
@@ -33,7 +33,7 @@ const useFilterFocusHighlightStyles = (chartId: number) => {
     () => ({
       borderColor: theme.colors.primary.light2,
       opacity: 1,
-      boxShadow: `0px 0px ${theme.gridUnit * 2}px ${theme.colors.primary.base}`,
+      boxShadow: `0px 0px ${theme.sizeUnit * 2}px ${theme.colorPrimary}`,
       pointerEvents: 'auto',
     }),
     [theme],
diff --git a/superset-frontend/src/database/actions.ts b/superset-frontend/src/database/actions.ts
index ba98d0cd49c..556d0b014e7 100644
--- a/superset-frontend/src/database/actions.ts
+++ b/superset-frontend/src/database/actions.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { makeApi } from '@superset-ui/core';
+import { SupersetClient, makeApi } from '@superset-ui/core';
 import { ThunkDispatch } from 'redux-thunk';
 import { AnyAction } from 'redux';
 import { QueryExecutePayload, QueryExecuteResponse } from './types';
@@ -30,6 +30,13 @@ export const executeQueryApi = makeApi<
   endpoint: '/api/v1/sqllab/execute',
 });
 
+export function setQuery(query: string) {
+  return {
+    type: 'SET_QUERY',
+    payload: query,
+  };
+}
+
 export function setQueryIsLoading(isLoading: boolean) {
   return {
     type: 'SET_QUERY_IS_LOADING',
@@ -66,3 +73,16 @@ export function executeQuery(payload: QueryExecutePayload) {
     }
   };
 }
+
+export function formatQuery(sql: string) {
+  return function (dispatch: ThunkDispatch<any, undefined, AnyAction>) {
+    return SupersetClient.post({
+      endpoint: `/api/v1/sqllab/format_sql/`,
+      body: JSON.stringify({ sql }),
+      headers: { 'Content-Type': 'application/json' },
+    }).then(response => {
+      dispatch(setQuery(response.json.result));
+      return response;
+    });
+  };
+}
diff --git a/superset-frontend/src/database/reducers.ts b/superset-frontend/src/database/reducers.ts
index 7541494b839..ace2afed1c3 100644
--- a/superset-frontend/src/database/reducers.ts
+++ b/superset-frontend/src/database/reducers.ts
@@ -31,6 +31,13 @@ export default function databaseReducer(
   action: any,
 ): QueryAdhocState {
   switch (action.type) {
+    case 'SET_QUERY':
+      return {
+        ...state,
+        sql: action.payload ?? '',
+        queryResult: null,
+        error: null,
+      };
     case 'SET_QUERY_IS_LOADING':
       return {
         ...state,
diff --git a/superset-frontend/src/embedded/index.tsx b/superset-frontend/src/embedded/index.tsx
index 1932ac005d3..c577015748d 100644
--- a/superset-frontend/src/embedded/index.tsx
+++ b/superset-frontend/src/embedded/index.tsx
@@ -21,7 +21,7 @@ import 'src/public-path';
 import { lazy, Suspense } from 'react';
 import ReactDOM from 'react-dom';
 import { BrowserRouter as Router, Route } from 'react-router-dom';
-import { makeApi, t, logging } from '@superset-ui/core';
+import { makeApi, t, logging, themeObject } from '@superset-ui/core';
 import Switchboard from '@superset-ui/switchboard';
 import getBootstrapData, { applicationRoot } from 'src/utils/getBootstrapData';
 import setupClient from 'src/setup/setupClient';
@@ -29,11 +29,12 @@ import setupPlugins from 'src/setup/setupPlugins';
 import { useUiConfig } from 'src/components/UiConfigContext';
 import { RootContextProviders } from 'src/views/RootContextProviders';
 import { store, USER_LOADED } from 'src/views/store';
-import ErrorBoundary from 'src/components/ErrorBoundary';
-import Loading from 'src/components/Loading';
+import { Loading } from '@superset-ui/core/components';
+import { ErrorBoundary } from 'src/components';
 import { addDangerToast } from 'src/components/MessageToasts/actions';
 import ToastContainer from 'src/components/MessageToasts/ToastContainer';
 import { UserWithPermissionsAndRoles } from 'src/types/bootstrapTypes';
+import { AnyThemeConfig } from 'packages/superset-ui-core/src/theme/types';
 import { embeddedApi } from './api';
 import { getDataMaskChangeTrigger } from './utils';
 
@@ -242,6 +243,21 @@ window.addEventListener('message', function embeddedPageInitializer(event) {
     );
     Switchboard.defineMethod('getActiveTabs', embeddedApi.getActiveTabs);
     Switchboard.defineMethod('getDataMask', embeddedApi.getDataMask);
+    Switchboard.defineMethod(
+      'setThemeConfig',
+      (payload: { themeConfig: AnyThemeConfig }) => {
+        const { themeConfig } = payload;
+        log('Received setThemeConfig request:', themeConfig);
+
+        try {
+          themeObject.setConfig(themeConfig);
+          return { success: true, message: 'Theme applied' };
+        } catch (error) {
+          logging.error('Failed to apply theme config:', error);
+          throw new Error(`Failed to apply theme config: ${error.message}`);
+        }
+      },
+    );
     Switchboard.start();
   }
 });
diff --git a/superset-frontend/src/explore/actions/hydrateExplore.test.ts b/superset-frontend/src/explore/actions/hydrateExplore.test.ts
index cdbca5b94df..f0703699147 100644
--- a/superset-frontend/src/explore/actions/hydrateExplore.test.ts
+++ b/superset-frontend/src/explore/actions/hydrateExplore.test.ts
@@ -213,3 +213,51 @@ test('uses configured default time range if not set', () => {
     }),
   );
 });
+
+test('extracts currency formats from metrics in dataset', () => {
+  const dispatch = jest.fn();
+  const getState = jest.fn(() => ({
+    user: {},
+    charts: {},
+    datasources: {},
+    common: {},
+    explore: {},
+  }));
+
+  const datasetWithMetrics = {
+    ...exploreInitialData.dataset,
+    metrics: [
+      {
+        metric_name: 'count',
+        currency: { symbol: 'GBP', symbolPosition: 'prefix' },
+      },
+      {
+        metric_name: 'revenue',
+        currency: { symbol: 'USD', symbolPosition: 'suffix' },
+      },
+      { metric_name: 'no_currency' },
+    ],
+  };
+
+  // @ts-ignore
+  hydrateExplore({ ...exploreInitialData, dataset: datasetWithMetrics })(
+    dispatch,
+    // @ts-ignore
+    getState,
+  );
+
+  expect(dispatch).toHaveBeenCalledWith(
+    expect.objectContaining({
+      data: expect.objectContaining({
+        datasources: expect.objectContaining({
+          '8__table': expect.objectContaining({
+            currency_formats: {
+              count: { symbol: 'GBP', symbolPosition: 'prefix' },
+              revenue: { symbol: 'USD', symbolPosition: 'suffix' },
+            },
+          }),
+        }),
+      }),
+    }),
+  );
+});
diff --git a/superset-frontend/src/explore/actions/hydrateExplore.ts b/superset-frontend/src/explore/actions/hydrateExplore.ts
index 2ee46c1e93e..b8e0375a648 100644
--- a/superset-frontend/src/explore/actions/hydrateExplore.ts
+++ b/superset-frontend/src/explore/actions/hydrateExplore.ts
@@ -27,6 +27,7 @@ import { getChartKey } from 'src/explore/exploreUtils';
 import { getControlsState } from 'src/explore/store';
 import { Dispatch } from 'redux';
 import {
+  Currency,
   ensureIsArray,
   getCategoricalSchemeRegistry,
   getColumnLabel,
@@ -97,6 +98,14 @@ export const hydrateExplore =
     }
 
     const initialDatasource = dataset;
+    initialDatasource.currency_formats = Object.fromEntries(
+      (initialDatasource.metrics ?? [])
+        .filter(metric => !!metric.currency)
+        .map((metric): [string, Currency] => [
+          metric.metric_name,
+          metric.currency!,
+        ]),
+    );
 
     const initialExploreState = {
       form_data: initialFormData,
diff --git a/superset-frontend/src/explore/actions/saveModalActions.test.ts b/superset-frontend/src/explore/actions/saveModalActions.test.ts
index d7a9e3fb4a3..b1adb19107d 100644
--- a/superset-frontend/src/explore/actions/saveModalActions.test.ts
+++ b/superset-frontend/src/explore/actions/saveModalActions.test.ts
@@ -689,4 +689,40 @@ describe('getSlicePayload', () => {
 
     expect(hasTemporalRange).toBe(true);
   });
+
+  test('should reset isExtra flag to false for temporal filter when saving as a new chart', () => {
+    const formDataWithTemporalFilterWithExtra: QueryFormData = {
+      ...formDataWithNativeFilters,
+      adhoc_filters: [
+        {
+          clause: 'WHERE',
+          subject: 'year',
+          operator: 'TEMPORAL_RANGE',
+          comparator: '2004 : ',
+          expressionType: 'SIMPLE',
+          isExtra: true,
+        },
+      ],
+    };
+
+    const result = getSlicePayload(
+      sliceName,
+      formDataWithTemporalFilterWithExtra,
+      dashboards,
+      owners as [],
+      {} as QueryFormData,
+    );
+
+    const savedFilters = JSON.parse(result.params as string).adhoc_filters;
+
+    expect(savedFilters).toHaveLength(1);
+    expect(savedFilters[0]).toMatchObject({
+      clause: 'WHERE',
+      subject: 'year',
+      operator: 'TEMPORAL_RANGE',
+      comparator: 'No filter',
+      expressionType: 'SIMPLE',
+      isExtra: false,
+    });
+  });
 });
diff --git a/superset-frontend/src/explore/actions/saveModalActions.ts b/superset-frontend/src/explore/actions/saveModalActions.ts
index 42f2c0686c8..967c10cf7c8 100644
--- a/superset-frontend/src/explore/actions/saveModalActions.ts
+++ b/superset-frontend/src/explore/actions/saveModalActions.ts
@@ -132,6 +132,7 @@ export const getSlicePayload = (
             adhocFilters[filtersKey].push({
               ...filter,
               comparator: 'No filter',
+              isExtra: false,
             });
           }
         },
diff --git a/superset-frontend/src/explore/components/ChartPills.tsx b/superset-frontend/src/explore/components/ChartPills.tsx
index 0eec7aa143b..6588b171103 100644
--- a/superset-frontend/src/explore/components/ChartPills.tsx
+++ b/superset-frontend/src/explore/components/ChartPills.tsx
@@ -18,15 +18,17 @@
  */
 import { forwardRef, RefObject } from 'react';
 import { css, QueryData, SupersetTheme } from '@superset-ui/core';
-import RowCountLabel from 'src/explore/components/RowCountLabel';
-import CachedLabel from 'src/components/CachedLabel';
-import Timer from 'src/components/Timer';
-import { Type } from 'src/components/Label';
+import {
+  CachedLabel,
+  type LabelType,
+  Timer,
+} from '@superset-ui/core/components';
+import RowCountLabel from 'src/components/RowCountLabel';
 
 const CHART_STATUS_MAP = {
-  failed: 'danger' as Type,
-  loading: 'warning' as Type,
-  success: 'success' as Type,
+  failed: 'danger' as LabelType,
+  loading: 'warning' as LabelType,
+  success: 'success' as LabelType,
 };
 
 export type ChartPillsProps = {
@@ -52,16 +54,14 @@ export const ChartPills = forwardRef(
   ) => {
     const isLoading = chartStatus === 'loading';
     const firstQueryResponse = queriesResponse?.[0];
+
     return (
       <div ref={ref}>
         <div
           css={(theme: SupersetTheme) => css`
             display: flex;
             justify-content: flex-end;
-            padding-bottom: ${theme.gridUnit * 4}px;
-            & .ant-tag:last-of-type {
-              margin: 0;
-            }
+            padding-bottom: ${theme.sizeUnit * 4}px;
           `}
         >
           {!isLoading && firstQueryResponse && (
diff --git a/superset-frontend/src/explore/components/Control.test.tsx b/superset-frontend/src/explore/components/Control.test.tsx
index bceab766e00..3fa10df3a06 100644
--- a/superset-frontend/src/explore/components/Control.test.tsx
+++ b/superset-frontend/src/explore/components/Control.test.tsx
@@ -34,7 +34,7 @@ test('render a control', () => {
   render(setup());
 
   const checkbox = screen.getByRole('checkbox');
-  expect(checkbox).toBeVisible();
+  expect(checkbox).toBeInTheDocument();
 });
 
 test('render null if type is not exit', () => {
diff --git a/superset-frontend/src/explore/components/Control.tsx b/superset-frontend/src/explore/components/Control.tsx
index 80dc4762cec..08947d52e9c 100644
--- a/superset-frontend/src/explore/components/Control.tsx
+++ b/superset-frontend/src/explore/components/Control.tsx
@@ -28,7 +28,7 @@ import {
   QueryFormData,
   usePrevious,
 } from '@superset-ui/core';
-import ErrorBoundary from 'src/components/ErrorBoundary';
+import { ErrorBoundary } from 'src/components';
 import { ExploreActions } from 'src/explore/actions/exploreActions';
 import controlMap from './controls';
 
@@ -60,7 +60,7 @@ export type ControlComponentProps<ValueType extends JsonValue = JsonValue> =
   Omit<ControlProps, 'value'> & BaseControlComponentProps<ValueType>;
 
 const StyledControl = styled.div`
-  padding-bottom: ${({ theme }) => theme.gridUnit * 4}px;
+  padding-bottom: ${({ theme }) => theme.sizeUnit * 4}px;
 `;
 
 export default function Control(props: ControlProps) {
diff --git a/superset-frontend/src/explore/components/ControlHeader.stories.tsx b/superset-frontend/src/explore/components/ControlHeader.stories.tsx
index 9b147f530a3..32144801527 100644
--- a/superset-frontend/src/explore/components/ControlHeader.stories.tsx
+++ b/superset-frontend/src/explore/components/ControlHeader.stories.tsx
@@ -19,7 +19,7 @@
 import ControlHeader, { ControlHeaderProps } from './ControlHeader';
 
 export default {
-  title: 'ControlHeader',
+  title: 'Components/ControlHeader',
   component: ControlHeader,
 };
 
diff --git a/superset-frontend/src/explore/components/ControlHeader.tsx b/superset-frontend/src/explore/components/ControlHeader.tsx
index 750019dc4e9..cdc5c135f13 100644
--- a/superset-frontend/src/explore/components/ControlHeader.tsx
+++ b/superset-frontend/src/explore/components/ControlHeader.tsx
@@ -16,12 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { FC, ReactNode, useMemo, useRef } from 'react';
+import { FC, ReactNode } from 'react';
 import { t, css, useTheme, SupersetTheme } from '@superset-ui/core';
-import { InfoTooltipWithTrigger } from '@superset-ui/chart-controls';
-import { Tooltip } from 'src/components/Tooltip';
-import { FormLabel } from 'src/components/Form';
-import { Icons } from 'src/components/Icons';
+import { FormLabel, InfoTooltip, Tooltip } from '@superset-ui/core/components';
+import { Icons } from '@superset-ui/core/components/Icons';
 
 type ValidationError = string;
 
@@ -64,23 +62,7 @@ const ControlHeader: FC<ControlHeaderProps> = ({
   warning,
   danger,
 }) => {
-  const { gridUnit, colors } = useTheme();
-  const hasHadNoErrors = useRef(false);
-  const labelColor = useMemo(() => {
-    if (!validationErrors.length) {
-      hasHadNoErrors.current = true;
-    }
-
-    if (hasHadNoErrors.current) {
-      if (validationErrors.length) {
-        return colors.error.base;
-      }
-
-      return 'unset';
-    }
-
-    return colors.warning.base;
-  }, [colors.error.base, colors.warning.base, validationErrors.length]);
+  const theme = useTheme();
 
   if (!label) {
     return null;
@@ -95,9 +77,9 @@ const ControlHeader: FC<ControlHeaderProps> = ({
       <span
         css={() => css`
           position: absolute;
-          top: 50%;
+          top: 60%;
           right: 0;
-          padding-left: ${gridUnit}px;
+          padding-left: ${theme.sizeUnit}px;
           transform: translate(100%, -50%);
           white-space: nowrap;
         `}
@@ -118,11 +100,11 @@ const ControlHeader: FC<ControlHeaderProps> = ({
         )}
         {renderTrigger && (
           <span>
-            <InfoTooltipWithTrigger
+            <InfoTooltip
               label={t('bolt')}
               tooltip={t('Changing this control takes effect instantly')}
               placement="top"
-              icon="bolt"
+              type="notice"
             />{' '}
           </span>
         )}
@@ -135,11 +117,12 @@ const ControlHeader: FC<ControlHeaderProps> = ({
       <div className="pull-left">
         <FormLabel
           css={(theme: SupersetTheme) => css`
-            margin-bottom: ${theme.gridUnit * 0.5}px;
+            margin-bottom: ${theme.sizeUnit * 0.5}px;
             position: relative;
+            font-size: ${theme.fontSizeSM}px;
           `}
         >
-          {leftNode && <span>{leftNode}</span>}
+          {leftNode && <span>{leftNode} </span>}
           <span
             role="button"
             tabIndex={0}
@@ -152,7 +135,7 @@ const ControlHeader: FC<ControlHeaderProps> = ({
             <span>
               <Tooltip id="error-tooltip" placement="top" title={warning}>
                 <Icons.WarningOutlined
-                  iconColor={colors.warning.base}
+                  iconColor={theme.colorWarning}
                   css={css`
                     vertical-align: baseline;
                   `}
@@ -164,8 +147,8 @@ const ControlHeader: FC<ControlHeaderProps> = ({
           {danger && (
             <span>
               <Tooltip id="error-tooltip" placement="top" title={danger}>
-                <Icons.ExclamationCircleOutlined
-                  iconColor={colors.error.base}
+                <Icons.CloseCircleOutlined
+                  iconColor={theme.colorErrorText}
                   iconSize="s"
                 />
               </Tooltip>{' '}
@@ -178,12 +161,7 @@ const ControlHeader: FC<ControlHeaderProps> = ({
                 placement="top"
                 title={validationErrors?.join(' ')}
               >
-                <Icons.ExclamationCircleOutlined
-                  css={css`
-                    ${iconStyles};
-                    color: ${labelColor};
-                  `}
-                />
+                <Icons.CloseCircleOutlined iconColor={theme.colorErrorText} />
               </Tooltip>{' '}
             </span>
           )}
diff --git a/superset-frontend/src/explore/components/ControlPanelsContainer.tsx b/superset-frontend/src/explore/components/ControlPanelsContainer.tsx
index 9f9937339ee..8435b957a6f 100644
--- a/superset-frontend/src/explore/components/ControlPanelsContainer.tsx
+++ b/superset-frontend/src/explore/components/ControlPanelsContainer.tsx
@@ -56,17 +56,19 @@ import { useSelector } from 'react-redux';
 import { rgba } from 'emotion-rgba';
 import { kebabCase, isEqual } from 'lodash';
 
-import Collapse from 'src/components/Collapse';
-import Tabs from 'src/components/Tabs';
-import { PluginContext } from 'src/components/DynamicPlugins';
-import Loading from 'src/components/Loading';
-import Modal from 'src/components/Modal';
+import {
+  Collapse,
+  Modal,
+  Loading,
+  Tooltip,
+} from '@superset-ui/core/components';
+import Tabs from '@superset-ui/core/components/Tabs';
+import { PluginContext } from 'src/components';
 
 import { getSectionsToRender } from 'src/explore/controlUtils';
 import { ExploreActions } from 'src/explore/actions/exploreActions';
 import { ChartState, ExplorePageState } from 'src/explore/types';
-import { Tooltip } from 'src/components/Tooltip';
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
 import ControlRow from './ControlRow';
 import Control from './Control';
 import { ExploreAlert } from './ExploreAlert';
@@ -77,6 +79,11 @@ import StashFormDataContainer from './StashFormDataContainer';
 
 const { confirm } = Modal;
 
+const TABS_KEYS = {
+  DATA: 'DATA',
+  CUSTOMIZE: 'CUSTOMIZE',
+};
+
 export type ControlPanelsContainerProps = {
   exploreState: ExplorePageState['explore'];
   actions: ExploreActions;
@@ -115,11 +122,11 @@ const actionButtonsContainerStyles = (theme: SupersetTheme) => css`
   bottom: 0;
   flex-direction: column;
   align-items: center;
-  padding: ${theme.gridUnit * 4}px;
+  padding: ${theme.sizeUnit * 4}px;
   z-index: 999;
   background: linear-gradient(
-    ${rgba(theme.colors.grayscale.light5, 0)},
-    ${theme.colors.grayscale.light5} ${theme.opacity.mediumLight}
+    ${rgba(theme.colorBgBase, 0)},
+    ${theme.colorBgBase} 35%
   );
 
   & > button {
@@ -139,9 +146,6 @@ const Styles = styled.div`
     height: 100%;
     overflow: visible;
   }
-  .nav-tabs {
-    flex: 0 0 1;
-  }
   .tab-content {
     overflow: auto;
     flex: 1 1 100%;
@@ -150,48 +154,14 @@ const Styles = styled.div`
     max-width: 100%;
   }
   .type-label {
-    margin-right: ${({ theme }) => theme.gridUnit * 3}px;
-    width: ${({ theme }) => theme.gridUnit * 7}px;
+    margin-right: ${({ theme }) => theme.sizeUnit * 3}px;
+    width: ${({ theme }) => theme.sizeUnit * 7}px;
     display: inline-block;
     text-align: center;
-    font-weight: ${({ theme }) => theme.typography.weights.bold};
+    font-weight: ${({ theme }) => theme.fontWeightStrong};
   }
 `;
 
-const ControlPanelsTabs = styled(Tabs)`
-  ${({ theme, fullWidth }) => css`
-    height: 100%;
-    overflow: visible;
-    .ant-tabs-nav {
-      margin-bottom: 0;
-    }
-    .ant-tabs-nav-list {
-      width: ${fullWidth ? '100%' : '50%'};
-    }
-    .ant-tabs-tabpane {
-      height: 100%;
-    }
-    .ant-tabs-content-holder {
-      padding-top: ${theme.gridUnit * 4}px;
-    }
-
-    .ant-collapse-ghost > .ant-collapse-item {
-      &:not(:last-child) {
-        border-bottom: 1px solid ${theme.colors.grayscale.light3};
-      }
-
-      & > .ant-collapse-header {
-        font-size: ${theme.typography.sizes.s}px;
-      }
-
-      & > .ant-collapse-content > .ant-collapse-content-box {
-        padding-bottom: 0;
-        font-size: ${theme.typography.sizes.s}px;
-      }
-    }
-  `}
-`;
-
 const isTimeSection = (section: ControlPanelSectionConfig): boolean =>
   !!section.label && sections.legacyTimeseriesTime.label === section.label;
 
@@ -269,7 +239,7 @@ function useResetOnChangeRef(initialValue: () => any, resetOnChangeValue: any) {
 }
 
 export const ControlPanelsContainer = (props: ControlPanelsContainerProps) => {
-  const { colors } = useTheme();
+  const theme = useTheme();
   const pluginContext = useContext(PluginContext);
 
   const prevState = usePrevious(props.exploreState);
@@ -586,17 +556,12 @@ export const ControlPanelsContainer = (props: ControlPanelsContainerProps) => {
       sectionHasHadNoErrors.current[sectionId] = true;
     }
 
-    const errorColor = sectionHasHadNoErrors.current[sectionId]
-      ? colors.error.base
-      : colors.warning.base;
-
     const PanelHeader = () => (
       <span data-test="collapsible-control-panel-header">
         <span
           css={(theme: SupersetTheme) => css`
-            font-size: ${theme.typography.sizes.m}px;
+            font-size: ${theme.fontSize}px;
             line-height: 1.3;
-            font-weight: ${theme.typography.weights.medium};
           `}
         >
           {label}
@@ -611,18 +576,13 @@ export const ControlPanelsContainer = (props: ControlPanelsContainerProps) => {
             id={`${kebabCase('validation-errors')}-tooltip`}
             title={t('This section contains validation errors')}
           >
-            <Icons.InfoCircleOutlined
-              css={css`
-                ${iconStyles};
-                color: ${errorColor};
-              `}
-            />
+            <Icons.CloseCircleOutlined iconColor={theme.colorErrorText} />
           </Tooltip>
         )}
       </span>
     );
 
-    return (
+    const PanelChildren = (
       <>
         <StashFormDataContainer
           key={`sectionId-${sectionId}`}
@@ -639,34 +599,7 @@ export const ControlPanelsContainer = (props: ControlPanelsContainerProps) => {
             .filter(Boolean)}
         />
         {isVisible && (
-          <Collapse.Panel
-            css={theme => css`
-              margin-bottom: 0;
-              box-shadow: none;
-
-              &:last-child {
-                padding-bottom: ${theme.gridUnit * 16}px;
-                border-bottom: 0;
-              }
-
-              .panel-body {
-                margin-left: ${theme.gridUnit * 4}px;
-                padding-bottom: 0;
-              }
-
-              span.label {
-                display: inline-block;
-              }
-              ${!section.label &&
-              `
-          .ant-collapse-header {
-            display: none;
-          }
-        `}
-            `}
-            header={<PanelHeader />}
-            key={sectionId}
-          >
+          <>
             {section.controlSetRows.map((controlSets, i) => {
               const renderedControls = controlSets
                 .map(controlItem => {
@@ -698,10 +631,18 @@ export const ControlPanelsContainer = (props: ControlPanelsContainerProps) => {
                 />
               );
             })}
-          </Collapse.Panel>
+          </>
         )}
       </>
     );
+
+    return {
+      key: String(section.label),
+      label: <PanelHeader />,
+      children: PanelChildren,
+      className: section.label ? '' : 'hidden-collapse-header',
+      style: { visibility: isVisible ? 'visible' : 'hidden' },
+    };
   };
 
   const hasControlsTransferred =
@@ -745,17 +686,13 @@ export const ControlPanelsContainer = (props: ControlPanelsContainerProps) => {
       dataTabHasHadNoErrors.current = true;
     }
 
-    const errorColor = dataTabHasHadNoErrors.current
-      ? colors.error.base
-      : colors.warning.base;
-
     return (
       <>
         <span>{t('Data')}</span>
         {props.errorMessage && (
           <span
             css={(theme: SupersetTheme) => css`
-              margin-left: ${theme.gridUnit * 2}px;
+              margin-left: ${theme.sizeUnit * 2}px;
             `}
           >
             {' '}
@@ -764,11 +701,9 @@ export const ControlPanelsContainer = (props: ControlPanelsContainerProps) => {
               placement="right"
               title={props.errorMessage}
             >
-              <Icons.ExclamationCircleOutlined
-                css={css`
-                  ${iconStyles};
-                  color: ${errorColor};
-                `}
+              <Icons.CloseCircleOutlined
+                iconColor={theme.colorErrorText}
+                iconSize="s"
               />
             </Tooltip>
           </span>
@@ -776,8 +711,8 @@ export const ControlPanelsContainer = (props: ControlPanelsContainerProps) => {
       </>
     );
   }, [
-    colors.error.base,
-    colors.warning.base,
+    theme.colorErrorText,
+    theme.colorWarningText,
     dataTabHasHadNoErrors,
     props.errorMessage,
   ]);
@@ -791,34 +726,48 @@ export const ControlPanelsContainer = (props: ControlPanelsContainerProps) => {
 
   return (
     <Styles ref={containerRef}>
-      <ControlPanelsTabs
+      <Tabs
         id="controlSections"
         data-test="control-tabs"
-        fullWidth={showCustomizeTab}
         allowOverflow={false}
-      >
-        <Tabs.TabPane key="query" tab={dataTabTitle}>
-          <Collapse
-            defaultActiveKey={expandedQuerySections}
-            expandIconPosition="right"
-            ghost
-          >
-            {showDatasourceAlert && <DatasourceAlert />}
-            {querySections.map(renderControlPanelSection)}
-          </Collapse>
-        </Tabs.TabPane>
-        {showCustomizeTab && (
-          <Tabs.TabPane key="display" tab={t('Customize')}>
-            <Collapse
-              defaultActiveKey={expandedCustomizeSections}
-              expandIconPosition="right"
-              ghost
-            >
-              {customizeSections.map(renderControlPanelSection)}
-            </Collapse>
-          </Tabs.TabPane>
-        )}
-      </ControlPanelsTabs>
+        items={[
+          {
+            key: TABS_KEYS.DATA,
+            label: dataTabTitle,
+            children: (
+              <>
+                {showDatasourceAlert && <DatasourceAlert />}
+                <Collapse
+                  defaultActiveKey={expandedQuerySections}
+                  expandIconPosition="end"
+                  ghost
+                  bordered
+                  items={[...querySections.map(renderControlPanelSection)]}
+                />
+              </>
+            ),
+          },
+          ...(showCustomizeTab
+            ? [
+                {
+                  key: TABS_KEYS.CUSTOMIZE,
+                  label: t('Customize'),
+                  children: (
+                    <Collapse
+                      defaultActiveKey={expandedCustomizeSections}
+                      expandIconPosition="end"
+                      ghost
+                      bordered
+                      items={[
+                        ...customizeSections.map(renderControlPanelSection),
+                      ]}
+                    />
+                  ),
+                },
+              ]
+            : []),
+        ]}
+      />
       <div css={actionButtonsContainerStyles}>
         <RunQueryButton
           onQuery={props.onQuery}
diff --git a/superset-frontend/src/explore/components/DataTableControl/index.tsx b/superset-frontend/src/explore/components/DataTableControl/index.tsx
index d95876213f1..dcaef57be44 100644
--- a/superset-frontend/src/explore/components/DataTableControl/index.tsx
+++ b/superset-frontend/src/explore/components/DataTableControl/index.tsx
@@ -29,19 +29,16 @@ import {
 } from '@superset-ui/core';
 import { Column } from 'react-table';
 import { debounce } from 'lodash';
-import { Input } from 'src/components/Input';
 import {
-  BOOL_FALSE_DISPLAY,
-  BOOL_TRUE_DISPLAY,
-  NULL_DISPLAY,
-  SLOW_DEBOUNCE,
-} from 'src/constants';
-import { Radio } from 'src/components/Radio';
-import { Icons } from 'src/components/Icons';
-import Button from 'src/components/Button';
-import Popover from 'src/components/Popover';
+  Constants,
+  Button,
+  Icons,
+  Input,
+  Popover,
+  Radio,
+} from '@superset-ui/core/components';
+import { CopyToClipboard } from 'src/components';
 import { prepareCopyToClipboardTabularData } from 'src/utils/common';
-import CopyToClipboard from 'src/components/CopyToClipboard';
 import { getTimeColumns, setTimeColumns } from './utils';
 
 export const CellNull = styled('span')`
@@ -49,15 +46,15 @@ export const CellNull = styled('span')`
 `;
 
 export const CopyButton = styled(Button)`
-  font-size: ${({ theme }) => theme.typography.sizes.s}px;
+  font-size: ${({ theme }) => theme.fontSizeSM}px;
 
   // needed to override button's first-of-type margin: 0
   && {
-    margin: 0 ${({ theme }) => theme.gridUnit * 2}px;
+    margin: 0 ${({ theme }) => theme.sizeUnit * 2}px;
   }
 
   i {
-    padding: 0 ${({ theme }) => theme.gridUnit}px;
+    padding: 0 ${({ theme }) => theme.sizeUnit}px;
   }
 `;
 
@@ -105,7 +102,10 @@ export const FilterInput = ({
   }, []);
 
   const theme = useTheme();
-  const debouncedChangeHandler = debounce(onChangeHandler, SLOW_DEBOUNCE);
+  const debouncedChangeHandler = debounce(
+    onChangeHandler,
+    Constants.SLOW_DEBOUNCE,
+  );
   return (
     <Input
       prefix={<Icons.SearchOutlined iconSize="l" />}
@@ -116,7 +116,7 @@ export const FilterInput = ({
       }}
       css={css`
         width: 200px;
-        margin-right: ${theme.gridUnit * 2}px;
+        margin-right: ${theme.sizeUnit * 2}px;
       `}
       ref={inputRef}
     />
@@ -156,13 +156,13 @@ const FormatPickerContainer = styled.div`
   display: flex;
   flex-direction: column;
 
-  padding: ${({ theme }) => `${theme.gridUnit * 4}px`};
+  padding: ${({ theme }) => `${theme.sizeUnit * 4}px`};
 `;
 
 const FormatPickerLabel = styled.span`
-  font-size: ${({ theme }) => theme.typography.sizes.s}px;
+  font-size: ${({ theme }) => theme.fontSizeSM}px;
   color: ${({ theme }) => theme.colors.grayscale.base};
-  margin-bottom: ${({ theme }) => theme.gridUnit * 2}px;
+  margin-bottom: ${({ theme }) => theme.sizeUnit * 2}px;
 `;
 
 const DataTableTemporalHeaderCell = ({
@@ -188,7 +188,9 @@ const DataTableTemporalHeaderCell = ({
   const overlayContent = useMemo(
     () =>
       datasourceId ? ( // eslint-disable-next-line jsx-a11y/no-static-element-interactions
-        <FormatPickerContainer onClick={e => e.stopPropagation()}>
+        <FormatPickerContainer
+          onClick={(e: React.MouseEvent<HTMLElement>) => e.stopPropagation()}
+        >
           {/* hack to disable click propagation from popover content to table header, which triggers sorting column */}
           <FormatPickerLabel>{t('Column Formatting')}</FormatPickerLabel>
           <FormatPicker
@@ -215,8 +217,8 @@ const DataTableTemporalHeaderCell = ({
         <Icons.SettingOutlined
           iconSize="m"
           iconColor={theme.colors.grayscale.light1}
-          css={{ marginRight: `${theme.gridUnit}px` }}
-          onClick={e => e.stopPropagation()}
+          css={{ marginRight: `${theme.sizeUnit}px` }}
+          onClick={(e: React.MouseEvent<HTMLElement>) => e.stopPropagation()}
         />
       </Popover>
       {columnName}
@@ -330,13 +332,13 @@ export const useTableColumns = (
                   ),
                 Cell: ({ value }) => {
                   if (value === true) {
-                    return BOOL_TRUE_DISPLAY;
+                    return Constants.BOOL_TRUE_DISPLAY;
                   }
                   if (value === false) {
-                    return BOOL_FALSE_DISPLAY;
+                    return Constants.BOOL_FALSE_DISPLAY;
                   }
                   if (value === null) {
-                    return <CellNull>{NULL_DISPLAY}</CellNull>;
+                    return <CellNull>{Constants.NULL_DISPLAY}</CellNull>;
                   }
                   if (
                     colType === GenericDataType.Temporal &&
diff --git a/superset-frontend/src/explore/components/DataTableControl/useTableColumns.test.ts b/superset-frontend/src/explore/components/DataTableControl/useTableColumns.test.ts
index e0728483342..d52524da125 100644
--- a/superset-frontend/src/explore/components/DataTableControl/useTableColumns.test.ts
+++ b/superset-frontend/src/explore/components/DataTableControl/useTableColumns.test.ts
@@ -18,7 +18,7 @@
  */
 import { GenericDataType } from '@superset-ui/core';
 import { renderHook } from '@testing-library/react-hooks';
-import { BOOL_FALSE_DISPLAY, BOOL_TRUE_DISPLAY } from 'src/constants';
+import { Constants } from '@superset-ui/core/components';
 import { useTableColumns } from '.';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -65,8 +65,8 @@ const cellValues = {
 const data = [cellValues, cellValues, cellValues, cellValues];
 
 const expectedDisplayValues = {
-  col01: BOOL_TRUE_DISPLAY,
-  col02: BOOL_FALSE_DISPLAY,
+  col01: Constants.BOOL_TRUE_DISPLAY,
+  col02: Constants.BOOL_FALSE_DISPLAY,
   [ASCII_KEY]: ASCII_KEY,
   [UNICODE_KEY]: UNICODE_KEY,
   [NUMTIME_KEY]: NUMTIME_FORMATTED_VALUE,
@@ -75,51 +75,50 @@ const expectedDisplayValues = {
 
 test('useTableColumns with no options', () => {
   const hook = renderHook(() => useTableColumns(colnames, coltypes, data));
-  expect(hook.result.current).toEqual([
-    {
-      Cell: expect.any(Function),
-      Header: 'col01',
-      accessor: expect.any(Function),
-      id: 'col01',
-    },
-    {
-      Cell: expect.any(Function),
-      Header: 'col02',
-      accessor: expect.any(Function),
-      id: 'col02',
-    },
-    {
-      Cell: expect.any(Function),
-      Header: ASCII_KEY,
-      accessor: expect.any(Function),
-      id: ASCII_KEY,
-    },
-    {
-      Cell: expect.any(Function),
-      Header: UNICODE_KEY,
-      accessor: expect.any(Function),
-      id: UNICODE_KEY,
-    },
-    {
-      Cell: expect.any(Function),
-      Header: expect.objectContaining({
-        type: expect.objectContaining({
-          name: 'DataTableTemporalHeaderCell',
-        }),
-        props: expect.objectContaining({
-          onTimeColumnChange: expect.any(Function),
-        }),
-      }),
-      accessor: expect.any(Function),
-      id: NUMTIME_KEY,
-    },
-    {
-      Cell: expect.any(Function),
-      Header: STRTIME_KEY,
-      accessor: expect.any(Function),
-      id: STRTIME_KEY,
-    },
-  ]);
+  expect(hook.result.current).toMatchInlineSnapshot(`
+    [
+      {
+        "Cell": [Function],
+        "Header": "col01",
+        "accessor": [Function],
+        "id": "col01",
+      },
+      {
+        "Cell": [Function],
+        "Header": "col02",
+        "accessor": [Function],
+        "id": "col02",
+      },
+      {
+        "Cell": [Function],
+        "Header": " !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_\`abcdefghijklmnopqrstuvwxyz{|}~",
+        "accessor": [Function],
+        "id": " !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_\`abcdefghijklmnopqrstuvwxyz{|}~",
+      },
+      {
+        "Cell": [Function],
+        "Header": "你好. 吃了吗?",
+        "accessor": [Function],
+        "id": "你好. 吃了吗?",
+      },
+      {
+        "Cell": [Function],
+        "Header": <DataTableTemporalHeaderCell
+          columnName="numtime"
+          isOriginalTimeColumn={false}
+          onTimeColumnChange={[Function]}
+        />,
+        "accessor": [Function],
+        "id": "numtime",
+      },
+      {
+        "Cell": [Function],
+        "Header": "strtime",
+        "accessor": [Function],
+        "id": "strtime",
+      },
+    ]
+  `);
   hook.result.current.forEach((col: JsonObject) => {
     expect(col.accessor(data[0])).toBe(data[0][col.id]);
   });
@@ -139,51 +138,50 @@ test('useTableColumns with options', () => {
       col01: { Header: 'Header' },
     }),
   );
-  expect(hook.result.current).toEqual([
-    {
-      Cell: expect.any(Function),
-      Header: 'Header',
-      accessor: expect.any(Function),
-      id: 'col01',
-    },
-    {
-      Cell: expect.any(Function),
-      Header: 'col02',
-      accessor: expect.any(Function),
-      id: 'col02',
-    },
-    {
-      Cell: expect.any(Function),
-      Header: ASCII_KEY,
-      accessor: expect.any(Function),
-      id: ASCII_KEY,
-    },
-    {
-      Cell: expect.any(Function),
-      Header: UNICODE_KEY,
-      accessor: expect.any(Function),
-      id: UNICODE_KEY,
-    },
-    {
-      Cell: expect.any(Function),
-      Header: expect.objectContaining({
-        type: expect.objectContaining({
-          name: 'DataTableTemporalHeaderCell',
-        }),
-        props: expect.objectContaining({
-          onTimeColumnChange: expect.any(Function),
-        }),
-      }),
-      accessor: expect.any(Function),
-      id: NUMTIME_KEY,
-    },
-    {
-      Cell: expect.any(Function),
-      Header: STRTIME_KEY,
-      accessor: expect.any(Function),
-      id: STRTIME_KEY,
-    },
-  ]);
+  expect(hook.result.current).toMatchInlineSnapshot(`
+    [
+      {
+        "Cell": [Function],
+        "Header": "Header",
+        "accessor": [Function],
+        "id": "col01",
+      },
+      {
+        "Cell": [Function],
+        "Header": "col02",
+        "accessor": [Function],
+        "id": "col02",
+      },
+      {
+        "Cell": [Function],
+        "Header": " !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_\`abcdefghijklmnopqrstuvwxyz{|}~",
+        "accessor": [Function],
+        "id": " !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_\`abcdefghijklmnopqrstuvwxyz{|}~",
+      },
+      {
+        "Cell": [Function],
+        "Header": "你好. 吃了吗?",
+        "accessor": [Function],
+        "id": "你好. 吃了吗?",
+      },
+      {
+        "Cell": [Function],
+        "Header": <DataTableTemporalHeaderCell
+          columnName="numtime"
+          isOriginalTimeColumn={false}
+          onTimeColumnChange={[Function]}
+        />,
+        "accessor": [Function],
+        "id": "numtime",
+      },
+      {
+        "Cell": [Function],
+        "Header": "strtime",
+        "accessor": [Function],
+        "id": "strtime",
+      },
+    ]
+  `);
   hook.result.current.forEach((col: JsonObject) => {
     expect(col.accessor(data[0])).toBe(data[0][col.id]);
   });
diff --git a/superset-frontend/src/explore/components/DataTablesPane/DataTablesPane.tsx b/superset-frontend/src/explore/components/DataTablesPane/DataTablesPane.tsx
index 051caa405cd..9de1c6c859a 100644
--- a/superset-frontend/src/explore/components/DataTablesPane/DataTablesPane.tsx
+++ b/superset-frontend/src/explore/components/DataTablesPane/DataTablesPane.tsx
@@ -11,8 +11,8 @@
  *
  * 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
+ * "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.
  */
@@ -24,8 +24,8 @@ import {
   t,
   useTheme,
 } from '@superset-ui/core';
-import { Icons } from 'src/components/Icons';
-import Tabs from 'src/components/Tabs';
+import { Icons } from '@superset-ui/core/components/Icons';
+import Tabs from '@superset-ui/core/components/Tabs';
 import {
   getItem,
   setItem,
@@ -38,10 +38,18 @@ import {
 } from './components';
 import { DataTablesPaneProps, ResultTypes } from './types';
 
+const StyledDiv = styled.div`
+  ${() => `
+    display: flex;
+    height: 100%;
+    flex-direction: column;
+    `}
+`;
+
 const SouthPane = styled.div`
   ${({ theme }) => `
     position: relative;
-    background-color: ${theme.colors.grayscale.light5};
+    background-color: ${theme.colorBgContainer};
     z-index: 5;
     overflow: hidden;
 
@@ -58,21 +66,19 @@ const SouthPane = styled.div`
     }
 
     .ant-tabs-tabpane {
-      display: flex;
-      flex-direction: column;
       height: 100%;
+      position: relative;
 
       .table-condensed {
         height: 100%;
         overflow: auto;
-        margin-bottom: ${theme.gridUnit * 4}px;
+        margin-bottom: ${theme.sizeUnit * 4}px;
 
         .table {
-          margin-bottom: ${theme.gridUnit * 2}px;
+          margin-bottom: ${theme.sizeUnit * 2}px;
         }
       }
-
-      .pagination-container > ul[role='navigation'] {
+     .pagination-container > ul[role='navigation'] {
         margin-top: 0;
       }
     }
@@ -158,12 +164,9 @@ export const DataTablesPane = ({
 
   const CollapseButton = useMemo(() => {
     const caretIcon = panelOpen ? (
-      <Icons.CaretUpOutlined
-        iconSize="l"
-        aria-label={t('Collapse data panel')}
-      />
+      <Icons.UpOutlined aria-label={t('Collapse data panel')} />
     ) : (
-      <Icons.DownOutlined iconSize="l" aria-label={t('Expand data panel')} />
+      <Icons.DownOutlined aria-label={t('Expand data panel')} />
     );
     return (
       <TableControlsWrapper>
@@ -197,37 +200,19 @@ export const DataTablesPane = ({
     actions,
     isVisible: ResultTypes.Results === activeTabKey,
     canDownload,
-  }).map((pane, idx) => {
-    if (idx === 0) {
-      return (
-        <Tabs.TabPane tab={t('Results')} key={ResultTypes.Results}>
-          {pane}
-        </Tabs.TabPane>
-      );
-    }
-    if (idx > 0) {
-      return (
-        <Tabs.TabPane
-          tab={t('Results %s', idx + 1)}
-          key={`${ResultTypes.Results} ${idx + 1}`}
-        >
-          {pane}
-        </Tabs.TabPane>
-      );
-    }
-    return null;
-  });
+  }).map((pane, idx) => ({
+    key: idx === 0 ? ResultTypes.Results : `${ResultTypes.Results} ${idx + 1}`,
+    label: idx === 0 ? t('Results') : t('Results %s', idx + 1),
+    children: pane,
+  }));
 
-  return (
-    <SouthPane data-test="some-purposeful-instance">
-      <Tabs
-        fullWidth={false}
-        tabBarExtraContent={CollapseButton}
-        activeKey={panelOpen ? activeTabKey : ''}
-        onTabClick={handleTabClick}
-      >
-        {queryResultsPanes}
-        <Tabs.TabPane tab={t('Samples')} key={ResultTypes.Samples}>
+  const tabItems = [
+    ...queryResultsPanes,
+    {
+      key: ResultTypes.Samples,
+      label: t('Samples'),
+      children: (
+        <StyledDiv>
           <SamplesPane
             datasource={datasource}
             queryForce={queryForce}
@@ -236,8 +221,19 @@ export const DataTablesPane = ({
             isVisible={ResultTypes.Samples === activeTabKey}
             canDownload={canDownload}
           />
-        </Tabs.TabPane>
-      </Tabs>
+        </StyledDiv>
+      ),
+    },
+  ];
+
+  return (
+    <SouthPane data-test="some-purposeful-instance">
+      <Tabs
+        tabBarExtraContent={CollapseButton}
+        activeKey={panelOpen ? activeTabKey : ''}
+        onTabClick={handleTabClick}
+        items={tabItems}
+      />
     </SouthPane>
   );
 };
diff --git a/superset-frontend/src/explore/components/DataTablesPane/components/DataTableControls.tsx b/superset-frontend/src/explore/components/DataTablesPane/components/DataTableControls.tsx
index 30dfb87c74a..d709322be02 100644
--- a/superset-frontend/src/explore/components/DataTablesPane/components/DataTableControls.tsx
+++ b/superset-frontend/src/explore/components/DataTablesPane/components/DataTableControls.tsx
@@ -16,24 +16,24 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import { styled, css, GenericDataType } from '@superset-ui/core';
 import { useMemo } from 'react';
 import { zip } from 'lodash';
-import { css, GenericDataType, styled } from '@superset-ui/core';
 import {
   CopyToClipboardButton,
   FilterInput,
 } from 'src/explore/components/DataTableControl';
 import { applyFormattingToTabularData } from 'src/utils/common';
 import { getTimeColumns } from 'src/explore/components/DataTableControl/utils';
-import RowCountLabel from 'src/explore/components/RowCountLabel';
+import RowCountLabel from 'src/components/RowCountLabel';
 import { TableControlsProps } from '../types';
 
 export const TableControlsWrapper = styled.div`
   ${({ theme }) => `
     display: flex;
     align-items: center;
+    padding-bottom: ${theme.sizeUnit * 2}px;
     justify-content: space-between;
-    margin-bottom: ${theme.gridUnit * 2}px;
 
     span {
       flex-shrink: 0;
diff --git a/superset-frontend/src/explore/components/DataTablesPane/components/ResultsPaneOnDashboard.tsx b/superset-frontend/src/explore/components/DataTablesPane/components/ResultsPaneOnDashboard.tsx
index b6691f87afb..434b1df6a41 100644
--- a/superset-frontend/src/explore/components/DataTablesPane/components/ResultsPaneOnDashboard.tsx
+++ b/superset-frontend/src/explore/components/DataTablesPane/components/ResultsPaneOnDashboard.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { t, styled } from '@superset-ui/core';
-import Tabs from 'src/components/Tabs';
+import Tabs from '@superset-ui/core/components/Tabs';
 import { ResultTypes, ResultsPaneProps } from '../types';
 import { useResultsPane } from './useResultsPane';
 
@@ -71,28 +71,15 @@ export const ResultsPaneOnDashboard = ({
     return <Wrapper>{resultsPanes[0]}</Wrapper>;
   }
 
-  const panes = resultsPanes.map((pane, idx) => {
-    if (idx === 0) {
-      return (
-        <Tabs.TabPane tab={t('Results')} key={ResultTypes.Results}>
-          {pane}
-        </Tabs.TabPane>
-      );
-    }
-
-    return (
-      <Tabs.TabPane
-        tab={t('Results %s', idx + 1)}
-        key={`${ResultTypes.Results} ${idx + 1}`}
-      >
-        {pane}
-      </Tabs.TabPane>
-    );
-  });
+  const items = resultsPanes.map((pane, idx) => ({
+    key: idx === 0 ? ResultTypes.Results : `${ResultTypes.Results} ${idx + 1}`,
+    label: idx === 0 ? t('Results') : t('Results %s', idx + 1),
+    children: pane,
+  }));
 
   return (
     <Wrapper>
-      <Tabs fullWidth={false}>{panes}</Tabs>
+      <Tabs items={items} />
     </Wrapper>
   );
 };
diff --git a/superset-frontend/src/explore/components/DataTablesPane/components/SamplesPane.tsx b/superset-frontend/src/explore/components/DataTablesPane/components/SamplesPane.tsx
index 4e83fa63a55..3bd0fce3c38 100644
--- a/superset-frontend/src/explore/components/DataTablesPane/components/SamplesPane.tsx
+++ b/superset-frontend/src/explore/components/DataTablesPane/components/SamplesPane.tsx
@@ -18,9 +18,13 @@
  */
 import { useState, useEffect, useMemo } from 'react';
 import { ensureIsArray, GenericDataType, styled, t } from '@superset-ui/core';
-import Loading from 'src/components/Loading';
-import { EmptyState } from 'src/components/EmptyState';
-import TableView, { EmptyWrapperType } from 'src/components/TableView';
+import {
+  TableView,
+  TableSize,
+  EmptyState,
+  Loading,
+  EmptyWrapperType,
+} from '@superset-ui/core/components';
 import {
   useFilteredTableData,
   useTableColumns,
@@ -30,7 +34,7 @@ import { TableControls } from './DataTableControls';
 import { SamplesPaneProps } from '../types';
 
 const Error = styled.pre`
-  margin-top: ${({ theme }) => `${theme.gridUnit * 4}px`};
+  margin-top: ${({ theme }) => `${theme.sizeUnit * 4}px`};
 `;
 
 const cache = new WeakSet();
@@ -148,6 +152,7 @@ export const SamplesPane = ({
         className="table-condensed"
         isPaginationSticky
         showRowCount={false}
+        size={TableSize.Small}
         small
       />
     </>
diff --git a/superset-frontend/src/explore/components/DataTablesPane/components/SingleQueryResultPane.tsx b/superset-frontend/src/explore/components/DataTablesPane/components/SingleQueryResultPane.tsx
index 9a3dd4eded9..55da157295f 100644
--- a/superset-frontend/src/explore/components/DataTablesPane/components/SingleQueryResultPane.tsx
+++ b/superset-frontend/src/explore/components/DataTablesPane/components/SingleQueryResultPane.tsx
@@ -18,7 +18,11 @@
  */
 import { useState } from 'react';
 import { t } from '@superset-ui/core';
-import TableView, { EmptyWrapperType } from 'src/components/TableView';
+import {
+  TableView,
+  TableSize,
+  EmptyWrapperType,
+} from '@superset-ui/core/components';
 import {
   useFilteredTableData,
   useTableColumns,
@@ -65,6 +69,7 @@ export const SingleQueryResultPane = ({
       />
       <TableView
         columns={columns}
+        size={TableSize.Small}
         data={filteredData}
         pageSize={dataSize}
         noDataText={t('No results')}
diff --git a/superset-frontend/src/explore/components/DataTablesPane/components/useResultsPane.tsx b/superset-frontend/src/explore/components/DataTablesPane/components/useResultsPane.tsx
index 969a9ef12d8..7d9577c74ae 100644
--- a/superset-frontend/src/explore/components/DataTablesPane/components/useResultsPane.tsx
+++ b/superset-frontend/src/explore/components/DataTablesPane/components/useResultsPane.tsx
@@ -25,15 +25,14 @@ import {
   getChartMetadataRegistry,
   getClientErrorObject,
 } from '@superset-ui/core';
-import Loading from 'src/components/Loading';
-import { EmptyState } from 'src/components/EmptyState';
+import { EmptyState, Loading } from '@superset-ui/core/components';
 import { getChartDataRequest } from 'src/components/Chart/chartAction';
 import { ResultsPaneProps, QueryResultInterface } from '../types';
 import { SingleQueryResultPane } from './SingleQueryResultPane';
 import { TableControls } from './DataTableControls';
 
 const Error = styled.pre`
-  margin-top: ${({ theme }) => `${theme.gridUnit * 4}px`};
+  margin-top: ${({ theme }) => `${theme.sizeUnit * 4}px`};
 `;
 
 const cache = new WeakMap();
@@ -111,7 +110,7 @@ export const useResultsPane = ({
   if (errorMessage) {
     const title = t('Run a query to display results');
     return Array(queryCount).fill(
-      <EmptyState image="document.svg" title={title} />,
+      <EmptyState image="document.svg" title={title} size="small" />,
     );
   }
 
@@ -137,7 +136,7 @@ export const useResultsPane = ({
   if (resultResp.length === 0) {
     const title = t('No results were returned for this query');
     return Array(queryCount).fill(
-      <EmptyState image="document.svg" title={title} />,
+      <EmptyState image="document.svg" title={title} size="small" />,
     );
   }
   const resultRespToDisplay = isQueryCountDynamic
diff --git a/superset-frontend/src/explore/components/DataTablesPane/test/ResultsPaneOnDashboard.test.tsx b/superset-frontend/src/explore/components/DataTablesPane/test/ResultsPaneOnDashboard.test.tsx
index 46de4787217..8e4f51cde48 100644
--- a/superset-frontend/src/explore/components/DataTablesPane/test/ResultsPaneOnDashboard.test.tsx
+++ b/superset-frontend/src/explore/components/DataTablesPane/test/ResultsPaneOnDashboard.test.tsx
@@ -18,6 +18,7 @@
  */
 import fetchMock from 'fetch-mock';
 import {
+  screen,
   render,
   userEvent,
   waitForElementToBeRemoved,
@@ -122,7 +123,7 @@ describe('ResultsPaneOnDashboard', () => {
       useRedux: true,
     });
     expect(await findByText('0 rows')).toBeVisible();
-    expect(await findByText('Bad Request')).toBeVisible();
+    expect(await findByText('Bad request')).toBeVisible();
   });
 
   test('force query, render and search', async () => {
@@ -168,11 +169,20 @@ describe('ResultsPaneOnDashboard', () => {
       sliceId: 196,
       vizType: VizType.MixedTimeseries,
     });
-    const { findByText } = render(<ResultsPaneOnDashboard {...props} />, {
+
+    render(<ResultsPaneOnDashboard {...props} />, {
       useRedux: true,
     });
-    expect(await findByText('Results')).toBeVisible();
-    expect(await findByText('Results 2')).toBeVisible();
+
+    await waitForElementToBeRemoved(() =>
+      screen.queryByRole('status', { name: 'Loading' }),
+    );
+
+    const tab1 = document.querySelector('[data-node-key="results"]');
+    const tab2 = document.querySelector('[data-node-key="results 2"]');
+
+    expect(tab1).toBeVisible();
+    expect(tab2).toBeVisible();
   });
 
   test('dynamic number of results pane', async () => {
@@ -193,14 +203,21 @@ describe('ResultsPaneOnDashboard', () => {
       sliceId: 196,
       vizType: VizType.MixedTimeseries,
     });
-    const { findByText, queryByText } = render(
-      <ResultsPaneOnDashboard {...props} />,
-      {
-        useRedux: true,
-      },
+
+    render(<ResultsPaneOnDashboard {...props} />, {
+      useRedux: true,
+    });
+
+    await waitForElementToBeRemoved(() =>
+      screen.queryByRole('status', { name: 'Loading' }),
     );
-    expect(await findByText('Results')).toBeVisible();
-    expect(await findByText('Results 2')).toBeVisible();
-    expect(queryByText('Results 3')).not.toBeInTheDocument();
+
+    const tab1 = document.querySelector('[data-node-key="results"]');
+    const tab2 = document.querySelector('[data-node-key="results 2"]');
+    const tab3 = document.querySelector('[data-node-key="results 3"]');
+
+    expect(tab1).toBeVisible();
+    expect(tab2).toBeVisible();
+    expect(tab3).toBeNull();
   });
 });
diff --git a/superset-frontend/src/explore/components/DataTablesPane/test/SamplesPane.test.tsx b/superset-frontend/src/explore/components/DataTablesPane/test/SamplesPane.test.tsx
index 65cfb54f631..de19b718ebf 100644
--- a/superset-frontend/src/explore/components/DataTablesPane/test/SamplesPane.test.tsx
+++ b/superset-frontend/src/explore/components/DataTablesPane/test/SamplesPane.test.tsx
@@ -86,7 +86,7 @@ describe('SamplesPane', () => {
       useRedux: true,
     });
 
-    expect(await findByText('Error: Bad Request')).toBeVisible();
+    expect(await findByText('Error: Bad request')).toBeVisible();
   });
 
   test('force query, render and search', async () => {
diff --git a/superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanelDragOption/index.tsx b/superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanelDragOption/index.tsx
index aaafd6fa55d..533b6c4bb1e 100644
--- a/superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanelDragOption/index.tsx
+++ b/superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanelDragOption/index.tsx
@@ -25,7 +25,7 @@ import {
   StyledColumnOption,
   StyledMetricOption,
 } from 'src/explore/components/optionRenderers';
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
 
 import { DatasourcePanelDndItem } from '../types';
 
@@ -35,17 +35,22 @@ const DatasourceItemContainer = styled.div`
     align-items: center;
     justify-content: space-between;
     width: 100%;
-    height: ${theme.gridUnit * 6}px;
-    padding: 0 ${theme.gridUnit}px;
+    height: ${theme.sizeUnit * 6}px;
+    padding: 0 ${theme.sizeUnit}px;
 
     // hack to make the drag preview image corners rounded
     transform: translate(0, 0);
-    background-color: inherit;
+    color: ${theme.colorText};
+    background-color: ${theme.colorBgLayout};
     border-radius: 4px;
 
+    &:hover {
+      background-color: ${theme.colorPrimaryBgHover};
+    }
+
     > div {
       min-width: 0;
-      margin-right: ${theme.gridUnit * 2}px;
+      margin-right: ${theme.sizeUnit * 2}px;
     }
   `}
 `;
diff --git a/superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanelItem.tsx b/superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanelItem.tsx
index 7f7830acc05..115f5b729c4 100644
--- a/superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanelItem.tsx
+++ b/superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanelItem.tsx
@@ -26,22 +26,22 @@ import {
   useTheme,
 } from '@superset-ui/core';
 
-import { Icons } from 'src/components/Icons';
-import { Tooltip } from 'src/components/Tooltip';
+import { Icons } from '@superset-ui/core/components/Icons';
+import { Tooltip } from '@superset-ui/core/components/Tooltip';
 import DatasourcePanelDragOption from './DatasourcePanelDragOption';
 import { DndItemType } from '../DndItemType';
 import { DndItemValue, FlattenedItem, Folder } from './types';
 
 const LabelWrapper = styled.div`
   ${({ theme }) => css`
-    color: ${theme.colors.grayscale.dark1};
+    color: ${theme.colorText};
     overflow: hidden;
     text-overflow: ellipsis;
-    font-size: ${theme.typography.sizes.s}px;
-    background-color: ${theme.colors.grayscale.light4};
-    margin: ${theme.gridUnit * 2}px 0;
+    font-size: ${theme.fontSizeSM}px;
+    background-color: ${theme.colorBgTextActive};
+    margin: ${theme.sizeUnit * 2}px 0;
     border-radius: ${theme.borderRadius}px;
-    padding: 0 ${theme.gridUnit}px;
+    padding: 0 ${theme.sizeUnit}px;
 
     &:first-of-type {
       margin-top: 0;
@@ -51,9 +51,12 @@ const LabelWrapper = styled.div`
     }
 
     padding: 0;
-    cursor: pointer;
+    cursor: grab;
+    &:active {
+      cursor: grabbing;
+    }
     &:hover {
-      background-color: ${theme.colors.grayscale.light3};
+      background-color: ${theme.colorBgTextHover};
     }
 
     & > span {
@@ -66,7 +69,7 @@ const LabelWrapper = styled.div`
 
     .metric-option {
       & > svg {
-        min-width: ${theme.gridUnit * 4}px;
+        min-width: ${theme.sizeUnit * 4}px;
       }
       & > .option-label {
         overflow: hidden;
@@ -93,9 +96,8 @@ const SectionHeaderTextContainer = styled.div`
 
 const SectionHeader = styled.span`
   ${({ theme }) => css`
-    color: ${theme.colors.grayscale.dark1};
-    font-size: ${theme.typography.sizes.m}px;
-    font-weight: ${theme.typography.weights.medium};
+    font-size: ${theme.fontSize}px;
+    font-weight: ${theme.fontWeightStrong};
     line-height: 1.3;
     text-align: left;
     display: -webkit-box;
@@ -109,7 +111,7 @@ const SectionHeader = styled.span`
 const Divider = styled.div`
   ${({ theme }) => css`
     height: 16px;
-    border-bottom: 1px solid ${theme.colors.grayscale.light3};
+    border-bottom: 1px solid ${theme.colorSplit};
   `}
 `;
 
@@ -162,7 +164,7 @@ const DatasourcePanelItem = ({
               css={
                 tooltipNode &&
                 css`
-                  margin-top: ${theme.gridUnit}px;
+                  margin-top: ${theme.sizeUnit}px;
                 `
               }
             >
@@ -181,14 +183,14 @@ const DatasourcePanelItem = ({
   const folder = folderMap.get(item.folderId);
   if (!folder) return null;
 
-  const indentation = item.depth * theme.gridUnit * 4;
+  const indentation = item.depth * theme.sizeUnit * 4;
 
   return (
     <div
       style={{
         ...style,
-        paddingLeft: theme.gridUnit * 4 + indentation,
-        paddingRight: theme.gridUnit * 4,
+        paddingLeft: theme.sizeUnit * 4 + indentation,
+        paddingRight: theme.sizeUnit * 4,
       }}
     >
       {item.type === 'header' && (
@@ -210,7 +212,7 @@ const DatasourcePanelItem = ({
         <div
           css={css`
             display: flex;
-            gap: ${theme.gridUnit * 2}px;
+            gap: ${theme.sizeUnit * 2}px;
             justify-content: space-between;
             align-items: baseline;
           `}
diff --git a/superset-frontend/src/explore/components/DatasourcePanel/index.tsx b/superset-frontend/src/explore/components/DatasourcePanel/index.tsx
index e1bb482a5e4..d5a4841b336 100644
--- a/superset-frontend/src/explore/components/DatasourcePanel/index.tsx
+++ b/superset-frontend/src/explore/components/DatasourcePanel/index.tsx
@@ -24,17 +24,16 @@ import {
   QueryFormData,
   styled,
   t,
+  useTheme,
 } from '@superset-ui/core';
 
 import { ControlConfig } from '@superset-ui/chart-controls';
 import AutoSizer from 'react-virtualized-auto-sizer';
 
 import { matchSorter, rankings } from 'match-sorter';
-import Alert from 'src/components/Alert';
+import { Alert, Constants, Input } from '@superset-ui/core/components';
 import { SaveDatasetModal } from 'src/SqlLab/components/SaveDatasetModal';
 import { getDatasourceAsSaveableDataset } from 'src/utils/datasourceUtils';
-import { Input } from 'src/components/Input';
-import { FAST_DEBOUNCE } from 'src/constants';
 import { ExploreActions } from 'src/explore/actions/exploreActions';
 import Control from 'src/explore/components/Control';
 import { useDebounceValue } from 'src/hooks/useDebounceValue';
@@ -75,33 +74,29 @@ export interface Props {
 
 const DatasourceContainer = styled.div`
   ${({ theme }) => css`
-    background-color: ${theme.colors.grayscale.light5};
     position: relative;
     height: 100%;
     display: flex;
     flex-direction: column;
     max-height: 100%;
-    .ant-collapse {
-      height: auto;
-    }
     .field-selections {
-      padding: 0 0 ${theme.gridUnit}px;
+      padding: 0 0 ${theme.sizeUnit}px;
       overflow: auto;
       height: 100%;
     }
     .field-length {
-      margin-bottom: ${theme.gridUnit * 2}px;
-      font-size: ${theme.typography.sizes.s}px;
+      margin-bottom: ${theme.sizeUnit * 2}px;
+      font-size: ${theme.fontSizeSM}px;
       color: ${theme.colors.grayscale.light1};
     }
     .form-control.input-md {
       display: inline-flex;
-      width: calc(100% - ${theme.gridUnit * 8}px);
-      height: ${theme.gridUnit * 8}px;
-      margin: ${theme.gridUnit * 2}px auto;
+      width: calc(100% - ${theme.sizeUnit * 8}px);
+      height: ${theme.sizeUnit * 8}px;
+      margin: ${theme.sizeUnit * 2}px auto;
     }
     .type-label {
-      font-size: ${theme.typography.sizes.s}px;
+      font-size: ${theme.fontSizeSM}px;
       color: ${theme.colors.grayscale.base};
     }
     .Control {
@@ -112,7 +107,7 @@ const DatasourceContainer = styled.div`
 
 const StyledInfoboxWrapper = styled.div`
   ${({ theme }) => css`
-    margin: 0 ${theme.gridUnit * 2.5}px;
+    margin: 0 ${theme.sizeUnit * 2.5}px;
 
     span {
       text-decoration: underline;
@@ -169,7 +164,7 @@ export default function DataSourcePanel({
 
   const [showSaveDatasetModal, setShowSaveDatasetModal] = useState(false);
   const [inputValue, setInputValue] = useState('');
-  const searchKeyword = useDebounceValue(inputValue, FAST_DEBOUNCE);
+  const searchKeyword = useDebounceValue(inputValue, Constants.FAST_DEBOUNCE);
 
   const filteredColumns = useMemo(() => {
     if (!searchKeyword) {
@@ -264,18 +259,20 @@ export default function DataSourcePanel({
     datasource.type &&
     saveableDatasets[datasource.type as keyof typeof saveableDatasets];
 
+  const theme = useTheme();
   const mainBody = useMemo(
     () => (
       <>
-        <Input
-          allowClear
-          onChange={evt => {
-            setInputValue(evt.target.value);
-          }}
-          value={inputValue}
-          className="form-control input-md"
-          placeholder={t('Search Metrics & Columns')}
-        />
+        <div style={{ padding: theme.sizeUnit * 4 }}>
+          <Input
+            allowClear
+            onChange={evt => {
+              setInputValue(evt.target.value);
+            }}
+            value={inputValue}
+            placeholder={t('Search Metrics & Columns')}
+          />
+        </div>
         <div className="field-selections" data-test="fieldSelections">
           {datasourceIsSaveable && showInfoboxCheck() && (
             <StyledInfoboxWrapper>
diff --git a/superset-frontend/src/explore/components/EmbedCodeContent.jsx b/superset-frontend/src/explore/components/EmbedCodeContent.jsx
index c629f75e603..1dad212b81d 100644
--- a/superset-frontend/src/explore/components/EmbedCodeContent.jsx
+++ b/superset-frontend/src/explore/components/EmbedCodeContent.jsx
@@ -17,18 +17,12 @@
  * under the License.
  */
 import { useCallback, useEffect, useMemo, useState } from 'react';
-import { css, styled, t } from '@superset-ui/core';
-import { Input, TextArea } from 'src/components/Input';
-import CopyToClipboard from 'src/components/CopyToClipboard';
+import { css, t } from '@superset-ui/core';
+import { Input, Space, Typography } from '@superset-ui/core/components';
+import { CopyToClipboard } from 'src/components';
 import { URL_PARAMS } from 'src/constants';
 import { getChartPermalink } from 'src/utils/urlUtils';
-import { CopyButton } from './DataTableControl';
-
-const CopyButtonEmbedCode = styled(CopyButton)`
-  && {
-    margin: 0 0 ${({ theme }) => theme.gridUnit}px;
-  }
-`;
+import { Icons } from '@superset-ui/core/components/Icons';
 
 const EmbedCodeContent = ({ formData, addDangerToast }) => {
   const [height, setHeight] = useState('400');
@@ -92,14 +86,12 @@ const EmbedCodeContent = ({ formData, addDangerToast }) => {
           shouldShowText={false}
           text={html}
           copyNode={
-            <CopyButtonEmbedCode buttonSize="xsmall">
-              {/* TODO: Remove fa-icon */}
-              {/* eslint-disable-next-line icons/no-fa-icons-usage */}
-              <i className="fa fa-clipboard" />
-            </CopyButtonEmbedCode>
+            <span role="button" aria-label="Copy to clipboard">
+              <Icons.CopyOutlined />
+            </span>
           }
         />
-        <TextArea
+        <Input.TextArea
           data-test="embed-code-textarea"
           name="embedCode"
           disabled={!html}
@@ -108,46 +100,42 @@ const EmbedCodeContent = ({ formData, addDangerToast }) => {
           readOnly
           css={theme => css`
             resize: vertical;
-            padding: ${theme.gridUnit * 2}px;
-            font-size: ${theme.typography.sizes.s}px;
+            margin-top: ${theme.sizeUnit * 2}px;
+            padding: ${theme.sizeUnit * 2}px;
+            font-size: ${theme.fontSizeSM}px;
             border-radius: 4px;
-            background-color: ${theme.colors.secondary.light5};
+            background-color: ${theme.colorBgSpotlight};
           `}
         />
       </div>
-      <div
+      <Space
+        direction="horizzontal"
         css={theme => css`
-          display: flex;
-          margin-top: ${theme.gridUnit * 4}px;
-          & > div {
-            margin-right: ${theme.gridUnit * 2}px;
-          }
-          & > div:last-of-type {
-            margin-right: 0;
-            margin-left: ${theme.gridUnit * 2}px;
-          }
+          margin-top: ${theme.margin}px;
         `}
       >
         <div>
-          <label htmlFor="embed-height">{t('Chart height')}</label>
+          <Typography.Text type="secondary">
+            {t('Chart height')}
+          </Typography.Text>
           <Input
-            type="text"
+            type="number"
             defaultValue={height}
             name="height"
             onChange={handleInputChange}
           />
         </div>
         <div>
-          <label htmlFor="embed-width">{t('Chart width')}</label>
+          <Typography.Text type="secondary">{t('Chart width')}</Typography.Text>
           <Input
-            type="text"
+            type="number"
             defaultValue={width}
             name="width"
             onChange={handleInputChange}
             id="embed-width"
           />
         </div>
-      </div>
+      </Space>
     </div>
   );
 };
diff --git a/superset-frontend/src/explore/components/ExploreAlert.tsx b/superset-frontend/src/explore/components/ExploreAlert.tsx
index 7630d69a2ab..1ea3a860731 100644
--- a/superset-frontend/src/explore/components/ExploreAlert.tsx
+++ b/superset-frontend/src/explore/components/ExploreAlert.tsx
@@ -18,8 +18,8 @@
  */
 
 import { forwardRef, RefObject, MouseEvent } from 'react';
-import { css, styled } from '@superset-ui/core';
-import Button, { ButtonStyle } from 'src/components/Button';
+import { Button } from '@superset-ui/core/components';
+import { ErrorAlert } from 'src/components';
 
 interface ControlPanelAlertProps {
   title: string;
@@ -32,66 +32,6 @@ interface ControlPanelAlertProps {
   className?: string;
 }
 
-const AlertContainer = styled.div`
-  ${({ theme }) => css`
-    margin: ${theme.gridUnit * 4}px;
-    padding: ${theme.gridUnit * 4}px;
-
-    border: 1px solid ${theme.colors.info.base};
-    background-color: ${theme.colors.info.light2};
-    border-radius: 2px;
-
-    color: ${theme.colors.info.dark2};
-    font-size: ${theme.typography.sizes.m}px;
-
-    p {
-      margin-bottom: ${theme.gridUnit}px;
-    }
-
-    & a,
-    & span[role='button'] {
-      color: inherit;
-      text-decoration: underline;
-      &:hover {
-        color: ${theme.colors.info.dark1};
-      }
-    }
-
-    &.alert-type-warning {
-      border-color: ${theme.colors.warning.base};
-      background-color: ${theme.colors.warning.light2};
-
-      p {
-        color: ${theme.colors.warning.dark2};
-      }
-
-      & a:hover,
-      & span[role='button']:hover {
-        color: ${theme.colors.warning.dark1};
-      }
-    }
-  `}
-`;
-
-const ButtonContainer = styled.div`
-  display: flex;
-  justify-content: flex-end;
-  button {
-    line-height: 1;
-  }
-`;
-
-const Title = styled.p`
-  font-weight: ${({ theme }) => theme.typography.weights.bold};
-`;
-
-const typeChart = {
-  warning: 'warning',
-  danger: 'danger',
-  error: 'primary',
-  info: 'primary',
-};
-
 export const ExploreAlert = forwardRef(
   (
     {
@@ -106,29 +46,24 @@ export const ExploreAlert = forwardRef(
     }: ControlPanelAlertProps,
     ref: RefObject<HTMLDivElement>,
   ) => (
-    <AlertContainer className={`alert-type-${type} ${className}`} ref={ref}>
-      <Title>{title}</Title>
-      <p>{bodyText}</p>
+    <ErrorAlert
+      errorType={title}
+      message={bodyText}
+      type={type}
+      className={className}
+      closable={false}
+      showIcon
+    >
       {primaryButtonText && primaryButtonAction && (
-        <ButtonContainer>
+        <div>
           {secondaryButtonAction && secondaryButtonText && (
-            <Button
-              buttonStyle="link"
-              buttonSize="small"
-              onClick={secondaryButtonAction}
-            >
+            <Button onClick={secondaryButtonAction}>
               {secondaryButtonText}
             </Button>
           )}
-          <Button
-            buttonStyle={typeChart[type] as ButtonStyle}
-            buttonSize="small"
-            onClick={primaryButtonAction}
-          >
-            {primaryButtonText}
-          </Button>
-        </ButtonContainer>
+          <Button onClick={primaryButtonAction}>{primaryButtonText}</Button>
+        </div>
       )}
-    </AlertContainer>
+    </ErrorAlert>
   ),
 );
diff --git a/superset-frontend/src/explore/components/ExploreChartHeader/ExploreChartHeader.test.tsx b/superset-frontend/src/explore/components/ExploreChartHeader/ExploreChartHeader.test.tsx
index 9888493cf9c..6f083fc9bf7 100644
--- a/superset-frontend/src/explore/components/ExploreChartHeader/ExploreChartHeader.test.tsx
+++ b/superset-frontend/src/explore/components/ExploreChartHeader/ExploreChartHeader.test.tsx
@@ -23,6 +23,7 @@ import {
   screen,
   userEvent,
   waitFor,
+  within,
 } from 'spec/helpers/testing-library';
 import fetchMock from 'fetch-mock';
 import * as chartAction from 'src/components/Chart/chartAction';
@@ -30,6 +31,7 @@ import * as saveModalActions from 'src/explore/actions/saveModalActions';
 import * as downloadAsImage from 'src/utils/downloadAsImage';
 import * as exploreUtils from 'src/explore/exploreUtils';
 import { FeatureFlag, VizType } from '@superset-ui/core';
+import { useUnsavedChangesPrompt } from 'src/hooks/useUnsavedChangesPrompt';
 import ExploreHeader from '.';
 
 const chartEndpoint = 'glob:*api/v1/chart/*';
@@ -40,6 +42,10 @@ window.featureFlags = {
   [FeatureFlag.EmbeddableCharts]: true,
 };
 
+jest.mock('src/hooks/useUnsavedChangesPrompt', () => ({
+  useUnsavedChangesPrompt: jest.fn(),
+}));
+
 const createProps = (additionalProps = {}) => ({
   chart: {
     id: 1,
@@ -134,6 +140,18 @@ fetchMock.post(
 describe('ExploreChartHeader', () => {
   jest.setTimeout(15000); // ✅ Applies to all tests in this suite
 
+  beforeEach(() => {
+    jest.clearAllMocks();
+
+    (useUnsavedChangesPrompt as jest.Mock).mockReturnValue({
+      showModal: false,
+      setShowModal: jest.fn(),
+      handleConfirmNavigation: jest.fn(),
+      handleSaveAndCloseModal: jest.fn(),
+      triggerManualSave: jest.fn(),
+    });
+  });
+
   test('Cancelling changes to the properties should reset previous properties', async () => {
     const props = createProps();
     render(<ExploreHeader {...props} />, { useRedux: true });
@@ -201,35 +219,173 @@ describe('ExploreChartHeader', () => {
   });
 
   test('Save chart', async () => {
-    const setSaveChartModalVisibility = jest.spyOn(
+    const setSaveChartModalVisibilitySpy = jest.spyOn(
       saveModalActions,
       'setSaveChartModalVisibility',
     );
+
+    const setSaveChartModalVisibilityMock =
+      setSaveChartModalVisibilitySpy as jest.Mock;
+
+    const triggerManualSave = jest.fn(() => {
+      setSaveChartModalVisibilityMock(true);
+    });
+
+    (useUnsavedChangesPrompt as jest.Mock).mockReturnValue({
+      showModal: false,
+      setShowModal: jest.fn(),
+      handleConfirmNavigation: jest.fn(),
+      handleSaveAndCloseModal: jest.fn(),
+      triggerManualSave,
+    });
+
     const props = createProps();
     render(<ExploreHeader {...props} />, { useRedux: true });
-    expect(await screen.findByText('Save')).toBeInTheDocument();
-    userEvent.click(screen.getByText('Save'));
-    expect(setSaveChartModalVisibility).toHaveBeenCalledWith(true);
-    setSaveChartModalVisibility.mockClear();
+
+    const saveButton: HTMLElement = await screen.findByRole('button', {
+      name: /save/i,
+    });
+
+    userEvent.click(saveButton);
+
+    expect(triggerManualSave).toHaveBeenCalled();
+    expect(setSaveChartModalVisibilityMock).toHaveBeenCalledWith(true);
+
+    setSaveChartModalVisibilityMock.mockClear();
   });
 
   test('Save disabled', async () => {
-    const setSaveChartModalVisibility = jest.spyOn(
-      saveModalActions,
-      'setSaveChartModalVisibility',
-    );
+    const triggerManualSave = jest.fn();
+
+    (useUnsavedChangesPrompt as jest.Mock).mockReturnValue({
+      showModal: false,
+      setShowModal: jest.fn(),
+      handleConfirmNavigation: jest.fn(),
+      handleSaveAndCloseModal: jest.fn(),
+      triggerManualSave,
+    });
+
     const props = createProps();
     render(<ExploreHeader {...props} saveDisabled />, { useRedux: true });
-    expect(await screen.findByText('Save')).toBeInTheDocument();
-    userEvent.click(screen.getByText('Save'));
-    expect(setSaveChartModalVisibility).not.toHaveBeenCalled();
-    setSaveChartModalVisibility.mockClear();
+
+    const saveButton: HTMLElement = await screen.findByRole('button', {
+      name: /save/i,
+    });
+
+    expect(saveButton).toBeDisabled();
+
+    userEvent.click(saveButton);
+
+    expect(triggerManualSave).not.toHaveBeenCalled();
+  });
+
+  test('should render UnsavedChangesModal when showModal is true', async () => {
+    const props = createProps();
+
+    (useUnsavedChangesPrompt as jest.Mock).mockReturnValue({
+      showModal: true,
+      setShowModal: jest.fn(),
+      handleConfirmNavigation: jest.fn(),
+      handleSaveAndCloseModal: jest.fn(),
+      triggerManualSave: jest.fn(),
+    });
+
+    render(<ExploreHeader {...props} />, { useRedux: true });
+
+    expect(await screen.findByRole('dialog')).toBeInTheDocument();
+    expect(
+      await screen.findByText('Save changes to your chart?'),
+    ).toBeInTheDocument();
+    expect(
+      await screen.findByText("If you don't save, changes will be lost."),
+    ).toBeInTheDocument();
+  });
+
+  test('should call handleSaveAndCloseModal when clicking Save in UnsavedChangesModal', async () => {
+    const handleSaveAndCloseModal = jest.fn();
+
+    (useUnsavedChangesPrompt as jest.Mock).mockReturnValue({
+      showModal: true,
+      setShowModal: jest.fn(),
+      handleConfirmNavigation: jest.fn(),
+      handleSaveAndCloseModal,
+      triggerManualSave: jest.fn(),
+    });
+
+    const props = createProps();
+    render(<ExploreHeader {...props} />, { useRedux: true });
+
+    const modal: HTMLElement = await screen.findByRole('dialog');
+    const saveButton: HTMLElement = within(modal).getByRole('button', {
+      name: /save/i,
+    });
+
+    userEvent.click(saveButton);
+
+    expect(handleSaveAndCloseModal).toHaveBeenCalled();
+  });
+
+  test('should call handleConfirmNavigation when clicking Discard in UnsavedChangesModal', async () => {
+    const handleConfirmNavigation = jest.fn();
+
+    (useUnsavedChangesPrompt as jest.Mock).mockReturnValue({
+      showModal: true,
+      setShowModal: jest.fn(),
+      handleConfirmNavigation,
+      handleSaveAndCloseModal: jest.fn(),
+      triggerManualSave: jest.fn(),
+    });
+
+    const props = createProps();
+    render(<ExploreHeader {...props} />, { useRedux: true });
+
+    const modal: HTMLElement = await screen.findByRole('dialog');
+    const discardButton: HTMLElement = within(modal).getByRole('button', {
+      name: /discard/i,
+    });
+
+    userEvent.click(discardButton);
+
+    expect(handleConfirmNavigation).toHaveBeenCalled();
+  });
+
+  test('should call setShowModal(false) when clicking close button in UnsavedChangesModal', async () => {
+    const setShowModal = jest.fn();
+
+    (useUnsavedChangesPrompt as jest.Mock).mockReturnValue({
+      showModal: true,
+      setShowModal,
+      handleConfirmNavigation: jest.fn(),
+      handleSaveAndCloseModal: jest.fn(),
+      triggerManualSave: jest.fn(),
+    });
+
+    const props = createProps();
+    render(<ExploreHeader {...props} />, { useRedux: true });
+
+    const closeButton: HTMLElement = await screen.findByRole('button', {
+      name: /close/i,
+    });
+
+    userEvent.click(closeButton);
+
+    expect(setShowModal).toHaveBeenCalledWith(false);
   });
 });
 
 describe('Additional actions tests', () => {
   jest.setTimeout(15000); // ✅ Applies to all tests in this suite
 
+  beforeEach(() => {
+    (useUnsavedChangesPrompt as jest.Mock).mockReturnValue({
+      showModal: false,
+      setShowModal: jest.fn(),
+      handleConfirmNavigation: jest.fn(),
+      handleSaveAndCloseModal: jest.fn(),
+      triggerManualSave: jest.fn(),
+    });
+  });
+
   test('Should render a button', async () => {
     const props = createProps();
     render(<ExploreHeader {...props} />, { useRedux: true });
@@ -356,6 +512,14 @@ describe('Additional actions tests', () => {
     beforeEach(() => {
       spyDownloadAsImage = sinon.spy(downloadAsImage, 'default');
       spyExportChart = sinon.spy(exploreUtils, 'exportChart');
+
+      (useUnsavedChangesPrompt as jest.Mock).mockReturnValue({
+        showModal: false,
+        setShowModal: jest.fn(),
+        handleConfirmNavigation: jest.fn(),
+        handleSaveAndCloseModal: jest.fn(),
+        triggerManualSave: jest.fn(),
+      });
     });
 
     afterEach(async () => {
diff --git a/superset-frontend/src/explore/components/ExploreChartHeader/index.jsx b/superset-frontend/src/explore/components/ExploreChartHeader/index.jsx
index db7d19a7066..18b24bfc6d9 100644
--- a/superset-frontend/src/explore/components/ExploreChartHeader/index.jsx
+++ b/superset-frontend/src/explore/components/ExploreChartHeader/index.jsx
@@ -16,24 +16,29 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { useCallback, useEffect, useState } from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useHistory } from 'react-router-dom';
 import { useDispatch } from 'react-redux';
 import PropTypes from 'prop-types';
-import { Tooltip } from 'src/components/Tooltip';
-import { css, logging, SupersetClient, t, useTheme } from '@superset-ui/core';
+import {
+  Tooltip,
+  Button,
+  DeleteModal,
+  UnsavedChangesModal,
+} from '@superset-ui/core/components';
+import { AlteredSliceTag } from 'src/components';
+import { css, logging, SupersetClient, t } from '@superset-ui/core';
 import { chartPropShape } from 'src/dashboard/util/propShapes';
-import AlteredSliceTag from 'src/components/AlteredSliceTag';
-import Button from 'src/components/Button';
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
 import PropertiesModal from 'src/explore/components/PropertiesModal';
 import { sliceUpdated } from 'src/explore/actions/exploreActions';
-import { PageHeaderWithActions } from 'src/components/PageHeaderWithActions';
+import { PageHeaderWithActions } from '@superset-ui/core/components/PageHeaderWithActions';
 import { setSaveChartModalVisibility } from 'src/explore/actions/saveModalActions';
 import { applyColors, resetColors } from 'src/utils/colorScheme';
 import ReportModal from 'src/features/reports/ReportModal';
-import DeleteModal from 'src/components/DeleteModal';
 import { deleteActiveReport } from 'src/features/reports/ReportModal/actions';
+import { useUnsavedChangesPrompt } from 'src/hooks/useUnsavedChangesPrompt';
+import { getChartFormDiffs } from 'src/utils/getChartFormDiffs';
 import { useExploreAdditionalActionsMenu } from '../useExploreAdditionalActionsMenu';
 import { useExploreMetadataBar } from './useExploreMetadataBar';
 
@@ -52,10 +57,11 @@ const propTypes = {
   timeout: PropTypes.number,
   chart: chartPropShape,
   saveDisabled: PropTypes.bool,
+  isSaveModalVisible: PropTypes.bool,
 };
 
 const saveButtonStyles = theme => css`
-  color: ${theme.colors.primary.dark2};
+  color: ${theme.colorPrimaryText};
   & > span[role='img'] {
     margin-right: 0;
   }
@@ -64,9 +70,9 @@ const saveButtonStyles = theme => css`
 const additionalItemsStyles = theme => css`
   display: flex;
   align-items: center;
-  margin-left: ${theme.gridUnit}px;
+  margin-left: ${theme.sizeUnit}px;
   & > span {
-    margin-right: ${theme.gridUnit * 3}px;
+    margin-right: ${theme.sizeUnit * 3}px;
   }
 `;
 
@@ -85,14 +91,16 @@ export const ExploreChartHeader = ({
   sliceName,
   saveDisabled,
   metadata,
+  isSaveModalVisible,
 }) => {
-  const theme = useTheme();
   const dispatch = useDispatch();
   const { latestQueryFormData, sliceFormData } = chart;
   const [isPropertiesModalOpen, setIsPropertiesModalOpen] = useState(false);
   const [isReportModalOpen, setIsReportModalOpen] = useState(false);
   const [currentReportDeleting, setCurrentReportDeleting] = useState(null);
-  const updateCategoricalNamespace = async () => {
+  const [shouldForceCloseModal, setShouldForceCloseModal] = useState(false);
+
+  const updateCategoricalNamespace = useCallback(async () => {
     const { dashboards } = metadata || {};
     const dashboard =
       dashboardId && dashboards && dashboards.find(d => d.id === dashboardId);
@@ -120,11 +128,11 @@ export const ExploreChartHeader = ({
         logging.info(t('Unable to retrieve dashboard colors'));
       }
     }
-  };
+  }, [dashboardColorScheme, dashboardId, metadata]);
 
   useEffect(() => {
     updateCategoricalNamespace();
-  }, []);
+  }, [updateCategoricalNamespace]);
 
   const openPropertiesModal = () => {
     setIsPropertiesModalOpen(true);
@@ -142,10 +150,6 @@ export const ExploreChartHeader = ({
     setIsReportModalOpen(false);
   };
 
-  const showModal = useCallback(() => {
-    dispatch(setSaveChartModalVisibility(true));
-  }, [dispatch]);
-
   const updateSlice = useCallback(
     slice => {
       dispatch(sliceUpdated(slice));
@@ -182,8 +186,53 @@ export const ExploreChartHeader = ({
     );
 
   const metadataBar = useExploreMetadataBar(metadata, slice);
-
   const oldSliceName = slice?.slice_name;
+
+  const originalFormData = useMemo(() => {
+    if (!sliceFormData) return {};
+    return {
+      ...sliceFormData,
+      chartTitle: oldSliceName,
+    };
+  }, [sliceFormData, oldSliceName]);
+
+  const currentFormData = useMemo(
+    () => ({ ...formData, chartTitle: sliceName }),
+    [formData, sliceName],
+  );
+
+  const formDiffs = useMemo(
+    () => getChartFormDiffs(originalFormData, currentFormData),
+    [originalFormData, currentFormData],
+  );
+
+  const {
+    showModal: showUnsavedChangesModal,
+    setShowModal: setShowUnsavedChangesModal,
+    handleConfirmNavigation,
+    handleSaveAndCloseModal,
+    triggerManualSave,
+  } = useUnsavedChangesPrompt({
+    hasUnsavedChanges: Object.keys(formDiffs).length > 0,
+    onSave: () => dispatch(setSaveChartModalVisibility(true)),
+    isSaveModalVisible,
+    manualSaveOnUnsavedChanges: true,
+  });
+
+  const showModal = useCallback(() => {
+    triggerManualSave();
+  }, [triggerManualSave]);
+
+  useEffect(() => {
+    if (!isSaveModalVisible) setShouldForceCloseModal(true);
+  }, [isSaveModalVisible, setShowUnsavedChangesModal]);
+
+  useEffect(() => {
+    if (!showUnsavedChangesModal && shouldForceCloseModal) {
+      setShouldForceCloseModal(false);
+    }
+  }, [showUnsavedChangesModal, shouldForceCloseModal]);
+
   return (
     <>
       <PageHeaderWithActions
@@ -215,11 +264,9 @@ export const ExploreChartHeader = ({
             {sliceFormData ? (
               <AlteredSliceTag
                 className="altered"
-                origFormData={{
-                  ...sliceFormData,
-                  chartTitle: oldSliceName,
-                }}
-                currentFormData={{ ...formData, chartTitle: sliceName }}
+                diffs={formDiffs}
+                origFormData={originalFormData}
+                currentFormData={currentFormData}
               />
             ) : null}
             {metadataBar}
@@ -241,11 +288,8 @@ export const ExploreChartHeader = ({
                 disabled={saveDisabled}
                 data-test="query-save-button"
                 css={saveButtonStyles}
+                icon={<Icons.SaveOutlined />}
               >
-                <Icons.SaveOutlined
-                  iconSize="l"
-                  iconColor={theme.colors.primary.dark2}
-                />
                 {t('Save')}
               </Button>
             </div>
@@ -292,6 +336,15 @@ export const ExploreChartHeader = ({
           title={t('Delete Report?')}
         />
       )}
+
+      <UnsavedChangesModal
+        title={t('Save changes to your chart?')}
+        body={t("If you don't save, changes will be lost.")}
+        showModal={showUnsavedChangesModal}
+        onHide={() => setShowUnsavedChangesModal(false)}
+        onConfirmNavigation={handleConfirmNavigation}
+        handleSave={handleSaveAndCloseModal}
+      />
     </>
   );
 };
diff --git a/superset-frontend/src/explore/components/ExploreChartHeader/useExploreMetadataBar.tsx b/superset-frontend/src/explore/components/ExploreChartHeader/useExploreMetadataBar.tsx
index 943d91efccb..c0fc1917fb5 100644
--- a/superset-frontend/src/explore/components/ExploreChartHeader/useExploreMetadataBar.tsx
+++ b/superset-frontend/src/explore/components/ExploreChartHeader/useExploreMetadataBar.tsx
@@ -18,7 +18,9 @@
  */
 import { useMemo } from 'react';
 import { t, tn } from '@superset-ui/core';
-import MetadataBar, { MetadataType } from 'src/components/MetadataBar';
+import MetadataBar, {
+  MetadataType,
+} from '@superset-ui/core/components/MetadataBar';
 import { ExplorePageInitialData } from 'src/explore/types';
 
 export const useExploreMetadataBar = (
diff --git a/superset-frontend/src/explore/components/ExploreChartPanel/index.jsx b/superset-frontend/src/explore/components/ExploreChartPanel/index.jsx
index 189177019c7..630ffd8ba31 100644
--- a/superset-frontend/src/explore/components/ExploreChartPanel/index.jsx
+++ b/superset-frontend/src/explore/components/ExploreChartPanel/index.jsx
@@ -38,7 +38,7 @@ import {
   setItem,
   LocalStorageKeys,
 } from 'src/utils/localStorageHelpers';
-import Alert from 'src/components/Alert';
+import { Alert } from '@superset-ui/core/components';
 import { SaveDatasetModal } from 'src/SqlLab/components/SaveDatasetModal';
 import { getDatasourceAsSaveableDataset } from 'src/utils/datasourceUtils';
 import { buildV1ChartDataPayload } from 'src/explore/exploreUtils';
@@ -93,32 +93,16 @@ const Styles = styled.div`
   }
 
   .gutter {
-    border-top: 1px solid ${({ theme }) => theme.colors.grayscale.light2};
-    border-bottom: 1px solid ${({ theme }) => theme.colors.grayscale.light2};
-    width: ${({ theme }) => theme.gridUnit * 9}px;
-    margin: ${({ theme }) => theme.gridUnit * GUTTER_SIZE_FACTOR}px auto;
+    border-top: 1px solid ${({ theme }) => theme.colorSplit};
+    border-bottom: 1px solid ${({ theme }) => theme.colorSplit};
+    width: ${({ theme }) => theme.sizeUnit * 9}px;
+    margin: ${({ theme }) => theme.sizeUnit * GUTTER_SIZE_FACTOR}px auto;
   }
 
   .gutter.gutter-vertical {
     display: ${({ showSplite }) => (showSplite ? 'block' : 'none')};
     cursor: row-resize;
   }
-
-  .ant-collapse {
-    .ant-tabs {
-      height: 100%;
-      .ant-tabs-nav {
-        padding-left: ${({ theme }) => theme.gridUnit * 5}px;
-        margin: 0;
-      }
-      .ant-tabs-content-holder {
-        overflow: hidden;
-        .ant-tabs-content {
-          height: 100%;
-        }
-      }
-    }
-  }
 `;
 
 const ExploreChartPanel = ({
@@ -140,8 +124,8 @@ const ExploreChartPanel = ({
   can_download: canDownload,
 }) => {
   const theme = useTheme();
-  const gutterMargin = theme.gridUnit * GUTTER_SIZE_FACTOR;
-  const gutterHeight = theme.gridUnit * GUTTER_SIZE_FACTOR;
+  const gutterMargin = theme.sizeUnit * GUTTER_SIZE_FACTOR;
+  const gutterHeight = theme.sizeUnit * GUTTER_SIZE_FACTOR;
   const {
     ref: chartPanelRef,
     observerRef: resizeObserverRef,
@@ -307,6 +291,7 @@ const ExploreChartPanel = ({
         css={css`
           display: flex;
           flex-direction: column;
+          padding-top: ${theme.sizeUnit * 2}px;
         `}
         ref={resizeObserverRef}
       >
@@ -315,7 +300,7 @@ const ExploreChartPanel = ({
             message={t('Chart type requires a dataset')}
             type="error"
             css={theme => css`
-              margin: 0 0 ${theme.gridUnit * 4}px 0;
+              margin: 0 0 ${theme.sizeUnit * 4}px 0;
             `}
             description={
               <>
@@ -359,7 +344,7 @@ const ExploreChartPanel = ({
             }
             type="warning"
             css={theme => css`
-              margin: 0 0 ${theme.gridUnit * 4}px 0;
+              margin: 0 0 ${theme.sizeUnit * 4}px 0;
             `}
           />
         )}
@@ -427,10 +412,7 @@ const ExploreChartPanel = ({
   }
 
   return (
-    <Styles
-      className="panel panel-default chart-container"
-      showSplite={showSplite}
-    >
+    <Styles className="chart-container" showSplite={showSplite}>
       <Split
         sizes={splitSizes}
         minSize={MIN_SIZES}
diff --git a/superset-frontend/src/explore/components/ExploreContentPopover.tsx b/superset-frontend/src/explore/components/ExploreContentPopover.tsx
index 93ee96a24e9..bbf9e0c1a3a 100644
--- a/superset-frontend/src/explore/components/ExploreContentPopover.tsx
+++ b/superset-frontend/src/explore/components/ExploreContentPopover.tsx
@@ -22,11 +22,12 @@ export const ExplorePopoverContent = styled.div`
   .edit-popover-resize {
     transform: scaleX(-1);
     float: right;
-    margin-top: ${({ theme }) => theme.gridUnit * 4}px;
-    margin-right: ${({ theme }) => theme.gridUnit * -2}px;
+    margin-top: ${({ theme }) => theme.sizeUnit * 4}px;
+    margin-right: ${({ theme }) => theme.sizeUnit * -1}px;
+    color: ${({ theme }) => theme.colorIcon};
     cursor: nwse-resize;
   }
   .filter-sql-editor {
-    border: ${({ theme }) => theme.colors.grayscale.light2} solid thin;
+    border: ${({ theme }) => theme.colorBorder} solid thin;
   }
 `;
diff --git a/superset-frontend/src/explore/components/ExploreViewContainer/index.jsx b/superset-frontend/src/explore/components/ExploreViewContainer/index.jsx
index 822a54ecafe..6f6df842b4f 100644
--- a/superset-frontend/src/explore/components/ExploreViewContainer/index.jsx
+++ b/superset-frontend/src/explore/components/ExploreViewContainer/index.jsx
@@ -33,10 +33,10 @@ import {
 } from '@superset-ui/core';
 import { debounce, isEqual, isObjectLike, omit, pick } from 'lodash';
 import { Resizable } from 're-resizable';
-import { usePluginContext } from 'src/components/DynamicPlugins';
+import { Tooltip } from '@superset-ui/core/components';
+import { usePluginContext } from 'src/components';
 import { Global } from '@emotion/react';
-import { Tooltip } from 'src/components/Tooltip';
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
 import {
   getItem,
   setItem,
@@ -98,32 +98,31 @@ const propTypes = {
 
 const ExplorePanelContainer = styled.div`
   ${({ theme }) => css`
-    background: ${theme.colors.grayscale.light5};
     text-align: left;
     position: relative;
     width: 100%;
     max-height: 100%;
+    background-color: ${theme.colorBgContainer};
     min-height: 0;
     display: flex;
     flex: 1;
     flex-wrap: nowrap;
-    border-top: 1px solid ${theme.colors.grayscale.light2};
+    border-top: 1px solid ${theme.colorSplit};
     .explore-column {
       display: flex;
       flex-direction: column;
-      padding: ${theme.gridUnit * 2}px 0;
+      padding: ${theme.sizeUnit * 2}px 0;
       max-height: 100%;
     }
     .data-source-selection {
-      background-color: ${theme.colors.grayscale.light5};
-      padding: ${theme.gridUnit * 2}px 0;
-      border-right: 1px solid ${theme.colors.grayscale.light2};
+      padding: ${theme.sizeUnit * 2}px 0;
+      border-right: 1px solid ${theme.colorSplit};
     }
     .main-explore-content {
       flex: 1;
-      min-width: ${theme.gridUnit * 128}px;
-      border-left: 1px solid ${theme.colors.grayscale.light2};
-      padding: 0 ${theme.gridUnit * 4}px;
+      min-width: ${theme.sizeUnit * 128}px;
+      border-left: 1px solid ${theme.colorSplit};
+      padding: 0 ${theme.sizeUnit * 4}px;
       .panel {
         margin-bottom: 0;
       }
@@ -136,10 +135,10 @@ const ExplorePanelContainer = styled.div`
       position: relative;
       display: flex;
       flex-direction: row;
-      padding: 0 ${theme.gridUnit * 2}px 0 ${theme.gridUnit * 4}px;
+      padding: 0 ${theme.sizeUnit * 2}px 0 ${theme.sizeUnit * 4}px;
       justify-content: space-between;
       .horizontal-text {
-        font-size: ${theme.typography.sizes.m}px;
+        font-size: ${theme.fontSize}px;
       }
     }
     .no-show {
@@ -151,12 +150,11 @@ const ExplorePanelContainer = styled.div`
     }
     .sidebar {
       height: 100%;
-      background-color: ${theme.colors.grayscale.light4};
-      padding: ${theme.gridUnit * 2}px;
-      width: ${theme.gridUnit * 8}px;
+      padding: ${theme.sizeUnit * 2}px;
+      width: ${theme.sizeUnit * 8}px;
     }
     .collapse-icon > svg {
-      color: ${theme.colors.primary.base};
+      color: ${theme.colorPrimary};
     }
   `};
 `;
@@ -269,6 +267,15 @@ function ExploreViewContainer(props) {
 
   const theme = useTheme();
 
+  useEffect(() => {
+    if (props.sliceName) {
+      document.title = props.sliceName;
+    }
+    return () => {
+      document.title = 'Superset';
+    };
+  }, [props.sliceName]);
+
   const addHistory = useCallback(
     async ({ isReplace = false, title } = {}) => {
       const formData = props.dashboardId
@@ -586,6 +593,7 @@ function ExploreViewContainer(props) {
         reports={props.reports}
         saveDisabled={errorMessage || props.chart.chartStatus === 'loading'}
         metadata={props.metadata}
+        isSaveModalVisible={props.isSaveModalVisible}
       />
       <ExplorePanelContainer id="explore-container">
         <Global
@@ -642,7 +650,7 @@ function ExploreViewContainer(props) {
                   transform: rotate(-90deg);
                 `}
                 className="collapse-icon"
-                iconColor={theme.colors.primary.base}
+                iconColor={theme.colorPrimary}
               />
             </span>
           </div>
@@ -671,7 +679,7 @@ function ExploreViewContainer(props) {
                     transform: rotate(90deg);
                   `}
                   className="collapse-icon"
-                  iconColor={theme.colors.primary.base}
+                  iconColor={theme.colorPrimary}
                 />
               </Tooltip>
             </span>
diff --git a/superset-frontend/src/explore/components/ExportToCSVDropdown/index.tsx b/superset-frontend/src/explore/components/ExportToCSVDropdown/index.tsx
index d539c4f47a7..71be72fc352 100644
--- a/superset-frontend/src/explore/components/ExportToCSVDropdown/index.tsx
+++ b/superset-frontend/src/explore/components/ExportToCSVDropdown/index.tsx
@@ -19,9 +19,8 @@
 import { ReactChild, useCallback, Key } from 'react';
 
 import { t, styled } from '@superset-ui/core';
-import { Icons } from 'src/components/Icons';
-import { Dropdown } from 'src/components/Dropdown';
-import { Menu } from 'src/components/Menu';
+import { Icons } from '@superset-ui/core/components/Icons';
+import { Dropdown } from '@superset-ui/core/components';
 
 enum MenuKeys {
   ExportOriginal = 'export_original',
@@ -40,8 +39,8 @@ const MenuItemContent = styled.div`
   justify-content: space-between;
 
   span[role='img'] {
-    font-size: ${({ theme }) => theme.typography.sizes.l}px;
-    margin-left: ${({ theme }) => theme.gridUnit * 4}px;
+    font-size: ${({ theme }) => theme.fontSizeLG}px;
+    margin-left: ${({ theme }) => theme.sizeUnit * 4}px;
   }
 `;
 
@@ -69,22 +68,30 @@ export const ExportToCSVDropdown = ({
   return (
     <Dropdown
       trigger={['click']}
-      dropdownRender={() => (
-        <Menu onClick={handleMenuClick} selectable={false}>
-          <Menu.Item key={MenuKeys.ExportOriginal}>
-            <MenuItemContent>
-              {t('Original')}
-              <Icons.DownloadOutlined />
-            </MenuItemContent>
-          </Menu.Item>
-          <Menu.Item key={MenuKeys.ExportPivoted}>
-            <MenuItemContent>
-              {t('Pivoted')}
-              <Icons.DownloadOutlined />
-            </MenuItemContent>
-          </Menu.Item>
-        </Menu>
-      )}
+      menu={{
+        onClick: handleMenuClick,
+        selectable: false,
+        items: [
+          {
+            key: MenuKeys.ExportOriginal,
+            label: (
+              <MenuItemContent>
+                {t('Original')}
+                <Icons.DownloadOutlined />
+              </MenuItemContent>
+            ),
+          },
+          {
+            key: MenuKeys.ExportPivoted,
+            label: (
+              <MenuItemContent>
+                {t('Pivoted')}
+                <Icons.DownloadOutlined />
+              </MenuItemContent>
+            ),
+          },
+        ],
+      }}
     >
       {children}
     </Dropdown>
diff --git a/superset-frontend/src/explore/components/PropertiesModal/index.tsx b/superset-frontend/src/explore/components/PropertiesModal/index.tsx
index 7427949a9ab..e66bd770254 100644
--- a/superset-frontend/src/explore/components/PropertiesModal/index.tsx
+++ b/superset-frontend/src/explore/components/PropertiesModal/index.tsx
@@ -18,12 +18,18 @@
  */
 import { ChangeEvent, useMemo, useState, useCallback, useEffect } from 'react';
 
-import Modal from 'src/components/Modal';
-import { Input, TextArea } from 'src/components/Input';
-import Button from 'src/components/Button';
-import { AsyncSelect, Row, Col, AntdForm } from 'src/components';
-// eslint-disable-next-line no-restricted-imports
-import { SelectValue } from 'antd/lib/select'; // TODO: Remove antd
+import {
+  Input,
+  Modal,
+  AsyncSelect,
+  Button,
+  Form,
+  Row,
+  Col,
+  FormItem,
+  Typography,
+  type SelectValue,
+} from '@superset-ui/core/components';
 import rison from 'rison';
 import {
   t,
@@ -36,12 +42,12 @@ import {
   useTheme,
   css,
 } from '@superset-ui/core';
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
 import Chart, { Slice } from 'src/types/Chart';
 import withToasts from 'src/components/MessageToasts/withToasts';
-import { loadTags } from 'src/components/Tags/utils';
+import { type TagType } from 'src/components';
+import { loadTags } from 'src/components/Tag/utils';
 import { fetchTags, OBJECT_TYPES } from 'src/features/tags/tags';
-import TagType from 'src/types/TagType';
 
 export type PropertiesModalProps = {
   slice: Slice;
@@ -53,13 +59,7 @@ export type PropertiesModalProps = {
   addSuccessToast: (msg: string) => void;
 };
 
-const FormItem = AntdForm.Item;
-
-const StyledFormItem = styled(AntdForm.Item)`
-  margin-bottom: 0;
-`;
-
-const StyledHelpBlock = styled.span`
+const StyledFormItem = styled(FormItem)`
   margin-bottom: 0;
 `;
 
@@ -72,7 +72,7 @@ function PropertiesModal({
 }: PropertiesModalProps) {
   const theme = useTheme();
   const [submitting, setSubmitting] = useState(false);
-  const [form] = AntdForm.useForm();
+  const [form] = Form.useForm();
   // values of form inputs
   const [name, setName] = useState(slice.slice_name || '');
   const [selectedOwners, setSelectedOwners] = useState<SelectValue | null>(
@@ -253,7 +253,7 @@ function PropertiesModal({
         <span>
           <Icons.EditOutlined
             css={css`
-              margin: auto ${theme.gridUnit * 2}px auto 0;
+              margin: auto ${theme.sizeUnit * 2}px auto 0;
             `}
             data-test="edit-alt"
           />
@@ -267,6 +267,7 @@ function PropertiesModal({
             htmlType="button"
             buttonSize="small"
             onClick={onHide}
+            buttonStyle="secondary"
             cta
           >
             {t('Cancel')}
@@ -294,7 +295,7 @@ function PropertiesModal({
       responsive
       wrapProps={{ 'data-test': 'properties-edit-modal' }}
     >
-      <AntdForm
+      <Form
         form={form}
         onFinish={onSubmit}
         layout="vertical"
@@ -311,7 +312,9 @@ function PropertiesModal({
       >
         <Row gutter={16}>
           <Col xs={24} md={12}>
-            <h3>{t('Basic information')}</h3>
+            <Typography.Title level={3}>
+              {t('Basic information')}
+            </Typography.Title>
             <FormItem label={t('Name')} required>
               <Input
                 aria-label={t('Name')}
@@ -324,53 +327,56 @@ function PropertiesModal({
                 }
               />
             </FormItem>
-            <FormItem>
+            <FormItem
+              extra={t(
+                'The description can be displayed as widget headers in the dashboard view. Supports markdown.',
+              )}
+            >
               <StyledFormItem label={t('Description')} name="description">
-                <TextArea rows={3} style={{ maxWidth: '100%' }} />
+                <Input.TextArea rows={3} style={{ maxWidth: '100%' }} />
               </StyledFormItem>
-              <StyledHelpBlock className="help-block">
-                {t(
-                  'The description can be displayed as widget headers in the dashboard view. Supports markdown.',
-                )}
-              </StyledHelpBlock>
             </FormItem>
-            <h3>{t('Certification')}</h3>
-            <FormItem>
+            <Typography.Title level={3}>{t('Certification')}</Typography.Title>
+            <FormItem
+              extra={t('Person or group that has certified this chart.')}
+            >
               <StyledFormItem label={t('Certified by')} name="certified_by">
                 <Input aria-label={t('Certified by')} />
               </StyledFormItem>
-              <StyledHelpBlock className="help-block">
-                {t('Person or group that has certified this chart.')}
-              </StyledHelpBlock>
             </FormItem>
-            <FormItem>
+            <FormItem
+              extra={t(
+                'Any additional detail to show in the certification tooltip.',
+              )}
+            >
               <StyledFormItem
                 label={t('Certification details')}
                 name="certification_details"
               >
                 <Input aria-label={t('Certification details')} />
               </StyledFormItem>
-              <StyledHelpBlock className="help-block">
-                {t(
-                  'Any additional detail to show in the certification tooltip.',
-                )}
-              </StyledHelpBlock>
             </FormItem>
           </Col>
           <Col xs={24} md={12}>
-            <h3>{t('Configuration')}</h3>
-            <FormItem>
+            <Typography.Title level={3}>{t('Configuration')}</Typography.Title>
+            <FormItem
+              extra={t(
+                "Duration (in seconds) of the caching timeout for this chart. Set to -1 to bypass the cache. Note this defaults to the dataset's timeout if undefined.",
+              )}
+            >
               <StyledFormItem label={t('Cache timeout')} name="cache_timeout">
                 <Input aria-label="Cache timeout" />
               </StyledFormItem>
-              <StyledHelpBlock className="help-block">
-                {t(
-                  "Duration (in seconds) of the caching timeout for this chart. Set to -1 to bypass the cache. Note this defaults to the dataset's timeout if undefined.",
-                )}
-              </StyledHelpBlock>
             </FormItem>
-            <h3 style={{ marginTop: '1em' }}>{t('Access')}</h3>
-            <FormItem label={ownersLabel}>
+            <Typography.Title level={3} style={{ marginTop: '1em' }}>
+              {t('Access')}
+            </Typography.Title>
+            <FormItem
+              label={ownersLabel}
+              extra={t(
+                'A list of users who can alter the chart. Searchable by name or username.',
+              )}
+            >
               <AsyncSelect
                 ariaLabel={ownersLabel}
                 mode="multiple"
@@ -381,17 +387,18 @@ function PropertiesModal({
                 disabled={!selectedOwners}
                 allowClear
               />
-              <StyledHelpBlock className="help-block">
-                {t(
-                  'A list of users who can alter the chart. Searchable by name or username.',
-                )}
-              </StyledHelpBlock>
             </FormItem>
             {isFeatureEnabled(FeatureFlag.TaggingSystem) && (
-              <h3 css={{ marginTop: '1em' }}>{t('Tags')}</h3>
+              <Typography.Title level={3} css={{ marginTop: '1em' }}>
+                {t('Tags')}
+              </Typography.Title>
             )}
             {isFeatureEnabled(FeatureFlag.TaggingSystem) && (
-              <FormItem>
+              <FormItem
+                extra={t(
+                  'A list of tags that have been applied to this chart.',
+                )}
+              >
                 <AsyncSelect
                   ariaLabel="Tags"
                   mode="multiple"
@@ -401,14 +408,11 @@ function PropertiesModal({
                   onClear={handleClearTags}
                   allowClear
                 />
-                <StyledHelpBlock className="help-block">
-                  {t('A list of tags that have been applied to this chart.')}
-                </StyledHelpBlock>
               </FormItem>
             )}
           </Col>
         </Row>
-      </AntdForm>
+      </Form>
     </Modal>
   );
 }
diff --git a/superset-frontend/src/explore/components/RunQueryButton/RunQueryButton.stories.tsx b/superset-frontend/src/explore/components/RunQueryButton/RunQueryButton.stories.tsx
index 22618381a53..b692faf1957 100644
--- a/superset-frontend/src/explore/components/RunQueryButton/RunQueryButton.stories.tsx
+++ b/superset-frontend/src/explore/components/RunQueryButton/RunQueryButton.stories.tsx
@@ -19,7 +19,7 @@
 import { RunQueryButton, RunQueryButtonProps } from '.';
 
 export default {
-  title: 'RunQueryButton',
+  title: 'Components/RunQueryButton',
   component: RunQueryButton,
 };
 
diff --git a/superset-frontend/src/explore/components/RunQueryButton/index.tsx b/superset-frontend/src/explore/components/RunQueryButton/index.tsx
index c866f638e8e..d5ddd8097fb 100644
--- a/superset-frontend/src/explore/components/RunQueryButton/index.tsx
+++ b/superset-frontend/src/explore/components/RunQueryButton/index.tsx
@@ -19,8 +19,8 @@
 
 import { ReactNode } from 'react';
 import { t, useTheme } from '@superset-ui/core';
-import Button from 'src/components/Button';
-import { Icons } from 'src/components/Icons';
+import { Button } from '@superset-ui/core/components';
+import { Icons } from '@superset-ui/core/components/Icons';
 
 export type RunQueryButtonProps = {
   loading: boolean;
@@ -42,7 +42,7 @@ export const RunQueryButton = ({
 }: RunQueryButtonProps) => {
   const theme = useTheme();
   return loading ? (
-    <Button onClick={onStop} buttonStyle="warning" disabled={!canStopQuery}>
+    <Button onClick={onStop} buttonStyle="danger" disabled={!canStopQuery}>
       <Icons.Square iconSize="xs" iconColor={theme.colors.primary.light5} />
       {t('Stop')}
     </Button>
diff --git a/superset-frontend/src/explore/components/SaveModal.test.jsx b/superset-frontend/src/explore/components/SaveModal.test.jsx
index cb398180f60..6789bff2dfe 100644
--- a/superset-frontend/src/explore/components/SaveModal.test.jsx
+++ b/superset-frontend/src/explore/components/SaveModal.test.jsx
@@ -31,8 +31,8 @@ import fetchMock from 'fetch-mock';
 import * as saveModalActions from 'src/explore/actions/saveModalActions';
 import SaveModal, { PureSaveModal } from 'src/explore/components/SaveModal';
 
-jest.mock('src/components', () => ({
-  ...jest.requireActual('src/components'),
+jest.mock('@superset-ui/core/components/Select', () => ({
+  ...jest.requireActual('@superset-ui/core/components/Select/AsyncSelect'),
   AsyncSelect: ({ onChange }) => (
     <input
       data-test="mock-async-select"
diff --git a/superset-frontend/src/explore/components/SaveModal.tsx b/superset-frontend/src/explore/components/SaveModal.tsx
index 0a1551429e0..a8dc8d79172 100644
--- a/superset-frontend/src/explore/components/SaveModal.tsx
+++ b/superset-frontend/src/explore/components/SaveModal.tsx
@@ -22,7 +22,18 @@ import { Dispatch } from 'redux';
 import rison from 'rison';
 import { connect } from 'react-redux';
 import { withRouter, RouteComponentProps } from 'react-router-dom';
-import { InfoTooltipWithTrigger } from '@superset-ui/chart-controls';
+import {
+  InfoTooltip,
+  Alert,
+  Button,
+  AsyncSelect,
+  Form,
+  FormItem,
+  Modal,
+  Input,
+  Loading,
+  Divider,
+} from '@superset-ui/core/components';
 import {
   css,
   DatasourceType,
@@ -32,14 +43,7 @@ import {
   SupersetClient,
   t,
 } from '@superset-ui/core';
-import { Input } from 'src/components/Input';
-import { Form, FormItem } from 'src/components/Form';
-import Alert from 'src/components/Alert';
-import Modal from 'src/components/Modal';
-import { Radio } from 'src/components/Radio';
-import Button from 'src/components/Button';
-import { AsyncSelect } from 'src/components';
-import Loading from 'src/components/Loading';
+import { Radio } from '@superset-ui/core/components/Radio';
 import { canUserEditDashboard } from 'src/dashboard/util/permissionUtils';
 import { setSaveChartModalVisibility } from 'src/explore/actions/saveModalActions';
 import { SaveActionType } from 'src/explore/types';
@@ -73,13 +77,13 @@ type SaveModalState = {
 };
 
 export const StyledModal = styled(Modal)`
-  .antd5-modal-body {
+  .ant-modal-body {
     overflow: visible;
   }
   i {
     position: absolute;
-    top: -${({ theme }) => theme.gridUnit * 5.25}px;
-    left: ${({ theme }) => theme.gridUnit * 26.75}px;
+    top: -${({ theme }) => theme.sizeUnit * 5.25}px;
+    left: ${({ theme }) => theme.sizeUnit * 26.75}px;
   }
 `;
 
@@ -354,7 +358,7 @@ class SaveModal extends Component<SaveModalProps, SaveModalState> {
             {t('Save as...')}
           </Radio>
         </FormItem>
-        <hr />
+        <Divider />
         <FormItem label={t('Chart name')} required>
           <Input
             name="new_slice_name"
@@ -367,7 +371,7 @@ class SaveModal extends Component<SaveModalProps, SaveModalState> {
         </FormItem>
         {this.props.datasource?.type === 'query' && (
           <FormItem label={t('Dataset Name')} required>
-            <InfoTooltipWithTrigger
+            <InfoTooltip
               tooltip={t('A reusable dataset will be saved with your chart.')}
               placement="right"
             />
diff --git a/superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx b/superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx
index 905fd04f9ce..43829aeec9f 100644
--- a/superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx
+++ b/superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx
@@ -20,7 +20,7 @@ import { PureComponent } from 'react';
 import rison from 'rison';
 import PropTypes from 'prop-types';
 import { CompactPicker } from 'react-color';
-import Button from 'src/components/Button';
+import { Button, AsyncSelect, EmptyState } from '@superset-ui/core/components';
 import {
   t,
   SupersetClient,
@@ -33,12 +33,10 @@ import {
   withTheme,
 } from '@superset-ui/core';
 import SelectControl from 'src/explore/components/controls/SelectControl';
-import { AsyncSelect } from 'src/components';
 import TextControl from 'src/explore/components/controls/TextControl';
 import CheckboxControl from 'src/explore/components/controls/CheckboxControl';
-import PopoverSection from 'src/components/PopoverSection';
+import PopoverSection from '@superset-ui/core/components/PopoverSection';
 import ControlHeader from 'src/explore/components/ControlHeader';
-import { EmptyState } from 'src/components/EmptyState';
 import {
   ANNOTATION_SOURCE_TYPES,
   ANNOTATION_TYPES,
@@ -901,7 +899,7 @@ class AnnotationLayer extends PureComponent {
     return (
       <>
         {this.props.error && (
-          <span style={{ color: this.props.theme.colors.error.base }}>
+          <span style={{ color: this.props.theme.colorError }}>
             ERROR: {this.props.error}
           </span>
         )}
@@ -967,11 +965,19 @@ class AnnotationLayer extends PureComponent {
         </div>
         <div style={{ display: 'flex', justifyContent: 'space-between' }}>
           {isNew ? (
-            <Button buttonSize="small" onClick={() => this.props.close()}>
+            <Button
+              buttonSize="small"
+              buttonStyle="secondary"
+              onClick={() => this.props.close()}
+            >
               {t('Cancel')}
             </Button>
           ) : (
-            <Button buttonSize="small" onClick={this.deleteAnnotation}>
+            <Button
+              buttonSize="small"
+              buttonStyle="secondary"
+              onClick={this.deleteAnnotation}
+            >
               {t('Remove')}
             </Button>
           )}
diff --git a/superset-frontend/src/explore/components/controls/AnnotationLayerControl/index.tsx b/superset-frontend/src/explore/components/controls/AnnotationLayerControl/index.tsx
index 2110feecd96..ba97733c69a 100644
--- a/superset-frontend/src/explore/components/controls/AnnotationLayerControl/index.tsx
+++ b/superset-frontend/src/explore/components/controls/AnnotationLayerControl/index.tsx
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { List } from 'src/components/List';
 import { connect } from 'react-redux';
 import { PureComponent } from 'react';
 import {
@@ -27,17 +26,19 @@ import {
   SupersetTheme,
   t,
   withTheme,
-  css,
 } from '@superset-ui/core';
-import { InfoTooltipWithTrigger } from '@superset-ui/chart-controls';
-import AsyncEsmComponent from 'src/components/AsyncEsmComponent';
+import {
+  AsyncEsmComponent,
+  List,
+  InfoTooltip,
+} from '@superset-ui/core/components';
 import { getChartKey } from 'src/explore/exploreUtils';
 import { runAnnotationQuery } from 'src/components/Chart/chartAction';
 import CustomListItem from 'src/explore/components/controls/CustomListItem';
 import { ChartState, ExplorePageState } from 'src/explore/types';
 import { AnyAction } from 'redux';
 import { ThunkDispatch } from 'redux-thunk';
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
 import ControlPopover, {
   getSectionContainerElement,
 } from '../ControlPopover/ControlPopover';
@@ -188,31 +189,25 @@ class AnnotationLayerControl extends PureComponent<Props, PopoverState> {
   renderInfo(anno: Annotation) {
     const { annotationError, annotationQuery, theme } = this.props;
     if (annotationQuery[anno.name]) {
-      return (
-        <Icons.SyncOutlined
-          iconColor={theme.colors.primary.base}
-          iconSize="m"
-        />
-      );
+      return <Icons.SyncOutlined iconColor={theme.colorPrimary} iconSize="m" />;
     }
     if (annotationError[anno.name]) {
       return (
-        <InfoTooltipWithTrigger
+        <InfoTooltip
           label="validation-errors"
-          bsStyle="danger"
+          type="error"
           tooltip={annotationError[anno.name]}
         />
       );
     }
     if (!anno.show) {
-      return <span style={{ color: theme.colors.error.base }}> Hidden </span>;
+      return <span style={{ color: theme.colorError }}> Hidden </span>;
     }
     return '';
   }
 
   render() {
     const { addedAnnotationIndex } = this.state;
-    const { theme } = this.props;
     const addedAnnotation =
       addedAnnotationIndex !== null
         ? this.props.value[addedAnnotationIndex]
@@ -246,7 +241,7 @@ class AnnotationLayerControl extends PureComponent<Props, PopoverState> {
 
     return (
       <div>
-        <List bordered css={theme => ({ borderRadius: theme.gridUnit })}>
+        <List bordered css={theme => ({ borderRadius: theme.borderRadius })}>
           {annotations}
           <ControlPopover
             trigger="click"
@@ -265,10 +260,6 @@ class AnnotationLayerControl extends PureComponent<Props, PopoverState> {
             <CustomListItem selectable>
               <Icons.PlusOutlined
                 iconSize="m"
-                css={css`
-                  margin: auto ${theme.gridUnit}px auto 0;
-                  vertical-align: tex-top;
-                `}
                 data-test="add-annotation-layer-button"
               />
               {t('Add annotation layer')}
diff --git a/superset-frontend/src/explore/components/controls/BoundsControl.stories.tsx b/superset-frontend/src/explore/components/controls/BoundsControl.stories.tsx
index aebd1a17ba7..b8d04f56fa9 100644
--- a/superset-frontend/src/explore/components/controls/BoundsControl.stories.tsx
+++ b/superset-frontend/src/explore/components/controls/BoundsControl.stories.tsx
@@ -19,7 +19,7 @@
 import BoundsControl, { BoundsControlProps } from './BoundsControl';
 
 export default {
-  title: 'BoundsControl',
+  title: 'Components/BoundsControl',
   component: BoundsControl,
 };
 
diff --git a/superset-frontend/src/explore/components/controls/BoundsControl.tsx b/superset-frontend/src/explore/components/controls/BoundsControl.tsx
index 87914d04b0f..b7621733f9b 100644
--- a/superset-frontend/src/explore/components/controls/BoundsControl.tsx
+++ b/superset-frontend/src/explore/components/controls/BoundsControl.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { useEffect, useRef, useState } from 'react';
-import { InputNumber } from 'src/components/Input';
+import { InputNumber } from '@superset-ui/core/components';
 import { t, styled } from '@superset-ui/core';
 import { debounce } from 'lodash';
 import ControlHeader from 'src/explore/components/ControlHeader';
@@ -35,12 +35,12 @@ const StyledDiv = styled.div`
 
 const MinInput = styled(InputNumber)`
   flex: 1;
-  margin-right: ${({ theme }) => theme.gridUnit}px;
+  margin-right: ${({ theme }) => theme.sizeUnit}px;
 `;
 
 const MaxInput = styled(InputNumber)`
   flex: 1;
-  margin-left: ${({ theme }) => theme.gridUnit}px;
+  margin-left: ${({ theme }) => theme.sizeUnit}px;
 `;
 
 const parseNumber = (value: undefined | number | string | null) => {
diff --git a/superset-frontend/src/explore/components/controls/CheckboxControl.jsx b/superset-frontend/src/explore/components/controls/CheckboxControl.jsx
index b5fd1e3ca55..63baa6454da 100644
--- a/superset-frontend/src/explore/components/controls/CheckboxControl.jsx
+++ b/superset-frontend/src/explore/components/controls/CheckboxControl.jsx
@@ -19,8 +19,8 @@
 import { Component } from 'react';
 import PropTypes from 'prop-types';
 import { styled, css } from '@superset-ui/core';
+import { Checkbox } from '@superset-ui/core/components';
 import ControlHeader from '../ControlHeader';
-import Checkbox from '../../../components/Checkbox';
 
 const propTypes = {
   value: PropTypes.bool,
@@ -36,10 +36,10 @@ const defaultProps = {
 const CheckBoxControlWrapper = styled.div`
   ${({ theme }) => css`
     .ControlHeader label {
-      color: ${theme.colors.grayscale.dark1};
+      color: ${theme.colorText};
     }
-    span[role='checkbox'] {
-      padding-right: ${theme.gridUnit * 2}px;
+    span:has(label) {
+      padding-right: ${theme.sizeUnit * 2}px;
     }
   `}
 `;
diff --git a/superset-frontend/src/explore/components/controls/CheckboxControl.test.tsx b/superset-frontend/src/explore/components/controls/CheckboxControl.test.tsx
index 77d90b966c1..8deae245168 100644
--- a/superset-frontend/src/explore/components/controls/CheckboxControl.test.tsx
+++ b/superset-frontend/src/explore/components/controls/CheckboxControl.test.tsx
@@ -35,7 +35,7 @@ describe('CheckboxControl', () => {
     render(setup());
 
     const checkbox = screen.getByRole('checkbox');
-    expect(checkbox).toBeVisible();
+    expect(checkbox).toBeInTheDocument();
     expect(checkbox).not.toBeChecked();
   });
 
diff --git a/superset-frontend/src/explore/components/controls/CollectionControl/CollectionControl.test.tsx b/superset-frontend/src/explore/components/controls/CollectionControl/CollectionControl.test.tsx
index 96004318832..2e5cea85d00 100644
--- a/superset-frontend/src/explore/components/controls/CollectionControl/CollectionControl.test.tsx
+++ b/superset-frontend/src/explore/components/controls/CollectionControl/CollectionControl.test.tsx
@@ -20,7 +20,7 @@ import { render, screen, userEvent } from 'spec/helpers/testing-library';
 import CollectionControl from '.';
 
 jest.mock('@superset-ui/chart-controls', () => ({
-  InfoTooltipWithTrigger: (props: any) => (
+  InfoTooltip: (props: any) => (
     <button
       onClick={props.onClick}
       type="button"
@@ -120,10 +120,10 @@ test('Should have remove button', async () => {
   render(<CollectionControl {...props} />);
 
   expect(
-    await screen.findByRole('button', { name: 'remove-item' }),
+    await screen.findByRole('button', { name: 'Show info tooltip' }),
   ).toBeInTheDocument();
   expect(props.onChange).toHaveBeenCalledTimes(0);
-  userEvent.click(screen.getByRole('button', { name: 'remove-item' }));
+  userEvent.click(screen.getByRole('button', { name: 'Show info tooltip' }));
   expect(props.onChange).toHaveBeenCalledWith([]);
 });
 
diff --git a/superset-frontend/src/explore/components/controls/CollectionControl/index.jsx b/superset-frontend/src/explore/components/controls/CollectionControl/index.jsx
index 1e4c9b454d9..44b963dc8fa 100644
--- a/superset-frontend/src/explore/components/controls/CollectionControl/index.jsx
+++ b/superset-frontend/src/explore/components/controls/CollectionControl/index.jsx
@@ -18,7 +18,7 @@
  */
 import { Component } from 'react';
 import PropTypes from 'prop-types';
-import { List } from 'src/components/List';
+import { InfoTooltip, List } from '@superset-ui/core/components';
 import { nanoid } from 'nanoid';
 import { t, withTheme } from '@superset-ui/core';
 import {
@@ -27,12 +27,11 @@ import {
   SortableElement,
   arrayMove,
 } from 'react-sortable-hoc';
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
 import {
   HeaderContainer,
   AddIconButton,
 } from 'src/explore/components/controls/OptionControls';
-import { InfoTooltipWithTrigger } from '@superset-ui/chart-controls';
 import ControlHeader from 'src/explore/components/ControlHeader';
 import CustomListItem from 'src/explore/components/controls/CustomListItem';
 import controlMap from '..';
@@ -65,12 +64,10 @@ const defaultProps = {
 const SortableListItem = SortableElement(CustomListItem);
 const SortableList = SortableContainer(List);
 const SortableDragger = SortableHandle(() => (
-  // TODO: Remove fa-icon
-  // eslint-disable-next-line icons/no-fa-icons-usage
-  <i
+  <Icons.MenuOutlined
     role="img"
     aria-label="drag"
-    className="fa fa-bars text-primary"
+    className="text-primary"
     style={{ cursor: 'ns-resize' }}
   />
 ));
@@ -111,7 +108,7 @@ class CollectionControl extends Component {
         onSortEnd={this.onSortEnd.bind(this)}
         bordered
         css={theme => ({
-          borderRadius: theme.gridUnit,
+          borderRadius: theme.borderRadius,
         })}
       >
         {this.props.value.map((o, i) => {
@@ -123,7 +120,7 @@ class CollectionControl extends Component {
               css={theme => ({
                 justifyContent: 'flex-start',
                 display: '-webkit-flex',
-                paddingInline: theme.gridUnit * 3,
+                paddingInline: theme.sizeUnit * 3,
               })}
               key={this.props.keyAccessor(o)}
               index={i}
@@ -132,8 +129,8 @@ class CollectionControl extends Component {
               <div
                 css={theme => ({
                   flex: 1,
-                  marginLeft: theme.gridUnit * 2,
-                  marginRight: theme.gridUnit * 2,
+                  marginLeft: theme.sizeUnit * 2,
+                  marginRight: theme.sizeUnit * 2,
                 })}
               >
                 <Control
@@ -142,8 +139,9 @@ class CollectionControl extends Component {
                   onChange={this.onChange.bind(this, i)}
                 />
               </div>
-              <InfoTooltipWithTrigger
+              <InfoTooltip
                 icon="times"
+                role="button"
                 label="remove-item"
                 tooltip={t('Remove item')}
                 bsStyle="primary"
@@ -157,16 +155,12 @@ class CollectionControl extends Component {
   }
 
   render() {
-    const { theme } = this.props;
     return (
       <div data-test="CollectionControl" className="CollectionControl">
         <HeaderContainer>
           <ControlHeader {...this.props} />
           <AddIconButton onClick={this.onAdd}>
-            <Icons.PlusOutlined
-              iconSize="s"
-              iconColor={theme.colors.grayscale.light5}
-            />
+            <Icons.PlusOutlined iconSize="s" />
           </AddIconButton>
         </HeaderContainer>
         {this.renderList()}
diff --git a/superset-frontend/src/explore/components/controls/ColorPickerControl.jsx b/superset-frontend/src/explore/components/controls/ColorPickerControl.jsx
index 56b86e58947..f0949daa8c7 100644
--- a/superset-frontend/src/explore/components/controls/ColorPickerControl.jsx
+++ b/superset-frontend/src/explore/components/controls/ColorPickerControl.jsx
@@ -20,7 +20,7 @@ import { Component } from 'react';
 import PropTypes from 'prop-types';
 import { SketchPicker } from 'react-color';
 import { getCategoricalSchemeRegistry, styled, css } from '@superset-ui/core';
-import Popover from 'src/components/Popover';
+import { Popover } from '@superset-ui/core/components';
 import ControlHeader from '../ControlHeader';
 
 const propTypes = {
@@ -47,7 +47,7 @@ const StyledSwatch = styled.div`
       width: 50px;
       height: 20px;
       position: relative;
-      padding: ${theme.gridUnit}px;
+      padding: ${theme.sizeUnit}px;
       borderRadius: ${theme.borderRadius}px;
       display: inline-block;
       cursor: pointer;
diff --git a/superset-frontend/src/explore/components/controls/ColorSchemeControl/ColorSchemeLabel.tsx b/superset-frontend/src/explore/components/controls/ColorSchemeControl/ColorSchemeLabel.tsx
index 73d61143e77..55b439e24f2 100644
--- a/superset-frontend/src/explore/components/controls/ColorSchemeControl/ColorSchemeLabel.tsx
+++ b/superset-frontend/src/explore/components/controls/ColorSchemeControl/ColorSchemeLabel.tsx
@@ -19,7 +19,7 @@
 
 import { css, SupersetTheme } from '@superset-ui/core';
 import { useRef, useState } from 'react';
-import { Tooltip } from 'src/components/Tooltip';
+import { Tooltip } from '@superset-ui/core/components';
 
 type ColorSchemeLabelProps = {
   colors: string[];
@@ -55,8 +55,8 @@ export default function ColorSchemeLabel(props: ColorSchemeLabelProps) {
       <span
         data-test="color"
         key={`${id}-${i}`}
-        css={(theme: { gridUnit: number }) => css`
-          padding-left: ${theme.gridUnit / 2}px;
+        css={(theme: { sizeUnit: number }) => css`
+          padding-left: ${theme.sizeUnit / 2}px;
           :before {
             content: '';
             display: inline-block;
@@ -100,7 +100,7 @@ export default function ColorSchemeLabel(props: ColorSchemeLabelProps) {
           ref={labelNameRef}
           css={(theme: SupersetTheme) => css`
             min-width: 125px;
-            padding-right: ${theme.gridUnit * 2}px;
+            padding-right: ${theme.sizeUnit * 2}px;
             text-overflow: ellipsis;
             overflow: hidden;
             white-space: nowrap;
@@ -115,7 +115,7 @@ export default function ColorSchemeLabel(props: ColorSchemeLabelProps) {
             text-overflow: ellipsis;
             overflow: hidden;
             white-space: nowrap;
-            padding-right: ${theme.gridUnit}px;
+            padding-right: ${theme.sizeUnit}px;
           `}
         >
           {colorsList()}
diff --git a/superset-frontend/src/explore/components/controls/ColorSchemeControl/index.tsx b/superset-frontend/src/explore/components/controls/ColorSchemeControl/index.tsx
index c1e620c6db8..be84eedfb69 100644
--- a/superset-frontend/src/explore/components/controls/ColorSchemeControl/index.tsx
+++ b/superset-frontend/src/explore/components/controls/ColorSchemeControl/index.tsx
@@ -28,20 +28,18 @@ import {
   getLabelsColorMap,
   CategoricalColorNamespace,
 } from '@superset-ui/core';
-// eslint-disable-next-line no-restricted-imports
-import AntdSelect from 'antd/lib/select'; // TODO: Remove antd
 import { sortBy } from 'lodash';
 import ControlHeader from 'src/explore/components/ControlHeader';
-import { Tooltip } from 'src/components/Tooltip';
-import { Icons } from 'src/components/Icons';
-import { SelectOptionsType } from 'src/components/Select/types';
-import { StyledSelect } from 'src/components/Select/styles';
-import { handleFilterOptionHelper } from 'src/components/Select/utils';
+import {
+  Tooltip,
+  Select,
+  type SelectOptionsType,
+} from '@superset-ui/core/components';
+import { Icons } from '@superset-ui/core/components/Icons';
+import { handleFilterOptionHelper } from '@superset-ui/core/components/Select/utils';
 import { getColorNamespace } from 'src/utils/colorScheme';
 import ColorSchemeLabel from './ColorSchemeLabel';
 
-const { Option, OptGroup } = AntdSelect;
-
 export type OptionData = SelectOptionsType[number]['options'][number];
 
 export interface ColorSchemes {
@@ -117,7 +115,7 @@ const Label = ({
         {label}{' '}
         <Tooltip title={alertTitle}>
           <Icons.WarningOutlined
-            iconColor={theme.colors.warning.base}
+            iconColor={theme.colorWarning}
             css={css`
               vertical-align: baseline;
             `}
@@ -176,11 +174,14 @@ const ColorSchemeControl = ({
   const options = useMemo(() => {
     if (showDashboardLockedOption) {
       return [
-        <Option value="dashboard" label={t('Dashboard')} key="dashboard">
-          <Tooltip title={DASHBOARD_CONTEXT_TOOLTIP}>
-            {t('Dashboard scheme')}
-          </Tooltip>
-        </Option>,
+        {
+          value: 'dashboard',
+          label: (
+            <Tooltip title={DASHBOARD_CONTEXT_TOOLTIP}>
+              {t('Dashboard scheme')}
+            </Tooltip>
+          ),
+        },
       ];
     }
     const schemesObject = typeof schemes === 'function' ? schemes() : schemes;
@@ -208,14 +209,13 @@ const ColorSchemeControl = ({
             : currentScheme.colors;
         }
         const option = {
-          customLabel: (
+          label: (
             <ColorSchemeLabel
               id={currentScheme.id}
               label={currentScheme.label}
               colors={colors}
             />
           ) as ReactNode,
-          label: schemesObject?.[value]?.label || value,
           value,
         };
         acc[currentScheme.group ?? ColorSchemeGroup.Other].options.push(option);
@@ -251,25 +251,18 @@ const ColorSchemeControl = ({
       nonEmptyGroups.length === 1 &&
       nonEmptyGroups[0].title === ColorSchemeGroup.Other
     ) {
-      return nonEmptyGroups[0].options.map((opt, index) => (
-        <Option value={opt.value} label={opt.label} key={index}>
-          {opt.customLabel}
-        </Option>
-      ));
+      return nonEmptyGroups[0].options.map(opt => ({
+        value: opt.value,
+        label: opt.customLabel || opt.label,
+      }));
     }
-    return nonEmptyGroups.map((group, groupIndex) => (
-      <OptGroup label={group.label} key={groupIndex}>
-        {group.options.map((opt, optIndex) => (
-          <Option
-            value={opt.value}
-            label={opt.label}
-            key={`${groupIndex}-${optIndex}`}
-          >
-            {opt.customLabel}
-          </Option>
-        ))}
-      </OptGroup>
-    ));
+    return nonEmptyGroups.map(group => ({
+      label: group.label,
+      options: group.options.map(opt => ({
+        value: opt.value,
+        label: opt.customLabel || opt.label,
+      })),
+    }));
   }, [choices, hasDashboardScheme, hasSharedLabelsColor, isLinear, schemes]);
 
   // We can't pass on change directly because it receives a second
@@ -308,15 +301,15 @@ const ColorSchemeControl = ({
           />
         }
       />
-      <StyledSelect
+      <Select
         css={css`
           width: 100%;
           & .ant-select-item.ant-select-item-group {
-            padding-left: ${theme.gridUnit}px;
-            font-size: ${theme.typography.sizes.m}px;
+            padding-left: ${theme.sizeUnit}px;
+            font-size: ${theme.fontSize}px;
           }
           & .ant-select-item-option-grouped {
-            padding-left: ${theme.gridUnit * 3}px;
+            padding-left: ${theme.sizeUnit * 3}px;
           }
         `}
         aria-label={t('Select color scheme')}
@@ -325,8 +318,9 @@ const ColorSchemeControl = ({
         onChange={handleOnChange}
         placeholder={t('Select scheme')}
         value={currentScheme}
-        getPopupContainer={triggerNode => triggerNode.parentNode}
         showSearch
+        getPopupContainer={triggerNode => triggerNode.parentNode}
+        options={options}
         filterOption={(search, option) =>
           handleFilterOptionHelper(
             search,
@@ -335,9 +329,7 @@ const ColorSchemeControl = ({
             true,
           )
         }
-      >
-        {options}
-      </StyledSelect>
+      />
     </>
   );
 };
diff --git a/superset-frontend/src/explore/components/controls/ColumnConfigControl/ColumnConfigControl.tsx b/superset-frontend/src/explore/components/controls/ColumnConfigControl/ColumnConfigControl.tsx
index e8d67aa018f..32d5b7235f7 100644
--- a/superset-frontend/src/explore/components/controls/ColumnConfigControl/ColumnConfigControl.tsx
+++ b/superset-frontend/src/explore/components/controls/ColumnConfigControl/ColumnConfigControl.tsx
@@ -23,6 +23,7 @@ import {
   COLUMN_NAME_ALIASES,
   ControlComponentProps,
 } from '@superset-ui/chart-controls';
+import { Icons } from '@superset-ui/core/components';
 import ColumnConfigItem from './ColumnConfigItem';
 import {
   ColumnConfigInfo,
@@ -129,8 +130,8 @@ export default function ColumnConfigControl<T extends ColumnConfig>({
       <ControlHeader {...props} />
       <div
         css={{
-          border: `1px solid ${theme.colors.grayscale.light2}`,
-          borderRadius: theme.gridUnit,
+          border: `1px solid ${theme.colorBorder}`,
+          borderRadius: theme.borderRadius,
         }}
       >
         {columnsWithChildInfo.map(col => (
@@ -166,11 +167,11 @@ export default function ColumnConfigControl<T extends ColumnConfig>({
             role="button"
             tabIndex={-1}
             css={{
-              padding: theme.gridUnit * 2,
+              padding: theme.sizeUnit * 2,
               textAlign: 'center',
               cursor: 'pointer',
-              fontSize: theme.typography.sizes.xs,
-              color: theme.colors.text.label,
+              fontSize: theme.fontSizeXS,
+              color: theme.colorTextLabel,
               ':hover': {
                 backgroundColor: theme.colors.grayscale.light4,
               },
@@ -179,16 +180,11 @@ export default function ColumnConfigControl<T extends ColumnConfig>({
           >
             {showAllColumns ? (
               <>
-                {/* TODO: Remove fa-icon */}
-                {/* eslint-disable-next-line icons/no-fa-icons-usage */}
-                <i className="fa fa-angle-up" /> &nbsp; {t('Show less columns')}
+                <Icons.UpOutlined /> &nbsp; {t('Show less columns')}
               </>
             ) : (
               <>
-                {/* TODO: Remove fa-icon */}
-                {/* eslint-disable-next-line icons/no-fa-icons-usage */}
-                <i className="fa fa-angle-down" /> &nbsp;
-                {t('Show all columns')}
+                <Icons.DownOutlined /> &nbsp; {t('Show all columns')}
               </>
             )}
           </div>
diff --git a/superset-frontend/src/explore/components/controls/ColumnConfigControl/ColumnConfigItem.tsx b/superset-frontend/src/explore/components/controls/ColumnConfigControl/ColumnConfigItem.tsx
index d274b734c35..fad0d1cb14e 100644
--- a/superset-frontend/src/explore/components/controls/ColumnConfigControl/ColumnConfigItem.tsx
+++ b/superset-frontend/src/explore/components/controls/ColumnConfigControl/ColumnConfigItem.tsx
@@ -18,8 +18,8 @@
  */
 import { memo } from 'react';
 import { css, useTheme } from '@superset-ui/core';
-import Popover from 'src/components/Popover';
-import { Icons } from 'src/components/Icons';
+import { Popover } from '@superset-ui/core/components';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { ColumnTypeLabel } from '@superset-ui/chart-controls';
 import ColumnConfigPopover, {
   ColumnConfigPopoverProps,
@@ -34,14 +34,14 @@ export default memo(function ColumnConfigItem({
   width,
   height,
 }: ColumnConfigItemProps) {
-  const { colors, gridUnit } = useTheme();
-  const caretWidth = gridUnit * 6;
+  const { colors, sizeUnit } = useTheme();
+  const caretWidth = sizeUnit * 6;
 
   const outerContainerStyle = css({
     display: 'flex',
     alignItems: 'center',
     cursor: 'pointer',
-    padding: `${gridUnit}px ${2 * gridUnit}px`,
+    padding: `${sizeUnit}px ${2 * sizeUnit}px`,
     borderBottom: `1px solid ${colors.grayscale.light2}`,
     position: 'relative',
     paddingRight: `${caretWidth}px`,
@@ -62,31 +62,31 @@ export default memo(function ColumnConfigItem({
   const nameContainerStyle = css({
     display: 'flex',
     alignItems: 'center',
-    paddingLeft: column.isChildColumn ? gridUnit * 7 : gridUnit,
+    paddingLeft: column.isChildColumn ? sizeUnit * 7 : sizeUnit,
     flex: 1,
   });
 
   const nameTextStyle = css({
-    paddingLeft: gridUnit,
+    paddingLeft: sizeUnit,
   });
 
   const iconContainerStyle = css({
     display: 'flex',
     alignItems: 'center',
     position: 'absolute',
-    right: 3 * gridUnit,
-    top: 3 * gridUnit,
+    right: 3 * sizeUnit,
+    top: 3 * sizeUnit,
     transform: 'translateY(-50%)',
-    gap: gridUnit,
+    gap: sizeUnit,
     color: colors.grayscale.light1,
   });
 
   const theme = useTheme();
 
   const caretIconStyle = css({
-    fontSize: `${theme.typography.sizes.s}px`,
-    fontWeight: theme.typography.weights.normal,
-    color: theme.colors.grayscale.light1,
+    fontSize: `${theme.fontSizeSM}px`,
+    fontWeight: theme.fontWeightNormal,
+    color: theme.colorIcon,
   });
 
   return (
@@ -101,8 +101,8 @@ export default memo(function ColumnConfigItem({
       )}
       trigger="click"
       placement="right"
-      overlayInnerStyle={{ width, height }}
-      overlayClassName="column-config-popover"
+      styles={{ body: { width, height } }}
+      rootClassName="column-config-popover"
     >
       <div css={outerContainerStyle}>
         <div css={nameContainerStyle}>
diff --git a/superset-frontend/src/explore/components/controls/ColumnConfigControl/ColumnConfigPopover.tsx b/superset-frontend/src/explore/components/controls/ColumnConfigControl/ColumnConfigPopover.tsx
index 76de5156b3d..7a9ebfbaef4 100644
--- a/superset-frontend/src/explore/components/controls/ColumnConfigControl/ColumnConfigPopover.tsx
+++ b/superset-frontend/src/explore/components/controls/ColumnConfigControl/ColumnConfigPopover.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { GenericDataType } from '@superset-ui/core';
-import Tabs from 'src/components/Tabs';
+import Tabs from '@superset-ui/core/components/Tabs';
 import {
   SHARED_COLUMN_CONFIG_PROPS,
   SharedColumnConfigProp,
@@ -29,6 +29,7 @@ import {
   ColumnConfigInfo,
   ControlFormItemDefaultSpec,
   isTabLayoutItem,
+  TabLayoutItem,
 } from './types';
 import ControlForm, { ControlFormItem, ControlFormRow } from './ControlForm';
 
@@ -72,23 +73,28 @@ export default function ColumnConfigPopover({
     ];
 
   if (isTabLayoutItem(layout[0])) {
-    return (
-      <Tabs centered>
-        {layout.map((item, i) =>
-          isTabLayoutItem(item) ? (
-            <Tabs.TabPane tab={item.tab} key={i}>
-              <ControlForm onChange={onChange} value={column.config}>
-                {item.children.map((row, i) => renderRow(row, i))}
-              </ControlForm>
-            </Tabs.TabPane>
-          ) : null,
-        )}
-      </Tabs>
-    );
+    const tabItems = (layout as TabLayoutItem[])
+      .filter(isTabLayoutItem)
+      .map((item: TabLayoutItem, i: number) => ({
+        key: i.toString(),
+        label: item.tab,
+        children: (
+          <ControlForm onChange={onChange} value={column.config}>
+            {item.children.map(
+              (row: ColumnConfigFormItem[], rowIndex: number) =>
+                renderRow(row, rowIndex),
+            )}
+          </ControlForm>
+        ),
+      }));
+
+    return <Tabs items={tabItems} />;
   }
   return (
     <ControlForm onChange={onChange} value={column.config}>
-      {layout.map((row, i) => renderRow(row as ColumnConfigFormItem[], i))}
+      {(layout as ColumnConfigFormItem[][]).map(
+        (row: ColumnConfigFormItem[], i: number) => renderRow(row, i),
+      )}
     </ControlForm>
   );
 }
diff --git a/superset-frontend/src/explore/components/controls/ColumnConfigControl/ControlForm/ControlFormItem.tsx b/superset-frontend/src/explore/components/controls/ColumnConfigControl/ControlForm/ControlFormItem.tsx
index 58798ca1102..7a2308a72cc 100644
--- a/superset-frontend/src/explore/components/controls/ColumnConfigControl/ControlForm/ControlFormItem.tsx
+++ b/superset-frontend/src/explore/components/controls/ColumnConfigControl/ControlForm/ControlFormItem.tsx
@@ -51,7 +51,7 @@ export function ControlFormItem({
   controlType,
   ...props
 }: ControlFormItemProps) {
-  const { gridUnit } = useTheme();
+  const { sizeUnit } = useTheme();
   const [hovered, setHovered] = useState(false);
   const [value, setValue] = useState(
     initialValue === undefined ? defaultValue : initialValue,
@@ -84,7 +84,7 @@ export function ControlFormItem({
   return (
     <div
       css={{
-        margin: 2 * gridUnit,
+        margin: 2 * sizeUnit,
         width,
         maxWidth: '100%',
         flex: 1,
diff --git a/superset-frontend/src/explore/components/controls/ColumnConfigControl/ControlForm/controls.ts b/superset-frontend/src/explore/components/controls/ColumnConfigControl/ControlForm/controls.ts
index beded787bd7..0447f032db0 100644
--- a/superset-frontend/src/explore/components/controls/ColumnConfigControl/ControlForm/controls.ts
+++ b/superset-frontend/src/explore/components/controls/ColumnConfigControl/ControlForm/controls.ts
@@ -17,9 +17,8 @@
  * under the License.
  */
 import { sharedControlComponents } from '@superset-ui/chart-controls';
-import { Select } from 'src/components';
-import { Input, InputNumber } from 'src/components/Input';
-import Slider from 'src/components/Slider';
+import { Input, InputNumber, Select } from '@superset-ui/core/components';
+import Slider from '@superset-ui/core/components/Slider';
 import CurrencyControl from '../../CurrencyControl';
 import CheckboxControl from '../../CheckboxControl';
 
diff --git a/superset-frontend/src/explore/components/controls/ColumnConfigControl/ControlForm/index.tsx b/superset-frontend/src/explore/components/controls/ColumnConfigControl/ControlForm/index.tsx
index 2b32f5e4f4e..9ae7b37b66d 100644
--- a/superset-frontend/src/explore/components/controls/ColumnConfigControl/ControlForm/index.tsx
+++ b/superset-frontend/src/explore/components/controls/ColumnConfigControl/ControlForm/index.tsx
@@ -22,12 +22,8 @@ import {
   FunctionComponentElement,
   useMemo,
 } from 'react';
-import {
-  FAST_DEBOUNCE,
-  JsonObject,
-  JsonValue,
-  useTheme,
-} from '@superset-ui/core';
+import { JsonObject, JsonValue, useTheme } from '@superset-ui/core';
+import { Constants } from '@superset-ui/core/components';
 import { debounce } from 'lodash';
 import { ControlFormItemNode } from './ControlFormItem';
 
@@ -38,13 +34,13 @@ export type ControlFormRowProps = {
 };
 
 export function ControlFormRow({ children }: ControlFormRowProps) {
-  const { gridUnit } = useTheme();
+  const { sizeUnit } = useTheme();
   return (
     <div
       css={{
         display: 'flex',
         flexWrap: 'nowrap',
-        marginBottom: gridUnit,
+        marginBottom: sizeUnit,
         maxWidth: '100%',
       }}
     >
@@ -77,7 +73,7 @@ export default function ControlForm({
     () =>
       ({
         0: onChange,
-        [FAST_DEBOUNCE]: debounce(onChange, FAST_DEBOUNCE),
+        [Constants.FAST_DEBOUNCE]: debounce(onChange, Constants.FAST_DEBOUNCE),
       }) as Record<number, typeof onChange>,
     [onChange],
   );
@@ -92,7 +88,7 @@ export default function ControlForm({
           const {
             name,
             width,
-            debounceDelay = FAST_DEBOUNCE,
+            debounceDelay = Constants.FAST_DEBOUNCE,
             onChange: onItemValueChange,
           } = item.props;
           return cloneElement(item, {
@@ -128,8 +124,8 @@ export default function ControlForm({
     <div
       css={{
         label: {
-          color: theme.colors.text.label,
-          fontSize: theme.typography.sizes.s,
+          color: theme.colorTextLabel,
+          fontSize: theme.fontSizeSM,
         },
       }}
     >
diff --git a/superset-frontend/src/explore/components/controls/ColumnConfigControl/constants.tsx b/superset-frontend/src/explore/components/controls/ColumnConfigControl/constants.tsx
index 51dc19fe970..a929383bbff 100644
--- a/superset-frontend/src/explore/components/controls/ColumnConfigControl/constants.tsx
+++ b/superset-frontend/src/explore/components/controls/ColumnConfigControl/constants.tsx
@@ -24,7 +24,7 @@ import {
   D3_TIME_FORMAT_DOCS,
   D3_TIME_FORMAT_OPTIONS,
 } from '@superset-ui/chart-controls';
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { ColumnConfigFormLayout } from './types';
 
 export type SharedColumnConfigProp =
diff --git a/superset-frontend/src/explore/components/controls/ComparisonRangeLabel.tsx b/superset-frontend/src/explore/components/controls/ComparisonRangeLabel.tsx
index c56280bbaf9..bd2c848ae75 100644
--- a/superset-frontend/src/explore/components/controls/ComparisonRangeLabel.tsx
+++ b/superset-frontend/src/explore/components/controls/ComparisonRangeLabel.tsx
@@ -19,7 +19,7 @@
 
 import { useEffect, useState } from 'react';
 import { useSelector } from 'react-redux';
-import { isEmpty, isEqual } from 'lodash';
+import { isEmpty, isEqual, noop } from 'lodash';
 import {
   BinaryAdhocFilter,
   css,
@@ -35,7 +35,7 @@ import ControlHeader, {
 } from 'src/explore/components/ControlHeader';
 import { RootState } from 'src/views/store';
 import { DEFAULT_DATE_PATTERN } from '@superset-ui/chart-controls';
-import { extendedDayjs } from 'src/utils/dates';
+import { extendedDayjs } from '@superset-ui/core/utils/dates';
 
 const DAYJS_FORMAT = 'YYYY-MM-DD';
 
@@ -61,6 +61,8 @@ const oldChoices = {
 export const ComparisonRangeLabel = ({
   multi = true,
 }: ComparisonRangeLabelProps) => {
+  noop(multi); // This is to avoid unused variable warning, can be removed if not needed
+
   const [labels, setLabels] = useState<string[]>([]);
   const currentTimeRangeFilters = useSelector<RootState, BinaryAdhocFilter[]>(
     state =>
@@ -182,8 +184,8 @@ export const ComparisonRangeLabel = ({
         <>
           <div
             css={theme => css`
-              font-size: ${theme.typography.sizes.m}px;
-              color: ${theme.colors.grayscale.dark1};
+              font-size: ${theme.fontSize}px;
+              color: ${theme.colorText};
             `}
             key={label}
           >
diff --git a/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/ConditionalFormattingControl.tsx b/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/ConditionalFormattingControl.tsx
index 3b5b9d94904..09820d44d62 100644
--- a/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/ConditionalFormattingControl.tsx
+++ b/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/ConditionalFormattingControl.tsx
@@ -17,9 +17,9 @@
  * under the License.
  */
 import { useEffect, useState } from 'react';
-import { styled, css, t, useTheme } from '@superset-ui/core';
+import { styled, css, t } from '@superset-ui/core';
 import { Comparator } from '@superset-ui/chart-controls';
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
 import ControlHeader from 'src/explore/components/ControlHeader';
 import { FormattingPopover } from './FormattingPopover';
 import {
@@ -35,16 +35,16 @@ import {
 
 const FormattersContainer = styled.div`
   ${({ theme }) => css`
-    padding: ${theme.gridUnit}px;
-    border: solid 1px ${theme.colors.grayscale.light2};
-    border-radius: ${theme.gridUnit}px;
+    padding: ${theme.sizeUnit}px;
+    border: solid 1px ${theme.colorBorder};
+    border-radius: ${theme.borderRadius}px;
   `}
 `;
 
 export const FormatterContainer = styled(OptionControlContainer)`
   &,
   & > div {
-    margin-bottom: ${({ theme }) => theme.gridUnit}px;
+    margin-bottom: ${({ theme }) => theme.sizeUnit}px;
     :last-child {
       margin-bottom: 0;
     }
@@ -55,7 +55,7 @@ export const CloseButton = styled.button`
   ${({ theme }) => css`
     color: ${theme.colors.grayscale.light1};
     height: 100%;
-    width: ${theme.gridUnit * 6}px;
+    width: ${theme.sizeUnit * 6}px;
     border: none;
     border-right: solid 1px ${theme.colors.grayscale.dark2}0C;
     padding: 0;
@@ -74,7 +74,6 @@ const ConditionalFormattingControl = ({
   extraColorChoices,
   ...props
 }: ConditionalFormattingControlProps) => {
-  const theme = useTheme();
   const [conditionalFormattingConfigs, setConditionalFormattingConfigs] =
     useState<ConditionalFormattingConfig[]>(value ?? []);
 
@@ -146,10 +145,7 @@ const ConditionalFormattingControl = ({
         {conditionalFormattingConfigs.map((config, index) => (
           <FormatterContainer key={index}>
             <CloseButton onClick={() => onDelete(index)}>
-              <Icons.CloseOutlined
-                iconSize="m"
-                iconColor={theme.colors.grayscale.light1}
-              />
+              <Icons.CloseOutlined iconSize="m" />
             </CloseButton>
             <FormattingPopover
               title={t('Edit formatter')}
@@ -164,13 +160,7 @@ const ConditionalFormattingControl = ({
               <OptionControlContainer withCaret>
                 <Label>{createLabel(config)}</Label>
                 <CaretContainer>
-                  <Icons.RightOutlined
-                    iconSize="m"
-                    css={css`
-                      margin-top: ${theme.gridUnit}px;
-                    `}
-                    iconColor={theme.colors.grayscale.light1}
-                  />
+                  <Icons.RightOutlined iconSize="m" />
                 </CaretContainer>
               </OptionControlContainer>
             </FormattingPopover>
@@ -186,9 +176,8 @@ const ConditionalFormattingControl = ({
           <AddControlLabel>
             <Icons.PlusOutlined
               iconSize="m"
-              iconColor={theme.colors.grayscale.light1}
               css={theme => ({
-                margin: `auto ${theme.gridUnit}px auto 0`,
+                margin: `auto ${theme.sizeUnit}px auto 0`,
                 verticalAlign: 'baseline',
               })}
             />
diff --git a/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/FormattingPopover.tsx b/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/FormattingPopover.tsx
index 5b03a5b27a9..dd6aef1f0a9 100644
--- a/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/FormattingPopover.tsx
+++ b/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/FormattingPopover.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { useCallback, useState } from 'react';
-import Popover from 'src/components/Popover';
+import { Popover } from '@superset-ui/core/components';
 import { FormattingPopoverContent } from './FormattingPopoverContent';
 import { ConditionalFormattingConfig, FormattingPopoverProps } from './types';
 
diff --git a/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/FormattingPopoverContent.tsx b/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/FormattingPopoverContent.tsx
index 8e68bc02091..5b18ebf14b7 100644
--- a/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/FormattingPopoverContent.tsx
+++ b/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/FormattingPopoverContent.tsx
@@ -18,18 +18,29 @@
  */
 import { useState } from 'react';
 import { styled, SupersetTheme, t, useTheme } from '@superset-ui/core';
-import { ColorSchemeEnum } from '@superset-ui/plugin-chart-table';
 import {
   Comparator,
   MultipleValueComparators,
 } from '@superset-ui/chart-controls';
-import { Form, FormItem, FormProps } from 'src/components/Form';
-import Select from 'src/components/Select/Select';
-import { Col, Row } from 'src/components';
-import { InputNumber } from 'src/components/Input';
-import Button from 'src/components/Button';
+import {
+  Select,
+  Button,
+  Form,
+  FormItem,
+  InputNumber,
+  Col,
+  Row,
+  type FormProps,
+} from '@superset-ui/core/components';
 import { ConditionalFormattingConfig } from './types';
 
+// TODO: tangled redefinition that aligns with @superset-ui/plugin-chart-table
+// used to be imported but main app shouldn't depend on plugins...
+export enum ColorSchemeEnum {
+  'Green' = 'Green',
+  'Red' = 'Red',
+}
+
 const FullWidthInputNumber = styled(InputNumber)`
   width: 100%;
 `;
@@ -40,12 +51,9 @@ const JustifyEnd = styled.div`
 `;
 
 const colorSchemeOptions = (theme: SupersetTheme) => [
-  { value: theme.colors.success.light1, label: t('success') },
-  { value: theme.colors.warning.light1, label: t('alert') },
-  { value: theme.colors.error.light1, label: t('error') },
-  { value: theme.colors.success.dark1, label: t('success dark') },
-  { value: theme.colors.warning.dark1, label: t('alert dark') },
-  { value: theme.colors.error.dark1, label: t('error dark') },
+  { value: theme.colorSuccessBg, label: t('success') },
+  { value: theme.colorWarningBg, label: t('alert') },
+  { value: theme.colorErrorBg, label: t('error') },
 ];
 
 const operatorOptions = [
diff --git a/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/types.ts b/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/types.ts
index a1252ba6898..f2406cdc169 100644
--- a/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/types.ts
+++ b/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/types.ts
@@ -18,7 +18,7 @@
  */
 
 import { ReactNode } from 'react';
-import { PopoverProps } from 'src/components/Popover';
+import { PopoverProps } from '@superset-ui/core/components/Popover';
 import { Comparator, ControlComponentProps } from '@superset-ui/chart-controls';
 
 export type ConditionalFormattingConfig = {
diff --git a/superset-frontend/src/explore/components/controls/ContourControl/ContourOption.tsx b/superset-frontend/src/explore/components/controls/ContourControl/ContourOption.tsx
index b53de37ef3c..1064bbb7601 100644
--- a/superset-frontend/src/explore/components/controls/ContourControl/ContourOption.tsx
+++ b/superset-frontend/src/explore/components/controls/ContourControl/ContourOption.tsx
@@ -34,9 +34,9 @@ const StyledListItem = styled.li`
 
 const ColorPatch = styled.div<{ formattedColor: string }>`
   background-color: ${({ formattedColor }) => formattedColor};
-  height: ${({ theme }) => theme.gridUnit}px;
-  width: ${({ theme }) => theme.gridUnit}px;
-  margin: 0 ${({ theme }) => theme.gridUnit}px;
+  height: ${({ theme }) => theme.sizeUnit}px;
+  width: ${({ theme }) => theme.sizeUnit}px;
+  margin: 0 ${({ theme }) => theme.sizeUnit}px;
 `;
 
 const ContourOption = ({
diff --git a/superset-frontend/src/explore/components/controls/ContourControl/ContourPopoverControl.tsx b/superset-frontend/src/explore/components/controls/ContourControl/ContourPopoverControl.tsx
index fc9c1bfd786..90df7d043c0 100644
--- a/superset-frontend/src/explore/components/controls/ContourControl/ContourPopoverControl.tsx
+++ b/superset-frontend/src/explore/components/controls/ContourControl/ContourPopoverControl.tsx
@@ -17,9 +17,8 @@
  * under the License.
  */
 import { useState, useEffect } from 'react';
-import { Row, Col } from 'src/components';
-import Button from 'src/components/Button';
-import Tabs from 'src/components/Tabs';
+import { Button, Row, Col } from '@superset-ui/core/components';
+import Tabs from '@superset-ui/core/components/Tabs';
 import { legacyValidateInteger, styled, t } from '@superset-ui/core';
 import ControlHeader from '../../ControlHeader';
 import TextControl from '../TextControl';
@@ -37,12 +36,12 @@ enum ContourTypes {
 }
 
 const ContourActionsContainer = styled.div`
-  margin-top: ${({ theme }) => theme.gridUnit * 2}px;
+  margin-top: ${({ theme }) => theme.sizeUnit * 2}px;
 `;
 
 const StyledRow = styled(Row)`
   width: 100%;
-  gap: ${({ theme }) => theme.gridUnit * 2}px;
+  gap: ${({ theme }) => theme.sizeUnit * 2}px;
 `;
 
 const isIsoband = (contour: ContourType) => {
@@ -214,122 +213,125 @@ const ContourPopoverControl = ({
     }
   };
 
+  const tabItems = [
+    {
+      key: ContourTypes.Isoline,
+      label: t('Isoline'),
+      children: (
+        <div key={ContourTypes.Isoline} className="isoline-popover-section">
+          <StyledRow>
+            <Col flex="1">
+              <ControlHeader
+                name="isoline-threshold"
+                label={t('Threshold')}
+                description={t(
+                  'Defines the value that determines the boundary between different regions or levels in the data ',
+                )}
+                validationErrors={validationErrors.lowerThreshold}
+                hovered
+              />
+              <TextControl
+                value={contour.lowerThreshold}
+                onChange={updateLowerThreshold}
+              />
+            </Col>
+          </StyledRow>
+          <StyledRow>
+            <Col flex="1">
+              <ControlHeader
+                name="isoline-stroke-width"
+                label={t('Stroke Width')}
+                description={t('The width of the Isoline in pixels')}
+                validationErrors={validationErrors.strokeWidth}
+                hovered
+              />
+              <TextControl
+                value={contour.strokeWidth || ''}
+                onChange={updateStrokeWidth}
+              />
+            </Col>
+            <Col flex="1">
+              <ControlHeader
+                name="isoline-color"
+                label={t('Color')}
+                description={t('The color of the isoline')}
+                validationErrors={validationErrors.color}
+                hovered
+              />
+              <ColorPickerControl
+                value={typeof contour === 'object' && contour?.color}
+                onChange={updateColor}
+              />
+            </Col>
+          </StyledRow>
+        </div>
+      ),
+    },
+    {
+      key: ContourTypes.Isoband,
+      label: t('Isoband'),
+      children: (
+        <div key={ContourTypes.Isoband} className="isoline-popover-section">
+          <StyledRow>
+            <Col flex="1">
+              <ControlHeader
+                name="isoband-threshold-lower"
+                label={t('Lower Threshold')}
+                description={t(
+                  'The lower limit of the threshold range of the Isoband',
+                )}
+                validationErrors={validationErrors.lowerThreshold}
+                hovered
+              />
+              <TextControl
+                value={contour.lowerThreshold || ''}
+                onChange={updateLowerThreshold}
+              />
+            </Col>
+            <Col flex="1">
+              <ControlHeader
+                name="isoband-threshold-upper"
+                label={t('Upper Threshold')}
+                description={t(
+                  'The upper limit of the threshold range of the Isoband',
+                )}
+                validationErrors={validationErrors.upperThreshold}
+                hovered
+              />
+              <TextControl
+                value={contour.upperThreshold || ''}
+                onChange={updateUpperThreshold}
+              />
+            </Col>
+          </StyledRow>
+          <StyledRow>
+            <Col flex="1">
+              <ControlHeader
+                name="isoband-color"
+                label={t('Color')}
+                description={t('The color of the isoband')}
+                validationErrors={validationErrors.color}
+                hovered
+              />
+              <ColorPickerControl
+                value={contour?.color}
+                onChange={updateColor}
+              />
+            </Col>
+          </StyledRow>
+        </div>
+      ),
+    },
+  ];
+
   return (
     <>
       <Tabs
         id="contour-edit-tabs"
         onChange={onTabChange}
         defaultActiveKey={getTabKey(initialValue)}
-      >
-        <Tabs.TabPane
-          className="adhoc-filter-edit-tab"
-          key={ContourTypes.Isoline}
-          tab={t('Isoline')}
-        >
-          <div key={ContourTypes.Isoline} className="isoline-popover-section">
-            <StyledRow>
-              <Col flex="1">
-                <ControlHeader
-                  name="isoline-threshold"
-                  label={t('Threshold')}
-                  description={t(
-                    'Defines the value that determines the boundary between different regions or levels in the data ',
-                  )}
-                  validationErrors={validationErrors.lowerThreshold}
-                  hovered
-                />
-                <TextControl
-                  value={contour.lowerThreshold}
-                  onChange={updateLowerThreshold}
-                />
-              </Col>
-            </StyledRow>
-            <StyledRow>
-              <Col flex="1">
-                <ControlHeader
-                  name="isoline-stroke-width"
-                  label={t('Stroke Width')}
-                  description={t('The width of the Isoline in pixels')}
-                  validationErrors={validationErrors.strokeWidth}
-                  hovered
-                />
-                <TextControl
-                  value={contour.strokeWidth || ''}
-                  onChange={updateStrokeWidth}
-                />
-              </Col>
-              <Col flex="1">
-                <ControlHeader
-                  name="isoline-color"
-                  label={t('Color')}
-                  description={t('The color of the isoline')}
-                  validationErrors={validationErrors.color}
-                  hovered
-                />
-                <ColorPickerControl
-                  value={typeof contour === 'object' && contour?.color}
-                  onChange={updateColor}
-                />
-              </Col>
-            </StyledRow>
-          </div>
-        </Tabs.TabPane>
-        <Tabs.TabPane
-          className="adhoc-filter-edit-tab"
-          key={ContourTypes.Isoband}
-          tab={t('Isoband')}
-        >
-          <div key={ContourTypes.Isoband} className="isoline-popover-section">
-            <StyledRow>
-              <Col flex="1">
-                <ControlHeader
-                  name="isoband-threshold-lower"
-                  label={t('Lower Threshold')}
-                  description={t(
-                    'The lower limit of the threshold range of the Isoband',
-                  )}
-                  validationErrors={validationErrors.lowerThreshold}
-                  hovered
-                />
-                <TextControl
-                  value={contour.lowerThreshold || ''}
-                  onChange={updateLowerThreshold}
-                />
-              </Col>
-              <Col flex="1">
-                <ControlHeader
-                  name="isoband-threshold-upper"
-                  label={t('Upper Threshold')}
-                  description={t(
-                    'The upper limit of the threshold range of the Isoband',
-                  )}
-                  validationErrors={validationErrors.upperThreshold}
-                  hovered
-                />
-                <TextControl
-                  value={contour.upperThreshold || ''}
-                  onChange={updateUpperThreshold}
-                />
-              </Col>
-            </StyledRow>
-            <StyledRow>
-              <Col flex="1">
-                <ControlHeader
-                  name="isoband-color"
-                  label={t('Color')}
-                  description={t('The color of the isoband')}
-                  validationErrors={validationErrors.color}
-                  hovered
-                />
-                <ColorPickerControl
-                  value={contour?.color}
-                  onChange={updateColor}
-                />
-              </Col>
-            </StyledRow>
-          </div>
-        </Tabs.TabPane>
-      </Tabs>
+        items={tabItems}
+      />
       <ContourActionsContainer>
         <Button buttonSize="small" onClick={onClose} cta>
           {t('Close')}
@@ -339,7 +341,6 @@ const ContourPopoverControl = ({
           disabled={!isComplete || containsErrors()}
           buttonStyle="primary"
           buttonSize="small"
-          className="m-r-5"
           onClick={handleSave}
           cta
         >
diff --git a/superset-frontend/src/explore/components/controls/ContourControl/index.tsx b/superset-frontend/src/explore/components/controls/ContourControl/index.tsx
index ebd420540d2..2e372b98a4a 100644
--- a/superset-frontend/src/explore/components/controls/ContourControl/index.tsx
+++ b/superset-frontend/src/explore/components/controls/ContourControl/index.tsx
@@ -47,8 +47,8 @@ const DEFAULT_CONTOURS: ContourType[] = [
 
 const NewContourFormatPlaceholder = styled('div')`
   position: relative;
-  width: calc(100% - ${({ theme }) => theme.gridUnit}px);
-  bottom: ${({ theme }) => theme.gridUnit * 4}px;
+  width: calc(100% - ${({ theme }) => theme.sizeUnit}px);
+  bottom: ${({ theme }) => theme.sizeUnit * 4}px;
   left: 0;
 `;
 
diff --git a/superset-frontend/src/explore/components/controls/ControlPopover/ControlPopover.tsx b/superset-frontend/src/explore/components/controls/ControlPopover/ControlPopover.tsx
index b7be6cc5916..75159b6c7c7 100644
--- a/superset-frontend/src/explore/components/controls/ControlPopover/ControlPopover.tsx
+++ b/superset-frontend/src/explore/components/controls/ControlPopover/ControlPopover.tsx
@@ -19,11 +19,12 @@
 // eslint-disable-next-line no-restricted-syntax -- whole React import is required for `ControlPopover.test.tsx` Jest test passing.
 import React, { FC, useCallback, useRef, useEffect, useState } from 'react';
 
-import Popover, {
+import {
+  Popover,
   PopoverProps as BasePopoverProps,
-} from 'src/components/Popover';
+} from '@superset-ui/core/components';
 
-import { TooltipPlacement } from 'src/components/Tooltip';
+import { TooltipPlacement } from '@superset-ui/core/components/Tooltip/types';
 
 const sectionContainerId = 'controlSections';
 export const getSectionContainerElement = () =>
diff --git a/superset-frontend/src/explore/components/controls/CurrencyControl/CurrencyControl.tsx b/superset-frontend/src/explore/components/controls/CurrencyControl/CurrencyControl.tsx
index 7186472fef5..2829be3686a 100644
--- a/superset-frontend/src/explore/components/controls/CurrencyControl/CurrencyControl.tsx
+++ b/superset-frontend/src/explore/components/controls/CurrencyControl/CurrencyControl.tsx
@@ -27,9 +27,8 @@ import {
   t,
 } from '@superset-ui/core';
 import { CSSObject } from '@emotion/react';
-import { Select } from 'src/components';
+import { Select, type SelectProps } from '@superset-ui/core/components';
 import { ViewState } from 'src/views/types';
-import { SelectProps } from 'src/components/Select/types';
 import ControlHeader from '../../ControlHeader';
 
 export interface CurrencyControlProps {
@@ -47,7 +46,7 @@ const CurrencyControlContainer = styled.div`
     align-items: center;
 
     & > :first-child {
-      margin-right: ${theme.gridUnit * 4}px;
+      margin-right: ${theme.sizeUnit * 4}px;
       min-width: 0;
       flex: 1;
     }
diff --git a/superset-frontend/src/explore/components/controls/CustomListItem/index.tsx b/superset-frontend/src/explore/components/controls/CustomListItem/index.tsx
index e84e29dbd63..744acb292b8 100644
--- a/superset-frontend/src/explore/components/controls/CustomListItem/index.tsx
+++ b/superset-frontend/src/explore/components/controls/CustomListItem/index.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { useTheme } from '@superset-ui/core';
-import { ListItemProps, List } from 'src/components/List';
+import { List, type ListItemProps } from '@superset-ui/core/components';
 
 export interface CustomListItemProps extends ListItemProps {
   selectable: boolean;
@@ -27,14 +27,14 @@ export default function CustomListItem(props: CustomListItemProps) {
   const { selectable, children, ...rest } = props;
   const theme = useTheme();
   const css: Record<string, Record<string, Record<string, number> | string>> = {
-    '&.antd5-list-item': {
+    '&.ant-list-item': {
       ':first-of-type': {
-        borderTopLeftRadius: theme.gridUnit,
-        borderTopRightRadius: theme.gridUnit,
+        borderTopLeftRadius: theme.borderRadius,
+        borderTopRightRadius: theme.borderRadius,
       },
       ':last-of-type': {
-        borderBottomLeftRadius: theme.gridUnit,
-        borderBottomRightRadius: theme.gridUnit,
+        borderBottomLeftRadius: theme.borderRadius,
+        borderBottomRightRadius: theme.borderRadius,
       },
     },
   };
diff --git a/superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx b/superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx
index 9bea9432b21..574484e0dc2 100644
--- a/superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx
+++ b/superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx
@@ -30,24 +30,26 @@ import {
 } from '@superset-ui/core';
 import { getTemporalColumns } from '@superset-ui/chart-controls';
 import { getUrlParam } from 'src/utils/urlUtils';
-import { Dropdown } from 'src/components/Dropdown';
-import { Menu } from 'src/components/Menu';
-import { Tooltip } from 'src/components/Tooltip';
-import { Icons } from 'src/components/Icons';
+import {
+  Dropdown,
+  Tooltip,
+  Button,
+  ModalTrigger,
+} from '@superset-ui/core/components';
 import {
   ChangeDatasourceModal,
   DatasourceModal,
-} from 'src/components/Datasource';
-import Button from 'src/components/Button';
-import ErrorAlert from 'src/components/ErrorMessage/ErrorAlert';
-import WarningIconWithTooltip from 'src/components/WarningIconWithTooltip';
+  ErrorAlert,
+} from 'src/components';
+import { Menu } from '@superset-ui/core/components/Menu';
+import { Icons } from '@superset-ui/core/components/Icons';
+import WarningIconWithTooltip from '@superset-ui/core/components/WarningIconWithTooltip';
 import { URL_PARAMS } from 'src/constants';
 import { getDatasourceAsSaveableDataset } from 'src/utils/datasourceUtils';
 import {
   userHasPermission,
   isUserAdmin,
 } from 'src/dashboard/util/permissionUtils';
-import ModalTrigger from 'src/components/ModalTrigger';
 import ViewQueryModalFooter from 'src/explore/components/controls/ViewQueryModalFooter';
 import ViewQuery from 'src/explore/components/controls/ViewQuery';
 import { SaveDatasetModal } from 'src/SqlLab/components/SaveDatasetModal';
@@ -71,20 +73,30 @@ const defaultProps = {
   isEditable: true,
 };
 
+const getDatasetType = datasource => {
+  if (datasource.type === 'query') {
+    return 'query';
+  }
+  if (datasource.type === 'table' && datasource.sql) {
+    return 'virtual_dataset';
+  }
+  return 'physical_dataset';
+};
+
 const Styles = styled.div`
   .data-container {
     display: flex;
     justify-content: space-between;
     align-items: center;
-    border-bottom: 1px solid ${({ theme }) => theme.colors.grayscale.light2};
-    padding: ${({ theme }) => 4 * theme.gridUnit}px;
-    padding-right: ${({ theme }) => 2 * theme.gridUnit}px;
+    border-bottom: 1px solid ${({ theme }) => theme.colorSplit};
+    padding: ${({ theme }) => 4 * theme.sizeUnit}px;
+    padding-right: ${({ theme }) => 2 * theme.sizeUnit}px;
   }
   .error-alert {
-    margin: ${({ theme }) => 2 * theme.gridUnit}px;
+    margin: ${({ theme }) => 2 * theme.sizeUnit}px;
   }
-  .antd5-dropdown-trigger {
-    margin-left: ${({ theme }) => 2 * theme.gridUnit}px;
+  .ant-dropdown-trigger {
+    margin-left: ${({ theme }) => 2 * theme.sizeUnit}px;
   }
   .btn-group .open .dropdown-toggle {
     box-shadow: none;
@@ -93,32 +105,30 @@ const Styles = styled.div`
     }
   }
   i.angle {
-    color: ${({ theme }) => theme.colors.primary.base};
+    color: ${({ theme }) => theme.colorPrimary};
   }
   svg.datasource-modal-trigger {
-    color: ${({ theme }) => theme.colors.primary.base};
+    color: ${({ theme }) => theme.colorPrimary};
     cursor: pointer;
   }
   .title-select {
     flex: 1 1 100%;
     display: inline-block;
-    background-color: ${({ theme }) => theme.colors.grayscale.light3};
-    padding: ${({ theme }) => theme.gridUnit * 2}px;
+    padding: ${({ theme }) => theme.sizeUnit * 2}px 0px;
     border-radius: ${({ theme }) => theme.borderRadius}px;
-    text-align: center;
     text-overflow: ellipsis;
     white-space: nowrap;
     overflow: hidden;
   }
   .datasource-svg {
-    margin-right: ${({ theme }) => 2 * theme.gridUnit}px;
+    margin-right: ${({ theme }) => 2 * theme.sizeUnit}px;
     flex: none;
   }
   span[aria-label='dataset-physical'] {
     color: ${({ theme }) => theme.colors.grayscale.base};
   }
   span[aria-label='more'] {
-    color: ${({ theme }) => theme.colors.primary.base};
+    color: ${({ theme }) => theme.colorPrimary};
   }
 `;
 
@@ -134,10 +144,9 @@ const VISIBLE_TITLE_LENGTH = 25;
 
 // Assign icon for each DatasourceType.  If no icon assignment is found in the lookup, no icon will render
 export const datasourceIconLookup = {
-  [DatasourceType.Query]: (
-    <Icons.ConsoleSqlOutlined className="datasource-svg" />
-  ),
-  [DatasourceType.Table]: <Icons.TableOutlined className="datasource-svg" />,
+  query: <Icons.ConsoleSqlOutlined className="datasource-svg" />,
+  physical_dataset: <Icons.TableOutlined className="datasource-svg" />,
+  virtual_dataset: <Icons.ConsoleSqlOutlined className="datasource-svg" />,
 };
 
 // Render title for datasource with tooltip only if text is longer than VISIBLE_TITLE_LENGTH
@@ -397,15 +406,15 @@ class DatasourceControl extends PureComponent {
     return (
       <Styles data-test="datasource-control" className="DatasourceControl">
         <div className="data-container">
-          {datasourceIconLookup[datasource?.type]}
+          {datasourceIconLookup[getDatasetType(datasource)]}
           {renderDatasourceTitle(titleText, tooltip)}
           {healthCheckMessage && (
             <Tooltip title={healthCheckMessage}>
               <Icons.WarningOutlined
                 css={css`
-                  margin-left: ${theme.gridUnit * 2}px;
+                  margin-left: ${theme.sizeUnit * 2}px;
                 `}
-                iconColor={theme.colors.warning.base}
+                iconColor={theme.colorWarning}
               />
             </Tooltip>
           )}
@@ -413,7 +422,7 @@ class DatasourceControl extends PureComponent {
             <WarningIconWithTooltip warningMarkdown={extra.warning_markdown} />
           )}
           <Dropdown
-            dropdownRender={() =>
+            popupRender={() =>
               datasource.type === DatasourceType.Query
                 ? queryDatasourceMenu
                 : defaultDatasourceMenu
@@ -422,8 +431,8 @@ class DatasourceControl extends PureComponent {
             data-test="datasource-menu"
           >
             <Icons.MoreOutlined
-              IconSize="xl"
-              iconColor={theme.colors.primary.base}
+              iconSize="xl"
+              iconColor={theme.colorPrimary}
               className="datasource-modal-trigger"
               data-test="datasource-menu-trigger"
             />
@@ -444,19 +453,27 @@ class DatasourceControl extends PureComponent {
         {isMissingDatasource && !isMissingParams && (
           <div className="error-alert">
             <ErrorAlert
-              level="warning"
+              type="warning"
               errorType={t('Missing dataset')}
-              description={
+              descriptionPre={false}
+              descriptionDetailsCollapsed={false}
+              descriptionDetails={
                 <>
-                  {t('The dataset linked to this chart may have been deleted.')}
-                  <Button
-                    buttonStyle="primary"
-                    onClick={() =>
-                      this.handleMenuItemClick({ key: CHANGE_DATASET })
-                    }
-                  >
-                    {t('Swap dataset')}
-                  </Button>
+                  <p>
+                    {t(
+                      'The dataset linked to this chart may have been deleted.',
+                    )}
+                  </p>
+                  <p>
+                    <Button
+                      buttonStyle="warning"
+                      onClick={() =>
+                        this.handleMenuItemClick({ key: CHANGE_DATASET })
+                      }
+                    >
+                      {t('Swap dataset')}
+                    </Button>
+                  </p>
                 </>
               }
             />
diff --git a/superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx b/superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx
index 421019e6537..2ed3da7bda1 100644
--- a/superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx
+++ b/superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx
@@ -27,15 +27,17 @@ import {
   useCSSTextTruncation,
   fetchTimeRange,
 } from '@superset-ui/core';
-import Button from 'src/components/Button';
+import {
+  Button,
+  Constants,
+  Divider,
+  Modal,
+  Tooltip,
+  Select,
+} from '@superset-ui/core/components';
 import ControlHeader from 'src/explore/components/ControlHeader';
-import Modal from 'src/components/Modal';
-import { Divider } from 'src/components/Divider';
-import { Icons } from 'src/components/Icons';
-import Select from 'src/components/Select/Select';
-import { Tooltip } from 'src/components/Tooltip';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { useDebouncedEffect } from 'src/explore/exploreUtils';
-import { SLOW_DEBOUNCE } from 'src/constants';
 import { noOp } from 'src/utils/common';
 import ControlPopover from '../ControlPopover/ControlPopover';
 
@@ -65,31 +67,24 @@ const ContentStyleWrapper = styled.div`
       margin-top: 8px;
     }
 
-    .antd5-input-number {
-      width: 100%;
-    }
-
     .ant-picker {
       padding: 4px 17px 4px;
       border-radius: 4px;
-      width: 100%;
     }
 
-    .antd5-divider-horizontal {
+    .ant-divider-horizontal {
       margin: 16px 0;
     }
 
     .control-label {
-      font-size: 11px;
-      font-weight: ${theme.typography.weights.medium};
-      color: ${theme.colors.grayscale.light2};
+      font-size: ${theme.fontSizeSM}px;
       line-height: 16px;
       margin: 8px 0;
     }
 
     .section-title {
       font-style: normal;
-      font-weight: ${theme.typography.weights.bold};
+      font-weight: ${theme.fontWeightStrong};
       font-size: 15px;
       line-height: 24px;
       margin-bottom: 8px;
@@ -111,14 +106,14 @@ const ContentStyleWrapper = styled.div`
 
 const IconWrapper = styled.span`
   span {
-    margin-right: ${({ theme }) => 2 * theme.gridUnit}px;
+    margin-right: ${({ theme }) => 2 * theme.sizeUnit}px;
     vertical-align: middle;
   }
   .text {
     vertical-align: middle;
   }
   .error {
-    color: ${({ theme }) => theme.colors.error.base};
+    color: ${({ theme }) => theme.colorError};
   }
 `;
 
@@ -133,7 +128,7 @@ const getTooltipTitle = (
       {range && (
         <div
           css={(theme: SupersetTheme) => css`
-            margin-top: ${theme.gridUnit}px;
+            margin-top: ${theme.sizeUnit}px;
           `}
         >
           {range}
@@ -237,7 +232,7 @@ export default function DateFilterLabel(props: DateFilterControlProps) {
         });
       }
     },
-    SLOW_DEBOUNCE,
+    Constants.SLOW_DEBOUNCE,
     [timeRangeValue],
   );
 
@@ -278,9 +273,9 @@ export default function DateFilterLabel(props: DateFilterControlProps) {
 
   const overlayContent = (
     <ContentStyleWrapper>
-      <div className="control-label">{t('RANGE TYPE')}</div>
+      <div className="control-label">{t('Range type')}</div>
       <StyledRangeType
-        ariaLabel={t('RANGE TYPE')}
+        ariaLabel={t('Range type')}
         options={FRAME_OPTIONS}
         value={frame}
         onChange={onChangeFrame}
@@ -319,9 +314,7 @@ export default function DateFilterLabel(props: DateFilterControlProps) {
         )}
         {!validTimeRange && (
           <IconWrapper className="warning">
-            <Icons.ExclamationCircleOutlined
-              iconColor={theme.colors.error.base}
-            />
+            <Icons.ExclamationCircleOutlined iconColor={theme.colorError} />
             <span className="text error">{evalResponse}</span>
           </IconWrapper>
         )}
diff --git a/superset-frontend/src/explore/components/controls/DateFilterControl/components/AdvancedFrame.tsx b/superset-frontend/src/explore/components/controls/DateFilterControl/components/AdvancedFrame.tsx
index 5e9b034dd3f..c410196cd19 100644
--- a/superset-frontend/src/explore/components/controls/DateFilterControl/components/AdvancedFrame.tsx
+++ b/superset-frontend/src/explore/components/controls/DateFilterControl/components/AdvancedFrame.tsx
@@ -17,8 +17,7 @@
  * under the License.
  */
 import { SEPARATOR, t } from '@superset-ui/core';
-import { Input } from 'src/components/Input';
-import { InfoTooltipWithTrigger } from '@superset-ui/chart-controls';
+import { Input, Icons, InfoTooltip } from '@superset-ui/core/components';
 import { FrameComponentProps } from 'src/explore/components/controls/DateFilterControl/types';
 import DateFunctionTooltip from './DateFunctionTooltip';
 
@@ -55,14 +54,12 @@ export function AdvancedFrame(props: FrameComponentProps) {
       <div className="section-title">
         {t('Configure Advanced Time Range ')}
         <DateFunctionTooltip placement="rightBottom">
-          {/* TODO: Remove fa-icon */}
-          {/* eslint-disable-next-line icons/no-fa-icons-usage */}
-          <i className="fa fa-info-circle text-muted" />
+          <Icons.InfoCircleOutlined />
         </DateFunctionTooltip>
       </div>
       <div className="control-label">
-        {t('START (INCLUSIVE)')}{' '}
-        <InfoTooltipWithTrigger
+        {t('Start (inclusive)')}{' '}
+        <InfoTooltip
           tooltip={t('Start date included in time range')}
           placement="right"
         />
@@ -73,8 +70,8 @@ export function AdvancedFrame(props: FrameComponentProps) {
         onChange={e => onChange('since', e.target.value)}
       />
       <div className="control-label">
-        {t('END (EXCLUSIVE)')}{' '}
-        <InfoTooltipWithTrigger
+        {t('End (exclusive)')}{' '}
+        <InfoTooltip
           tooltip={t('End date excluded from time range')}
           placement="right"
         />
diff --git a/superset-frontend/src/explore/components/controls/DateFilterControl/components/CalendarFrame.tsx b/superset-frontend/src/explore/components/controls/DateFilterControl/components/CalendarFrame.tsx
index 4fb48cf52b6..631d1345da3 100644
--- a/superset-frontend/src/explore/components/controls/DateFilterControl/components/CalendarFrame.tsx
+++ b/superset-frontend/src/explore/components/controls/DateFilterControl/components/CalendarFrame.tsx
@@ -18,7 +18,7 @@
  */
 import { useEffect } from 'react';
 import { t } from '@superset-ui/core';
-import { Radio } from 'src/components/Radio';
+import { Radio } from '@superset-ui/core/components/Radio';
 import {
   CALENDAR_RANGE_OPTIONS,
   CALENDAR_RANGE_SET,
diff --git a/superset-frontend/src/explore/components/controls/DateFilterControl/components/CommonFrame.tsx b/superset-frontend/src/explore/components/controls/DateFilterControl/components/CommonFrame.tsx
index 633066a4fd9..6c853d866dc 100644
--- a/superset-frontend/src/explore/components/controls/DateFilterControl/components/CommonFrame.tsx
+++ b/superset-frontend/src/explore/components/controls/DateFilterControl/components/CommonFrame.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { t } from '@superset-ui/core';
-import { Radio } from 'src/components/Radio';
+import { Radio } from '@superset-ui/core/components/Radio';
 import {
   COMMON_RANGE_OPTIONS,
   COMMON_RANGE_SET,
diff --git a/superset-frontend/src/explore/components/controls/DateFilterControl/components/CurrentCalendarFrame.tsx b/superset-frontend/src/explore/components/controls/DateFilterControl/components/CurrentCalendarFrame.tsx
index 27fc77818f5..7783ea719dc 100644
--- a/superset-frontend/src/explore/components/controls/DateFilterControl/components/CurrentCalendarFrame.tsx
+++ b/superset-frontend/src/explore/components/controls/DateFilterControl/components/CurrentCalendarFrame.tsx
@@ -18,7 +18,7 @@
  */
 import { useEffect } from 'react';
 import { t } from '@superset-ui/core';
-import { Radio } from 'src/components/Radio';
+import { Radio } from '@superset-ui/core/components/Radio';
 import {
   CURRENT_RANGE_OPTIONS,
   CURRENT_CALENDAR_RANGE_SET,
diff --git a/superset-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.tsx b/superset-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.tsx
index 969b46855e5..cab8d5f309e 100644
--- a/superset-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.tsx
+++ b/superset-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.tsx
@@ -17,12 +17,17 @@
  * under the License.
  */
 import { t, customTimeRangeDecode } from '@superset-ui/core';
-import { InfoTooltipWithTrigger } from '@superset-ui/chart-controls';
-import { Col, Row } from 'src/components';
-import { InputNumber } from 'src/components/Input';
-import { DatePicker } from 'src/components/DatePicker';
-import { Radio } from 'src/components/Radio';
-import Select from 'src/components/Select/Select';
+import {
+  InfoTooltip,
+  DatePicker,
+  Select,
+  Radio,
+  AntdThemeProvider,
+  Col,
+  Row,
+  InputNumber,
+  Loading,
+} from '@superset-ui/core/components';
 import {
   SINCE_GRAIN_OPTIONS,
   SINCE_MODE_OPTIONS,
@@ -37,9 +42,7 @@ import {
   CustomRangeKey,
   FrameComponentProps,
 } from 'src/explore/components/controls/DateFilterControl/types';
-import Loading from 'src/components/Loading';
 import { Dayjs } from 'dayjs';
-import { AntdThemeProvider } from 'src/components/AntdThemeProvider';
 import { useLocale } from 'src/hooks/useLocale';
 
 export function CustomFrame(props: FrameComponentProps) {
@@ -117,14 +120,14 @@ export function CustomFrame(props: FrameComponentProps) {
         <Row gutter={24}>
           <Col span={12}>
             <div className="control-label">
-              {t('START (INCLUSIVE)')}{' '}
-              <InfoTooltipWithTrigger
+              {t('Start (inclusive)')}{' '}
+              <InfoTooltip
                 tooltip={t('Start date included in time range')}
                 placement="right"
               />
             </div>
             <Select
-              ariaLabel={t('START (INCLUSIVE)')}
+              ariaLabel={t('Start (inclusive)')}
               options={SINCE_MODE_OPTIONS}
               value={sinceMode}
               onChange={(value: string) => onChange('sinceMode', value)}
@@ -176,14 +179,14 @@ export function CustomFrame(props: FrameComponentProps) {
           </Col>
           <Col span={12}>
             <div className="control-label">
-              {t('END (EXCLUSIVE)')}{' '}
-              <InfoTooltipWithTrigger
+              {t('End (exclusive)')}{' '}
+              <InfoTooltip
                 tooltip={t('End date excluded from time range')}
                 placement="right"
               />
             </div>
             <Select
-              ariaLabel={t('END (EXCLUSIVE)')}
+              ariaLabel={t('End (exclusive)')}
               options={UNTIL_MODE_OPTIONS}
               value={untilMode}
               onChange={(value: string) => onChange('untilMode', value)}
diff --git a/superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx b/superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx
index d2c99a822a6..02c7e9009ae 100644
--- a/superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx
+++ b/superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx
@@ -18,7 +18,7 @@
  */
 import { useTheme, t } from '@superset-ui/core';
 
-import { Tooltip } from 'src/components/Tooltip';
+import { Tooltip } from '@superset-ui/core/components';
 import { ClassNames } from '@emotion/react';
 
 const TIME_PICKER_HELPER = (
@@ -110,26 +110,26 @@ const StyledTooltip = (props: any) => {
       {({ css }) => (
         <Tooltip
           overlayClassName={css`
-            .antd5-tooltip-content {
-              min-width: ${theme.gridUnit * 125}px;
+            .ant-tooltip-content {
+              min-width: ${theme.sizeUnit * 125}px;
               max-height: 410px;
               overflow-y: scroll;
 
-              .antd5-tooltip-inner {
-                max-width: ${theme.gridUnit * 125}px;
+              .ant-tooltip-inner {
+                max-width: ${theme.sizeUnit * 125}px;
                 h3 {
-                  font-size: ${theme.typography.sizes.m}px;
-                  font-weight: ${theme.typography.weights.bold};
+                  font-size: ${theme.fontSize}px;
+                  font-weight: ${theme.fontWeightStrong};
                 }
                 h4 {
-                  font-size: ${theme.typography.sizes.m}px;
-                  font-weight: ${theme.typography.weights.bold};
+                  font-size: ${theme.fontSize}px;
+                  font-weight: ${theme.fontWeightStrong};
                 }
                 pre {
                   border: none;
                   text-align: left;
                   word-break: break-word;
-                  font-size: ${theme.typography.sizes.s}px;
+                  font-size: ${theme.fontSizeSM}px;
                 }
               }
             }
diff --git a/superset-frontend/src/explore/components/controls/DateFilterControl/components/DateLabel.tsx b/superset-frontend/src/explore/components/controls/DateFilterControl/components/DateLabel.tsx
index 859b19d4e5d..b4643bf32b3 100644
--- a/superset-frontend/src/explore/components/controls/DateFilterControl/components/DateLabel.tsx
+++ b/superset-frontend/src/explore/components/controls/DateFilterControl/components/DateLabel.tsx
@@ -20,7 +20,7 @@
 import { forwardRef, MouseEvent, ReactNode, RefObject } from 'react';
 
 import { css, styled, t } from '@superset-ui/core';
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
 
 export type DateLabelProps = {
   name?: string;
@@ -31,7 +31,7 @@ export type DateLabelProps = {
 };
 
 // This is the color that antd components (such as Select or Input) use on hover
-// TODO: use theme.colors.primary.base here and in antd components
+// TODO: use theme.colorPrimary here and in antd components
 const ACTIVE_BORDER_COLOR = '#45BED6';
 
 const LabelContainer = styled.div<{
@@ -39,14 +39,13 @@ const LabelContainer = styled.div<{
   isPlaceholder?: boolean;
 }>`
   ${({ theme, isActive, isPlaceholder }) => css`
-    width: 100%;
-    height: ${theme.gridUnit * 8}px;
+    height: ${theme.sizeUnit * 8}px;
 
     display: flex;
     align-items: center;
     flex-wrap: nowrap;
 
-    padding: 0 ${theme.gridUnit * 3}px;
+    padding: 0 ${theme.sizeUnit * 3}px;
 
     background-color: ${theme.colors.grayscale.light5};
 
@@ -63,9 +62,7 @@ const LabelContainer = styled.div<{
     }
 
     .date-label-content {
-      color: ${isPlaceholder
-        ? theme.colors.grayscale.light1
-        : theme.colors.grayscale.dark1};
+      color: ${isPlaceholder ? theme.colors.grayscale.light1 : theme.colorText};
       overflow: hidden;
       text-overflow: ellipsis;
       min-width: 0;
@@ -75,7 +72,7 @@ const LabelContainer = styled.div<{
 
     span[role='img'] {
       margin-left: auto;
-      padding-left: ${theme.gridUnit}px;
+      padding-left: ${theme.sizeUnit}px;
 
       & > span[role='img'] {
         line-height: 0;
diff --git a/superset-frontend/src/explore/components/controls/DateFilterControl/utils/constants.ts b/superset-frontend/src/explore/components/controls/DateFilterControl/utils/constants.ts
index e76b778fc65..fd81e07bf99 100644
--- a/superset-frontend/src/explore/components/controls/DateFilterControl/utils/constants.ts
+++ b/superset-frontend/src/explore/components/controls/DateFilterControl/utils/constants.ts
@@ -32,8 +32,8 @@ import {
   CurrentQuarter,
   CurrentDay,
 } from 'src/explore/components/controls/DateFilterControl/types';
-import { CheckboxOptionType } from 'src/components/Radio';
-import { extendedDayjs } from 'src/utils/dates';
+import { CheckboxOptionType } from '@superset-ui/core/components/Radio';
+import { extendedDayjs } from '@superset-ui/core/utils/dates';
 
 export const FRAME_OPTIONS: SelectOptionType[] = [
   { value: 'Common', label: t('Last') },
diff --git a/superset-frontend/src/explore/components/controls/DateFilterControl/utils/dateParser.ts b/superset-frontend/src/explore/components/controls/DateFilterControl/utils/dateParser.ts
index 2f3256dd394..ec48ce3863f 100644
--- a/superset-frontend/src/explore/components/controls/DateFilterControl/utils/dateParser.ts
+++ b/superset-frontend/src/explore/components/controls/DateFilterControl/utils/dateParser.ts
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { extendedDayjs } from 'src/utils/dates';
+import { extendedDayjs } from '@superset-ui/core/utils/dates';
 import { Dayjs } from 'dayjs';
 import { CustomRangeType } from 'src/explore/components/controls/DateFilterControl/types';
 import { DAYJS_FORMAT } from './constants';
diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopover.tsx b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopover.tsx
index 6e0a256965b..0f388dc8b05 100644
--- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopover.tsx
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopover.tsx
@@ -36,14 +36,17 @@ import {
   DatasourceType,
 } from '@superset-ui/core';
 import { ColumnMeta, isSavedExpression } from '@superset-ui/chart-controls';
-import Tabs from 'src/components/Tabs';
-import Button from 'src/components/Button';
-import { Select } from 'src/components';
+import Tabs from '@superset-ui/core/components/Tabs';
+import {
+  Button,
+  Form,
+  FormItem,
+  Select,
+  SQLEditor,
+  EmptyState,
+} from '@superset-ui/core/components';
 
-import { Form, FormItem } from 'src/components/Form';
 import sqlKeywords from 'src/SqlLab/utils/sqlKeywords';
-import { SQLEditor } from 'src/components/AsyncAceEditor';
-import { EmptyState } from 'src/components/EmptyState';
 import { getColumnKeywords } from 'src/explore/controlUtils/getColumnKeywords';
 import { StyledColumnOption } from 'src/explore/components/optionRenderers';
 import {
@@ -53,10 +56,16 @@ import {
 import { ExplorePageState } from 'src/explore/types';
 import useResizeButton from './useResizeButton';
 
+const TABS_KEYS = {
+  SAVED: 'saved',
+  SIMPLE: 'simple',
+  SQL_EXPRESSION: 'sqlExpression',
+};
+
 const StyledSelect = styled(Select)`
   .metric-option {
     & > svg {
-      min-width: ${({ theme }) => `${theme.gridUnit * 4}px`};
+      min-width: ${({ theme }) => `${theme.sizeUnit * 4}px`};
     }
     & > .option-label {
       overflow: hidden;
@@ -306,164 +315,175 @@ const ColumnSelectPopover = ({
           height: ${height}px;
           width: ${width}px;
         `}
-      >
-        <Tabs.TabPane
-          key="saved"
-          tab={t('Saved')}
-          disabled={disabledTabs.has('saved')}
-        >
-          {calculatedColumns.length > 0 ? (
-            <FormItem label={savedExpressionsLabel}>
-              <StyledSelect
-                ariaLabel={savedExpressionsLabel}
-                value={selectedCalculatedColumn?.column_name}
-                onChange={onCalculatedColumnChange}
-                allowClear
-                autoFocus={!selectedCalculatedColumn}
-                placeholder={t('%s column(s)', calculatedColumns.length)}
-                options={calculatedColumns.map(calculatedColumn => ({
-                  value: calculatedColumn.column_name,
-                  label:
-                    calculatedColumn.verbose_name ||
-                    calculatedColumn.column_name,
-                  customLabel: (
-                    <StyledColumnOption column={calculatedColumn} showType />
-                  ),
-                  key: calculatedColumn.column_name,
-                }))}
-              />
-            </FormItem>
-          ) : datasourceType === DatasourceType.Table ? (
-            <EmptyState
-              image="empty.svg"
-              size="small"
-              title={
-                isTemporal
-                  ? t('No temporal columns found')
-                  : t('No saved expressions found')
-              }
-              description={
-                isTemporal
-                  ? t(
-                      'Add calculated temporal columns to dataset in "Edit datasource" modal',
-                    )
-                  : t(
-                      'Add calculated columns to dataset in "Edit datasource" modal',
-                    )
-              }
-            />
-          ) : (
-            <EmptyState
-              image="empty.svg"
-              size="small"
-              title={
-                isTemporal
-                  ? t('No temporal columns found')
-                  : t('No saved expressions found')
-              }
-              description={
-                isTemporal ? (
-                  <>
-                    <span
-                      role="button"
-                      tabIndex={0}
-                      onClick={setDatasetAndClose}
-                    >
-                      {t('Create a dataset')}
-                    </span>{' '}
-                    {t(' to mark a column as a time column')}
-                  </>
+        items={[
+          {
+            key: TABS_KEYS.SAVED,
+            label: t('Saved'),
+            disabled: disabledTabs.has('saved'),
+            children: (
+              <>
+                {calculatedColumns.length > 0 ? (
+                  <FormItem label={savedExpressionsLabel}>
+                    <StyledSelect
+                      ariaLabel={savedExpressionsLabel}
+                      value={selectedCalculatedColumn?.column_name}
+                      onChange={onCalculatedColumnChange}
+                      allowClear
+                      autoFocus={!selectedCalculatedColumn}
+                      placeholder={t('%s column(s)', calculatedColumns.length)}
+                      options={calculatedColumns.map(calculatedColumn => ({
+                        value: calculatedColumn.column_name,
+                        label: (
+                          <StyledColumnOption
+                            column={calculatedColumn}
+                            showType
+                          />
+                        ),
+                        key: calculatedColumn.column_name,
+                      }))}
+                    />
+                  </FormItem>
+                ) : datasourceType === DatasourceType.Table ? (
+                  <EmptyState
+                    image="empty.svg"
+                    size="small"
+                    title={
+                      isTemporal
+                        ? t('No temporal columns found')
+                        : t('No saved expressions found')
+                    }
+                    description={
+                      isTemporal
+                        ? t(
+                            'Add calculated temporal columns to dataset in "Edit datasource" modal',
+                          )
+                        : t(
+                            'Add calculated columns to dataset in "Edit datasource" modal',
+                          )
+                    }
+                  />
                 ) : (
-                  <>
-                    <span
-                      role="button"
-                      tabIndex={0}
-                      onClick={setDatasetAndClose}
-                    >
-                      {t('Create a dataset')}
-                    </span>{' '}
-                    {t(' to add calculated columns')}
-                  </>
-                )
-              }
-            />
-          )}
-        </Tabs.TabPane>
-        <Tabs.TabPane
-          key="simple"
-          tab={t('Simple')}
-          disabled={disabledTabs.has('simple')}
-        >
-          {isTemporal && simpleColumns.length === 0 ? (
-            <EmptyState
-              image="empty.svg"
-              size="small"
-              title={t('No temporal columns found')}
-              description={
-                datasourceType === DatasourceType.Table ? (
-                  t('Mark a column as temporal in "Edit datasource" modal')
+                  <EmptyState
+                    image="empty.svg"
+                    size="small"
+                    title={
+                      isTemporal
+                        ? t('No temporal columns found')
+                        : t('No saved expressions found')
+                    }
+                    description={
+                      isTemporal ? (
+                        <>
+                          <span
+                            role="button"
+                            tabIndex={0}
+                            onClick={setDatasetAndClose}
+                          >
+                            {t('Create a dataset')}
+                          </span>{' '}
+                          {t(' to mark a column as a time column')}
+                        </>
+                      ) : (
+                        <>
+                          <span
+                            role="button"
+                            tabIndex={0}
+                            onClick={setDatasetAndClose}
+                          >
+                            {t('Create a dataset')}
+                          </span>{' '}
+                          {t(' to add calculated columns')}
+                        </>
+                      )
+                    }
+                  />
+                )}
+              </>
+            ),
+          },
+          {
+            key: TABS_KEYS.SIMPLE,
+            label: t('Simple'),
+            disabled: disabledTabs.has('simple'),
+            children: (
+              <>
+                {isTemporal && simpleColumns.length === 0 ? (
+                  <EmptyState
+                    image="empty.svg"
+                    size="small"
+                    title={t('No temporal columns found')}
+                    description={
+                      datasourceType === DatasourceType.Table ? (
+                        t(
+                          'Mark a column as temporal in "Edit datasource" modal',
+                        )
+                      ) : (
+                        <>
+                          <span
+                            role="button"
+                            tabIndex={0}
+                            onClick={setDatasetAndClose}
+                          >
+                            {t('Create a dataset')}
+                          </span>{' '}
+                          {t(' to mark a column as a time column')}
+                        </>
+                      )
+                    }
+                  />
                 ) : (
-                  <>
-                    <span
-                      role="button"
-                      tabIndex={0}
-                      onClick={setDatasetAndClose}
-                    >
-                      {t('Create a dataset')}
-                    </span>{' '}
-                    {t(' to mark a column as a time column')}
-                  </>
-                )
-              }
-            />
-          ) : (
-            <FormItem label={simpleColumnsLabel}>
-              <Select
-                ariaLabel={simpleColumnsLabel}
-                value={selectedSimpleColumn?.column_name}
-                onChange={onSimpleColumnChange}
-                allowClear
-                autoFocus={!selectedSimpleColumn}
-                placeholder={t('%s column(s)', simpleColumns.length)}
-                options={simpleColumns.map(simpleColumn => ({
-                  value: simpleColumn.column_name,
-                  label: simpleColumn.verbose_name || simpleColumn.column_name,
-                  customLabel: (
-                    <StyledColumnOption column={simpleColumn} showType />
-                  ),
-                  key: simpleColumn.column_name,
-                }))}
-              />
-            </FormItem>
-          )}
-        </Tabs.TabPane>
+                  <FormItem label={simpleColumnsLabel}>
+                    <Select
+                      ariaLabel={simpleColumnsLabel}
+                      value={selectedSimpleColumn?.column_name}
+                      onChange={onSimpleColumnChange}
+                      allowClear
+                      autoFocus={!selectedSimpleColumn}
+                      placeholder={t('%s column(s)', simpleColumns.length)}
+                      options={simpleColumns.map(simpleColumn => ({
+                        value: simpleColumn.column_name,
+                        label: (
+                          <StyledColumnOption column={simpleColumn} showType />
+                        ),
+                        key: simpleColumn.column_name,
+                      }))}
+                    />
+                  </FormItem>
+                )}
+              </>
+            ),
+          },
+          {
+            key: TABS_KEYS.SQL_EXPRESSION,
+            label: t('Custom SQL'),
+            disabled: disabledTabs.has('sqlExpression'),
+            children: (
+              <>
+                <SQLEditor
+                  value={
+                    adhocColumn?.sqlExpression ||
+                    selectedSimpleColumn?.column_name ||
+                    selectedCalculatedColumn?.expression
+                  }
+                  onFocus={onSqlEditorFocus}
+                  showLoadingForImport
+                  onChange={onSqlExpressionChange}
+                  width="100%"
+                  height={`${height - 80}px`}
+                  showGutter={false}
+                  editorProps={{ $blockScrolling: true }}
+                  enableLiveAutocompletion
+                  className="filter-sql-editor"
+                  wrapEnabled
+                  ref={sqlEditorRef}
+                  keywords={keywords}
+                />
+              </>
+            ),
+          },
+        ]}
+      />
 
-        <Tabs.TabPane
-          key="sqlExpression"
-          tab={t('Custom SQL')}
-          disabled={disabledTabs.has('sqlExpression')}
-        >
-          <SQLEditor
-            value={
-              adhocColumn?.sqlExpression ||
-              selectedSimpleColumn?.column_name ||
-              selectedCalculatedColumn?.expression
-            }
-            onFocus={onSqlEditorFocus}
-            showLoadingForImport
-            onChange={onSqlExpressionChange}
-            width="100%"
-            height={`${height - 80}px`}
-            showGutter={false}
-            editorProps={{ $blockScrolling: true }}
-            enableLiveAutocompletion
-            className="filter-sql-editor"
-            wrapEnabled
-            ref={sqlEditorRef}
-            keywords={keywords}
-          />
-        </Tabs.TabPane>
-      </Tabs>
       <div>
         <Button buttonSize="small" onClick={onResetStateAndClose} cta>
           {t('Close')}
diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndColumnSelectPopoverTitle.jsx b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndColumnSelectPopoverTitle.jsx
index 4b2dc77ae16..972f54bd465 100644
--- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndColumnSelectPopoverTitle.jsx
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndColumnSelectPopoverTitle.jsx
@@ -18,14 +18,14 @@
  */
 import { useCallback, useState } from 'react';
 import { t, styled, useTheme } from '@superset-ui/core';
-import { Input } from 'src/components/Input';
-import { Tooltip } from 'src/components/Tooltip';
-import { Icons } from 'src/components/Icons';
+import { Input, Tooltip } from '@superset-ui/core/components';
+import { Icons } from '@superset-ui/core/components/Icons';
 
 const StyledInput = styled(Input)`
   border-radius: ${({ theme }) => theme.borderRadius};
   height: 26px;
-  padding-left: ${({ theme }) => theme.gridUnit * 2.5}px;
+  padding-left: ${({ theme }) => theme.sizeUnit * 2.5}px;
+  border-color: ${({ theme }) => theme.colorSplit};
 `;
 
 export const DndColumnSelectPopoverTitle = ({
@@ -94,9 +94,7 @@ export const DndColumnSelectPopoverTitle = ({
         {title || defaultLabel}
         &nbsp;
         <Icons.EditOutlined
-          iconColor={
-            isHovered ? theme.colors.primary.base : theme.colors.grayscale.base
-          }
+          iconColor={isHovered ? theme.colorPrimary : theme.colorText}
           iconSize="m"
         />
       </span>
diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndFilterSelect.test.tsx b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndFilterSelect.test.tsx
index ed2532e1def..3a9cb67771d 100644
--- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndFilterSelect.test.tsx
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndFilterSelect.test.tsx
@@ -25,7 +25,6 @@ import {
   QueryFormData,
 } from '@superset-ui/core';
 import { ColumnMeta } from '@superset-ui/chart-controls';
-import { TimeseriesDefaultFormData } from '@superset-ui/plugin-chart-echarts';
 
 import {
   fireEvent,
@@ -33,7 +32,7 @@ import {
   screen,
   within,
 } from 'spec/helpers/testing-library';
-import type { AsyncAceEditorProps } from 'src/components/AsyncAceEditor';
+import type { AsyncAceEditorProps } from '@superset-ui/core/components';
 import AdhocMetric from 'src/explore/components/controls/MetricControl/AdhocMetric';
 import AdhocFilter from 'src/explore/components/controls/FilterControl/AdhocFilter';
 import { Operators } from 'src/explore/constants';
@@ -47,8 +46,8 @@ import { Datasource } from '../../../types';
 import { DndItemType } from '../../DndItemType';
 import DatasourcePanelDragOption from '../../DatasourcePanel/DatasourcePanelDragOption';
 
-jest.mock('src/components/AsyncAceEditor', () => ({
-  ...jest.requireActual('src/components/AsyncAceEditor'),
+jest.mock('@superset-ui/core/components/AsyncAceEditor', () => ({
+  ...jest.requireActual('@superset-ui/core/components/AsyncAceEditor'),
   SQLEditor: (props: AsyncAceEditorProps) => (
     <div data-test="react-ace">{props.value}</div>
   ),
@@ -127,7 +126,6 @@ test('renders options with saved metric', async () => {
     setup({
       formData: {
         ...baseFormData,
-        ...TimeseriesDefaultFormData,
         metrics: ['saved_metric'],
       },
     }),
@@ -172,7 +170,6 @@ test('renders options with adhoc metric', async () => {
     setup({
       formData: {
         ...baseFormData,
-        ...TimeseriesDefaultFormData,
         metrics: [adhocMetric],
       },
     }),
@@ -212,7 +209,6 @@ test('cannot drop a column that is not part of the simple column selection', ()
       {setup({
         formData: {
           ...baseFormData,
-          ...TimeseriesDefaultFormData,
           metrics: [adhocMetric],
         },
         columns: [{ column_name: 'order_date' }],
@@ -342,7 +338,6 @@ describe('when disallow_adhoc_metrics is set', () => {
         {setup({
           formData: {
             ...baseFormData,
-            ...TimeseriesDefaultFormData,
             metrics: [adhocMetric],
           },
           datasource: {
@@ -391,7 +386,6 @@ describe('when disallow_adhoc_metrics is set', () => {
         {setup({
           formData: {
             ...baseFormData,
-            ...TimeseriesDefaultFormData,
             metrics: [adhocMetric],
           },
           datasource: {
diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndFilterSelect.tsx b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndFilterSelect.tsx
index d15289db8c4..4e7df9a3640 100644
--- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndFilterSelect.tsx
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndFilterSelect.tsx
@@ -30,7 +30,7 @@ import {
   isColumnMeta,
   isTemporalColumn,
 } from '@superset-ui/chart-controls';
-import Modal from 'src/components/Modal';
+import { Modal } from '@superset-ui/core/components';
 import {
   OPERATOR_ENUM_TO_OPERATOR_TYPE,
   Operators,
diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndSelectLabel.tsx b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndSelectLabel.tsx
index 3ef13317455..161d4b21edd 100644
--- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndSelectLabel.tsx
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndSelectLabel.tsx
@@ -18,7 +18,7 @@
  */
 import { ReactNode, useCallback, useContext, useEffect, useMemo } from 'react';
 import { useDrop } from 'react-dnd';
-import { t, useTheme } from '@superset-ui/core';
+import { t } from '@superset-ui/core';
 import ControlHeader from 'src/explore/components/ControlHeader';
 import {
   AddControlLabel,
@@ -29,7 +29,7 @@ import {
   DatasourcePanelDndItem,
   DndItemValue,
 } from 'src/explore/components/DatasourcePanel/types';
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { DndItemType } from '../../DndItemType';
 import { DraggingContext, DropzoneContext } from '../../ExploreContainer';
 
@@ -54,7 +54,6 @@ export default function DndSelectLabel({
   isLoading,
   ...props
 }: DndSelectLabelProps) {
-  const theme = useTheme();
   const canDropProp = props.canDrop;
   const canDropValueProp = props.canDropValue;
 
@@ -100,13 +99,7 @@ export default function DndSelectLabel({
         cancelHover={!props.onClickGhostButton}
         onClick={props.onClickGhostButton}
       >
-        <Icons.PlusOutlined
-          iconSize="m"
-          iconColor={theme.colors.grayscale.light1}
-          css={theme => ({
-            margin: `auto ${theme.gridUnit}px auto 0`,
-          })}
-        />
+        <Icons.PlusOutlined iconSize="m" />
         {t(props.ghostButtonText)}
       </AddControlLabel>
     );
diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/Option.tsx b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/Option.tsx
index b85fed46629..9174de76f64 100644
--- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/Option.tsx
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/Option.tsx
@@ -18,7 +18,7 @@
  */
 import { useCallback } from 'react';
 import { css, styled, t, useTheme } from '@superset-ui/core';
-import { Icons } from 'src/components/Icons';
+import { Icons, InfoTooltip } from '@superset-ui/core/components';
 import {
   CaretContainer,
   CloseContainer,
@@ -26,10 +26,9 @@ import {
   Label,
 } from 'src/explore/components/controls/OptionControls';
 import { OptionProps } from 'src/explore/components/controls/DndColumnSelectControl/types';
-import { InfoTooltipWithTrigger } from '@superset-ui/chart-controls';
 
-const StyledInfoTooltipWithTrigger = styled(InfoTooltipWithTrigger)`
-  margin: 0 ${({ theme }) => theme.gridUnit}px;
+const StyledInfoTooltip = styled(InfoTooltip)`
+  margin: 0 ${({ theme }) => theme.sizeUnit}px;
 `;
 
 export default function Option({
@@ -71,10 +70,9 @@ export default function Option({
       )}
       <Label data-test="control-label">{children}</Label>
       {(!!datasourceWarningMessage || isExtra) && (
-        <StyledInfoTooltipWithTrigger
-          icon="exclamation-triangle"
+        <StyledInfoTooltip
+          type="warning"
           placement="top"
-          bsStyle="warning"
           tooltip={
             datasourceWarningMessage ||
             t(`
@@ -89,7 +87,7 @@ export default function Option({
           <Icons.RightOutlined
             iconSize="m"
             css={css`
-              margin-top: ${theme.gridUnit}px;
+              margin: ${theme.sizeUnit}px;
             `}
             iconColor={theme.colors.grayscale.light1}
           />
diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/OptionWrapper.tsx b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/OptionWrapper.tsx
index 77efc52e1a8..be04b71d7f1 100644
--- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/OptionWrapper.tsx
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/OptionWrapper.tsx
@@ -28,7 +28,7 @@ import {
   OptionProps,
   OptionItemInterface,
 } from 'src/explore/components/controls/DndColumnSelectControl/types';
-import { Tooltip } from 'src/components/Tooltip';
+import { Tooltip } from '@superset-ui/core/components';
 import { StyledColumnOption } from 'src/explore/components/optionRenderers';
 import { styled, isAdhocColumn } from '@superset-ui/core';
 import { ColumnMeta } from '@superset-ui/chart-controls';
diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/useResizeButton.tsx b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/useResizeButton.tsx
index 6dd0268ddae..33529a3c7c1 100644
--- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/useResizeButton.tsx
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/useResizeButton.tsx
@@ -29,6 +29,7 @@ import {
   POPOVER_INITIAL_HEIGHT,
   POPOVER_INITIAL_WIDTH,
 } from 'src/explore/constants';
+import { Icons } from '@superset-ui/core/components';
 
 const RESIZE_THROTTLE_MS = 50;
 
@@ -132,14 +133,12 @@ export default function useResizeButton(
   }, [onMouseUp]);
 
   return [
-    // TODO: Remove fa-icon
-    // eslint-disable-next-line icons/no-fa-icons-usage
-    <i
+    <Icons.ArrowsAltOutlined
       role="button"
       aria-label="Resize"
       tabIndex={0}
       onMouseDown={onDragDown}
-      className="fa fa-expand edit-popover-resize text-muted"
+      className="edit-popover-resize"
     />,
     width,
     height,
diff --git a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterControl/index.jsx b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterControl/index.jsx
index de3b515fe05..b88d0244fb4 100644
--- a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterControl/index.jsx
+++ b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterControl/index.jsx
@@ -19,7 +19,6 @@
 import { Component } from 'react';
 import PropTypes from 'prop-types';
 import {
-  css,
   t,
   logging,
   SupersetClient,
@@ -38,12 +37,11 @@ import {
 import FilterDefinitionOption from 'src/explore/components/controls/MetricControl/FilterDefinitionOption';
 import {
   AddControlLabel,
-  AddIconButton,
   HeaderContainer,
   LabelsContainer,
 } from 'src/explore/components/controls/OptionControls';
-import { Icons } from 'src/components/Icons';
-import Modal from 'src/components/Modal';
+import { Icons } from '@superset-ui/core/components/Icons';
+import { Modal } from '@superset-ui/core/components';
 import AdhocFilterPopoverTrigger from 'src/explore/components/controls/FilterControl/AdhocFilterPopoverTrigger';
 import AdhocFilterOption from 'src/explore/components/controls/FilterControl/AdhocFilterOption';
 import AdhocFilter from 'src/explore/components/controls/FilterControl/AdhocFilter';
@@ -356,37 +354,25 @@ class AdhocFilterControl extends Component {
   }
 
   render() {
-    const { theme } = this.props;
     return (
       <div className="metrics-select" data-test="adhoc-filter-control">
         <HeaderContainer>
           <ControlHeader {...this.props} />
-          {this.addNewFilterPopoverTrigger(
-            <AddIconButton data-test="add-filter-button">
-              <Icons.PlusOutlined
-                iconSize="m"
-                iconColor={theme.colors.grayscale.light5}
-              />
-            </AddIconButton>,
-          )}
         </HeaderContainer>
         <LabelsContainer>
-          {this.state.values.length > 0
-            ? this.state.values.map((value, index) =>
-                this.valueRenderer(value, index),
-              )
-            : this.addNewFilterPopoverTrigger(
-                <AddControlLabel>
-                  <Icons.PlusOutlined
-                    css={css`
-                      margin: auto ${theme.gridUnit}px auto 0;
-                    `}
-                    iconSize="m"
-                    iconColor={theme.colors.grayscale.light1}
-                  />
-                  {t('Add filter')}
-                </AddControlLabel>,
-              )}
+          {[
+            ...(this.state.values.length > 0
+              ? this.state.values.map((value, index) =>
+                  this.valueRenderer(value, index),
+                )
+              : []),
+            this.addNewFilterPopoverTrigger(
+              <AddControlLabel role="button" data-test="add-filter-button">
+                <Icons.PlusOutlined iconSize="m" />
+                {t('Add filter')}
+              </AddControlLabel>,
+            ),
+          ]}
         </LabelsContainer>
       </div>
     );
diff --git a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover/index.jsx b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover/index.jsx
index 01169ff187e..55a0515dd8f 100644
--- a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover/index.jsx
+++ b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover/index.jsx
@@ -18,11 +18,11 @@
  */
 import { createRef, Component } from 'react';
 import PropTypes from 'prop-types';
-import Button from 'src/components/Button';
+import { Button, Icons } from '@superset-ui/core/components';
+import { ErrorBoundary } from 'src/components';
 import { styled, t } from '@superset-ui/core';
 
-import ErrorBoundary from 'src/components/ErrorBoundary';
-import Tabs from 'src/components/Tabs';
+import Tabs from '@superset-ui/core/components/Tabs';
 import adhocMetricType from 'src/explore/components/controls/MetricControl/adhocMetricType';
 import AdhocFilter from 'src/explore/components/controls/FilterControl/AdhocFilter';
 import AdhocFilterEditPopoverSimpleTabContent from 'src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent';
@@ -54,16 +54,12 @@ const propTypes = {
   requireSave: PropTypes.bool,
 };
 
-const ResizeIcon = styled.i`
-  margin-left: ${({ theme }) => theme.gridUnit * 2}px;
-`;
-
 const FilterPopoverContentContainer = styled.div`
   .adhoc-filter-edit-tabs > .nav-tabs {
-    margin-bottom: ${({ theme }) => theme.gridUnit * 2}px;
+    margin-bottom: ${({ theme }) => theme.sizeUnit * 2}px;
 
     & > li > a {
-      padding: ${({ theme }) => theme.gridUnit}px;
+      padding: ${({ theme }) => theme.sizeUnit}px;
     }
   }
 
@@ -72,22 +68,22 @@ const FilterPopoverContentContainer = styled.div`
   }
 
   .filter-edit-clause-info {
-    font-size: ${({ theme }) => theme.typography.sizes.xs}px;
+    font-size: ${({ theme }) => theme.fontSizeXS}px;
   }
 
   .filter-edit-clause-section {
     display: flex;
     flex-direction: row;
-    gap: ${({ theme }) => theme.gridUnit * 5}px;
+    gap: ${({ theme }) => theme.sizeUnit * 5}px;
   }
 
   .adhoc-filter-simple-column-dropdown {
-    margin-top: ${({ theme }) => theme.gridUnit * 5}px;
+    margin-top: ${({ theme }) => theme.sizeUnit * 5}px;
   }
 `;
 
 const FilterActionsContainer = styled.div`
-  margin-top: ${({ theme }) => theme.gridUnit * 2}px;
+  margin-top: ${({ theme }) => theme.sizeUnit * 2}px;
 `;
 
 export default class AdhocFilterEditPopover extends Component {
@@ -206,44 +202,50 @@ export default class AdhocFilterEditPopover extends Component {
           style={{ minHeight: this.state.height, width: this.state.width }}
           allowOverflow
           onChange={this.onTabChange}
-        >
-          <Tabs.TabPane
-            className="adhoc-filter-edit-tab"
-            key={ExpressionTypes.Simple}
-            tab={t('Simple')}
-          >
-            <ErrorBoundary>
-              <AdhocFilterEditPopoverSimpleTabContent
-                operators={operators}
-                adhocFilter={this.state.adhocFilter}
-                onChange={this.onAdhocFilterChange}
-                options={options}
-                datasource={datasource}
-                onHeightChange={this.adjustHeight}
-                partitionColumn={partitionColumn}
-                popoverRef={this.popoverContentRef.current}
-                validHandler={this.setSimpleTabIsValid}
-              />
-            </ErrorBoundary>
-          </Tabs.TabPane>
-          <Tabs.TabPane
-            className="adhoc-filter-edit-tab"
-            key={ExpressionTypes.Sql}
-            tab={t('Custom SQL')}
-          >
-            <ErrorBoundary>
-              <AdhocFilterEditPopoverSqlTabContent
-                adhocFilter={this.state.adhocFilter}
-                onChange={this.onAdhocFilterChange}
-                options={this.props.options}
-                height={this.state.height}
-                activeKey={this.state.activeKey}
-              />
-            </ErrorBoundary>
-          </Tabs.TabPane>
-        </Tabs>
+          items={[
+            {
+              key: ExpressionTypes.Simple,
+              label: t('Simple'),
+              children: (
+                <ErrorBoundary>
+                  <AdhocFilterEditPopoverSimpleTabContent
+                    operators={operators}
+                    adhocFilter={this.state.adhocFilter}
+                    onChange={this.onAdhocFilterChange}
+                    options={options}
+                    datasource={datasource}
+                    onHeightChange={this.adjustHeight}
+                    partitionColumn={partitionColumn}
+                    popoverRef={this.popoverContentRef.current}
+                    validHandler={this.setSimpleTabIsValid}
+                  />
+                </ErrorBoundary>
+              ),
+            },
+            {
+              key: ExpressionTypes.Sql,
+              label: t('Custom SQL'),
+              children: (
+                <ErrorBoundary>
+                  <AdhocFilterEditPopoverSqlTabContent
+                    adhocFilter={this.state.adhocFilter}
+                    onChange={this.onAdhocFilterChange}
+                    options={this.props.options}
+                    height={this.state.height}
+                    activeKey={this.state.activeKey}
+                  />
+                </ErrorBoundary>
+              ),
+            },
+          ]}
+        />
         <FilterActionsContainer>
-          <Button buttonSize="small" onClick={this.props.onClose} cta>
+          <Button
+            buttonStyle="secondary"
+            buttonSize="small"
+            onClick={this.props.onClose}
+            cta
+          >
             {t('Close')}
           </Button>
           <Button
@@ -255,18 +257,17 @@ export default class AdhocFilterEditPopover extends Component {
             }
             buttonStyle="primary"
             buttonSize="small"
-            className="m-r-5"
             onClick={this.onSave}
             cta
           >
             {t('Save')}
           </Button>
-          <ResizeIcon
+          <Icons.ArrowsAltOutlined
             role="button"
             aria-label="Resize"
             tabIndex={0}
             onMouseDown={this.onDragDown}
-            className="fa fa-expand edit-popover-resize text-muted"
+            className="edit-popover-resize"
           />
         </FilterActionsContainer>
       </FilterPopoverContentContainer>
diff --git a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/AdhocFilterEditPopoverSimpleTabContent.test.tsx b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/AdhocFilterEditPopoverSimpleTabContent.test.tsx
index f7614deaf89..04018e819c6 100644
--- a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/AdhocFilterEditPopoverSimpleTabContent.test.tsx
+++ b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/AdhocFilterEditPopoverSimpleTabContent.test.tsx
@@ -544,12 +544,20 @@ describe('AdhocFilterEditPopoverSimpleTabContent Advanced data Type Test', () =>
     );
     expect(props.validHandler.lastCall.args[0]).toBe(true);
 
-    const operatorValueField = screen.getByText('1 operator(s)');
+    const operatorValueField = screen.getByRole('combobox', {
+      name: 'Select operator',
+    });
+
+    userEvent.click(operatorValueField);
 
     await act(async () => {
       userEvent.type(operatorValueField, '{enter}');
     });
 
-    expect(screen.getByText('EQUALS')).toBeInTheDocument();
+    expect(
+      await screen.findByText('Equal to (=)', {
+        selector: '.ant-select-selection-item',
+      }),
+    ).toBeInTheDocument();
   });
 });
diff --git a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/index.tsx b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/index.tsx
index bfd2b409a8e..9b529a722ca 100644
--- a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/index.tsx
+++ b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/index.tsx
@@ -18,16 +18,16 @@
  */
 import { FC, ChangeEvent, useEffect, useState } from 'react';
 
-import FormItem from 'src/components/Form/FormItem';
-import { Select } from 'src/components';
+import { Input, Select, Tooltip } from '@superset-ui/core/components';
 import {
   isFeatureEnabled,
   FeatureFlag,
   isDefined,
   styled,
   SupersetClient,
-  SupersetTheme,
+  useTheme,
   t,
+  css,
 } from '@superset-ui/core';
 import {
   Operators,
@@ -41,8 +41,6 @@ import {
 } from 'src/explore/constants';
 import FilterDefinitionOption from 'src/explore/components/controls/MetricControl/FilterDefinitionOption';
 import AdhocFilter from 'src/explore/components/controls/FilterControl/AdhocFilter';
-import { Tooltip } from 'src/components/Tooltip';
-import { Input } from 'src/components/Input';
 import { optionLabel } from 'src/utils/common';
 import {
   ColumnMeta,
@@ -54,16 +52,6 @@ import { useDatePickerInAdhocFilter } from '../utils';
 import { useDefaultTimeFilter } from '../../DateFilterControl/utils';
 import { Clauses, ExpressionTypes } from '../types';
 
-const StyledInput = styled(Input)`
-  margin-bottom: ${({ theme }) => theme.gridUnit * 4}px;
-`;
-
-export const StyledFormItem = styled(FormItem)`
-  &.ant-row.ant-form-item {
-    margin: 0;
-  }
-`;
-
 const SelectWithLabel = styled(Select)<{ labelText: string }>`
   .ant-select-selector::after {
     content: ${({ labelText }) => labelText || '\\A0'};
@@ -449,29 +437,26 @@ const AdhocFilterEditPopoverSimpleTabContent: FC<Props> = props => {
       setComparator(props.adhocFilter.comparator);
     }
   }, [props.adhocFilter.comparator]);
+  const theme = useTheme();
 
   // another name for columns, just for following previous naming.
   const subjectComponent = (
     <Select
-      css={(theme: SupersetTheme) => ({
-        marginTop: theme.gridUnit * 4,
-        marginBottom: theme.gridUnit * 4,
-      })}
+      css={{
+        marginTop: theme.sizeUnit * 4,
+        marginBottom: theme.sizeUnit * 4,
+      }}
       data-test="select-element"
       options={columns.map(column => ({
         value:
           ('column_name' in column && column.column_name) ||
           ('optionName' in column && column.optionName) ||
           '',
-        label:
-          ('saved_metric_name' in column && column.saved_metric_name) ||
-          ('column_name' in column && column.column_name) ||
-          ('label' in column && column.label),
         key:
           ('id' in column && column.id) ||
           ('optionName' in column && column.optionName) ||
           undefined,
-        customLabel: renderSubjectOptionLabel(column),
+        label: renderSubjectOptionLabel(column),
       }))}
       {...subjectSelectProps}
     />
@@ -480,7 +465,6 @@ const AdhocFilterEditPopoverSimpleTabContent: FC<Props> = props => {
   const operatorsAndOperandComponent = (
     <>
       <Select
-        css={(theme: SupersetTheme) => ({ marginBottom: theme.gridUnit * 4 })}
         options={(props.operators ?? OPERATORS_OPTIONS)
           .filter(op => isOperatorRelevantWrapper(op, subject))
           .map((option, index) => ({
@@ -499,6 +483,9 @@ const AdhocFilterEditPopoverSimpleTabContent: FC<Props> = props => {
           }
         >
           <SelectWithLabel
+            css={css`
+              margin-top: ${theme.sizeUnit * 4}px;
+            `}
             labelText={labelText}
             options={suggestions}
             {...comparatorSelectProps}
@@ -511,7 +498,12 @@ const AdhocFilterEditPopoverSimpleTabContent: FC<Props> = props => {
             advancedDataTypesState.parsedAdvancedDataType
           }
         >
-          <StyledInput
+          <div
+            css={css`
+              margin-top: ${theme.sizeUnit * 4}px;
+            `}
+          />
+          <Input
             data-test="adhoc-filter-simple-value"
             name="filter-value"
             ref={ref => {
diff --git a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSqlTabContent/AdhocFilterEditPopoverSqlTabContent.test.tsx b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSqlTabContent/AdhocFilterEditPopoverSqlTabContent.test.tsx
index 01a16e4b31a..3857ec1d658 100644
--- a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSqlTabContent/AdhocFilterEditPopoverSqlTabContent.test.tsx
+++ b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSqlTabContent/AdhocFilterEditPopoverSqlTabContent.test.tsx
@@ -35,7 +35,7 @@ afterEach(async () => {
   await new Promise(resolve => setTimeout(resolve, 0));
 });
 
-jest.mock('src/components/AsyncAceEditor', () => ({
+jest.mock('@superset-ui/core/components/AsyncAceEditor', () => ({
   SQLEditor: ({ value, onChange }: IAceEditorProps) => (
     <textarea
       defaultValue={value}
diff --git a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSqlTabContent/index.tsx b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSqlTabContent/index.tsx
index 0e87eeab095..c4748806dbd 100644
--- a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSqlTabContent/index.tsx
+++ b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSqlTabContent/index.tsx
@@ -17,9 +17,8 @@
  * under the License.
  */
 import { useEffect, useRef, useMemo } from 'react';
-import { Select } from 'src/components';
+import { Select, SQLEditor } from '@superset-ui/core/components';
 import { css, styled, t, useTheme } from '@superset-ui/core';
-import { SQLEditor } from 'src/components/AsyncAceEditor';
 import sqlKeywords from 'src/SqlLab/utils/sqlKeywords';
 import { getColumnKeywords } from 'src/explore/controlUtils/getColumnKeywords';
 import AdhocFilter from 'src/explore/components/controls/FilterControl/AdhocFilter';
@@ -29,8 +28,8 @@ import { Clauses, ExpressionTypes } from '../types';
 
 const StyledSelect = styled(Select)`
   ${({ theme }) => `
-    width: ${theme.gridUnit * 30}px;
-    marginRight: ${theme.gridUnit}px;
+    width: ${theme.sizeUnit * 30}px;
+    marginRight: ${theme.sizeUnit}px;
   `}
 `;
 
@@ -117,7 +116,7 @@ export default function AdhocFilterEditPopoverSqlTabContent({
       </div>
       <div
         css={css`
-          margin-top: ${theme.gridUnit * 4}px;
+          margin-top: ${theme.sizeUnit * 4}px;
         `}
       >
         <SQLEditor
diff --git a/superset-frontend/src/explore/components/controls/FilterControl/utils/useDatePickerInAdhocFilter.tsx b/superset-frontend/src/explore/components/controls/FilterControl/utils/useDatePickerInAdhocFilter.tsx
index 276c2a248f4..f42ddf4883e 100644
--- a/superset-frontend/src/explore/components/controls/FilterControl/utils/useDatePickerInAdhocFilter.tsx
+++ b/superset-frontend/src/explore/components/controls/FilterControl/utils/useDatePickerInAdhocFilter.tsx
@@ -18,7 +18,7 @@
  */
 import { ReactElement } from 'react';
 
-import { t } from '@superset-ui/core';
+import { getExtensionsRegistry, t } from '@superset-ui/core';
 import { Dataset, isTemporalColumn } from '@superset-ui/chart-controls';
 import DateFilterControl from 'src/explore/components/controls/DateFilterControl/DateFilterLabel';
 import ControlHeader from 'src/explore/components/ControlHeader';
@@ -38,10 +38,17 @@ export const useDatePickerInAdhocFilter = ({
 }: DatePickerInFilterProps): ReactElement | undefined => {
   const onTimeRangeChange = (val: string) => onChange(columnName, val);
 
+  const extensionsRegistry = getExtensionsRegistry();
+
+  const DateFilterControlExtension = extensionsRegistry.get(
+    'filter.dateFilterControl',
+  );
+  const DateFilterComponent = DateFilterControlExtension ?? DateFilterControl;
+
   return isTemporalColumn(columnName, datasource) ? (
     <>
       <ControlHeader label={t('Time Range')} />
-      <DateFilterControl
+      <DateFilterComponent
         value={timeRange}
         name="time_range"
         onChange={onTimeRangeChange}
diff --git a/superset-frontend/src/explore/components/controls/FixedOrMetricControl/FixedOrMetricControl.test.tsx b/superset-frontend/src/explore/components/controls/FixedOrMetricControl/FixedOrMetricControl.test.tsx
index ccf627808f2..ba9646c0945 100644
--- a/superset-frontend/src/explore/components/controls/FixedOrMetricControl/FixedOrMetricControl.test.tsx
+++ b/superset-frontend/src/explore/components/controls/FixedOrMetricControl/FixedOrMetricControl.test.tsx
@@ -20,7 +20,7 @@ import { render, screen, userEvent } from 'spec/helpers/testing-library';
 import FixedOrMetricControl from '.';
 
 jest.mock(
-  'src/components/Icons/AsyncIcon',
+  '@superset-ui/core/components/Icons/AsyncIcon',
   () =>
     ({ fileName }: { fileName: string }) => (
       <span role="img" aria-label={fileName.replace('_', '-')} />
diff --git a/superset-frontend/src/explore/components/controls/FixedOrMetricControl/index.jsx b/superset-frontend/src/explore/components/controls/FixedOrMetricControl/index.jsx
index 50dcd1a930d..aa405a0ab58 100644
--- a/superset-frontend/src/explore/components/controls/FixedOrMetricControl/index.jsx
+++ b/superset-frontend/src/explore/components/controls/FixedOrMetricControl/index.jsx
@@ -18,13 +18,12 @@
  */
 import { Component } from 'react';
 import PropTypes from 'prop-types';
-import { css, t } from '@superset-ui/core';
-import Label from 'src/components/Label';
-import Collapse from 'src/components/Collapse';
+import { t } from '@superset-ui/core';
+import { Collapse, Label } from '@superset-ui/core/components';
 import TextControl from 'src/explore/components/controls/TextControl';
 import MetricsControl from 'src/explore/components/controls/MetricControl/MetricsControl';
 import ControlHeader from 'src/explore/components/ControlHeader';
-import PopoverSection from 'src/components/PopoverSection';
+import PopoverSection from '@superset-ui/core/components/PopoverSection';
 
 const controlTypes = {
   fixed: 'fix',
@@ -102,87 +101,70 @@ export default class FixedOrMetricControl extends Component {
         <ControlHeader {...this.props} />
         <Collapse
           ghost
-          css={theme => css`
-            &.ant-collapse
-              > .ant-collapse-item.ant-collapse-no-arrow
-              > .ant-collapse-header {
-              border: 0px;
-              padding: 0px 0px ${theme.gridUnit * 2}px 0px;
-              display: inline-block;
-            }
-            &.ant-collapse-ghost
-              > .ant-collapse-item
-              > .ant-collapse-content
-              > .ant-collapse-content-box {
-              padding: 0px;
-
-              & .well {
-                margin-bottom: 0px;
-                padding: ${theme.gridUnit * 2}px;
-              }
-            }
-          `}
-        >
-          <Collapse.Panel
-            showArrow={false}
-            header={
-              <Label>
-                {this.state.type === controlTypes.fixed && (
-                  <span>{this.state.fixedValue}</span>
-                )}
-                {this.state.type === controlTypes.metric && (
-                  <span>
-                    <span>{t('metric')}: </span>
-                    <strong>
-                      {this.state.metricValue
-                        ? this.state.metricValue.label
-                        : null}
-                    </strong>
-                  </span>
-                )}
-              </Label>
-            }
-          >
-            <div className="well">
-              <PopoverSection
-                title={t('Fixed')}
-                isSelected={type === controlTypes.fixed}
-                onSelect={() => {
-                  this.setType(controlTypes.fixed);
-                }}
-              >
-                <TextControl
-                  isFloat
-                  onChange={this.setFixedValue}
-                  onFocus={() => {
-                    this.setType(controlTypes.fixed);
-                  }}
-                  value={this.state.fixedValue}
-                />
-              </PopoverSection>
-              <PopoverSection
-                title={t('Based on a metric')}
-                isSelected={type === controlTypes.metric}
-                onSelect={() => {
-                  this.setType(controlTypes.metric);
-                }}
-              >
-                <MetricsControl
-                  name="metric"
-                  columns={columns}
-                  savedMetrics={metrics}
-                  multi={false}
-                  onFocus={() => {
-                    this.setType(controlTypes.metric);
-                  }}
-                  onChange={this.setMetric}
-                  value={this.state.metricValue}
-                  datasource={this.props.datasource}
-                />
-              </PopoverSection>
-            </div>
-          </Collapse.Panel>
-        </Collapse>
+          items={[
+            {
+              key: 'fixed-or-metric',
+              showArrow: false,
+              label: (
+                <Label>
+                  {this.state.type === controlTypes.fixed && (
+                    <span>{this.state.fixedValue}</span>
+                  )}
+                  {this.state.type === controlTypes.metric && (
+                    <span>
+                      <span>{t('metric')}: </span>
+                      <strong>
+                        {this.state.metricValue
+                          ? this.state.metricValue.label
+                          : null}
+                      </strong>
+                    </span>
+                  )}
+                </Label>
+              ),
+              children: (
+                <div className="well">
+                  <PopoverSection
+                    title={t('Fixed')}
+                    isSelected={type === controlTypes.fixed}
+                    onSelect={() => {
+                      this.setType(controlTypes.fixed);
+                    }}
+                  >
+                    <TextControl
+                      isFloat
+                      onChange={this.setFixedValue}
+                      onFocus={() => {
+                        this.setType(controlTypes.fixed);
+                      }}
+                      value={this.state.fixedValue}
+                    />
+                  </PopoverSection>
+                  <PopoverSection
+                    title={t('Based on a metric')}
+                    isSelected={type === controlTypes.metric}
+                    onSelect={() => {
+                      this.setType(controlTypes.metric);
+                    }}
+                  >
+                    <MetricsControl
+                      name="metric"
+                      columns={columns}
+                      savedMetrics={metrics}
+                      multi={false}
+                      onFocus={() => {
+                        this.setType(controlTypes.metric);
+                      }}
+                      onChange={this.setMetric}
+                      value={this.state.metricValue}
+                      datasource={this.props.datasource}
+                    />
+                  </PopoverSection>
+                </div>
+              ),
+            },
+          ]}
+        />
       </div>
     );
   }
diff --git a/superset-frontend/src/explore/components/controls/HiddenControl.tsx b/superset-frontend/src/explore/components/controls/HiddenControl.tsx
index 02a42fc80ab..50e4fe80104 100644
--- a/superset-frontend/src/explore/components/controls/HiddenControl.tsx
+++ b/superset-frontend/src/explore/components/controls/HiddenControl.tsx
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { Input } from 'src/components/Input';
+import { Input } from '@superset-ui/core/components';
 
 interface HiddenControlsProps {
   onChange: () => void;
diff --git a/superset-frontend/src/explore/components/controls/LayerConfigsControl/FlatLayerTree.tsx b/superset-frontend/src/explore/components/controls/LayerConfigsControl/FlatLayerTree.tsx
index 604cfb99294..b5abe9adb16 100644
--- a/superset-frontend/src/explore/components/controls/LayerConfigsControl/FlatLayerTree.tsx
+++ b/superset-frontend/src/explore/components/controls/LayerConfigsControl/FlatLayerTree.tsx
@@ -16,12 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { css, styled, t } from '@superset-ui/core';
-// eslint-disable-next-line no-restricted-imports
-import { Button, Tree } from 'antd'; // TODO: Remove antd
-// eslint-disable-next-line no-restricted-imports
-import { TreeProps } from 'antd/lib/tree'; // TODO: Remove antd
+import { Button } from '@superset-ui/core/components';
+import Tree, { TreeProps } from '@superset-ui/core/components/Tree';
 import { forwardRef } from 'react';
 import { FlatLayerDataNode, FlatLayerTreeProps, LayerConf } from './types';
 import { handleDrop } from './dragDropUtil';
@@ -39,8 +37,8 @@ export const StyledLayerTreeItem = styled(LayerTreeItem)`
     border: none;
     border-radius: ${theme.borderRadius}px;
     background-color: ${theme.colors.grayscale.light3};
-    font-size: ${theme.typography.sizes.s}px;
-    font-weight: ${theme.typography.weights.normal};
+    font-size: ${theme.fontSizeSM}px;
+    font-weight: ${theme.fontWeightNormal};
 
     &:hover {
       background-color: ${theme.colors.grayscale.light3};
@@ -49,13 +47,13 @@ export const StyledLayerTreeItem = styled(LayerTreeItem)`
     & .layer-tree-item-close {
       border-right: solid;
       border-right-width: 1px;
-      border-right-color: ${theme.colors.grayscale.light2};
+      border-right-color: ${theme.colorSplit};
     }
 
     & .layer-tree-item-edit {
       border-left: solid;
       border-left-width: 1px;
-      border-left-color: ${theme.colors.grayscale.light2};
+      border-left-color: ${theme.colorSplit};
     }
 
     & .layer-tree-item-title {
@@ -65,8 +63,8 @@ export const StyledLayerTreeItem = styled(LayerTreeItem)`
 
     & .layer-tree-item-type {
       padding-left: 4px;
-      font-size: ${theme.typography.sizes.xs}px;
-      font-family: ${theme.typography.families.monospace};
+      font-size: ${theme.fontSizeXS}px;
+      font-family: ${theme.fontFamilyCode};
     }
 
     & > button {
@@ -120,7 +118,9 @@ export const FlatLayerTree = forwardRef<HTMLDivElement, FlatLayerTreeProps>(
 
     const treeData = layerConfigsToTreeData(layerConfigs);
 
-    const onDrop: TreeProps['onDrop'] = info => {
+    const onDrop = (
+      info: Parameters<NonNullable<TreeProps<FlatLayerDataNode>['onDrop']>>[0],
+    ) => {
       const data = handleDrop(info, treeData);
       const movedLayerConfigs = treeDataToLayerConfigs(data);
       onMoveLayer(movedLayerConfigs);
diff --git a/superset-frontend/src/explore/components/controls/LayerConfigsControl/GeoStylerWrapper.tsx b/superset-frontend/src/explore/components/controls/LayerConfigsControl/GeoStylerWrapper.tsx
index b9e3db4d00f..d43da761ef8 100644
--- a/superset-frontend/src/explore/components/controls/LayerConfigsControl/GeoStylerWrapper.tsx
+++ b/superset-frontend/src/explore/components/controls/LayerConfigsControl/GeoStylerWrapper.tsx
@@ -22,7 +22,7 @@
  * via emotion. Emotion can only be used on a component that
  * accepts a className property.
  */
-import CardStyle from 'geostyler/dist/Component/CardStyle/CardStyle';
+import { CardStyle } from 'geostyler';
 import { FC } from 'react';
 import { GeoStylerWrapperProps } from './types';
 
diff --git a/superset-frontend/src/explore/components/controls/LayerConfigsControl/LayerConfigsControl.tsx b/superset-frontend/src/explore/components/controls/LayerConfigsControl/LayerConfigsControl.tsx
index c997b760464..a218040dab3 100644
--- a/superset-frontend/src/explore/components/controls/LayerConfigsControl/LayerConfigsControl.tsx
+++ b/superset-frontend/src/explore/components/controls/LayerConfigsControl/LayerConfigsControl.tsx
@@ -18,7 +18,7 @@
  */
 import { ControlHeader } from '@superset-ui/chart-controls';
 import { css, styled, t } from '@superset-ui/core';
-import Popover from 'src/components/Popover';
+import { Popover } from '@superset-ui/core/components';
 import { FC, useState } from 'react';
 import { EditItem, LayerConf, LayerConfigsControlProps } from './types';
 import LayerConfigsPopoverContent from './LayerConfigsPopoverContent';
@@ -41,8 +41,8 @@ export const StyledFlatLayerTree = styled(FlatLayerTree)`
       margin: 4px;
 
       color: ${theme.colors.grayscale.light1};
-      font-size: ${theme.typography.sizes.s}px;
-      font-weight: ${theme.typography.weights.normal};
+      font-size: ${theme.fontSizeSM}px;
+      font-weight: ${theme.fontWeightNormal};
 
       &:hover {
         background-color: ${theme.colors.grayscale.light4};
diff --git a/superset-frontend/src/explore/components/controls/LayerConfigsControl/LayerConfigsPopoverContent.tsx b/superset-frontend/src/explore/components/controls/LayerConfigsControl/LayerConfigsPopoverContent.tsx
index 5794aafa770..ef1c530d654 100644
--- a/superset-frontend/src/explore/components/controls/LayerConfigsControl/LayerConfigsPopoverContent.tsx
+++ b/superset-frontend/src/explore/components/controls/LayerConfigsControl/LayerConfigsPopoverContent.tsx
@@ -18,7 +18,9 @@
  */
 import { css, JsonValue, styled, t } from '@superset-ui/core';
 // eslint-disable-next-line no-restricted-imports
-import { Button, Form, Tabs } from 'antd'; // TODO: Remove antd
+import { Button } from '@superset-ui/core/components/Button';
+import { Form } from '@superset-ui/core/components/Form';
+import Tabs from '@superset-ui/core/components/Tabs';
 import { mix } from 'polished';
 import { Data as GsData } from 'geostyler-data';
 import { Style as GsStyle } from 'geostyler-style';
@@ -58,12 +60,12 @@ export const StyledCloseButton = styled(Button)`
     line-height: 1.5715;
     border-radius: ${theme.borderRadius}px;
     background-color: ${theme.colors.primary.light4};
-    color: ${theme.colors.primary.dark1};
-    font-size: ${theme.typography.sizes.s}px;
-    font-weight: ${theme.typography.weights.bold};
+    color: ${theme.colorPrimaryText};
+    font-size: ${theme.fontSizeSM}px;
+    font-weight: ${theme.fontWeightStrong};
     text-transform: uppercase;
-    min-width: ${theme.gridUnit * 36};
-    min-height: ${theme.gridUnit * 8};
+    min-width: ${theme.sizeUnit * 36};
+    min-height: ${theme.sizeUnit * 8};
     box-shadow: none;
     border-width: 0px;
     border-style: none;
@@ -71,10 +73,10 @@ export const StyledCloseButton = styled(Button)`
     &:hover {
       background-color: ${mix(
         0.1,
-        theme.colors.primary.base,
+        theme.colorPrimary,
         theme.colors.primary.light4,
       )};
-      color: ${theme.colors.primary.dark1};
+      color: ${theme.colorPrimaryText};
     }
   `}
 `;
@@ -95,8 +97,8 @@ export const StyledControlNumberFormItem = styled(ControlFormItem)`
 export const StyledGeoStyler = styled(GeoStylerWrapper)`
   ${({ theme }) => css`
     h2 {
-      font-weight: ${theme.typography.weights.normal};
-      font-size: ${theme.typography.sizes.xl}px;
+      font-weight: ${theme.fontWeightNormal};
+      font-size: ${theme.fontSizeXL}px;
     }
     .ant-form-item-control {
       flex: unset;
@@ -110,19 +112,19 @@ export const StyledSaveButton = styled(Button)`
     margin-left: 4px;
     line-height: 1.5715;
     border-radius: ${theme.borderRadius}px;
-    background-color: ${theme.colors.primary.base};
+    background-color: ${theme.colorPrimary};
     color: ${theme.colors.grayscale.light5};
-    font-size: ${theme.typography.sizes.s}px;
-    font-weight: ${theme.typography.weights.bold};
+    font-size: ${theme.fontSizeSM}px;
+    font-weight: ${theme.fontWeightStrong};
     text-transform: uppercase;
-    min-width: ${theme.gridUnit * 36};
-    min-height: ${theme.gridUnit * 8};
+    min-width: ${theme.sizeUnit * 36};
+    min-height: ${theme.sizeUnit * 8};
     box-shadow: none;
     border-width: 0px;
     border-style: none;
     border-color: transparent;
     &:hover {
-      background-color: ${theme.colors.primary.dark1};
+      background-color: ${theme.colorPrimaryText};
     }
   `}
 `;
@@ -376,121 +378,129 @@ export const LayerConfigsPopoverContent: FC<
   return (
     <div>
       <Form key={JSON.stringify(formKey)}>
-        <Tabs defaultActiveKey={LAYER_CONFIG_TABS.LAYER}>
-          <Tabs.TabPane tab={layerTabLabel} key={LAYER_CONFIG_TABS.LAYER}>
-            <StyledControlFormItem
-              controlType="Input"
-              label={layerUrlLabel}
-              description={layerUrlDescription}
-              placeholder={layerUrlPlaceholder}
-              value={currentLayerConf.url}
-              name="url"
-              onChange={onLayerUrlChange}
-            />
-            <StyledControlFormItem
-              controlType="Select"
-              label={layerTypeLabel}
-              description={layerTypeDescription}
-              options={[
-                { value: 'WMS', label: t('WMS') },
-                { value: 'WFS', label: t('WFS') },
-                { value: 'XYZ', label: t('XYZ') },
-              ]}
-              value={currentLayerConf.type}
-              defaultValue={currentLayerConf.type}
-              name="type"
-              onChange={onLayerTypeChange}
-            />
-            {isWmsLayerConf(currentLayerConf) && (
-              <StyledControlFormItem
-                controlType="Select"
-                label={serviceVersionLabel}
-                description={serviceVersionDescription}
-                options={wmsVersionOptions}
-                value={wmsVersion}
-                defaultValue={wmsVersionOptions[0].value as string}
-                name="wmsVersion"
-                onChange={onWmsVersionChange}
-              />
-            )}
-            {isWfsLayerConf(currentLayerConf) && (
-              <StyledControlFormItem
-                controlType="Select"
-                label={serviceVersionLabel}
-                description={serviceVersionDescription}
-                options={wfsVersionOptions}
-                value={wfsVersion}
-                defaultValue={wfsVersionOptions[0].value as string}
-                name="wfsVersion"
-                onChange={onWfsVersionChange}
-              />
-            )}
-            {isWmsLayerConf(currentLayerConf) && (
-              <StyledControlFormItem
-                controlType="Input"
-                label={layersParamLabel}
-                description={layersParamDescription}
-                placeholder={layersParamPlaceholder}
-                value={currentLayerConf.layersParam}
-                name="layersParam"
-                onChange={onLayersParamChange}
-              />
-            )}
-            {isWfsLayerConf(currentLayerConf) && (
-              <StyledControlFormItem
-                controlType="Input"
-                label={layersParamLabel}
-                description={layersParamDescription}
-                placeholder={layersParamPlaceholder}
-                value={currentLayerConf.typeName}
-                name="typeName"
-                onChange={onTypeNameChange}
-              />
-            )}
-            <StyledControlFormItem
-              controlType="Input"
-              label={layerTitleLabel}
-              description={layerTitleDescription}
-              placeholder={layerTitlePlaceholder}
-              value={currentLayerConf.title}
-              name="title"
-              onChange={onLayerTitleChange}
-            />
-            {isWfsLayerConf(currentLayerConf) && (
-              <StyledControlNumberFormItem
-                controlType="InputNumber"
-                label={maxFeaturesLabel}
-                description={maxFeaturesDescription}
-                placeholder={maxFeaturesPlaceholder}
-                value={currentLayerConf.maxFeatures}
-                name="maxFeatures"
-                onChange={onMaxFeaturesChange}
-              />
-            )}
-            <StyledControlFormItem
-              controlType="Input"
-              label={attributionLabel}
-              description={attributionDescription}
-              placeholder={attributionPlaceholder}
-              value={currentLayerConf.attribution}
-              name="attribution"
-              onChange={onAttributionChange}
-            />
-          </Tabs.TabPane>
-          <Tabs.TabPane
-            tab={styleTabLabel}
-            key={LAYER_CONFIG_TABS.GEOSTYLER}
-            disabled={!isWfsLayerConf(currentLayerConf)}
-          >
-            {isWfsLayerConf(currentLayerConf) && (
-              <StyledGeoStyler
-                style={currentLayerConf.style}
-                onStyleChange={onStyleChange}
-                data={geostylerData}
-              />
-            )}
-          </Tabs.TabPane>
-        </Tabs>
+        <Tabs
+          defaultActiveKey={LAYER_CONFIG_TABS.LAYER}
+          items={[
+            {
+              key: LAYER_CONFIG_TABS.LAYER,
+              label: layerTabLabel,
+              children: (
+                <>
+                  <StyledControlFormItem
+                    controlType="Input"
+                    label={layerUrlLabel}
+                    description={layerUrlDescription}
+                    placeholder={layerUrlPlaceholder}
+                    value={currentLayerConf.url}
+                    name="url"
+                    onChange={onLayerUrlChange}
+                  />
+                  <StyledControlFormItem
+                    controlType="Select"
+                    label={layerTypeLabel}
+                    description={layerTypeDescription}
+                    options={[
+                      { value: 'WMS', label: t('WMS') },
+                      { value: 'WFS', label: t('WFS') },
+                      { value: 'XYZ', label: t('XYZ') },
+                    ]}
+                    value={currentLayerConf.type}
+                    defaultValue={currentLayerConf.type}
+                    name="type"
+                    onChange={onLayerTypeChange}
+                  />
+                  {isWmsLayerConf(currentLayerConf) && (
+                    <StyledControlFormItem
+                      controlType="Select"
+                      label={serviceVersionLabel}
+                      description={serviceVersionDescription}
+                      options={wmsVersionOptions}
+                      value={wmsVersion}
+                      defaultValue={wmsVersionOptions[0].value as string}
+                      name="wmsVersion"
+                      onChange={onWmsVersionChange}
+                    />
+                  )}
+                  {isWfsLayerConf(currentLayerConf) && (
+                    <StyledControlFormItem
+                      controlType="Select"
+                      label={serviceVersionLabel}
+                      description={serviceVersionDescription}
+                      options={wfsVersionOptions}
+                      value={wfsVersion}
+                      defaultValue={wfsVersionOptions[0].value as string}
+                      name="wfsVersion"
+                      onChange={onWfsVersionChange}
+                    />
+                  )}
+                  {isWmsLayerConf(currentLayerConf) && (
+                    <StyledControlFormItem
+                      controlType="Input"
+                      label={layersParamLabel}
+                      description={layersParamDescription}
+                      placeholder={layersParamPlaceholder}
+                      value={currentLayerConf.layersParam}
+                      name="layersParam"
+                      onChange={onLayersParamChange}
+                    />
+                  )}
+                  {isWfsLayerConf(currentLayerConf) && (
+                    <StyledControlFormItem
+                      controlType="Input"
+                      label={layersParamLabel}
+                      description={layersParamDescription}
+                      placeholder={layersParamPlaceholder}
+                      value={currentLayerConf.typeName}
+                      name="typeName"
+                      onChange={onTypeNameChange}
+                    />
+                  )}
+                  <StyledControlFormItem
+                    controlType="Input"
+                    label={layerTitleLabel}
+                    description={layerTitleDescription}
+                    placeholder={layerTitlePlaceholder}
+                    value={currentLayerConf.title}
+                    name="title"
+                    onChange={onLayerTitleChange}
+                  />
+                  {isWfsLayerConf(currentLayerConf) && (
+                    <StyledControlNumberFormItem
+                      controlType="InputNumber"
+                      label={maxFeaturesLabel}
+                      description={maxFeaturesDescription}
+                      placeholder={maxFeaturesPlaceholder}
+                      value={currentLayerConf.maxFeatures}
+                      name="maxFeatures"
+                      onChange={onMaxFeaturesChange}
+                    />
+                  )}
+                  <StyledControlFormItem
+                    controlType="Input"
+                    label={attributionLabel}
+                    description={attributionDescription}
+                    placeholder={attributionPlaceholder}
+                    value={currentLayerConf.attribution}
+                    name="attribution"
+                    onChange={onAttributionChange}
+                  />
+                </>
+              ),
+            },
+            {
+              key: LAYER_CONFIG_TABS.GEOSTYLER,
+              label: styleTabLabel,
+              disabled: !isWfsLayerConf(currentLayerConf),
+              children: isWfsLayerConf(currentLayerConf) && (
+                <StyledGeoStyler
+                  style={currentLayerConf.style}
+                  onStyleChange={onStyleChange}
+                  data={geostylerData}
+                />
+              ),
+            },
+          ]}
+        />
         <StyledButtonContainer>
           <StyledCloseButton type="default" onClick={onCloseClick}>
             {t('Close')}
diff --git a/superset-frontend/src/explore/components/controls/LayerConfigsControl/LayerTreeItem.tsx b/superset-frontend/src/explore/components/controls/LayerConfigsControl/LayerTreeItem.tsx
index 4fcbf0ec069..72f519ff7d8 100644
--- a/superset-frontend/src/explore/components/controls/LayerConfigsControl/LayerTreeItem.tsx
+++ b/superset-frontend/src/explore/components/controls/LayerConfigsControl/LayerTreeItem.tsx
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { Icons } from 'src/components/Icons';
-// eslint-disable-next-line no-restricted-imports
-import { Button, Tag } from 'antd'; // TODO: Remove antd
+import { Icons } from '@superset-ui/core/components/Icons';
+import { Button } from '@superset-ui/core/components';
+import { Tag } from 'src/components';
 import { FC } from 'react';
 import { LayerTreeItemProps } from './types';
 
diff --git a/superset-frontend/src/explore/components/controls/LayerConfigsControl/dragDropUtil.tsx b/superset-frontend/src/explore/components/controls/LayerConfigsControl/dragDropUtil.tsx
index f87ed9620ef..6d0e23b4890 100644
--- a/superset-frontend/src/explore/components/controls/LayerConfigsControl/dragDropUtil.tsx
+++ b/superset-frontend/src/explore/components/controls/LayerConfigsControl/dragDropUtil.tsx
@@ -17,8 +17,7 @@
  * under the License.
  */
 
-// eslint-disable-next-line no-restricted-imports
-import { TreeProps } from 'antd/lib/tree'; // TODO: Remove antd
+import { TreeProps } from '@superset-ui/core/components/Tree';
 import { DropInfoType, FlatLayerDataNode } from './types';
 
 /**
diff --git a/superset-frontend/src/explore/components/controls/LayerConfigsControl/types.ts b/superset-frontend/src/explore/components/controls/LayerConfigsControl/types.ts
index 6ad5b850e17..dc8f947c2a8 100644
--- a/superset-frontend/src/explore/components/controls/LayerConfigsControl/types.ts
+++ b/superset-frontend/src/explore/components/controls/LayerConfigsControl/types.ts
@@ -16,12 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
-// eslint-disable-next-line no-restricted-imports
-import { DataNode, TreeProps } from 'antd/lib/tree'; // TODO: Remove antd
+import { TreeProps, TreeDataNode } from '@superset-ui/core/components/Tree';
 import { ControlComponentProps } from '@superset-ui/chart-controls';
 import { Style } from 'geostyler-style';
-import { CardStyleProps } from 'geostyler/dist/Component/CardStyle/CardStyle';
+import { Data } from 'geostyler-data';
 
 export interface BaseLayerConf {
   title: string;
@@ -48,7 +46,7 @@ export interface WmsLayerConf extends BaseLayerConf {
   layersParam: string;
 }
 
-export interface FlatLayerDataNode extends DataNode {
+export interface FlatLayerDataNode extends TreeDataNode {
   layerConf: LayerConf;
 }
 
@@ -81,8 +79,11 @@ export interface LayerConfigsPopoverContentProps {
   layerConf: LayerConf;
 }
 
-export interface GeoStylerWrapperProps extends CardStyleProps {
+export interface GeoStylerWrapperProps {
+  style?: Style;
   className?: string;
+  onStyleChange?: (newStyle: Style) => void;
+  data?: Data;
 }
 
 export interface LayerTreeItemProps {
diff --git a/superset-frontend/src/explore/components/controls/MapViewControl/ExtentTag.tsx b/superset-frontend/src/explore/components/controls/MapViewControl/ExtentTag.tsx
index fb43b28d231..b305f595599 100644
--- a/superset-frontend/src/explore/components/controls/MapViewControl/ExtentTag.tsx
+++ b/superset-frontend/src/explore/components/controls/MapViewControl/ExtentTag.tsx
@@ -18,8 +18,7 @@
  */
 
 import { t } from '@superset-ui/core';
-// eslint-disable-next-line no-restricted-imports
-import { Tag } from 'antd'; // TODO: Remove antd
+import { Tag } from 'src/components';
 import { FC } from 'react';
 import { ExtentTagProps } from './types';
 
diff --git a/superset-frontend/src/explore/components/controls/MapViewControl/MapViewControl.tsx b/superset-frontend/src/explore/components/controls/MapViewControl/MapViewControl.tsx
index ca23247ad19..e418fe1f0c4 100644
--- a/superset-frontend/src/explore/components/controls/MapViewControl/MapViewControl.tsx
+++ b/superset-frontend/src/explore/components/controls/MapViewControl/MapViewControl.tsx
@@ -18,8 +18,7 @@
  */
 import { ControlHeader } from '@superset-ui/chart-controls';
 import { css, styled, t } from '@superset-ui/core';
-import Button from 'src/components/Button';
-import Popover from 'src/components/Popover';
+import { Button, Popover } from '@superset-ui/core/components';
 import { FC, useState } from 'react';
 import { mix } from 'polished';
 import { MapViewConfigs, MapViewConfigsControlProps } from './types';
@@ -34,12 +33,12 @@ export const StyledExtentButton = styled(Button)`
     line-height: 1.5715;
     border-radius: ${theme.borderRadius}px;
     background-color: ${theme.colors.primary.light4};
-    color: ${theme.colors.primary.dark1};
-    font-size: ${theme.typography.sizes.s}px;
-    font-weight: ${theme.typography.weights.bold};
+    color: ${theme.colorPrimaryText};
+    font-size: ${theme.fontSizeSM}px;
+    font-weight: ${theme.fontWeightStrong};
     text-transform: uppercase;
-    min-width: ${theme.gridUnit * 36};
-    min-height: ${theme.gridUnit * 8};
+    min-width: ${theme.sizeUnit * 36};
+    min-height: ${theme.sizeUnit * 8};
     box-shadow: none;
     border-width: 0px;
     border-style: none;
@@ -49,10 +48,10 @@ export const StyledExtentButton = styled(Button)`
     &:hover {
       background-color: ${mix(
         0.1,
-        theme.colors.primary.base,
+        theme.colorPrimary,
         theme.colors.primary.light4,
       )};
-      color: ${theme.colors.primary.dark1};
+      color: ${theme.colorPrimaryText};
     }
   `}
 `;
diff --git a/superset-frontend/src/explore/components/controls/MapViewControl/MapViewPopoverContent.tsx b/superset-frontend/src/explore/components/controls/MapViewControl/MapViewPopoverContent.tsx
index 182d5f38067..c08104ec1c2 100644
--- a/superset-frontend/src/explore/components/controls/MapViewControl/MapViewPopoverContent.tsx
+++ b/superset-frontend/src/explore/components/controls/MapViewControl/MapViewPopoverContent.tsx
@@ -17,10 +17,8 @@
  * under the License.
  */
 import { css, styled, t } from '@superset-ui/core';
-import { Form } from 'src/components/Form';
-import Button from 'src/components/Button';
+import { Button, Form } from '@superset-ui/core/components';
 import { FC, useEffect, useState } from 'react';
-import { mix } from 'polished';
 import { MapViewConfigs, MapViewPopoverContentProps } from './types';
 import { ControlFormItem } from '../ColumnConfigControl/ControlForm';
 
@@ -29,34 +27,6 @@ export const StyledButtonContainer = styled.div`
   margin: 8px;
 `;
 
-export const StyledCloseButton = styled(Button)`
-  ${({ theme }) => css`
-    flex: 1;
-    margin-right: 4px;
-    line-height: 1.5715;
-    border-radius: ${theme.borderRadius}px;
-    background-color: ${theme.colors.primary.light4};
-    color: ${theme.colors.primary.dark1};
-    font-size: ${theme.typography.sizes.s}px;
-    font-weight: ${theme.typography.weights.bold};
-    text-transform: uppercase;
-    min-width: ${theme.gridUnit * 36};
-    min-height: ${theme.gridUnit * 8};
-    box-shadow: none;
-    border-width: 0px;
-    border-style: none;
-    border-color: transparent;
-    &:hover {
-      background-color: ${mix(
-        0.1,
-        theme.colors.primary.base,
-        theme.colors.primary.light4,
-      )};
-      color: ${theme.colors.primary.dark1};
-    }
-  `}
-`;
-
 export const StyledControlNumberFormItem = styled(ControlFormItem)`
   ${({ theme }) => css`
     border-radius: ${theme.borderRadius}px;
@@ -64,29 +34,6 @@ export const StyledControlNumberFormItem = styled(ControlFormItem)`
   `}
 `;
 
-export const StyledSaveButton = styled(Button)`
-  ${({ theme }) => css`
-    flex: 1;
-    margin-left: 4px;
-    line-height: 1.5715;
-    border-radius: ${theme.borderRadius}px;
-    background-color: ${theme.colors.primary.base};
-    color: ${theme.colors.grayscale.light5};
-    font-size: ${theme.typography.sizes.s}px;
-    font-weight: ${theme.typography.weights.bold};
-    text-transform: uppercase;
-    min-width: ${theme.gridUnit * 36};
-    min-height: ${theme.gridUnit * 8};
-    box-shadow: none;
-    border-width: 0px;
-    border-style: none;
-    border-color: transparent;
-    &:hover {
-      background-color: ${theme.colors.primary.dark1};
-    }
-  `}
-`;
-
 export const MapViewPopoverContent: FC<MapViewPopoverContentProps> = ({
   onClose = () => {},
   onSave = () => {},
@@ -186,12 +133,12 @@ export const MapViewPopoverContent: FC<MapViewPopoverContentProps> = ({
           max={180}
         />
         <StyledButtonContainer>
-          <StyledCloseButton type="default" onClick={onCloseClick}>
+          <Button buttonStyle="secondary" onClick={onCloseClick}>
             {closeButtonText}
-          </StyledCloseButton>
-          <StyledSaveButton type="primary" onClick={onSaveClick}>
+          </Button>
+          <Button buttonStyle="primary" onClick={onSaveClick}>
             {saveButtonText}
-          </StyledSaveButton>
+          </Button>
         </StyledButtonContainer>
       </Form>
     </div>
diff --git a/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx b/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx
index 63a5a8aecb7..90828040310 100644
--- a/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx
+++ b/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx
@@ -26,13 +26,17 @@ import {
   ensureIsArray,
   DatasourceType,
 } from '@superset-ui/core';
-import Tabs from 'src/components/Tabs';
-import Button from 'src/components/Button';
-import { Select } from 'src/components';
-import { Tooltip } from 'src/components/Tooltip';
-import { EmptyState } from 'src/components/EmptyState';
-import { Form, FormItem } from 'src/components/Form';
-import { SQLEditor } from 'src/components/AsyncAceEditor';
+import Tabs from '@superset-ui/core/components/Tabs';
+import {
+  Button,
+  EmptyState,
+  Form,
+  FormItem,
+  Icons,
+  Select,
+  Tooltip,
+  SQLEditor,
+} from '@superset-ui/core/components';
 import sqlKeywords from 'src/SqlLab/utils/sqlKeywords';
 import { noOp } from 'src/utils/common';
 import {
@@ -75,7 +79,7 @@ const defaultProps = {
 const StyledSelect = styled(Select)`
   .metric-option {
     & > svg {
-      min-width: ${({ theme }) => `${theme.gridUnit * 4}px`};
+      min-width: ${({ theme }) => `${theme.sizeUnit * 4}px`};
     }
     & > .option-label {
       overflow: hidden;
@@ -372,58 +376,59 @@ export default class AdhocMetricEditPopover extends PureComponent {
           style={{ height: this.state.height, width: this.state.width }}
           onChange={this.onTabChange}
           allowOverflow
-        >
-          <Tabs.TabPane key={SAVED_TAB_KEY} tab={t('Saved')}>
-            {ensureIsArray(savedMetricsOptions).length > 0 ? (
-              <FormItem label={t('Saved metric')}>
-                <StyledSelect
-                  options={ensureIsArray(savedMetricsOptions).map(
-                    savedMetric => ({
-                      value: savedMetric.metric_name,
-                      label: savedMetric.metric_name,
-                      customLabel: this.renderMetricOption(savedMetric),
-                      key: savedMetric.id,
-                    }),
-                  )}
-                  {...savedSelectProps}
-                />
-              </FormItem>
-            ) : datasource.type === DatasourceType.Table ? (
-              <EmptyState
-                image="empty.svg"
-                size="small"
-                title={t('No saved metrics found')}
-                description={t(
-                  'Add metrics to dataset in "Edit datasource" modal',
-                )}
-              />
-            ) : (
-              <EmptyState
-                image="empty.svg"
-                size="small"
-                title={t('No saved metrics found')}
-                description={
-                  <>
-                    <span
-                      tabIndex={0}
-                      role="button"
-                      onClick={() => {
-                        this.props.handleDatasetModal(true);
-                        this.props.onClose();
-                      }}
-                    >
-                      {t('Create a dataset')}
-                    </span>
-                    {t(' to add metrics')}
-                  </>
-                }
-              />
-            )}
-          </Tabs.TabPane>
-          <Tabs.TabPane
-            key={EXPRESSION_TYPES.SIMPLE}
-            tab={
-              extra.disallow_adhoc_metrics ? (
+          items={[
+            {
+              key: SAVED_TAB_KEY,
+              label: t('Saved'),
+              children:
+                ensureIsArray(savedMetricsOptions).length > 0 ? (
+                  <FormItem label={t('Saved metric')}>
+                    <StyledSelect
+                      options={ensureIsArray(savedMetricsOptions).map(
+                        savedMetric => ({
+                          value: savedMetric.metric_name,
+                          label: this.renderMetricOption(savedMetric),
+                          key: savedMetric.id,
+                        }),
+                      )}
+                      {...savedSelectProps}
+                    />
+                  </FormItem>
+                ) : datasource.type === DatasourceType.Table ? (
+                  <EmptyState
+                    image="empty.svg"
+                    size="small"
+                    title={t('No saved metrics found')}
+                    description={t(
+                      'Add metrics to dataset in "Edit datasource" modal',
+                    )}
+                  />
+                ) : (
+                  <EmptyState
+                    image="empty.svg"
+                    size="small"
+                    title={t('No saved metrics found')}
+                    description={
+                      <>
+                        <span
+                          tabIndex={0}
+                          role="button"
+                          onClick={() => {
+                            this.props.handleDatasetModal(true);
+                            this.props.onClose();
+                          }}
+                        >
+                          {t('Create a dataset')}
+                        </span>
+                        {t(' to add metrics')}
+                      </>
+                    }
+                  />
+                ),
+            },
+            {
+              key: EXPRESSION_TYPES.SIMPLE,
+              label: extra.disallow_adhoc_metrics ? (
                 <Tooltip
                   title={t(
                     'Simple ad-hoc metrics are not enabled for this dataset',
@@ -433,36 +438,36 @@ export default class AdhocMetricEditPopover extends PureComponent {
                 </Tooltip>
               ) : (
                 t('Simple')
-              )
-            }
-            disabled={extra.disallow_adhoc_metrics}
-          >
-            <FormItem label={t('column')}>
-              <Select
-                options={columns.map(column => ({
-                  value: column.column_name,
-                  label: column.verbose_name || column.column_name,
-                  key: column.id,
-                  customLabel: this.renderColumnOption(column),
-                }))}
-                {...columnSelectProps}
-              />
-            </FormItem>
-            <FormItem label={t('aggregate')}>
-              <Select
-                options={AGGREGATES_OPTIONS.map(option => ({
-                  value: option,
-                  label: option,
-                  key: option,
-                }))}
-                {...aggregateSelectProps}
-              />
-            </FormItem>
-          </Tabs.TabPane>
-          <Tabs.TabPane
-            key={EXPRESSION_TYPES.SQL}
-            tab={
-              extra.disallow_adhoc_metrics ? (
+              ),
+              disabled: extra.disallow_adhoc_metrics,
+              children: (
+                <>
+                  <FormItem label={t('column')}>
+                    <Select
+                      options={columns.map(column => ({
+                        value: column.column_name,
+                        key: column.id,
+                        label: this.renderColumnOption(column),
+                      }))}
+                      {...columnSelectProps}
+                    />
+                  </FormItem>
+                  <FormItem label={t('aggregate')}>
+                    <Select
+                      options={AGGREGATES_OPTIONS.map(option => ({
+                        value: option,
+                        label: option,
+                        key: option,
+                      }))}
+                      {...aggregateSelectProps}
+                    />
+                  </FormItem>
+                </>
+              ),
+            },
+            {
+              key: EXPRESSION_TYPES.SQL,
+              label: extra.disallow_adhoc_metrics ? (
                 <Tooltip
                   title={t(
                     'Custom SQL ad-hoc metrics are not enabled for this dataset',
@@ -472,34 +477,35 @@ export default class AdhocMetricEditPopover extends PureComponent {
                 </Tooltip>
               ) : (
                 t('Custom SQL')
-              )
-            }
-            data-test="adhoc-metric-edit-tab#custom"
-            disabled={extra.disallow_adhoc_metrics}
-          >
-            <SQLEditor
-              data-test="sql-editor"
-              showLoadingForImport
-              ref={this.handleAceEditorRef}
-              keywords={keywords}
-              height={`${this.state.height - 80}px`}
-              onChange={this.onSqlExpressionChange}
-              width="100%"
-              showGutter={false}
-              value={
-                adhocMetric.sqlExpression ||
-                adhocMetric.translateToSql({ transformCountDistinct: true })
-              }
-              editorProps={{ $blockScrolling: true }}
-              enableLiveAutocompletion
-              className="filter-sql-editor"
-              wrapEnabled
-            />
-          </Tabs.TabPane>
-        </Tabs>
+              ),
+              disabled: extra.disallow_adhoc_metrics,
+              children: (
+                <SQLEditor
+                  data-test="sql-editor"
+                  showLoadingForImport
+                  ref={this.handleAceEditorRef}
+                  keywords={keywords}
+                  height={`${this.state.height - 80}px`}
+                  onChange={this.onSqlExpressionChange}
+                  width="100%"
+                  showGutter={false}
+                  value={
+                    adhocMetric.sqlExpression ||
+                    adhocMetric.translateToSql({ transformCountDistinct: true })
+                  }
+                  editorProps={{ $blockScrolling: true }}
+                  enableLiveAutocompletion
+                  className="filter-sql-editor"
+                  wrapEnabled
+                />
+              ),
+            },
+          ]}
+        />
         <div>
           <Button
             buttonSize="small"
+            buttonStyle="secondary"
             onClick={this.onResetStateAndClose}
             data-test="AdhocMetricEdit#cancel"
             cta
@@ -516,14 +522,12 @@ export default class AdhocMetricEditPopover extends PureComponent {
           >
             {t('Save')}
           </Button>
-          {/* TODO: Remove fa-icon */}
-          {/* eslint-disable-next-line icons/no-fa-icons-usage */}
-          <i
+          <Icons.ArrowsAltOutlined
             role="button"
             aria-label="Resize"
             tabIndex={0}
             onMouseDown={this.onDragDown}
-            className="fa fa-expand edit-popover-resize text-muted"
+            className="edit-popover-resize"
           />
         </div>
       </Form>
diff --git a/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopoverTitle.tsx b/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopoverTitle.tsx
index 753b5e75dfb..ec7de286931 100644
--- a/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopoverTitle.tsx
+++ b/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopoverTitle.tsx
@@ -26,9 +26,8 @@ import {
 } from 'react';
 
 import { t, styled, useTheme } from '@superset-ui/core';
-import { Input } from 'src/components/Input';
-import { Tooltip } from 'src/components/Tooltip';
-import { Icons } from 'src/components/Icons';
+import { Input, Tooltip } from '@superset-ui/core/components';
+import { Icons } from '@superset-ui/core/components/Icons';
 
 const TitleLabel = styled.span`
   display: inline-block;
@@ -38,7 +37,7 @@ const TitleLabel = styled.span`
 const StyledInput = styled(Input)`
   border-radius: ${({ theme }) => theme.borderRadius};
   height: 26px;
-  padding-left: ${({ theme }) => theme.gridUnit * 2.5}px;
+  padding-left: ${({ theme }) => theme.sizeUnit * 2.5}px;
 `;
 
 export interface AdhocMetricEditPopoverTitleProps {
@@ -124,7 +123,7 @@ const AdhocMetricEditPopoverTitle: FC<AdhocMetricEditPopoverTitleProps> = ({
         &nbsp;
         <Icons.EditOutlined
           iconColor={
-            isHovered ? theme.colors.primary.base : theme.colors.grayscale.base
+            isHovered ? theme.colorPrimary : theme.colors.grayscale.base
           }
           iconSize="m"
         />
diff --git a/superset-frontend/src/explore/components/controls/MetricControl/AggregateOption.jsx b/superset-frontend/src/explore/components/controls/MetricControl/AggregateOption.jsx
index 72a1e39cb28..b3a601a110b 100644
--- a/superset-frontend/src/explore/components/controls/MetricControl/AggregateOption.jsx
+++ b/superset-frontend/src/explore/components/controls/MetricControl/AggregateOption.jsx
@@ -30,7 +30,7 @@ export default function AggregateOption({ aggregate, showType }) {
   return (
     <div>
       {showType && <ColumnTypeLabel type="aggregate" />}
-      <span className="m-r-5 option-label">{aggregate.aggregate_name}</span>
+      <span className="option-label">{aggregate.aggregate_name}</span>
     </div>
   );
 }
diff --git a/superset-frontend/src/explore/components/controls/MetricControl/MetricsControl.jsx b/superset-frontend/src/explore/components/controls/MetricControl/MetricsControl.jsx
index b94f790e32d..082befda40f 100644
--- a/superset-frontend/src/explore/components/controls/MetricControl/MetricsControl.jsx
+++ b/superset-frontend/src/explore/components/controls/MetricControl/MetricsControl.jsx
@@ -18,10 +18,10 @@
  */
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import PropTypes from 'prop-types';
-import { ensureIsArray, t, useTheme, usePrevious } from '@superset-ui/core';
+import { ensureIsArray, t, usePrevious } from '@superset-ui/core';
 import { isEqual } from 'lodash';
 import ControlHeader from 'src/explore/components/ControlHeader';
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
 import {
   AddIconButton,
   AddControlLabel,
@@ -124,7 +124,6 @@ const MetricsControl = ({
   ...props
 }) => {
   const [value, setValue] = useState(coerceAdhocMetrics(propsValue));
-  const theme = useTheme();
   const prevColumns = usePrevious(columns);
   const prevSavedMetrics = usePrevious(savedMetrics);
 
@@ -317,10 +316,7 @@ const MetricsControl = ({
             disabled={isAddNewMetricDisabled()}
             data-test="add-metric-button"
           >
-            <Icons.PlusOutlined
-              iconSize="m"
-              iconColor={theme.colors.grayscale.light5}
-            />
+            <Icons.PlusOutlined iconSize="m" />
           </AddIconButton>,
         )}
       </HeaderContainer>
@@ -329,10 +325,7 @@ const MetricsControl = ({
           ? value.map((value, index) => valueRenderer(value, index))
           : addNewMetricPopoverTrigger(
               <AddControlLabel>
-                <Icons.PlusOutlined
-                  iconSize="m"
-                  iconColor={theme.colors.grayscale.light1}
-                />
+                <Icons.PlusOutlined iconSize="m" />
                 {t('Add metric')}
               </AddControlLabel>,
             )}
diff --git a/superset-frontend/src/explore/components/controls/NumberControl/index.tsx b/superset-frontend/src/explore/components/controls/NumberControl/index.tsx
index e06fd0f4264..02edc658670 100644
--- a/superset-frontend/src/explore/components/controls/NumberControl/index.tsx
+++ b/superset-frontend/src/explore/components/controls/NumberControl/index.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { styled } from '@superset-ui/core';
-import { InputNumber } from 'src/components/Input';
+import { InputNumber } from '@superset-ui/core/components/Input';
 import ControlHeader, { ControlHeaderProps } from '../../ControlHeader';
 
 type NumberValueType = number | undefined;
diff --git a/superset-frontend/src/explore/components/controls/OptionControls/index.tsx b/superset-frontend/src/explore/components/controls/OptionControls/index.tsx
index 5d52db70bbc..28029f8aaff 100644
--- a/superset-frontend/src/explore/components/controls/OptionControls/index.tsx
+++ b/superset-frontend/src/explore/components/controls/OptionControls/index.tsx
@@ -20,15 +20,13 @@ import { useRef, ReactNode } from 'react';
 
 import { useDrag, useDrop, DropTargetMonitor } from 'react-dnd';
 import { styled, t, useTheme, keyframes, css } from '@superset-ui/core';
-import { InfoTooltipWithTrigger } from '@superset-ui/chart-controls';
-import { Tooltip } from 'src/components/Tooltip';
-import { Icons } from 'src/components/Icons';
+import { InfoTooltip, Icons, Tooltip } from '@superset-ui/core/components';
 import { savedMetricType } from 'src/explore/components/controls/MetricControl/types';
 import AdhocMetric from 'src/explore/components/controls/MetricControl/AdhocMetric';
 import { StyledMetricOption } from '../../optionRenderers';
 
 export const DragContainer = styled.div`
-  margin-bottom: ${({ theme }) => theme.gridUnit}px;
+  margin-bottom: ${({ theme }) => theme.sizeUnit}px;
   :last-child {
     margin-bottom: 0;
   }
@@ -40,11 +38,14 @@ export const OptionControlContainer = styled.div<{
   display: flex;
   align-items: center;
   width: 100%;
-  font-size: ${({ theme }) => theme.typography.sizes.s}px;
-  height: ${({ theme }) => theme.gridUnit * 6}px;
-  background-color: ${({ theme }) => theme.colors.grayscale.light3};
+  font-size: ${({ theme }) => theme.fontSizeSM}px;
+  height: ${({ theme }) => theme.sizeUnit * 6}px;
+  background-color: ${({ theme }) => theme.colorBgLayout};
   border-radius: 3px;
   cursor: ${({ withCaret }) => (withCaret ? 'pointer' : 'default')};
+  :hover {
+    background-color: ${({ theme }) => theme.colorPrimaryBgHover};
+  }
 `;
 export const Label = styled.div`
   ${({ theme }) => `
@@ -54,14 +55,14 @@ export const Label = styled.div`
     text-overflow: ellipsis;
     align-items: center;
     white-space: nowrap;
-    padding-left: ${theme.gridUnit}px;
+    padding-left: ${theme.sizeUnit}px;
     svg {
-      margin-right: ${theme.gridUnit}px;
+      margin-right: ${theme.sizeUnit}px;
     }
     .type-label {
-      margin-right: ${theme.gridUnit * 2}px;
-      margin-left: ${theme.gridUnit}px;
-      font-weight: ${theme.typography.weights.normal};
+      margin-right: ${theme.sizeUnit * 2}px;
+      margin-left: ${theme.sizeUnit}px;
+      font-weight: ${theme.fontWeightNormal};
       width: auto;
     }
     .option-label {
@@ -77,19 +78,19 @@ const LabelText = styled.span`
 
 export const CaretContainer = styled.div`
   height: 100%;
-  border-left: solid 1px ${({ theme }) => theme.colors.grayscale.dark2}0C;
+  border-left: solid 1px ${({ theme }) => theme.colorSplit};
   margin-left: auto;
 `;
 
 export const CloseContainer = styled.div`
   height: auto;
-  width: ${({ theme }) => theme.gridUnit * 6}px;
+  width: ${({ theme }) => theme.sizeUnit * 6}px;
   border-right: solid 1px ${({ theme }) => theme.colors.grayscale.dark2}0C;
   cursor: pointer;
 `;
 
-const StyledInfoTooltipWithTrigger = styled(InfoTooltipWithTrigger)`
-  margin: 0 ${({ theme }) => theme.gridUnit}px;
+const StyledInfoTooltip = styled(InfoTooltip)`
+  margin: 0 ${({ theme }) => theme.sizeUnit}px;
 `;
 
 export const HeaderContainer = styled.div`
@@ -99,9 +100,9 @@ export const HeaderContainer = styled.div`
 `;
 
 export const LabelsContainer = styled.div`
-  padding: ${({ theme }) => theme.gridUnit}px;
-  border: solid 1px ${({ theme }) => theme.colors.grayscale.light2};
-  border-radius: ${({ theme }) => theme.gridUnit}px;
+  padding: ${({ theme }) => theme.sizeUnit}px;
+  border: solid 1px ${({ theme }) => theme.colorSplit};
+  border-radius: ${({ theme }) => theme.borderRadius}px;
 `;
 
 const borderPulse = keyframes`
@@ -127,32 +128,28 @@ export const DndLabelsContainer = styled.div<{
 }>`
   ${({ theme, isLoading, canDrop, isDragging, isOver }) => `
   position: relative;
-  padding: ${theme.gridUnit}px;
+  padding: ${theme.sizeUnit}px;
   border: ${
     !isLoading && isDragging
-      ? `dashed 1px ${
-          canDrop ? theme.colors.info.dark1 : theme.colors.error.dark1
-        }`
+      ? `dashed 1px ${canDrop ? theme.colorSplit : theme.colorErrorBgHover}`
       : `solid 1px ${
           isLoading && isDragging
-            ? theme.colors.warning.light1
-            : theme.colors.grayscale.light2
+            ? theme.colorWarningBgHover
+            : theme.colorBorder
         }`
   };
-  border-radius: ${theme.gridUnit}px;
+  border-radius: ${theme.borderRadius}px;
   &:before,
   &:after {
     content: ' ';
     position: absolute;
-    border-radius: ${theme.gridUnit}px;
+    border-radius: ${theme.borderRadius}px;
   }
   &:before {
     display: ${isDragging || isLoading ? 'block' : 'none'};
-    background-color: ${
-      canDrop ? theme.colors.primary.base : theme.colors.error.light1
-    };
-    z-index: ${theme.zIndex.aboveDashboardCharts};
-    opacity: ${theme.opacity.light};
+    background-color: ${canDrop ? theme.colorPrimary : theme.colorErrorBgHover};
+    z-index: 10;
+    opacity: 10%;
     top: 1px;
     right: 1px;
     bottom: 1px;
@@ -161,14 +158,14 @@ export const DndLabelsContainer = styled.div<{
   &:after {
     display: ${isLoading || (canDrop && isOver) ? 'block' : 'none'};
     background-color: ${
-      isLoading ? theme.colors.grayscale.light3 : theme.colors.primary.base
+      isLoading ? theme.colors.grayscale.light3 : theme.colorPrimary
     };
-    z-index: ${theme.zIndex.dropdown};
-    opacity: ${theme.opacity.mediumLight};
-    top: ${-theme.gridUnit}px;
-    right: ${-theme.gridUnit}px;
-    bottom: ${-theme.gridUnit}px;
-    left: ${-theme.gridUnit}px;
+    z-index: 11;
+    opacity: 35%;
+    top: ${-theme.sizeUnit}px;
+    right: ${-theme.sizeUnit}px;
+    bottom: ${-theme.sizeUnit}px;
+    left: ${-theme.sizeUnit}px;
     cursor: ${isLoading ? 'wait' : 'auto'};
   }
   `}
@@ -179,12 +176,12 @@ export const DndLabelsContainer = styled.div<{
       css`
         animation: ${borderPulse} 2s ease-in infinite;
         background: linear-gradient(currentColor 0 0) 0 100%/0% 3px no-repeat;
-        background-size: 100% ${theme.gridUnit / 2}px;
+        background-size: 100% ${theme.sizeUnit / 2}px;
         top: auto;
-        right: ${theme.gridUnit}px;
-        left: ${theme.gridUnit}px;
-        bottom: -${theme.gridUnit / 2}px;
-        height: ${theme.gridUnit / 2}px;
+        right: ${theme.sizeUnit}px;
+        left: ${theme.sizeUnit}px;
+        bottom: -${theme.sizeUnit / 2}px;
+        height: ${theme.sizeUnit / 2}px;
       `};
   }
 `;
@@ -195,12 +192,12 @@ export const AddControlLabel = styled.div<{
   display: flex;
   align-items: center;
   width: 100%;
-  height: ${({ theme }) => theme.gridUnit * 6}px;
-  padding-left: ${({ theme }) => theme.gridUnit}px;
-  font-size: ${({ theme }) => theme.typography.sizes.s}px;
+  height: ${({ theme }) => theme.sizeUnit * 6}px;
+  padding-left: ${({ theme }) => theme.sizeUnit}px;
+  font-size: ${({ theme }) => theme.fontSizeSM}px;
   color: ${({ theme }) => theme.colors.grayscale.light1};
-  border: dashed 1px ${({ theme }) => theme.colors.grayscale.light2};
-  border-radius: ${({ theme }) => theme.gridUnit}px;
+  border: dashed 1px ${({ theme }) => theme.colorSplit};
+  border-radius: ${({ theme }) => theme.borderRadius}px;
   cursor: ${({ cancelHover }) => (cancelHover ? 'inherit' : 'pointer')};
 
   :hover {
@@ -212,16 +209,19 @@ export const AddControlLabel = styled.div<{
     background-color: ${({ cancelHover, theme }) =>
       cancelHover ? 'inherit' : theme.colors.grayscale.light3};
   }
+  svg {
+    margin-right: ${({ theme }) => theme.sizeUnit}px;
+  }
 `;
 
 export const AddIconButton = styled.button`
   display: flex;
   align-items: center;
   justify-content: center;
-  height: ${({ theme }) => theme.gridUnit * 4}px;
-  width: ${({ theme }) => theme.gridUnit * 4}px;
+  height: ${({ theme }) => theme.sizeUnit * 4}px;
+  width: ${({ theme }) => theme.sizeUnit * 4}px;
   padding: 0;
-  background-color: ${({ theme }) => theme.colors.primary.dark1};
+  background-color: ${({ theme }) => theme.colorPrimaryText};
   border: none;
   border-radius: 2px;
 
@@ -395,10 +395,9 @@ export const OptionControlLabel = ({
         {getLabelContent()}
       </Label>
       {(!!datasourceWarningMessage || isExtra) && (
-        <StyledInfoTooltipWithTrigger
-          icon="exclamation-triangle"
+        <StyledInfoTooltip
+          type="warning"
           placement="top"
-          bsStyle="warning"
           tooltip={
             datasourceWarningMessage ||
             t(`
@@ -413,7 +412,7 @@ export const OptionControlLabel = ({
           <Icons.RightOutlined
             iconSize="m"
             css={css`
-              margin-top: ${theme.gridUnit}px;
+              margin: ${theme.sizeUnit}px;
             `}
             iconColor={theme.colors.grayscale.light1}
           />
diff --git a/superset-frontend/src/explore/components/controls/SelectAsyncControl/SelectAsyncControl.test.tsx b/superset-frontend/src/explore/components/controls/SelectAsyncControl/SelectAsyncControl.test.tsx
index c3720ebdbcc..24e16b30b73 100644
--- a/superset-frontend/src/explore/components/controls/SelectAsyncControl/SelectAsyncControl.test.tsx
+++ b/superset-frontend/src/explore/components/controls/SelectAsyncControl/SelectAsyncControl.test.tsx
@@ -22,7 +22,7 @@ import SelectAsyncControl from '.';
 
 const datasetsOwnersEndpoint = 'glob:*/api/v1/dataset/related/owners*';
 
-jest.mock('src/components/Select/Select', () => ({
+jest.mock('@superset-ui/core/components/Select/Select', () => ({
   __esModule: true,
   default: (props: any) => (
     <div
diff --git a/superset-frontend/src/explore/components/controls/SelectAsyncControl/index.tsx b/superset-frontend/src/explore/components/controls/SelectAsyncControl/index.tsx
index 2ce48f8cc26..11bca33a8fe 100644
--- a/superset-frontend/src/explore/components/controls/SelectAsyncControl/index.tsx
+++ b/superset-frontend/src/explore/components/controls/SelectAsyncControl/index.tsx
@@ -19,10 +19,13 @@
 import { useEffect, useState } from 'react';
 import { t, SupersetClient, getClientErrorObject } from '@superset-ui/core';
 import ControlHeader from 'src/explore/components/ControlHeader';
-import { Select } from 'src/components';
-import { SelectOptionsType, SelectProps } from 'src/components/Select/types';
-// eslint-disable-next-line no-restricted-imports
-import { SelectValue, LabeledValue } from 'antd/lib/select'; // TODO: Remove antd
+import {
+  Select,
+  type SelectValue,
+  type LabeledValue,
+  type SelectOptionsType,
+  type SelectProps,
+} from '@superset-ui/core/components';
 import withToasts from 'src/components/MessageToasts/withToasts';
 
 type SelectAsyncProps = Omit<SelectProps, 'options' | 'ariaLabel' | 'onChange'>;
diff --git a/superset-frontend/src/explore/components/controls/SelectControl.jsx b/superset-frontend/src/explore/components/controls/SelectControl.jsx
index b50d54c9adc..f75d67dedca 100644
--- a/superset-frontend/src/explore/components/controls/SelectControl.jsx
+++ b/superset-frontend/src/explore/components/controls/SelectControl.jsx
@@ -19,7 +19,7 @@
 import { PureComponent } from 'react';
 import PropTypes from 'prop-types';
 import { css, isEqualArray, t } from '@superset-ui/core';
-import Select from 'src/components/Select/Select';
+import { Select } from '@superset-ui/core/components';
 import ControlHeader from 'src/explore/components/ControlHeader';
 
 const propTypes = {
@@ -94,8 +94,7 @@ export const innerGetOptions = props => {
     options = props.options.map(o => ({
       ...o,
       value: o[valueKey],
-      label: o.label || o[valueKey],
-      customLabel: optionRenderer ? optionRenderer(o) : undefined,
+      label: optionRenderer ? optionRenderer(o) : o.label || o[valueKey],
     }));
   } else if (choices) {
     // Accepts different formats of input
@@ -263,7 +262,7 @@ export default class SelectControl extends PureComponent {
       <div
         css={theme => css`
           .type-label {
-            margin-right: ${theme.gridUnit * 2}px;
+            margin-right: ${theme.sizeUnit * 2}px;
           }
           .Select__multi-value__label > span,
           .Select__option > span,
diff --git a/superset-frontend/src/explore/components/controls/SelectControl.test.jsx b/superset-frontend/src/explore/components/controls/SelectControl.test.jsx
index 4cf235a98ef..b4b2b0b8d1a 100644
--- a/superset-frontend/src/explore/components/controls/SelectControl.test.jsx
+++ b/superset-frontend/src/explore/components/controls/SelectControl.test.jsx
@@ -141,7 +141,9 @@ describe('SelectControl', () => {
       expect(
         container.querySelector('[role="option"]'),
       ).not.toBeInTheDocument();
-      expect(within(selectorWrapper).getByText('No Data')).toBeInTheDocument();
+      expect(
+        within(selectorWrapper).getByText('No data', { selector: 'div' }),
+      ).toBeInTheDocument();
     });
 
     it('renders with tokenSeparators', () => {
@@ -163,12 +165,10 @@ describe('SelectControl', () => {
         },
       });
       fireEvent(selectorInput, paste);
-      const yearOption = screen.getByLabelText('1 year ago');
+      const yearOption = screen.getByRole('option', { name: /1 year ago/i });
       expect(yearOption).toBeInTheDocument();
       expect(yearOption).toHaveAttribute('aria-selected', 'true');
-      const weekOption = screen.getByText(/1 week ago/, {
-        selector: 'div [role="option"]',
-      });
+      const weekOption = screen.getByRole('option', { name: /1 week ago/ });
       expect(weekOption?.getAttribute('aria-selected')).toEqual('true');
     });
 
diff --git a/superset-frontend/src/explore/components/controls/SliderControl.stories.tsx b/superset-frontend/src/explore/components/controls/SliderControl.stories.tsx
index 5f1e45ed380..c5e7b1ead19 100644
--- a/superset-frontend/src/explore/components/controls/SliderControl.stories.tsx
+++ b/superset-frontend/src/explore/components/controls/SliderControl.stories.tsx
@@ -19,7 +19,7 @@
 import SliderControl from './SliderControl';
 
 export default {
-  title: 'SliderControl',
+  title: 'Components/SliderControl',
   component: SliderControl,
 };
 
diff --git a/superset-frontend/src/explore/components/controls/SliderControl.tsx b/superset-frontend/src/explore/components/controls/SliderControl.tsx
index 5b1aab5a5ac..ef2b3c1682c 100644
--- a/superset-frontend/src/explore/components/controls/SliderControl.tsx
+++ b/superset-frontend/src/explore/components/controls/SliderControl.tsx
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import Slider from 'src/components/Slider';
+import Slider from '@superset-ui/core/components/Slider';
 import ControlHeader, {
   ControlHeaderProps,
 } from 'src/explore/components/ControlHeader';
diff --git a/superset-frontend/src/explore/components/controls/SpatialControl.jsx b/superset-frontend/src/explore/components/controls/SpatialControl.jsx
index db46e3eb46d..52575341cbb 100644
--- a/superset-frontend/src/explore/components/controls/SpatialControl.jsx
+++ b/superset-frontend/src/explore/components/controls/SpatialControl.jsx
@@ -18,13 +18,16 @@
  */
 import { Component } from 'react';
 import PropTypes from 'prop-types';
-import { Row, Col } from 'src/components';
+import {
+  Row,
+  Col,
+  Checkbox,
+  Label,
+  Popover,
+} from '@superset-ui/core/components';
 import { t } from '@superset-ui/core';
 
-import Label from 'src/components/Label';
-import Popover from 'src/components/Popover';
-import PopoverSection from 'src/components/PopoverSection';
-import Checkbox from 'src/components/Checkbox';
+import PopoverSection from '@superset-ui/core/components/PopoverSection';
 import ControlHeader from '../ControlHeader';
 import SelectControl from './SelectControl';
 
diff --git a/superset-frontend/src/explore/components/controls/TextAreaControl.jsx b/superset-frontend/src/explore/components/controls/TextAreaControl.jsx
index 605d4952186..e3a65c5e3b8 100644
--- a/superset-frontend/src/explore/components/controls/TextAreaControl.jsx
+++ b/superset-frontend/src/explore/components/controls/TextAreaControl.jsx
@@ -18,14 +18,15 @@
  */
 import { Component } from 'react';
 import PropTypes from 'prop-types';
-import { TextArea } from 'src/components/Input';
-import { Tooltip, TooltipProps } from 'src/components/Tooltip';
+import {
+  Input,
+  Tooltip,
+  Button,
+  TextAreaEditor,
+  ModalTrigger,
+} from '@superset-ui/core/components';
 import { t, withTheme } from '@superset-ui/core';
 
-import Button from 'src/components/Button';
-import { TextAreaEditor } from 'src/components/AsyncAceEditor';
-import ModalTrigger from 'src/components/ModalTrigger';
-
 import ControlHeader from 'src/explore/components/ControlHeader';
 
 const propTypes = {
@@ -56,7 +57,8 @@ const propTypes = {
     'vertical',
   ]),
   textAreaStyles: PropTypes.object,
-  tooltipOptions: PropTypes.oneOf([null, TooltipProps]),
+  tooltipOptions: PropTypes.object,
+  hotkeys: PropTypes.array,
 };
 
 const defaultProps = {
@@ -70,6 +72,7 @@ const defaultProps = {
   resize: null,
   textAreaStyles: {},
   tooltipOptions: {},
+  hotkeys: [],
 };
 
 class TextAreaControl extends Component {
@@ -86,7 +89,7 @@ class TextAreaControl extends Component {
     const minLines = inModal ? 40 : this.props.minLines || 12;
     if (this.props.language) {
       const style = {
-        border: `1px solid ${this.props.theme.colors.grayscale.light1}`,
+        border: `1px solid ${this.props.theme.colorBorder}`,
         minHeight: `${minLines}em`,
         width: 'auto',
         ...this.props.textAreaStyles,
@@ -97,6 +100,15 @@ class TextAreaControl extends Component {
       if (this.props.readOnly) {
         style.backgroundColor = '#f2f2f2';
       }
+      const onEditorLoad = editor => {
+        this.props.hotkeys.forEach(keyConfig => {
+          editor.commands.addCommand({
+            name: keyConfig.name,
+            bindKey: { win: keyConfig.key, mac: keyConfig.key },
+            exec: keyConfig.func,
+          });
+        });
+      };
       const codeEditor = (
         <div>
           <TextAreaEditor
@@ -105,6 +117,7 @@ class TextAreaControl extends Component {
             minLines={minLines}
             maxLines={inModal ? 1000 : this.props.maxLines}
             editorProps={{ $blockScrolling: true }}
+            onLoad={onEditorLoad}
             defaultValue={this.props.initialValue}
             readOnly={this.props.readOnly}
             key={this.props.name}
@@ -122,12 +135,13 @@ class TextAreaControl extends Component {
 
     const textArea = (
       <div>
-        <TextArea
+        <Input.TextArea
           placeholder={t('textarea')}
           onChange={this.onControlChange.bind(this)}
           defaultValue={this.props.initialValue}
           disabled={this.props.readOnly}
           style={{ height: this.props.height }}
+          aria-required={this.props['aria-required']}
         />
       </div>
     );
@@ -156,7 +170,10 @@ class TextAreaControl extends Component {
           <ModalTrigger
             modalTitle={controlHeader}
             triggerNode={
-              <Button buttonSize="small" className="m-t-5">
+              <Button
+                buttonSize="small"
+                style={{ marginTop: this.props.theme.sizeUnit }}
+              >
                 {t('Edit')} <strong>{this.props.language}</strong>{' '}
                 {t('in modal')}
               </Button>
diff --git a/superset-frontend/src/explore/components/controls/TextControl/index.tsx b/superset-frontend/src/explore/components/controls/TextControl/index.tsx
index 2ec8fe0468b..a07edd86c4a 100644
--- a/superset-frontend/src/explore/components/controls/TextControl/index.tsx
+++ b/superset-frontend/src/explore/components/controls/TextControl/index.tsx
@@ -19,9 +19,8 @@
 import { Component, ChangeEvent } from 'react';
 import { legacyValidateNumber, legacyValidateInteger } from '@superset-ui/core';
 import { debounce } from 'lodash';
-import { FAST_DEBOUNCE } from 'src/constants';
 import ControlHeader from 'src/explore/components/ControlHeader';
-import { Input } from 'src/components/Input';
+import { Constants, Input } from '@superset-ui/core/components';
 
 type InputValueType = string | number;
 
@@ -85,7 +84,7 @@ export default class TextControl<
 
   debouncedOnChange = debounce((inputValue: string) => {
     this.onChange(inputValue);
-  }, FAST_DEBOUNCE);
+  }, Constants.FAST_DEBOUNCE);
 
   onChangeWrapper = (event: ChangeEvent<HTMLInputElement>) => {
     const { value } = event.target;
diff --git a/superset-frontend/src/explore/components/controls/TimeOffsetControl.test.tsx b/superset-frontend/src/explore/components/controls/TimeOffsetControl.test.tsx
index 986947aa60d..fac75f662a0 100644
--- a/superset-frontend/src/explore/components/controls/TimeOffsetControl.test.tsx
+++ b/superset-frontend/src/explore/components/controls/TimeOffsetControl.test.tsx
@@ -19,7 +19,7 @@
 import configureStore from 'redux-mock-store';
 import { render, screen } from 'spec/helpers/testing-library';
 import { INVALID_DATE } from '@superset-ui/chart-controls';
-import { extendedDayjs } from 'src/utils/dates';
+import { extendedDayjs } from '@superset-ui/core/utils/dates';
 import TimeOffsetControls, {
   TimeOffsetControlsProps,
 } from './TimeOffsetControl';
diff --git a/superset-frontend/src/explore/components/controls/TimeOffsetControl.tsx b/superset-frontend/src/explore/components/controls/TimeOffsetControl.tsx
index 655d5565fd4..5ac9f527ad7 100644
--- a/superset-frontend/src/explore/components/controls/TimeOffsetControl.tsx
+++ b/superset-frontend/src/explore/components/controls/TimeOffsetControl.tsx
@@ -18,7 +18,7 @@
  */
 import { ReactNode, useCallback, useEffect, useState } from 'react';
 import { isEmpty, isEqual } from 'lodash';
-import { extendedDayjs } from 'src/utils/dates';
+import { extendedDayjs } from '@superset-ui/core/utils/dates';
 import {
   parseDttmToDate,
   BinaryAdhocFilter,
@@ -27,8 +27,10 @@ import {
   computeCustomDateTime,
   fetchTimeRange,
 } from '@superset-ui/core';
-import { DatePicker } from 'src/components/DatePicker';
-import { RangePickerProps } from 'antd-v5/es/date-picker';
+import {
+  DatePicker,
+  type RangePickerProps,
+} from '@superset-ui/core/components';
 import { useSelector } from 'react-redux';
 
 import ControlHeader from 'src/explore/components/ControlHeader';
diff --git a/superset-frontend/src/explore/components/controls/TimeRangeControl/index.tsx b/superset-frontend/src/explore/components/controls/TimeRangeControl/index.tsx
new file mode 100644
index 00000000000..8956d3d4dc2
--- /dev/null
+++ b/superset-frontend/src/explore/components/controls/TimeRangeControl/index.tsx
@@ -0,0 +1,58 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 dayjs from 'dayjs';
+import { TimeRangePicker } from 'src/components/TimePicker';
+import ControlHeader, { ControlHeaderProps } from '../../ControlHeader';
+
+type TimeRangeValueType = [string, string];
+
+export interface TimeRangeControlProps extends ControlHeaderProps {
+  value?: TimeRangeValueType;
+  onChange?: (value: TimeRangeValueType, errors: any) => void;
+  allowClear?: boolean;
+  showNow?: boolean;
+  allowEmpty?: [boolean, boolean];
+}
+
+export default function TimeRangeControl({
+  value: stringValue,
+  onChange,
+  allowClear,
+  showNow,
+  allowEmpty,
+  ...rest
+}: TimeRangeControlProps) {
+  const dayjsValue: [dayjs.Dayjs | null, dayjs.Dayjs | null] = [
+    stringValue?.[0] ? dayjs.utc(stringValue[0], 'HH:mm:ss') : null,
+    stringValue?.[1] ? dayjs.utc(stringValue[1], 'HH:mm:ss') : null,
+  ];
+
+  return (
+    <div>
+      <ControlHeader {...rest} />
+      <TimeRangePicker
+        value={dayjsValue}
+        onChange={(_, stringValue) => onChange?.(stringValue, null)}
+        allowClear={allowClear}
+        showNow={showNow}
+        allowEmpty={allowEmpty}
+      />
+    </div>
+  );
+}
diff --git a/superset-frontend/src/explore/components/controls/TimeSeriesColumnControl/index.jsx b/superset-frontend/src/explore/components/controls/TimeSeriesColumnControl/index.jsx
index e6fa51a8ddb..6a57fffd2c6 100644
--- a/superset-frontend/src/explore/components/controls/TimeSeriesColumnControl/index.jsx
+++ b/superset-frontend/src/explore/components/controls/TimeSeriesColumnControl/index.jsx
@@ -18,11 +18,16 @@
  */
 import { Component } from 'react';
 import PropTypes from 'prop-types';
-import { Input } from 'src/components/Input';
-import Button from 'src/components/Button';
-import { Select, Row, Col } from 'src/components';
+import {
+  Button,
+  Col,
+  Divider,
+  InfoTooltip,
+  Input,
+  Row,
+  Select,
+} from '@superset-ui/core/components';
 import { t, styled } from '@superset-ui/core';
-import { InfoTooltipWithTrigger } from '@superset-ui/chart-controls';
 import BoundsControl from '../BoundsControl';
 import CheckboxControl from '../CheckboxControl';
 import ControlPopover from '../ControlPopover/ControlPopover';
@@ -75,7 +80,7 @@ const colTypeOptions = [
 ];
 
 const StyledRow = styled(Row)`
-  margin-top: ${({ theme }) => theme.gridUnit * 2}px;
+  margin-top: ${({ theme }) => theme.sizeUnit * 2}px;
   display: flex;
   align-items: center;
 `;
@@ -85,13 +90,13 @@ const StyledCol = styled(Col)`
   align-items: center;
 `;
 
-const StyledTooltip = styled(InfoTooltipWithTrigger)`
-  margin-left: ${({ theme }) => theme.gridUnit}px;
+const StyledTooltip = styled(InfoTooltip)`
+  margin-left: ${({ theme }) => theme.sizeUnit}px;
   color: ${({ theme }) => theme.colors.grayscale.light1};
 `;
 
 const ButtonBar = styled.div`
-  margin-top: ${({ theme }) => theme.gridUnit * 5}px;
+  margin-top: ${({ theme }) => theme.sizeUnit * 5}px;
   display: flex;
   justify-content: center;
 `;
@@ -222,7 +227,7 @@ export default class TimeSeriesColumnControl extends Component {
             options={colTypeOptions}
           />,
         )}
-        <hr />
+        <Divider />
         {this.state.colType === 'spark' &&
           this.formRow(
             t('Width'),
@@ -364,7 +369,7 @@ export default class TimeSeriesColumnControl extends Component {
           open={this.state.popoverVisible}
           onOpenChange={this.onPopoverVisibleChange}
         >
-          <InfoTooltipWithTrigger
+          <InfoTooltip
             icon="edit"
             className="text-primary"
             label="edit-ts-column"
diff --git a/superset-frontend/src/explore/components/controls/ViewQuery.test.tsx b/superset-frontend/src/explore/components/controls/ViewQuery.test.tsx
new file mode 100644
index 00000000000..9a18020c342
--- /dev/null
+++ b/superset-frontend/src/explore/components/controls/ViewQuery.test.tsx
@@ -0,0 +1,158 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 {
+  screen,
+  render,
+  fireEvent,
+  waitFor,
+} from 'spec/helpers/testing-library';
+import fetchMock from 'fetch-mock';
+import copyTextToClipboard from 'src/utils/copy';
+import ViewQuery, { ViewQueryProps } from './ViewQuery';
+
+const mockHistoryPush = jest.fn();
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useHistory: () => ({
+    push: mockHistoryPush,
+  }),
+}));
+
+jest.mock('src/utils/copy');
+
+function setup(props: ViewQueryProps) {
+  return render(<ViewQuery {...props} />, { useRouter: true, useRedux: true });
+}
+
+const mockProps = {
+  sql: 'select * from table',
+  datasource: '1__table',
+};
+
+const datasetApiEndpoint = 'glob:*/api/v1/dataset/1?**';
+const formatSqlEndpoint = 'glob:*/api/v1/sqllab/format_sql/';
+const formattedSQL = 'SELECT * FROM table;';
+
+beforeEach(() => {
+  fetchMock.get(datasetApiEndpoint, {
+    result: {
+      database: {
+        backend: 'sqlite',
+      },
+    },
+  });
+  fetchMock.post(formatSqlEndpoint, {
+    result: formattedSQL,
+  });
+});
+
+afterEach(() => {
+  jest.resetAllMocks();
+  fetchMock.restore();
+});
+
+const getFormatSwitch = () =>
+  screen.getByRole('switch', { name: 'Show original SQL' });
+
+test('renders the component with Formatted SQL and buttons', async () => {
+  const { container } = setup(mockProps);
+  expect(screen.getByText('Copy')).toBeInTheDocument();
+  expect(getFormatSwitch()).toBeInTheDocument();
+  expect(screen.getByText('View in SQL Lab')).toBeInTheDocument();
+
+  await waitFor(() =>
+    expect(fetchMock.calls(formatSqlEndpoint)).toHaveLength(1),
+  );
+
+  expect(container).toHaveTextContent(formattedSQL);
+});
+
+test('copies the SQL to the clipboard when Copy button is clicked', async () => {
+  setup(mockProps);
+
+  (copyTextToClipboard as jest.Mock).mockResolvedValue('');
+  const copyButton = screen.getByText('Copy');
+  expect(copyTextToClipboard as jest.Mock).not.toHaveBeenCalled();
+  fireEvent.click(copyButton);
+  expect(copyTextToClipboard as jest.Mock).toHaveBeenCalled();
+});
+
+test('shows the original SQL when Format switch is unchecked', async () => {
+  const { container } = setup(mockProps);
+  const formatButton = getFormatSwitch();
+
+  await waitFor(() =>
+    expect(fetchMock.calls(formatSqlEndpoint)).toHaveLength(1),
+  );
+
+  fireEvent.click(formatButton);
+
+  expect(container).toHaveTextContent(mockProps.sql);
+});
+
+test('toggles back to formatted SQL when Format switch is clicked', async () => {
+  const { container } = setup(mockProps);
+  const formatButton = getFormatSwitch();
+
+  await waitFor(() =>
+    expect(fetchMock.calls(formatSqlEndpoint)).toHaveLength(1),
+  );
+
+  // Click to format SQL
+  fireEvent.click(formatButton);
+
+  await waitFor(() => expect(container).toHaveTextContent(mockProps.sql));
+
+  // Toggle format switch
+  fireEvent.click(formatButton);
+
+  await waitFor(() => expect(container).toHaveTextContent(formattedSQL));
+});
+
+test('navigates to SQL Lab when View in SQL Lab button is clicked', () => {
+  setup(mockProps);
+
+  const viewInSQLLabButton = screen.getByText('View in SQL Lab');
+  fireEvent.click(viewInSQLLabButton);
+
+  expect(mockHistoryPush).toHaveBeenCalledWith('/sqllab', {
+    state: {
+      requestedQuery: {
+        datasourceKey: mockProps.datasource,
+        sql: mockProps.sql,
+      },
+    },
+  });
+});
+
+test('opens SQL Lab in a new tab when View in SQL Lab button is clicked with meta key', () => {
+  window.open = jest.fn();
+
+  setup(mockProps);
+  const viewInSQLLabButton = screen.getByText('View in SQL Lab');
+
+  fireEvent.click(viewInSQLLabButton, { metaKey: true });
+
+  const { datasource, sql } = mockProps;
+  expect(window.open).toHaveBeenCalledWith(
+    `/sqllab?datasourceKey=${datasource}&sql=${sql}`,
+    '_blank',
+  );
+});
diff --git a/superset-frontend/src/explore/components/controls/ViewQuery.tsx b/superset-frontend/src/explore/components/controls/ViewQuery.tsx
index 1b3e359ce10..dca607e8461 100644
--- a/superset-frontend/src/explore/components/controls/ViewQuery.tsx
+++ b/superset-frontend/src/explore/components/controls/ViewQuery.tsx
@@ -16,33 +16,37 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-// TODO: Remove fa-icon
-/* eslint-disable icons/no-fa-icons-usage */
-import { FC } from 'react';
-import { styled } from '@superset-ui/core';
-import SyntaxHighlighter from 'react-syntax-highlighter/dist/cjs/light';
-import github from 'react-syntax-highlighter/dist/cjs/styles/hljs/github';
-import CopyToClipboard from 'src/components/CopyToClipboard';
+import {
+  FC,
+  KeyboardEvent,
+  MouseEvent,
+  useCallback,
+  useEffect,
+  useState,
+} from 'react';
+import rison from 'rison';
+import { styled, SupersetClient, t } from '@superset-ui/core';
+import { Icons, Switch, Button, Skeleton } from '@superset-ui/core/components';
+import { CopyToClipboard } from 'src/components';
 import { CopyButton } from 'src/explore/components/DataTableControl';
-import markdownSyntax from 'react-syntax-highlighter/dist/cjs/languages/hljs/markdown';
-import htmlSyntax from 'react-syntax-highlighter/dist/cjs/languages/hljs/htmlbars';
-import sqlSyntax from 'react-syntax-highlighter/dist/cjs/languages/hljs/sql';
-import jsonSyntax from 'react-syntax-highlighter/dist/cjs/languages/hljs/json';
+import CodeSyntaxHighlighter, {
+  SupportedLanguage,
+  preloadLanguages,
+} from '@superset-ui/core/components/CodeSyntaxHighlighter';
+import { useHistory } from 'react-router-dom';
 
 const CopyButtonViewQuery = styled(CopyButton)`
-  && {
-    margin: 0 0 ${({ theme }) => theme.gridUnit}px;
-  }
+  ${({ theme }) => `
+		&& {
+			margin: 0 0 ${theme.sizeUnit}px;
+		}
+  `}
 `;
 
-SyntaxHighlighter.registerLanguage('markdown', markdownSyntax);
-SyntaxHighlighter.registerLanguage('html', htmlSyntax);
-SyntaxHighlighter.registerLanguage('sql', sqlSyntax);
-SyntaxHighlighter.registerLanguage('json', jsonSyntax);
-
-interface ViewQueryProps {
+export interface ViewQueryProps {
   sql: string;
-  language?: string;
+  datasource: string;
+  language?: SupportedLanguage;
 }
 
 const StyledSyntaxContainer = styled.div`
@@ -51,26 +55,135 @@ const StyledSyntaxContainer = styled.div`
   flex-direction: column;
 `;
 
-const StyledSyntaxHighlighter = styled(SyntaxHighlighter)`
+const StyledHeaderMenuContainer = styled.div`
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  margin-top: ${({ theme }) => -theme.sizeUnit * 4}px;
+  align-items: flex-end;
+`;
+
+const StyledHeaderActionContainer = styled.div`
+  display: flex;
+  flex-direction: row;
+  column-gap: ${({ theme }) => theme.sizeUnit * 2}px;
+`;
+
+const StyledThemedSyntaxHighlighter = styled(CodeSyntaxHighlighter)`
   flex: 1;
 `;
 
+const StyledLabel = styled.label`
+  font-size: ${({ theme }) => theme.fontSize}px;
+`;
+
+const DATASET_BACKEND_QUERY = {
+  keys: ['none'],
+  columns: ['database.backend'],
+};
+
 const ViewQuery: FC<ViewQueryProps> = props => {
-  const { sql, language = 'sql' } = props;
+  const { sql, language = 'sql', datasource } = props;
+  const datasetId = datasource.split('__')[0];
+  const [formattedSQL, setFormattedSQL] = useState<string>();
+  const [showFormatSQL, setShowFormatSQL] = useState(true);
+  const history = useHistory();
+  const currentSQL = (showFormatSQL ? formattedSQL : sql) ?? sql;
+
+  // Preload the language when component mounts to ensure smooth experience
+  useEffect(() => {
+    preloadLanguages([language]);
+  }, [language]);
+
+  const formatCurrentQuery = useCallback(() => {
+    if (formattedSQL) {
+      setShowFormatSQL(val => !val);
+    } else {
+      const queryParams = rison.encode(DATASET_BACKEND_QUERY);
+      SupersetClient.get({
+        endpoint: `/api/v1/dataset/${datasetId}?q=${queryParams}`,
+      })
+        .then(({ json }) =>
+          SupersetClient.post({
+            endpoint: `/api/v1/sqllab/format_sql/`,
+            body: JSON.stringify({
+              sql,
+              engine: json.result.database.backend,
+            }),
+            headers: { 'Content-Type': 'application/json' },
+          }),
+        )
+        .then(({ json }) => {
+          setFormattedSQL(json.result);
+          setShowFormatSQL(true);
+        })
+        .catch(() => {
+          setShowFormatSQL(true);
+        });
+    }
+  }, [sql, datasetId, formattedSQL]);
+
+  const navToSQLLab = useCallback(
+    (domEvent: KeyboardEvent<HTMLElement> | MouseEvent<HTMLElement>) => {
+      const requestedQuery = {
+        datasourceKey: datasource,
+        sql: currentSQL,
+      };
+      if (domEvent.metaKey || domEvent.ctrlKey) {
+        domEvent.preventDefault();
+        window.open(
+          `/sqllab?datasourceKey=${datasource}&sql=${currentSQL}`,
+          '_blank',
+        );
+      } else {
+        history.push('/sqllab', { state: { requestedQuery } });
+      }
+    },
+    [history, datasource, currentSQL],
+  );
+
+  useEffect(() => {
+    formatCurrentQuery();
+  }, [sql]);
+
   return (
     <StyledSyntaxContainer key={sql}>
-      <CopyToClipboard
-        text={sql}
-        shouldShowText={false}
-        copyNode={
-          <CopyButtonViewQuery buttonSize="xsmall">
-            <i className="fa fa-clipboard" />
-          </CopyButtonViewQuery>
-        }
-      />
-      <StyledSyntaxHighlighter language={language} style={github}>
-        {sql}
-      </StyledSyntaxHighlighter>
+      <StyledHeaderMenuContainer>
+        <StyledHeaderActionContainer>
+          <CopyToClipboard
+            text={currentSQL}
+            shouldShowText={false}
+            copyNode={
+              <CopyButtonViewQuery
+                buttonSize="small"
+                icon={<Icons.CopyOutlined />}
+              >
+                {t('Copy')}
+              </CopyButtonViewQuery>
+            }
+          />
+          <Button onClick={navToSQLLab}>{t('View in SQL Lab')}</Button>
+        </StyledHeaderActionContainer>
+        <StyledHeaderActionContainer>
+          <Switch
+            id="formatSwitch"
+            checked={!showFormatSQL}
+            onChange={formatCurrentQuery}
+          />
+          <StyledLabel htmlFor="formatSwitch">
+            {t('Show original SQL')}
+          </StyledLabel>
+        </StyledHeaderActionContainer>
+      </StyledHeaderMenuContainer>
+      {!formattedSQL && <Skeleton active />}
+      {formattedSQL && (
+        <StyledThemedSyntaxHighlighter
+          language={language}
+          customStyle={{ flex: 1 }}
+        >
+          {currentSQL}
+        </StyledThemedSyntaxHighlighter>
+      )}
     </StyledSyntaxContainer>
   );
 };
diff --git a/superset-frontend/src/explore/components/controls/ViewQueryModal.tsx b/superset-frontend/src/explore/components/controls/ViewQueryModal.tsx
index ab4093d4bba..061ef2adc2c 100644
--- a/superset-frontend/src/explore/components/controls/ViewQueryModal.tsx
+++ b/superset-frontend/src/explore/components/controls/ViewQueryModal.tsx
@@ -23,13 +23,14 @@ import {
   ensureIsArray,
   t,
   getClientErrorObject,
+  QueryFormData,
 } from '@superset-ui/core';
-import Loading from 'src/components/Loading';
+import { Loading } from '@superset-ui/core/components';
 import { getChartDataRequest } from 'src/components/Chart/chartAction';
 import ViewQuery from 'src/explore/components/controls/ViewQuery';
 
 interface Props {
-  latestQueryFormData: object;
+  latestQueryFormData: QueryFormData;
 }
 
 type Result = {
@@ -43,7 +44,7 @@ const ViewQueryModalContainer = styled.div`
   flex-direction: column;
 `;
 
-const ViewQueryModal: FC<Props> = props => {
+const ViewQueryModal: FC<Props> = ({ latestQueryFormData }) => {
   const [result, setResult] = useState<Result[]>([]);
   const [isLoading, setIsLoading] = useState(false);
   const [error, setError] = useState<string | null>(null);
@@ -51,7 +52,7 @@ const ViewQueryModal: FC<Props> = props => {
   const loadChartData = (resultType: string) => {
     setIsLoading(true);
     getChartDataRequest({
-      formData: props.latestQueryFormData,
+      formData: latestQueryFormData,
       resultFormat: 'json',
       resultType,
     })
@@ -74,7 +75,7 @@ const ViewQueryModal: FC<Props> = props => {
   };
   useEffect(() => {
     loadChartData('query');
-  }, [JSON.stringify(props.latestQueryFormData)]);
+  }, [JSON.stringify(latestQueryFormData)]);
 
   if (isLoading) {
     return <Loading />;
@@ -87,7 +88,11 @@ const ViewQueryModal: FC<Props> = props => {
     <ViewQueryModalContainer>
       {result.map(item =>
         item.query ? (
-          <ViewQuery sql={item.query} language={item.language || undefined} />
+          <ViewQuery
+            datasource={latestQueryFormData.datasource}
+            sql={item.query}
+            language="sql"
+          />
         ) : null,
       )}
     </ViewQueryModalContainer>
diff --git a/superset-frontend/src/explore/components/controls/ViewQueryModalFooter.tsx b/superset-frontend/src/explore/components/controls/ViewQueryModalFooter.tsx
index 2e179326e44..3fa59a9a5ea 100644
--- a/superset-frontend/src/explore/components/controls/ViewQueryModalFooter.tsx
+++ b/superset-frontend/src/explore/components/controls/ViewQueryModalFooter.tsx
@@ -19,7 +19,7 @@
 import { FC } from 'react';
 import { isObject } from 'lodash';
 import { t, SupersetClient } from '@superset-ui/core';
-import Button from 'src/components/Button';
+import { Button } from '@superset-ui/core/components';
 import { useHistory } from 'react-router-dom';
 
 interface SimpleDataSource {
diff --git a/superset-frontend/src/explore/components/controls/ViewportControl.jsx b/superset-frontend/src/explore/components/controls/ViewportControl.jsx
index 05cfabd7481..daf82d14f0e 100644
--- a/superset-frontend/src/explore/components/controls/ViewportControl.jsx
+++ b/superset-frontend/src/explore/components/controls/ViewportControl.jsx
@@ -19,11 +19,9 @@
 import { Component } from 'react';
 import { t } from '@superset-ui/core';
 import PropTypes from 'prop-types';
-import Popover from 'src/components/Popover';
+import { Popover, FormLabel, Label } from '@superset-ui/core/components';
 import { decimal2sexagesimal } from 'geolib';
 
-import Label from 'src/components/Label';
-import { FormLabel } from 'src/components/Form';
 import TextControl from './TextControl';
 import ControlHeader from '../ControlHeader';
 
diff --git a/superset-frontend/src/explore/components/controls/VizTypeControl/FastVizSwitcher.tsx b/superset-frontend/src/explore/components/controls/VizTypeControl/FastVizSwitcher.tsx
index ebb19884fd5..96d54dab295 100644
--- a/superset-frontend/src/explore/components/controls/VizTypeControl/FastVizSwitcher.tsx
+++ b/superset-frontend/src/explore/components/controls/VizTypeControl/FastVizSwitcher.tsx
@@ -19,7 +19,7 @@
 import { memo, useMemo } from 'react';
 import { useSelector } from 'react-redux';
 import { css, SupersetTheme } from '@superset-ui/core';
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { getChartKey } from 'src/explore/exploreUtils';
 import { ExplorePageState } from 'src/explore/types';
 import { FastVizSwitcherProps } from './types';
@@ -29,7 +29,7 @@ import { FEATURED_CHARTS } from './constants';
 export const antdIconProps = {
   iconSize: 'l' as const,
   css: (theme: SupersetTheme) => css`
-    padding: ${theme.gridUnit}px;
+    padding: ${theme.sizeUnit}px;
     & > * {
       line-height: 0;
     }
@@ -83,7 +83,7 @@ export const FastVizSwitcher = memo(
         css={(theme: SupersetTheme) => css`
           display: flex;
           justify-content: space-between;
-          column-gap: ${theme.gridUnit}px;
+          column-gap: ${theme.sizeUnit}px;
         `}
         data-test="fast-viz-switcher"
       >
diff --git a/superset-frontend/src/explore/components/controls/VizTypeControl/VizTile.tsx b/superset-frontend/src/explore/components/controls/VizTypeControl/VizTile.tsx
index fca2e657cab..5d7e65e8dad 100644
--- a/superset-frontend/src/explore/components/controls/VizTypeControl/VizTile.tsx
+++ b/superset-frontend/src/explore/components/controls/VizTypeControl/VizTile.tsx
@@ -18,8 +18,8 @@
  */
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { css, t, useTheme } from '@superset-ui/core';
-import { usePluginContext } from 'src/components/DynamicPlugins';
-import { Tooltip } from 'src/components/Tooltip';
+import { Tooltip } from '@superset-ui/core/components';
+import { usePluginContext } from 'src/components';
 import { VizTileProps } from './types';
 
 export const VizTile = ({
@@ -31,7 +31,7 @@ export const VizTile = ({
   const { mountedPluginMetadata } = usePluginContext();
   const chartNameRef = useRef<HTMLSpanElement>(null);
   const theme = useTheme();
-  const TILE_TRANSITION_TIME = theme.transitionTiming * 2;
+  const TILE_TRANSITION_TIME = theme.motionDurationSlow;
   const [tooltipVisible, setTooltipVisible] = useState(false);
   const [isTransitioning, setIsTransitioning] = useState(false);
   const [showTooltip, setShowTooltip] = useState(false);
@@ -45,7 +45,7 @@ export const VizTile = ({
     setTooltipVisible(false);
     setTimeout(() => {
       setIsTransitioning(false);
-    }, TILE_TRANSITION_TIME * 1000);
+    }, 300);
   }, [onTileClick, TILE_TRANSITION_TIME, vizMeta.name]);
 
   // Antd tooltip seems to be bugged - when elements move, the tooltip sometimes
@@ -80,7 +80,7 @@ export const VizTile = ({
   return (
     <Tooltip
       title={tooltipTitle}
-      onOpenChange={visible => setTooltipVisible(visible)}
+      onOpenChange={(visible: boolean) => setTooltipVisible(visible)}
       open={tooltipVisible && !isTransitioning}
       placement="top"
       mouseEnterDelay={0.4}
@@ -91,7 +91,7 @@ export const VizTile = ({
           display: flex;
           align-items: center;
           color: ${theme.colors.grayscale.base};
-          font-weight: ${theme.typography.weights.bold};
+          font-weight: ${theme.fontWeightStrong};
           border-radius: 6px;
           white-space: nowrap;
           overflow: hidden;
@@ -99,12 +99,12 @@ export const VizTile = ({
           ${!isActive &&
           css`
             flex-shrink: 0;
-            width: ${theme.gridUnit * 6}px;
+            width: ${theme.sizeUnit * 6}px;
             background-color: transparent;
             transition: none;
             &:hover svg path {
-              fill: ${theme.colors.primary.base};
-              transition: fill ${theme.transitionTiming}s ease-out;
+              fill: ${theme.colorPrimary};
+              transition: fill ${theme.motionDurationMid} ease-out;
             }
           `}
 
@@ -113,18 +113,18 @@ export const VizTile = ({
             width: 100%;
             background-color: ${theme.colors.grayscale.light4};
             transition:
-              width ${TILE_TRANSITION_TIME}s ease-out,
-              background-color ${TILE_TRANSITION_TIME}s ease-out;
+              width ${TILE_TRANSITION_TIME} ease-out,
+              background-color ${TILE_TRANSITION_TIME} ease-out;
             cursor: default;
             svg path {
-              fill: ${theme.colors.primary.base};
+              fill: ${theme.colorPrimary};
             }
           `}
         `}
       >
         <span
           css={css`
-            padding: 0px ${theme.gridUnit}px;
+            padding: 0px ${theme.sizeUnit}px;
           `}
         >
           {vizMeta.icon}
@@ -133,8 +133,9 @@ export const VizTile = ({
           css={css`
             overflow: hidden;
             text-overflow: ellipsis;
+            font-size: ${theme.fontSizeSM}px;
             min-width: 0;
-            padding-right: ${theme.gridUnit}px;
+            padding-right: ${theme.sizeUnit}px;
           `}
           ref={chartNameRef}
         >
diff --git a/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeControl.test.jsx b/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeControl.test.jsx
index c9457210013..1451ef9b549 100644
--- a/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeControl.test.jsx
+++ b/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeControl.test.jsx
@@ -26,7 +26,7 @@ import {
   userEvent,
 } from 'spec/helpers/testing-library';
 import VizTypeControl from 'src/explore/components/controls/VizTypeControl';
-import { DynamicPluginProvider } from 'src/components/DynamicPlugins';
+import { DynamicPluginProvider } from 'src/components';
 
 const defaultProps = {
   name: 'viz_type',
diff --git a/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeControl.test.tsx b/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeControl.test.tsx
index 9f02cc28f26..4e6665a1e6b 100644
--- a/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeControl.test.tsx
+++ b/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeControl.test.tsx
@@ -26,8 +26,9 @@ import {
   waitFor,
 } from 'spec/helpers/testing-library';
 import { stateWithoutNativeFilters } from 'spec/fixtures/mockStore';
-import { DynamicPluginProvider } from 'src/components/DynamicPlugins';
+import { DynamicPluginProvider } from 'src/components';
 import { testWithId } from 'src/utils/testUtils';
+import TimeTableChartPlugin from 'src/visualizations/TimeTable';
 import {
   BigNumberTotalChartPlugin,
   EchartsAreaChartPlugin,
@@ -36,9 +37,8 @@ import {
   EchartsTimeseriesBarChartPlugin,
   EchartsTimeseriesChartPlugin,
   EchartsTimeseriesLineChartPlugin,
-} from '@superset-ui/plugin-chart-echarts';
-import TableChartPlugin from '@superset-ui/plugin-chart-table';
-import TimeTableChartPlugin from 'src/visualizations/TimeTable';
+} from '../../../../../plugins/plugin-chart-echarts/src';
+import TableChartPlugin from '../../../../../plugins/plugin-chart-table/src';
 import VizTypeControl, { VIZ_TYPE_CONTROL_TEST_ID } from './index';
 
 jest.useFakeTimers();
@@ -222,7 +222,7 @@ describe('VizTypeControl', () => {
 
     const visualizations = screen.getByTestId(getTestId('viz-row'));
 
-    userEvent.click(screen.getByRole('button', { name: 'ballot All charts' }));
+    userEvent.click(screen.getByRole('tab', { name: 'All charts' }));
 
     expect(
       await within(visualizations).findByText('Line Chart'),
@@ -247,7 +247,7 @@ describe('VizTypeControl', () => {
 
   it('Submit on viz type double-click', async () => {
     await waitForRenderWrapper();
-    userEvent.click(screen.getByRole('button', { name: 'ballot All charts' }));
+    userEvent.click(screen.getByRole('tab', { name: 'All charts' }));
     const visualizations = screen.getByTestId(getTestId('viz-row'));
     userEvent.click(within(visualizations).getByText('Bar Chart'));
 
diff --git a/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx b/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx
index 13512e5d8cd..8453f56dada 100644
--- a/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx
+++ b/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx
@@ -39,13 +39,10 @@ import {
   chartLabelWeight,
   chartLabelExplanations,
 } from '@superset-ui/core';
-import { AntdCollapse } from 'src/components';
-import { Tooltip } from 'src/components/Tooltip';
-import { Input } from 'src/components/Input';
-import Label from 'src/components/Label';
-import { usePluginContext } from 'src/components/DynamicPlugins';
-import { Icons } from 'src/components/Icons';
+import { Input, Collapse, Tooltip, Label } from '@superset-ui/core/components';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { nativeFilterGate } from 'src/dashboard/components/nativeFilters/utils';
+import { usePluginContext } from 'src/components';
 import scrollIntoView from 'scroll-into-view-if-needed';
 
 interface VizTypeGalleryProps {
@@ -103,30 +100,31 @@ const VizPickerLayout = styled.div<{ isSelectedVizMetadata: boolean }>`
 
 const SectionTitle = styled.h3`
   margin-top: 0;
-  margin-bottom: ${({ theme }) => theme.gridUnit * 2}px;
-  font-size: ${({ theme }) => theme.typography.sizes.l}px;
-  font-weight: ${({ theme }) => theme.typography.weights.bold};
-  line-height: ${({ theme }) => theme.gridUnit * 6}px;
+  margin-bottom: ${({ theme }) => theme.sizeUnit * 2}px;
+  font-size: ${({ theme }) => theme.fontSizeLG}px;
+  font-weight: ${({ theme }) => theme.fontWeightStrong};
+  line-height: ${({ theme }) => theme.sizeUnit * 6}px;
 `;
 
 const LeftPane = styled.div`
   grid-area: sidebar;
   display: flex;
   flex-direction: column;
-  border-right: 1px solid ${({ theme }) => theme.colors.grayscale.light2};
+  border-right: 1px solid ${({ theme }) => theme.colorBorder};
   overflow: auto;
 
   .ant-collapse .ant-collapse-item {
     .ant-collapse-header {
-      font-size: ${({ theme }) => theme.typography.sizes.s}px;
-      color: ${({ theme }) => theme.colors.grayscale.base};
-      padding-left: ${({ theme }) => theme.gridUnit * 2}px;
-      padding-bottom: ${({ theme }) => theme.gridUnit}px;
+      font-size: ${({ theme }) => theme.fontSizeSM}px;
+      color: ${({ theme }) => theme.colorText};
+      padding-left: ${({ theme }) => theme.sizeUnit * 2}px;
+      padding-bottom: ${({ theme }) => theme.sizeUnit}px;
     }
+
     .ant-collapse-content .ant-collapse-content-box {
       display: flex;
       flex-direction: column;
-      padding: 0 ${({ theme }) => theme.gridUnit * 2}px;
+      padding: 0 ${({ theme }) => theme.sizeUnit * 2}px;
     }
   }
 `;
@@ -139,12 +137,12 @@ const RightPane = styled.div`
 const SearchWrapper = styled.div`
   ${({ theme }) => `
     grid-area: search;
-    margin-top: ${theme.gridUnit * 3}px;
-    margin-bottom: ${theme.gridUnit}px;
-    margin-left: ${theme.gridUnit * 3}px;
-    margin-right: ${theme.gridUnit * 3}px;
-    .antd5-input-affix-wrapper {
-      padding-left: ${theme.gridUnit * 2}px;
+    margin-top: ${theme.sizeUnit * 3}px;
+    margin-bottom: ${theme.sizeUnit}px;
+    margin-left: ${theme.sizeUnit * 3}px;
+    margin-right: ${theme.sizeUnit * 3}px;
+    .ant-input-affix-wrapper {
+      padding-left: ${theme.sizeUnit * 2}px;
     }
   `}
 `;
@@ -154,7 +152,7 @@ const InputIconAlignment = styled.div`
   display: flex;
   justify-content: center;
   align-items: center;
-  color: ${({ theme }) => theme.colors.grayscale.base};
+  color: ${({ theme }) => theme.colorIcon};
 `;
 
 const SelectorLabel = styled.button`
@@ -164,24 +162,25 @@ const SelectorLabel = styled.button`
     flex-direction: row;
     align-items: center;
     cursor: pointer;
-    margin: ${theme.gridUnit}px 0;
-    padding: 0 ${theme.gridUnit}px;
+    margin: ${theme.sizeUnit}px 0;
+    padding: 0 ${theme.sizeUnit}px;
     border-radius: ${theme.borderRadius}px;
     line-height: 2em;
     text-overflow: ellipsis;
     white-space: nowrap;
     position: relative;
+    color: ${theme.colorText};
 
     &:focus {
       outline: initial;
     }
 
     &.selected {
-      background-color: ${theme.colors.primary.base};
-      color: ${theme.colors.primary.light5};
+      background-color: ${theme.colorPrimaryBgHover};
+      color: ${theme.colorPrimaryTextActive};
 
       svg {
-        color: ${theme.colors.primary.light5};
+        color: ${theme.colorIcon};
       }
 
       &:hover {
@@ -192,7 +191,7 @@ const SelectorLabel = styled.button`
     }
 
     & > span[role="img"] {
-      margin-right: ${theme.gridUnit * 2}px;
+      margin-right: ${theme.sizeUnit * 2}px;
     }
 
     .cancel {
@@ -206,23 +205,23 @@ const IconsPane = styled.div`
   display: grid;
   grid-template-columns: repeat(
     auto-fill,
-    ${({ theme }) => theme.gridUnit * THUMBNAIL_GRID_UNITS}px
+    ${({ theme }) => theme.sizeUnit * THUMBNAIL_GRID_UNITS}px
   );
   grid-auto-rows: max-content;
   justify-content: space-evenly;
-  grid-gap: ${({ theme }) => theme.gridUnit * 2}px;
+  grid-gap: ${({ theme }) => theme.sizeUnit * 2}px;
   justify-items: center;
   // for some reason this padding doesn't seem to apply at the bottom of the container. Why is a mystery.
-  padding: ${({ theme }) => theme.gridUnit * 2}px;
+  padding: ${({ theme }) => theme.sizeUnit * 2}px;
 `;
 
 const DetailsPane = (theme: SupersetTheme) => css`
   grid-area: details;
-  border-top: 1px solid ${theme.colors.grayscale.light2};
+  border-top: 1px solid ${theme.colorBorder};
 `;
 
 const DetailsPopulated = (theme: SupersetTheme) => css`
-  padding: ${theme.gridUnit * 4}px;
+  padding: ${theme.sizeUnit * 4}px;
   display: grid;
   grid-template-columns: 1fr 1fr;
   grid-template-rows: auto auto 1fr;
@@ -236,15 +235,15 @@ const DetailsPopulated = (theme: SupersetTheme) => css`
 // (plus grid layout) enables the description to scroll while the header stays in place.
 const TagsWrapper = styled.div`
   grid-area: viz-tags;
-  width: ${({ theme }) => theme.gridUnit * 120}px;
-  padding-right: ${({ theme }) => theme.gridUnit * 14}px;
-  padding-bottom: ${({ theme }) => theme.gridUnit * 2}px;
+  width: ${({ theme }) => theme.sizeUnit * 120}px;
+  padding-right: ${({ theme }) => theme.sizeUnit * 14}px;
+  padding-bottom: ${({ theme }) => theme.sizeUnit * 2}px;
 `;
 
 const Description = styled.p`
   grid-area: description;
   overflow: auto;
-  padding-right: ${({ theme }) => theme.gridUnit * 14}px;
+  padding-right: ${({ theme }) => theme.sizeUnit * 14}px;
   margin: 0;
 `;
 
@@ -254,54 +253,54 @@ const Examples = styled.div`
   flex-direction: row;
   flex-wrap: nowrap;
   overflow: auto;
-  gap: ${({ theme }) => theme.gridUnit * 4}px;
+  gap: ${({ theme }) => theme.sizeUnit * 4}px;
 
   img {
     height: 100%;
-    border-radius: ${({ theme }) => theme.gridUnit}px;
-    border: 1px solid ${({ theme }) => theme.colors.grayscale.light2};
+    border-radius: ${({ theme }) => theme.borderRadius}px;
+    border: 1px solid ${({ theme }) => theme.colorBorder};
   }
 `;
 
 const thumbnailContainerCss = (theme: SupersetTheme) => css`
   cursor: pointer;
-  width: ${theme.gridUnit * THUMBNAIL_GRID_UNITS}px;
+  width: ${theme.sizeUnit * THUMBNAIL_GRID_UNITS}px;
   position: relative;
 
   img {
-    min-width: ${theme.gridUnit * THUMBNAIL_GRID_UNITS}px;
-    min-height: ${theme.gridUnit * THUMBNAIL_GRID_UNITS}px;
-    border: 1px solid ${theme.colors.grayscale.light2};
-    border-radius: ${theme.gridUnit}px;
-    transition: border-color ${theme.transitionTiming};
+    min-width: ${theme.sizeUnit * THUMBNAIL_GRID_UNITS}px;
+    min-height: ${theme.sizeUnit * THUMBNAIL_GRID_UNITS}px;
+    border: 1px solid ${theme.colorBorder};
+    border-radius: ${theme.borderRadius}px;
+    transition: border-color ${theme.motionDurationMid};
   }
 
   &.selected img {
-    border: 2px solid ${theme.colors.primary.light2};
+    border: 2px solid ${theme.colorPrimaryBorder};
   }
 
   &:hover:not(.selected) img {
-    border: 1px solid ${theme.colors.grayscale.light1};
+    border: 1px solid ${theme.colorBorder};
   }
 
   .viztype-label {
-    margin-top: ${theme.gridUnit * 2}px;
+    margin-top: ${theme.sizeUnit * 2}px;
     text-align: center;
   }
 `;
 
 const HighlightLabel = styled.div`
   ${({ theme }) => `
-    border: 1px solid ${theme.colors.primary.dark1};
+    border: 1px solid ${theme.colorPrimaryText};
     box-sizing: border-box;
-    border-radius: ${theme.gridUnit}px;
+    border-radius: ${theme.borderRadius}px;
     background: ${theme.colors.grayscale.light5};
-    line-height: ${theme.gridUnit * 2.5}px;
-    color: ${theme.colors.primary.dark1};
-    font-size: ${theme.typography.sizes.s}px;
-    font-weight: ${theme.typography.weights.bold};
+    line-height: ${theme.sizeUnit * 2.5}px;
+    color: ${theme.colorPrimaryText};
+    font-size: ${theme.fontSizeSM}px;
+    font-weight: ${theme.fontWeightStrong};
     text-align: center;
-    padding: ${theme.gridUnit * 0.5}px ${theme.gridUnit}px;
+    padding: ${theme.sizeUnit * 0.5}px ${theme.sizeUnit}px;
     cursor: pointer;
 
     div {
@@ -312,13 +311,13 @@ const HighlightLabel = styled.div`
 
 const ThumbnailLabelWrapper = styled.div`
   position: absolute;
-  right: ${({ theme }) => theme.gridUnit}px;
-  top: ${({ theme }) => theme.gridUnit * 19}px;
+  right: ${({ theme }) => theme.sizeUnit}px;
+  top: ${({ theme }) => theme.sizeUnit * 19}px;
 `;
 
 const TitleLabelWrapper = styled.div`
   display: inline-block !important;
-  margin-left: ${({ theme }) => theme.gridUnit * 2}px;
+  margin-left: ${({ theme }) => theme.sizeUnit * 2}px;
 `;
 
 interface ThumbnailProps {
@@ -418,11 +417,15 @@ const Selector: FC<{
 
   return (
     <SelectorLabel
+      aria-label={selector}
+      aria-selected={isSelected}
       ref={btnRef}
       key={selector}
       name={selector}
       className={cx(className, isSelected && 'selected')}
       onClick={() => onClick(selector, sectionId)}
+      tabIndex={0}
+      role="tab"
     >
       {icon}
       {selector}
@@ -656,12 +659,12 @@ export default function VizTypeGallery(props: VizTypeGalleryProps) {
       className={className}
       isSelectedVizMetadata={Boolean(selectedVizMetadata)}
     >
-      <LeftPane>
+      <LeftPane aria-label={t('Choose chart type')} role="tablist">
         <Selector
-          css={({ gridUnit }) =>
+          css={({ sizeUnit }) =>
             // adjust style for not being inside a collapse
             css`
-              margin: ${gridUnit * 2}px;
+              margin: ${sizeUnit * 2}px;
               margin-bottom: 0;
             `
           }
@@ -676,10 +679,10 @@ export default function VizTypeGallery(props: VizTypeGalleryProps) {
           onClick={clickSelector}
         />
         <Selector
-          css={({ gridUnit }) =>
+          css={({ sizeUnit }) =>
             // adjust style for not being inside a collapse
             css`
-              margin: ${gridUnit * 2}px;
+              margin: ${sizeUnit * 2}px;
               margin-bottom: 0;
             `
           }
@@ -693,37 +696,37 @@ export default function VizTypeGallery(props: VizTypeGalleryProps) {
           }
           onClick={clickSelector}
         />
-        <AntdCollapse
-          expandIconPosition="right"
+        <Collapse
+          expandIconPosition="end"
           ghost
           defaultActiveKey={Sections.Category}
-        >
-          {Object.keys(sectionMap).map(sectionId => {
+          items={Object.keys(sectionMap).map(sectionId => {
             const section = sectionMap[sectionId as keyof typeof sectionMap];
 
-            return (
-              <AntdCollapse.Panel
-                header={<span className="header">{section.title}</span>}
-                key={sectionId}
-              >
-                {section.selectors.map((selector: string) => (
-                  <Selector
-                    key={selector}
-                    selector={selector}
-                    sectionId={sectionId}
-                    icon={section.icon}
-                    isSelected={
-                      !isActivelySearching &&
-                      selector === activeSelector &&
-                      sectionId === activeSection
-                    }
-                    onClick={clickSelector}
-                  />
-                ))}
-              </AntdCollapse.Panel>
-            );
+            return {
+              key: sectionId,
+              label: <span className="header">{section.title}</span>,
+              children: (
+                <>
+                  {section.selectors.map((selector: string) => (
+                    <Selector
+                      key={selector}
+                      selector={selector}
+                      sectionId={sectionId}
+                      icon={section.icon}
+                      isSelected={
+                        !isActivelySearching &&
+                        selector === activeSelector &&
+                        sectionId === activeSection
+                      }
+                      onClick={clickSelector}
+                    />
+                  ))}
+                </>
+              ),
+            };
           })}
-        </AntdCollapse>
+        />
       </LeftPane>
 
       <SearchWrapper>
@@ -795,8 +798,8 @@ export default function VizTypeGallery(props: VizTypeGalleryProps) {
               {selectedVizMetadata?.tags.map(tag => (
                 <Label
                   key={tag}
-                  css={({ gridUnit }) => css`
-                    margin-bottom: ${gridUnit * 2}px;
+                  css={({ sizeUnit }) => css`
+                    margin-bottom: ${sizeUnit * 2}px;
                   `}
                 >
                   {tag}
diff --git a/superset-frontend/src/explore/components/controls/VizTypeControl/constants.tsx b/superset-frontend/src/explore/components/controls/VizTypeControl/constants.tsx
index c57513ab4d0..0b92b9b2966 100644
--- a/superset-frontend/src/explore/components/controls/VizTypeControl/constants.tsx
+++ b/superset-frontend/src/explore/components/controls/VizTypeControl/constants.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { VizType } from '@superset-ui/core';
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { VizMeta } from './types';
 
 export const FEATURED_CHARTS: VizMeta[] = [
diff --git a/superset-frontend/src/explore/components/controls/VizTypeControl/index.tsx b/superset-frontend/src/explore/components/controls/VizTypeControl/index.tsx
index 0a9b4189f32..253ba331a99 100644
--- a/superset-frontend/src/explore/components/controls/VizTypeControl/index.tsx
+++ b/superset-frontend/src/explore/components/controls/VizTypeControl/index.tsx
@@ -24,8 +24,8 @@ import {
   styled,
   SupersetTheme,
 } from '@superset-ui/core';
-import { usePluginContext } from 'src/components/DynamicPlugins';
-import Modal from 'src/components/Modal';
+import { usePluginContext } from 'src/components';
+import { Icons, Modal } from '@superset-ui/core/components';
 import { noOp } from 'src/utils/common';
 import getBootstrapData from 'src/utils/getBootstrapData';
 import { FilterPlugins } from 'src/constants';
@@ -52,19 +52,17 @@ function VizSupportValidation({ vizType }: { vizType: string }) {
     <div
       className="text-danger"
       css={(theme: SupersetTheme) => css`
-        margin-top: ${theme.gridUnit}px;
+        margin-top: ${theme.sizeUnit}px;
       `}
     >
-      {/* TODO: Remove fa-icon */}
-      {/* eslint-disable-next-line icons/no-fa-icons-usage */}
-      <i className="fa fa-exclamation-circle text-danger" />{' '}
+      <Icons.ExclamationCircleOutlined className="text-danger" />{' '}
       <small>{t('This visualization type is not supported.')}</small>
     </div>
   );
 }
 
 const UnpaddedModal = styled(Modal)`
-  .antd5-modal-body {
+  .ant-modal-body {
     padding: 0;
   }
 `;
@@ -101,7 +99,7 @@ const VizTypeControl = ({
     <>
       <div
         css={(theme: SupersetTheme) => css`
-          min-width: ${theme.gridUnit * 72}px;
+          min-width: ${theme.sizeUnit * 72}px;
           max-width: fit-content;
         `}
       >
@@ -112,9 +110,11 @@ const VizTypeControl = ({
         css={(theme: SupersetTheme) => css`
           display: flex;
           justify-content: flex-end;
-          margin-top: ${theme.gridUnit * 3}px;
-          color: ${theme.colors.grayscale.base};
+          margin-top: ${theme.sizeUnit * 2}px;
+          color: ${theme.colorTextSecondary};
           text-decoration: underline;
+          font-size: ${theme.fontSizeSM}px;
+          color: ${theme.colorTextTertiary};
         `}
       >
         <span role="button" tabIndex={0} onClick={openModal}>
diff --git a/superset-frontend/src/explore/components/controls/ZoomConfigControl/ZoomConfigControl.tsx b/superset-frontend/src/explore/components/controls/ZoomConfigControl/ZoomConfigControl.tsx
index a9863824440..146cf035025 100644
--- a/superset-frontend/src/explore/components/controls/ZoomConfigControl/ZoomConfigControl.tsx
+++ b/superset-frontend/src/explore/components/controls/ZoomConfigControl/ZoomConfigControl.tsx
@@ -18,8 +18,8 @@
  */
 import { ControlHeader } from '@superset-ui/chart-controls';
 import { css, styled, t } from '@superset-ui/core';
-// eslint-disable-next-line no-restricted-imports
-import { Form, Tag } from 'antd'; // TODO: Remove antd
+import { Form } from '@superset-ui/core/components';
+import { Tag } from 'src/components';
 import { FC, useState } from 'react';
 import { isZoomConfigsLinear, isZoomConfigsExp } from './typeguards';
 import { ZoomConfigs, ZoomConfigsControlProps } from './types';
diff --git a/superset-frontend/src/explore/components/controls/index.js b/superset-frontend/src/explore/components/controls/index.js
index 95dd6f25f0b..a36a73ab2a2 100644
--- a/superset-frontend/src/explore/components/controls/index.js
+++ b/superset-frontend/src/explore/components/controls/index.js
@@ -17,6 +17,7 @@
  * under the License.
  */
 import { sharedControlComponents } from '@superset-ui/chart-controls';
+import { getExtensionsRegistry } from '@superset-ui/core';
 import AnnotationLayerControl from './AnnotationLayerControl';
 import BoundsControl from './BoundsControl';
 import CheckboxControl from './CheckboxControl';
@@ -54,6 +55,13 @@ import LayerConfigsControl from './LayerConfigsControl/LayerConfigsControl';
 import MapViewControl from './MapViewControl/MapViewControl';
 import ZoomConfigControl from './ZoomConfigControl/ZoomConfigControl';
 import NumberControl from './NumberControl';
+import TimeRangeControl from './TimeRangeControl';
+
+const extensionsRegistry = getExtensionsRegistry();
+const DateFilterControlExtension = extensionsRegistry.get(
+  'filter.dateFilterControl',
+);
+const DateFilterComponent = DateFilterControlExtension ?? DateFilterControl;
 
 const controlMap = {
   AnnotationLayerControl,
@@ -65,7 +73,7 @@ const controlMap = {
   ColumnConfigControl,
   CurrencyControl,
   DatasourceControl,
-  DateFilterControl,
+  DateFilterControl: DateFilterComponent,
   DndColumnSelectControl,
   DndColumnSelect,
   DndFilterSelect,
@@ -92,6 +100,7 @@ const controlMap = {
   TimeOffsetControl,
   ZoomConfigControl,
   NumberControl,
+  TimeRangeControl,
   ...sharedControlComponents,
 };
 export default controlMap;
diff --git a/superset-frontend/src/explore/components/controls/withAsyncVerification.test.tsx b/superset-frontend/src/explore/components/controls/withAsyncVerification.test.tsx
index 802afeddb00..cef0c740023 100644
--- a/superset-frontend/src/explore/components/controls/withAsyncVerification.test.tsx
+++ b/superset-frontend/src/explore/components/controls/withAsyncVerification.test.tsx
@@ -38,7 +38,9 @@ const defaultProps = {
   multi: true,
   needAsyncVerification: true,
   actions: { setControlValue: mockSetControlValue },
-  onChange: (p0: string[]) => {},
+  onChange: (p0: string[]) => {
+    console.log('onChange called with:', p0);
+  },
   columns: [
     { type: 'VARCHAR(255)', column_name: 'source' },
     { type: 'VARCHAR(255)', column_name: 'target' },
diff --git a/superset-frontend/src/explore/components/optionRenderers.tsx b/superset-frontend/src/explore/components/optionRenderers.tsx
index e6bdab289e5..1db3850881e 100644
--- a/superset-frontend/src/explore/components/optionRenderers.tsx
+++ b/superset-frontend/src/explore/components/optionRenderers.tsx
@@ -38,15 +38,15 @@ const OptionContainer = styled.div`
     text-overflow: ellipsis;
     white-space: nowrap;
     & ~ i {
-      margin-left: ${({ theme }) => theme.gridUnit}px;
+      margin-left: ${({ theme }) => theme.sizeUnit}px;
     }
   }
   .type-label {
-    margin-right: ${({ theme }) => theme.gridUnit * 3}px;
-    width: ${({ theme }) => theme.gridUnit * 7}px;
+    margin-right: ${({ theme }) => theme.sizeUnit * 3}px;
+    width: ${({ theme }) => theme.sizeUnit * 7}px;
     display: inline-block;
     text-align: center;
-    font-weight: ${({ theme }) => theme.typography.weights.bold};
+    font-weight: ${({ theme }) => theme.fontWeightStrong};
   }
 `;
 
diff --git a/superset-frontend/src/explore/components/useExploreAdditionalActionsMenu/DashboardsSubMenu.test.tsx b/superset-frontend/src/explore/components/useExploreAdditionalActionsMenu/DashboardsSubMenu.test.tsx
index 855ea531028..9f0423acf08 100644
--- a/superset-frontend/src/explore/components/useExploreAdditionalActionsMenu/DashboardsSubMenu.test.tsx
+++ b/superset-frontend/src/explore/components/useExploreAdditionalActionsMenu/DashboardsSubMenu.test.tsx
@@ -22,7 +22,7 @@ import {
   userEvent,
   waitFor,
 } from 'spec/helpers/testing-library';
-import { Menu } from 'src/components/Menu';
+import { Menu } from '@superset-ui/core/components/Menu';
 import DashboardItems from './DashboardsSubMenu';
 
 const asyncRender = (numberOfItems: number) => {
diff --git a/superset-frontend/src/explore/components/useExploreAdditionalActionsMenu/DashboardsSubMenu.tsx b/superset-frontend/src/explore/components/useExploreAdditionalActionsMenu/DashboardsSubMenu.tsx
index 8101621712a..2f7f85c7a7d 100644
--- a/superset-frontend/src/explore/components/useExploreAdditionalActionsMenu/DashboardsSubMenu.tsx
+++ b/superset-frontend/src/explore/components/useExploreAdditionalActionsMenu/DashboardsSubMenu.tsx
@@ -18,9 +18,9 @@
  */
 import { useState } from 'react';
 import { css, t, useTheme } from '@superset-ui/core';
-import { Input } from 'src/components/Input';
-import { Icons } from 'src/components/Icons';
-import { Menu } from 'src/components/Menu';
+import { Input } from '@superset-ui/core/components';
+import { Icons } from '@superset-ui/core/components/Icons';
+import { Menu } from '@superset-ui/core/components/Menu';
 import { Link } from 'react-router-dom';
 
 export interface DashboardsSubMenuProps {
@@ -60,7 +60,7 @@ const DashboardsSubMenu = ({
           prefix={<Icons.StarOutlined iconSize="l" />}
           css={css`
             width: ${WIDTH}px;
-            margin: ${theme.gridUnit * 2}px ${theme.gridUnit * 3}px;
+            margin: ${theme.sizeUnit * 2}px ${theme.sizeUnit * 3}px;
           `}
           value={dashboardSearch}
           onChange={e => setDashboardSearch(e.currentTarget.value)}
@@ -106,7 +106,7 @@ const DashboardsSubMenu = ({
                 <Icons.Full
                   iconSize="l"
                   css={css`
-                    margin-left: ${theme.gridUnit * 2}px;
+                    margin-left: ${theme.sizeUnit * 2}px;
                     visibility: ${hoveredItem === dashboard.id
                       ? 'visible'
                       : 'hidden'};
@@ -119,8 +119,8 @@ const DashboardsSubMenu = ({
         {noResultsFound && (
           <div
             css={css`
-              margin-left: ${theme.gridUnit * 3}px;
-              margin-bottom: ${theme.gridUnit}px;
+              margin-left: ${theme.sizeUnit * 3}px;
+              margin-bottom: ${theme.sizeUnit}px;
             `}
           >
             {t('No results found')}
diff --git a/superset-frontend/src/explore/components/useExploreAdditionalActionsMenu/index.jsx b/superset-frontend/src/explore/components/useExploreAdditionalActionsMenu/index.jsx
index f605a96b54a..373727548d4 100644
--- a/superset-frontend/src/explore/components/useExploreAdditionalActionsMenu/index.jsx
+++ b/superset-frontend/src/explore/components/useExploreAdditionalActionsMenu/index.jsx
@@ -27,10 +27,8 @@ import {
   useTheme,
   VizType,
 } from '@superset-ui/core';
-import { Icons } from 'src/components/Icons';
-import { Menu } from 'src/components/Menu';
-import ModalTrigger from 'src/components/ModalTrigger';
-import Button from 'src/components/Button';
+import { Icons, ModalTrigger, Button } from '@superset-ui/core/components';
+import { Menu } from '@superset-ui/core/components/Menu';
 import { useToasts } from 'src/components/MessageToasts/withToasts';
 import { exportChart, getChartKey } from 'src/explore/exploreUtils';
 import downloadAsImage from 'src/utils/downloadAsImage';
@@ -79,31 +77,31 @@ export const MenuItemWithCheckboxContainer = styled.div`
     align-items: center;
 
     & svg {
-      width: ${theme.gridUnit * 3}px;
-      height: ${theme.gridUnit * 3}px;
+      width: ${theme.sizeUnit * 3}px;
+      height: ${theme.sizeUnit * 3}px;
     }
 
     & span[role='checkbox'] {
       display: inline-flex;
-      margin-right: ${theme.gridUnit}px;
+      margin-right: ${theme.sizeUnit}px;
     }
   `}
 `;
 
 export const MenuTrigger = styled(Button)`
   ${({ theme }) => css`
-    width: ${theme.gridUnit * 8}px;
-    height: ${theme.gridUnit * 8}px;
+    width: ${theme.sizeUnit * 8}px;
+    height: ${theme.sizeUnit * 8}px;
     padding: 0;
-    border: 1px solid ${theme.colors.primary.dark2};
+    border: 1px solid ${theme.colorPrimary};
 
-    &.antd5-btn > span.anticon {
+    &.ant-btn > span.anticon {
       line-height: 0;
       transition: inherit;
     }
 
     &:hover:not(:focus) > span.anticon {
-      color: ${theme.colors.primary.light1};
+      color: ${theme.colorPrimary};
     }
   `}
 `;
@@ -388,8 +386,8 @@ export const useExploreAdditionalActionsMenu = (
                     addDangerToast={addDangerToast}
                   />
                 }
-                maxWidth={`${theme.gridUnit * 100}px`}
-                destroyOnClose
+                maxWidth={`${theme.sizeUnit * 100}px`}
+                destroyOnHidden
                 responsive
               />
             </Menu.Item>
@@ -449,7 +447,7 @@ export const useExploreAdditionalActionsMenu = (
       latestQueryFormData,
       showReportSubMenu,
       slice,
-      theme.gridUnit,
+      theme.sizeUnit,
     ],
   );
   return [menu, isDropdownVisible, setIsDropdownVisible];
diff --git a/superset-frontend/src/explore/controlUtils/getColumnKeywords.tsx b/superset-frontend/src/explore/controlUtils/getColumnKeywords.tsx
index 1bcc39a2d5a..3216509a3fa 100644
--- a/superset-frontend/src/explore/controlUtils/getColumnKeywords.tsx
+++ b/superset-frontend/src/explore/controlUtils/getColumnKeywords.tsx
@@ -19,7 +19,7 @@
 
 import { ColumnMeta } from '@superset-ui/chart-controls';
 import { t } from '@superset-ui/core';
-import { getTooltipHTML } from 'src/components/AsyncAceEditor';
+import { getTooltipHTML } from '@superset-ui/core/components/AsyncAceEditor';
 import { COLUMN_AUTOCOMPLETE_SCORE } from 'src/SqlLab/constants';
 
 export function getColumnKeywords(columns: ColumnMeta[]) {
diff --git a/superset-frontend/src/explore/controlUtils/standardizedFormData.test.ts b/superset-frontend/src/explore/controlUtils/standardizedFormData.test.ts
index 2a0f6ac05ff..6ef2594563c 100644
--- a/superset-frontend/src/explore/controlUtils/standardizedFormData.test.ts
+++ b/superset-frontend/src/explore/controlUtils/standardizedFormData.test.ts
@@ -25,9 +25,10 @@ import {
   TimeGranularity,
   VizType,
 } from '@superset-ui/core';
-import TableChartPlugin from '@superset-ui/plugin-chart-table';
-import { BigNumberTotalChartPlugin } from '@superset-ui/plugin-chart-echarts';
+// TODO: tests shouldn't depend on plugins
 import { sections } from '@superset-ui/chart-controls';
+import TableChartPlugin from '../../../plugins/plugin-chart-table/src';
+import { BigNumberTotalChartPlugin } from '../../../plugins/plugin-chart-echarts/src';
 import {
   StandardizedFormData,
   sharedMetricsKey,
diff --git a/superset-frontend/src/explore/exploreUtils/formData.test.ts b/superset-frontend/src/explore/exploreUtils/formData.test.ts
index f14455b51bd..c61b4370377 100644
--- a/superset-frontend/src/explore/exploreUtils/formData.test.ts
+++ b/superset-frontend/src/explore/exploreUtils/formData.test.ts
@@ -16,13 +16,83 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { sanitizeFormData } from './formData';
+import { SupersetClient } from '@superset-ui/core';
+import { postFormData, putFormData } from './formData';
 
-test('sanitizeFormData removes temporary control values', () => {
-  expect(
-    sanitizeFormData({
-      url_params: { foo: 'bar' },
-      metrics: ['foo', 'bar'],
-    }),
-  ).toEqual({ metrics: ['foo', 'bar'] });
+jest.mock('@superset-ui/core', () => ({
+  SupersetClient: {
+    post: jest.fn(),
+    put: jest.fn(),
+  },
+}));
+
+test('postFormData should call SupersetClient.post with correct payload and return key', async () => {
+  const mockKey = '123abc';
+  const mockResponse = { json: { key: mockKey } };
+
+  (SupersetClient.post as jest.Mock).mockResolvedValue(mockResponse);
+
+  const result = await postFormData(
+    1,
+    'table',
+    { some: 'form', data: true },
+    42,
+    'tab-7',
+  );
+
+  expect(SupersetClient.post).toHaveBeenCalledWith({
+    endpoint: 'api/v1/explore/form_data?tab_id=tab-7',
+    jsonPayload: {
+      datasource_id: 1,
+      datasource_type: 'table',
+      form_data: JSON.stringify({ some: 'form', data: true }), // assuming sanitizeFormData is a passthrough
+      chart_id: 42,
+    },
+  });
+
+  expect(result).toBe(mockKey);
+});
+
+test('putFormData should call SupersetClient.put with correct payload and return message', async () => {
+  const mockMessage = 'Form data updated';
+  const mockResponse = { json: { message: mockMessage } };
+
+  (SupersetClient.put as jest.Mock).mockResolvedValue(mockResponse);
+
+  const result = await putFormData(
+    10,
+    'druid',
+    'abc123',
+    { another: 'value' },
+    undefined,
+    'tab-5',
+  );
+
+  expect(SupersetClient.put).toHaveBeenCalledWith({
+    endpoint: 'api/v1/explore/form_data/abc123?tab_id=tab-5',
+    jsonPayload: {
+      datasource_id: 10,
+      datasource_type: 'druid',
+      form_data: JSON.stringify({ another: 'value' }), // again, assuming sanitizeFormData is passthrough
+    },
+  });
+
+  expect(result).toBe(mockMessage);
+});
+
+test('postFormData without optional params should work', async () => {
+  (SupersetClient.post as jest.Mock).mockResolvedValue({
+    json: { key: 'abc' },
+  });
+
+  await postFormData(2, 'table', { foo: 'bar' });
+
+  expect(SupersetClient.post).toHaveBeenCalledWith({
+    endpoint: 'api/v1/explore/form_data',
+    jsonPayload: {
+      datasource_id: 2,
+      datasource_type: 'table',
+      form_data: JSON.stringify({ foo: 'bar' }),
+    },
+  });
 });
diff --git a/superset-frontend/src/explore/exploreUtils/formData.ts b/superset-frontend/src/explore/exploreUtils/formData.ts
index 36de6640a5c..9a83d8fd8da 100644
--- a/superset-frontend/src/explore/exploreUtils/formData.ts
+++ b/superset-frontend/src/explore/exploreUtils/formData.ts
@@ -16,8 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { omit } from 'lodash';
-import { SupersetClient, JsonObject } from '@superset-ui/core';
+import { SupersetClient, JsonObject, JsonResponse } from '@superset-ui/core';
+import { sanitizeFormData } from 'src/utils/sanitizeFormData';
 
 type Payload = {
   datasource_id: number;
@@ -26,19 +26,12 @@ type Payload = {
   chart_id?: number;
 };
 
-const TEMPORARY_CONTROLS = ['url_params'];
-
-export const sanitizeFormData = (formData: JsonObject): JsonObject =>
-  omit(formData, TEMPORARY_CONTROLS);
-
 const assembleEndpoint = (key?: string, tabId?: string) => {
   let endpoint = 'api/v1/explore/form_data';
-  if (key) {
-    endpoint = endpoint.concat(`/${key}`);
-  }
-  if (tabId) {
-    endpoint = endpoint.concat(`?tab_id=${tabId}`);
-  }
+
+  if (key) endpoint = endpoint.concat(`/${key}`);
+  if (tabId) endpoint = endpoint.concat(`?tab_id=${tabId}`);
+
   return endpoint;
 };
 
@@ -47,15 +40,15 @@ const assemblePayload = (
   datasourceType: string,
   formData: JsonObject,
   chartId?: number,
-) => {
+): Payload => {
   const payload: Payload = {
     datasource_id: datasourceId,
     datasource_type: datasourceType,
     form_data: JSON.stringify(sanitizeFormData(formData)),
   };
-  if (chartId) {
-    payload.chart_id = chartId;
-  }
+
+  if (chartId) payload.chart_id = chartId;
+
   return payload;
 };
 
@@ -74,7 +67,7 @@ export const postFormData = (
       formData,
       chartId,
     ),
-  }).then(r => r.json.key);
+  }).then((r: JsonResponse) => r.json.key);
 
 export const putFormData = (
   datasourceId: number,
@@ -92,4 +85,4 @@ export const putFormData = (
       formData,
       chartId,
     ),
-  }).then(r => r.json.message);
+  }).then((r: JsonResponse) => r.json.message);
diff --git a/superset-frontend/src/features/alerts/AlertReportModal.test.tsx b/superset-frontend/src/features/alerts/AlertReportModal.test.tsx
index f526b465c1e..b79d27811e5 100644
--- a/superset-frontend/src/features/alerts/AlertReportModal.test.tsx
+++ b/superset-frontend/src/features/alerts/AlertReportModal.test.tsx
@@ -365,7 +365,7 @@ test('renders all Alert Condition fields', async () => {
   });
   userEvent.click(screen.getByTestId('alert-condition-panel'));
   const database = screen.getByRole('combobox', { name: /database/i });
-  const sql = screen.getAllByRole('textbox')[2];
+  const sql = screen.getByRole('textbox');
   const condition = screen.getByRole('combobox', { name: /condition/i });
   const threshold = screen.getByRole('spinbutton');
   expect(database).toBeInTheDocument();
diff --git a/superset-frontend/src/features/alerts/AlertReportModal.tsx b/superset-frontend/src/features/alerts/AlertReportModal.tsx
index ba2e9db9457..93769494158 100644
--- a/superset-frontend/src/features/alerts/AlertReportModal.tsx
+++ b/superset-frontend/src/features/alerts/AlertReportModal.tsx
@@ -38,19 +38,27 @@ import {
 } from '@superset-ui/core';
 import rison from 'rison';
 import { useSingleViewResource } from 'src/views/CRUD/hooks';
-
-import { InputNumber } from 'src/components/Input';
-import { Switch } from 'src/components/Switch';
-import Modal from 'src/components/Modal';
-import Collapse from 'src/components/Collapse';
-import TimezoneSelector from 'src/components/TimezoneSelector';
-import { propertyComparator } from 'src/components/Select/utils';
+import {
+  AsyncSelect,
+  Checkbox,
+  Collapse,
+  CollapseLabelInModal,
+  InfoTooltip,
+  Input,
+  InputNumber,
+  Modal,
+  Select,
+  Switch,
+  TreeSelect,
+  type CheckboxChangeEvent,
+  Typography,
+} from '@superset-ui/core/components';
+import TimezoneSelector from '@superset-ui/core/components/TimezoneSelector';
+import { propertyComparator } from '@superset-ui/core/components/Select/utils';
 import withToasts from 'src/components/MessageToasts/withToasts';
 import Owner from 'src/types/Owner';
-import { AntdCheckbox, AsyncSelect, Select, TreeSelect } from 'src/components';
 import TextAreaControl from 'src/explore/components/controls/TextAreaControl';
 import { useCommonConf } from 'src/features/databases/state';
-import { InfoTooltipWithTrigger } from '@superset-ui/chart-controls';
 import {
   NotificationMethodOption,
   NotificationSetting,
@@ -71,12 +79,11 @@ import {
 } from 'src/features/alerts/types';
 import { useSelector } from 'react-redux';
 import { UserWithPermissionsAndRoles } from 'src/types/bootstrapTypes';
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
+import { useOpenerRef } from 'src/hooks/useOpenerRef';
 import NumberInput from './components/NumberInput';
 import { AlertReportCronScheduler } from './components/AlertReportCronScheduler';
 import { NotificationMethod } from './components/NotificationMethod';
-import ValidatedPanelHeader from './components/ValidatedPanelHeader';
-import StyledPanel from './components/StyledPanel';
 import { buildErrorTooltipMessage } from './buildErrorTooltipMessage';
 
 const TIMEOUT_MIN = 1;
@@ -201,22 +208,19 @@ const noMarginBottom = css`
 Height of modal body defined here, total width defined at component invocation as antd prop.
  */
 const StyledModal = styled(Modal)`
-  .antd5-modal-body {
+  .ant-modal-body {
     height: 720px;
   }
 
   .control-label {
-    margin-top: ${({ theme }) => theme.gridUnit}px;
-  }
-
-  .ant-collapse > .ant-collapse-item {
-    border-bottom: none;
+    margin-top: ${({ theme }) => theme.sizeUnit}px;
   }
 
   .inline-container {
     display: flex;
     flex-direction: row;
     align-items: center;
+
     &.wrap {
       flex-wrap: wrap;
     }
@@ -245,28 +249,29 @@ export const StyledInputContainer = styled.div`
   ${({ theme }) => css`
     flex: 1;
     margin-top: 0px;
-    margin-bottom: ${theme.gridUnit * 4}px;
+    margin-bottom: ${theme.sizeUnit * 4}px;
 
     input::-webkit-outer-spin-button,
     input::-webkit-inner-spin-button {
       -webkit-appearance: none;
       margin: 0;
     }
+
     input[type='number'] {
       -moz-appearance: textfield;
     }
 
     .helper {
       display: block;
-      color: ${theme.colors.grayscale.base};
-      font-size: ${theme.typography.sizes.s}px;
-      padding: ${theme.gridUnit}px 0;
+      color: ${theme.colorTextTertiary};
+      font-size: ${theme.fontSizeSM}px;
+      padding: ${theme.sizeUnit}px 0;
       text-align: left;
     }
 
     .required {
-      margin-left: ${theme.gridUnit / 2}px;
-      color: ${theme.colors.error.base};
+      margin-left: ${theme.sizeUnit / 2}px;
+      color: ${theme.colorError};
     }
 
     .input-container {
@@ -279,11 +284,11 @@ export const StyledInputContainer = styled.div`
 
       label {
         display: flex;
-        margin-right: ${theme.gridUnit * 2}px;
+        margin-right: ${theme.sizeUnit * 2}px;
       }
 
       i {
-        margin: 0 ${theme.gridUnit}px;
+        margin: 0 ${theme.sizeUnit}px;
       }
     }
 
@@ -293,7 +298,7 @@ export const StyledInputContainer = styled.div`
     }
 
     input[disabled] {
-      color: ${theme.colors.grayscale.base};
+      color: ${theme.colorTextDisabled};
     }
 
     textarea {
@@ -303,16 +308,16 @@ export const StyledInputContainer = styled.div`
 
     input::placeholder,
     textarea::placeholder {
-      color: ${theme.colors.grayscale.light1};
+      color: ${theme.colorTextPlaceholder};
     }
 
     textarea,
     input[type='text'],
     input[type='number'] {
-      padding: ${theme.gridUnit}px ${theme.gridUnit * 2}px;
+      padding: ${theme.sizeUnit}px ${theme.sizeUnit * 2}px;
       border-style: none;
-      border: 1px solid ${theme.colors.grayscale.light2};
-      border-radius: ${theme.gridUnit}px;
+      border: 1px solid ${theme.colorBorder};
+      border-radius: ${theme.borderRadius}px;
 
       &[name='description'] {
         flex: 1 1 auto;
@@ -325,26 +330,18 @@ export const StyledInputContainer = styled.div`
   `}
 `;
 
-const StyledCheckbox = styled(AntdCheckbox)`
-  margin-top: ${({ theme }) => theme.gridUnit * 0}px;
-`;
-
-const StyledTooltip = styled(InfoTooltipWithTrigger)`
-  margin-left: ${({ theme }) => theme.gridUnit}px;
-`;
-
 // Notification Method components
 const StyledNotificationAddButton = styled.div`
   ${({ theme }) => css`
-    color: ${theme.colors.primary.dark1};
+    color: ${theme.colorPrimaryText};
     cursor: pointer;
 
     i {
-      margin-right: ${theme.gridUnit * 2}px;
+      margin-right: ${theme.sizeUnit * 2}px;
     }
 
     &.disabled {
-      color: ${theme.colors.grayscale.light1};
+      color: ${theme.colorTextDisabled};
       cursor: default;
     }
   `}
@@ -357,7 +354,7 @@ const StyledNotificationMethodWrapper = styled.div`
 `;
 
 const inputSpacer = (theme: SupersetTheme) => css`
-  margin-right: ${theme.gridUnit * 3}px;
+  margin-right: ${theme.sizeUnit * 3}px;
 `;
 
 type NotificationAddStatus = 'active' | 'disabled' | 'hidden';
@@ -408,13 +405,7 @@ const NotificationMethodAdd: FunctionComponent<NotificationMethodAddProps> = ({
 
   return (
     <StyledNotificationAddButton className={status} onClick={checkStatus}>
-      <Icons.PlusOutlined
-        iconSize="m"
-        css={theme => ({
-          margin: `auto ${theme.gridUnit * 2}px auto 0`,
-          verticalAlign: 'middle',
-        })}
-      />
+      <Icons.PlusOutlined iconSize="m" />
       {status === 'active'
         ? t('Add another notification method')
         : t('Add delivery method')}
@@ -431,6 +422,7 @@ const AlertReportModal: FunctionComponent<AlertReportModalProps> = ({
   isReport = false,
   addSuccessToast,
 }) => {
+  const openerRef = useOpenerRef(show);
   const currentUser = useSelector<any, UserWithPermissionsAndRoles>(
     state => state.user,
   );
@@ -1093,12 +1085,10 @@ const AlertReportModal: FunctionComponent<AlertReportModalProps> = ({
     updateAlertState('validator_config_json', config);
   };
 
-  const onThresholdChange = (event: ChangeEvent<HTMLInputElement>) => {
-    const { target } = event;
-
+  const onThresholdChange = (value: number | null) => {
     const config = {
       op: currentAlert ? currentAlert.validator_config_json?.op : undefined,
-      threshold: target.value,
+      threshold: value,
     };
 
     updateAlertState('validator_config_json', config);
@@ -1121,9 +1111,8 @@ const AlertReportModal: FunctionComponent<AlertReportModalProps> = ({
   const onFormatChange = (value: string) => {
     setReportFormat(value);
   };
-
-  const onForceScreenshotChange = (event: any) => {
-    setForceScreenshot(event.target.checked);
+  const onForceScreenshotChange = (e: CheckboxChangeEvent) => {
+    setForceScreenshot(e.target.checked);
   };
 
   // Make sure notification settings has the required info
@@ -1464,480 +1453,512 @@ const AlertReportModal: FunctionComponent<AlertReportModalProps> = ({
       show={show}
       width="500px"
       centered
-      title={<h4 data-test="alert-report-modal-title">{getTitleText()}</h4>}
+      openerRef={openerRef}
+      title={
+        <Typography.Title level={4} data-test="alert-report-modal-title">
+          {getTitleText()}
+        </Typography.Title>
+      }
     >
       <Collapse
-        expandIconPosition="right"
+        expandIconPosition="end"
         defaultActiveKey="general"
         accordion
-        css={css`
-          border: 'none';
-        `}
-      >
-        <StyledPanel
-          header={
-            <ValidatedPanelHeader
-              title={TRANSLATIONS.GENERAL_TITLE}
-              subtitle={t(
-                'Set up basic details, such as name and description.',
-              )}
-              validateCheckStatus={
-                !validationStatus[Sections.General].hasErrors
-              }
-              testId="general-information-panel"
-            />
-          }
-          key="general"
-        >
-          <div className="header-section">
-            <StyledInputContainer>
-              <div className="control-label">
-                {isReport ? t('Report name') : t('Alert name')}
-                <span className="required">*</span>
-              </div>
-              <div className="input-container">
-                <input
-                  type="text"
-                  name="name"
-                  value={currentAlert ? currentAlert.name : ''}
-                  placeholder={
-                    isReport ? t('Enter report name') : t('Enter alert name')
-                  }
-                  onChange={onInputChange}
-                />
-              </div>
-            </StyledInputContainer>
-            <StyledInputContainer>
-              <div className="control-label">
-                {t('Owners')}
-                <span className="required">*</span>
-              </div>
-              <div data-test="owners-select" className="input-container">
-                <AsyncSelect
-                  ariaLabel={t('Owners')}
-                  allowClear
-                  name="owners"
-                  mode="multiple"
-                  placeholder={t('Select owners')}
-                  value={
-                    (currentAlert?.owners as {
-                      label: string;
-                      value: number;
-                    }[]) || []
-                  }
-                  options={loadOwnerOptions}
-                  onChange={onOwnersChange}
-                />
-              </div>
-            </StyledInputContainer>
-            <StyledInputContainer>
-              <div className="control-label">{t('Description')}</div>
-              <div className="input-container">
-                <input
-                  type="text"
-                  name="description"
-                  value={currentAlert ? currentAlert.description || '' : ''}
-                  placeholder={t(
-                    'Include description to be sent with %s',
-                    reportOrAlert,
-                  )}
-                  onChange={onInputChange}
-                />
-              </div>
-            </StyledInputContainer>
-            <StyledSwitchContainer>
-              <Switch
-                checked={currentAlert ? currentAlert.active : false}
-                defaultChecked
-                onChange={onActiveSwitch}
-              />
-              <div className="switch-label">
-                {isReport ? t('Report is active') : t('Alert is active')}
-              </div>
-            </StyledSwitchContainer>
-          </div>
-        </StyledPanel>
-        {!isReport && (
-          <StyledPanel
-            header={
-              <ValidatedPanelHeader
-                title={TRANSLATIONS.ALERT_CONDITION_TITLE}
+        modalMode
+        items={[
+          {
+            key: 'general',
+            label: (
+              <CollapseLabelInModal
+                title={TRANSLATIONS.GENERAL_TITLE}
                 subtitle={t(
-                  'Define the database, SQL query, and triggering conditions for alert.',
+                  'Set up basic details, such as name and description.',
                 )}
                 validateCheckStatus={
-                  !validationStatus[Sections.Alert].hasErrors
+                  !validationStatus[Sections.General].hasErrors
                 }
-                testId="alert-condition-panel"
+                testId="general-information-panel"
               />
-            }
-            key="condition"
-          >
-            <StyledInputContainer>
-              <div className="control-label">
-                {t('Database')}
-                <span className="required">*</span>
-              </div>
-              <div className="input-container">
-                <AsyncSelect
-                  ariaLabel={t('Database')}
-                  name="source"
-                  placeholder={t('Select database')}
-                  value={
-                    currentAlert?.database?.label &&
-                    currentAlert?.database?.value
-                      ? {
-                          value: currentAlert.database.value,
-                          label: currentAlert.database.label,
-                        }
-                      : undefined
-                  }
-                  options={loadSourceOptions}
-                  onChange={onSourceChange}
-                />
-              </div>
-            </StyledInputContainer>
-            <StyledInputContainer>
-              <div className="control-label">
-                {t('SQL Query')}
-                <StyledTooltip
-                  tooltip={t(
-                    'The result of this query must be a value capable of numeric interpretation e.g. 1, 1.0, or "1" (compatible with Python\'s float() function).',
-                  )}
-                />
-                <span className="required">*</span>
-              </div>
-              <TextAreaControl
-                name="sql"
-                language="sql"
-                offerEditInModal={false}
-                minLines={15}
-                maxLines={15}
-                onChange={onSQLChange}
-                readOnly={false}
-                initialValue={resource?.sql}
-                key={currentAlert?.id}
-              />
-            </StyledInputContainer>
-            <div className="inline-container wrap">
-              <StyledInputContainer css={noMarginBottom}>
-                <div className="control-label" css={inputSpacer}>
-                  {t('Trigger Alert If...')}
-                  <span className="required">*</span>
-                </div>
-                <div className="input-container">
-                  <Select
-                    ariaLabel={t('Condition')}
-                    onChange={onConditionChange}
-                    placeholder={t('Condition')}
-                    value={currentAlert?.validator_config_json?.op || undefined}
-                    options={CONDITIONS}
-                    css={inputSpacer}
+            ),
+            children: (
+              <div className="header-section">
+                <StyledInputContainer>
+                  <div className="control-label">
+                    {isReport ? t('Report name') : t('Alert name')}
+                    <span className="required">*</span>
+                  </div>
+                  <div className="input-container">
+                    <Input
+                      name="name"
+                      placeholder={
+                        isReport
+                          ? t('Enter report name')
+                          : t('Enter alert name')
+                      }
+                      value={currentAlert ? currentAlert.name : ''}
+                      onChange={onInputChange}
+                    />
+                  </div>
+                </StyledInputContainer>
+                <StyledInputContainer>
+                  <div className="control-label">
+                    {t('Owners')}
+                    <span className="required">*</span>
+                  </div>
+                  <div data-test="owners-select" className="input-container">
+                    <AsyncSelect
+                      ariaLabel={t('Owners')}
+                      allowClear
+                      name="owners"
+                      mode="multiple"
+                      placeholder={t('Select owners')}
+                      value={
+                        (currentAlert?.owners as {
+                          label: string;
+                          value: number;
+                        }[]) || []
+                      }
+                      options={loadOwnerOptions}
+                      onChange={onOwnersChange}
+                    />
+                  </div>
+                </StyledInputContainer>
+                <StyledInputContainer>
+                  <div className="control-label">{t('Description')}</div>
+                  <div className="input-container">
+                    <Input
+                      name="description"
+                      value={currentAlert ? currentAlert.description || '' : ''}
+                      placeholder={t(
+                        'Include description to be sent with %s',
+                        reportOrAlert,
+                      )}
+                      onChange={onInputChange}
+                    />
+                  </div>
+                </StyledInputContainer>
+                <StyledSwitchContainer>
+                  <Switch
+                    checked={currentAlert ? currentAlert.active : false}
+                    defaultChecked
+                    onChange={onActiveSwitch}
                   />
-                </div>
-              </StyledInputContainer>
-              <StyledInputContainer css={noMarginBottom}>
-                <div className="control-label">
-                  {t('Value')}{' '}
-                  {!conditionNotNull && <span className="required">*</span>}
-                </div>
-                <div className="input-container">
-                  <input
-                    type="number"
-                    name="threshold"
-                    disabled={conditionNotNull}
-                    value={
-                      currentAlert?.validator_config_json?.threshold !==
-                        undefined && !conditionNotNull
-                        ? currentAlert.validator_config_json.threshold
-                        : ''
-                    }
-                    placeholder={t('Value')}
-                    onChange={onThresholdChange}
-                  />
-                </div>
-              </StyledInputContainer>
-            </div>
-          </StyledPanel>
-        )}
-        <StyledPanel
-          header={
-            <ValidatedPanelHeader
-              title={
-                isReport
-                  ? TRANSLATIONS.REPORT_CONTENTS_TITLE
-                  : TRANSLATIONS.ALERT_CONTENTS_TITLE
-              }
-              subtitle={t('Customize data source, filters, and layout.')}
-              validateCheckStatus={
-                !validationStatus[Sections.Content].hasErrors
-              }
-              testId="contents-panel"
-            />
-          }
-          key="contents"
-        >
-          <StyledInputContainer>
-            <div className="control-label">
-              {t('Content type')}
-              <span className="required">*</span>
-            </div>
-            <Select
-              ariaLabel={t('Select content type')}
-              onChange={onContentTypeChange}
-              value={contentType}
-              options={CONTENT_TYPE_OPTIONS}
-              placeholder={t('Select content type')}
-            />
-          </StyledInputContainer>
-          <StyledInputContainer>
-            {contentType === ContentType.Chart ? (
-              <>
-                <div className="control-label">
-                  {t('Select chart')}
-                  <span className="required">*</span>
-                </div>
-                <AsyncSelect
-                  ariaLabel={t('Chart')}
-                  name="chart"
-                  value={
-                    currentAlert?.chart?.label && currentAlert?.chart?.value
-                      ? {
-                          value: currentAlert.chart.value,
-                          label: currentAlert.chart.label,
-                        }
-                      : undefined
-                  }
-                  options={loadChartOptions}
-                  onChange={onChartChange}
-                  placeholder={t('Select chart to use')}
-                />
-              </>
-            ) : (
-              <>
-                <div className="control-label">
-                  {t('Select dashboard')}
-                  <span className="required">*</span>
-                </div>
-                <AsyncSelect
-                  ariaLabel={t('Dashboard')}
-                  name="dashboard"
-                  value={
-                    currentAlert?.dashboard?.label &&
-                    currentAlert?.dashboard?.value
-                      ? {
-                          value: currentAlert.dashboard.value,
-                          label: currentAlert.dashboard.label,
-                        }
-                      : undefined
-                  }
-                  options={loadDashboardOptions}
-                  onChange={onDashboardChange}
-                  placeholder={t('Select dashboard to use')}
-                />
-              </>
-            )}
-          </StyledInputContainer>
-          <StyledInputContainer
-            css={
-              ['PDF', 'TEXT', 'CSV'].includes(reportFormat) && noMarginBottom
-            }
-          >
-            {formatOptionEnabled && (
-              <>
-                <div className="control-label">
-                  {t('Content format')}
-                  <span className="required">*</span>
-                </div>
-                <Select
-                  ariaLabel={t('Select format')}
-                  onChange={onFormatChange}
-                  value={reportFormat}
-                  options={
-                    contentType === ContentType.Dashboard
-                      ? ['pdf', 'png'].map(
-                          key => FORMAT_OPTIONS[key as FORMAT_OPTIONS_KEY],
-                        )
-                      : /* If chart is of text based viz type: show text
-                  format option */
-                        TEXT_BASED_VISUALIZATION_TYPES.includes(chartVizType)
-                        ? Object.values(FORMAT_OPTIONS)
-                        : ['pdf', 'png', 'csv'].map(
-                            key => FORMAT_OPTIONS[key as FORMAT_OPTIONS_KEY],
-                          )
-                  }
-                  placeholder={t('Select format')}
-                />
-              </>
-            )}
-          </StyledInputContainer>
-          {tabsEnabled && contentType === ContentType.Dashboard && (
-            <StyledInputContainer>
-              <>
-                <div className="control-label">{t('Select tab')}</div>
-                <StyledTreeSelect
-                  disabled={tabOptions?.length === 0}
-                  treeData={tabOptions}
-                  value={currentAlert?.extra?.dashboard?.anchor}
-                  onSelect={updateAnchorState}
-                  placeholder={t('Select a tab')}
-                />
-              </>
-            </StyledInputContainer>
-          )}
-          {isScreenshot && (
-            <StyledInputContainer
-              css={
-                !isReport && contentType === ContentType.Chart && noMarginBottom
-              }
-            >
-              <div className="control-label">{t('Screenshot width')}</div>
-              <div className="input-container">
-                <InputNumber
-                  type="number"
-                  name="custom_width"
-                  value={currentAlert?.custom_width || undefined}
-                  min={600}
-                  max={2400}
-                  placeholder={t('Input custom width in pixels')}
-                  onChange={onCustomWidthChange}
-                />
+                  <div className="switch-label">
+                    {isReport ? t('Report is active') : t('Alert is active')}
+                  </div>
+                </StyledSwitchContainer>
               </div>
-            </StyledInputContainer>
-          )}
-          {(isReport || contentType === ContentType.Dashboard) && (
-            <div className="inline-container">
-              <StyledCheckbox
-                data-test="bypass-cache"
-                className="checkbox"
-                checked={forceScreenshot}
-                onChange={onForceScreenshotChange}
-              >
-                {t('Ignore cache when generating report')}
-              </StyledCheckbox>
-            </div>
-          )}
-        </StyledPanel>
-        <StyledPanel
-          header={
-            <ValidatedPanelHeader
-              title={TRANSLATIONS.SCHEDULE_TITLE}
-              subtitle={t(
-                'Define delivery schedule, timezone, and frequency settings.',
-              )}
-              validateCheckStatus={
-                !validationStatus[Sections.Schedule].hasErrors
-              }
-              testId="schedule-panel"
-            />
-          }
-          key="schedule"
-        >
-          <AlertReportCronScheduler
-            value={currentAlert?.crontab || ''}
-            onChange={newVal => updateAlertState('crontab', newVal)}
-          />
-          <StyledInputContainer>
-            <div className="control-label">
-              {t('Timezone')} <span className="required">*</span>
-            </div>
-            <TimezoneSelector
-              onTimezoneChange={onTimezoneChange}
-              timezone={currentAlert?.timezone}
-              minWidth="100%"
-            />
-          </StyledInputContainer>
-          <StyledInputContainer>
-            <div className="control-label">
-              {t('Log retention')}
-              <span className="required">*</span>
-            </div>
-            <div className="input-container">
-              <Select
-                ariaLabel={t('Log retention')}
-                placeholder={t('Log retention')}
-                onChange={onLogRetentionChange}
-                value={currentAlert?.log_retention}
-                options={RETENTION_OPTIONS}
-                sortComparator={propertyComparator('value')}
-              />
-            </div>
-          </StyledInputContainer>
-          <StyledInputContainer css={noMarginBottom}>
-            {isReport ? (
-              <>
-                <div className="control-label">
-                  {t('Working timeout')}
-                  <span className="required">*</span>
-                </div>
-                <div className="input-container">
-                  <NumberInput
-                    min={1}
-                    name="working_timeout"
-                    value={currentAlert?.working_timeout || ''}
-                    placeholder={t('Time in seconds')}
-                    onChange={onTimeoutVerifyChange}
-                    timeUnit={t('seconds')}
-                  />
-                </div>
-              </>
-            ) : (
-              <>
-                <div className="control-label">{t('Grace period')}</div>
-                <div className="input-container">
-                  <NumberInput
-                    min={1}
-                    name="grace_period"
-                    value={currentAlert?.grace_period || ''}
-                    placeholder={t('Time in seconds')}
-                    onChange={onTimeoutVerifyChange}
-                    timeUnit={t('seconds')}
-                  />
-                </div>
-              </>
-            )}
-          </StyledInputContainer>
-        </StyledPanel>
-        <StyledPanel
-          header={
-            <ValidatedPanelHeader
-              title={TRANSLATIONS.NOTIFICATION_TITLE}
-              subtitle={t('Choose notification method and recipients.')}
-              validateCheckStatus={
-                !validationStatus[Sections.Notification].hasErrors
-              }
-              testId="notification-method-panel"
-            />
-          }
-          key="notification"
-        >
-          {notificationSettings.map((notificationSetting, i) => (
-            <StyledNotificationMethodWrapper>
-              <NotificationMethod
-                setting={notificationSetting}
-                index={i}
-                key={`NotificationMethod-${i}`}
-                onUpdate={updateNotificationSetting}
-                onRemove={removeNotificationSetting}
-                onInputChange={onInputChange}
-                email_subject={currentAlert?.email_subject || ''}
-                defaultSubject={emailSubject || ''}
-                setErrorSubject={handleErrorUpdate}
-              />
-            </StyledNotificationMethodWrapper>
-          ))}
+            ),
+          },
+          ...(!isReport
+            ? [
+                {
+                  key: 'condition',
+                  label: (
+                    <CollapseLabelInModal
+                      title={TRANSLATIONS.ALERT_CONDITION_TITLE}
+                      subtitle={t(
+                        'Define the database, SQL query, and triggering conditions for alert.',
+                      )}
+                      validateCheckStatus={
+                        !validationStatus[Sections.Alert].hasErrors
+                      }
+                      testId="alert-condition-panel"
+                    />
+                  ),
+                  children: (
+                    <div>
+                      <StyledInputContainer>
+                        <div className="control-label">
+                          {t('Database')}
+                          <span className="required">*</span>
+                        </div>
+                        <div className="input-container">
+                          <AsyncSelect
+                            ariaLabel={t('Database')}
+                            name="source"
+                            placeholder={t('Select database')}
+                            value={
+                              currentAlert?.database?.label &&
+                              currentAlert?.database?.value
+                                ? {
+                                    value: currentAlert.database.value,
+                                    label: currentAlert.database.label,
+                                  }
+                                : undefined
+                            }
+                            options={loadSourceOptions}
+                            onChange={onSourceChange}
+                          />
+                        </div>
+                      </StyledInputContainer>
+                      <StyledInputContainer>
+                        <div className="control-label">
+                          {t('SQL Query')}
+                          <InfoTooltip
+                            tooltip={t(
+                              'The result of this query must be a value capable of numeric interpretation e.g. 1, 1.0, or "1" (compatible with Python\'s float() function).',
+                            )}
+                          />
+                          <span className="required">*</span>
+                        </div>
+                        <TextAreaControl
+                          name="sql"
+                          language="sql"
+                          offerEditInModal={false}
+                          minLines={15}
+                          maxLines={15}
+                          onChange={onSQLChange}
+                          readOnly={false}
+                          initialValue={resource?.sql}
+                          key={currentAlert?.id}
+                        />
+                      </StyledInputContainer>
+                      <div className="inline-container wrap">
+                        <StyledInputContainer css={noMarginBottom}>
+                          <div className="control-label" css={inputSpacer}>
+                            {t('Trigger Alert If...')}
+                            <span className="required">*</span>
+                          </div>
+                          <div className="input-container">
+                            <Select
+                              ariaLabel={t('Condition')}
+                              onChange={onConditionChange}
+                              placeholder={t('Condition')}
+                              value={
+                                currentAlert?.validator_config_json?.op ||
+                                undefined
+                              }
+                              options={CONDITIONS}
+                            />
+                          </div>
+                        </StyledInputContainer>
+                        <StyledInputContainer css={noMarginBottom}>
+                          <div className="control-label">
+                            {t('Value')}{' '}
+                            {!conditionNotNull && (
+                              <span className="required">*</span>
+                            )}
+                          </div>
+                          <div className="input-container">
+                            <InputNumber
+                              disabled={conditionNotNull}
+                              type="number"
+                              name="threshold"
+                              value={
+                                currentAlert?.validator_config_json
+                                  ?.threshold !== undefined && !conditionNotNull
+                                  ? currentAlert.validator_config_json.threshold
+                                  : ''
+                              }
+                              min={0}
+                              placeholder={t('Value')}
+                              onChange={onThresholdChange}
+                            />
+                          </div>
+                        </StyledInputContainer>
+                      </div>
+                    </div>
+                  ),
+                },
+              ]
+            : []),
           {
-            // Prohibit 'add notification method' button if only one present
-            allowedNotificationMethodsCount > notificationSettings.length && (
-              <NotificationMethodAdd
-                data-test="notification-add"
-                status={notificationAddState}
-                onClick={onNotificationAdd}
+            key: 'contents',
+            label: (
+              <CollapseLabelInModal
+                title={
+                  isReport
+                    ? TRANSLATIONS.REPORT_CONTENTS_TITLE
+                    : TRANSLATIONS.ALERT_CONTENTS_TITLE
+                }
+                subtitle={t('Customize data source, filters, and layout.')}
+                validateCheckStatus={
+                  !validationStatus[Sections.Content].hasErrors
+                }
+                testId="contents-panel"
               />
-            )
-          }
-        </StyledPanel>
-      </Collapse>
+            ),
+            children: (
+              <>
+                <StyledInputContainer>
+                  <div className="control-label">
+                    {t('Content type')}
+                    <span className="required">*</span>
+                  </div>
+                  <Select
+                    ariaLabel={t('Select content type')}
+                    onChange={onContentTypeChange}
+                    value={contentType}
+                    options={CONTENT_TYPE_OPTIONS}
+                    placeholder={t('Select content type')}
+                  />
+                </StyledInputContainer>
+                <StyledInputContainer>
+                  {contentType === ContentType.Chart ? (
+                    <>
+                      <div className="control-label">
+                        {t('Select chart')}
+                        <span className="required">*</span>
+                      </div>
+                      <AsyncSelect
+                        ariaLabel={t('Chart')}
+                        name="chart"
+                        value={
+                          currentAlert?.chart?.label &&
+                          currentAlert?.chart?.value
+                            ? {
+                                value: currentAlert.chart.value,
+                                label: currentAlert.chart.label,
+                              }
+                            : undefined
+                        }
+                        options={loadChartOptions}
+                        onChange={onChartChange}
+                        placeholder={t('Select chart to use')}
+                      />
+                    </>
+                  ) : (
+                    <>
+                      <div className="control-label">
+                        {t('Select dashboard')}
+                        <span className="required">*</span>
+                      </div>
+                      <AsyncSelect
+                        ariaLabel={t('Dashboard')}
+                        name="dashboard"
+                        value={
+                          currentAlert?.dashboard?.label &&
+                          currentAlert?.dashboard?.value
+                            ? {
+                                value: currentAlert.dashboard.value,
+                                label: currentAlert.dashboard.label,
+                              }
+                            : undefined
+                        }
+                        options={loadDashboardOptions}
+                        onChange={onDashboardChange}
+                        placeholder={t('Select dashboard to use')}
+                      />
+                    </>
+                  )}
+                </StyledInputContainer>
+                <StyledInputContainer
+                  css={
+                    ['PDF', 'TEXT', 'CSV'].includes(reportFormat) &&
+                    noMarginBottom
+                  }
+                >
+                  {formatOptionEnabled && (
+                    <>
+                      <div className="control-label">
+                        {t('Content format')}
+                        <span className="required">*</span>
+                      </div>
+                      <Select
+                        ariaLabel={t('Select format')}
+                        onChange={onFormatChange}
+                        value={reportFormat}
+                        options={
+                          contentType === ContentType.Dashboard
+                            ? ['pdf', 'png'].map(
+                                key =>
+                                  FORMAT_OPTIONS[key as FORMAT_OPTIONS_KEY],
+                              )
+                            : /* If chart is of text based viz type: show text
+                  format option */
+                              TEXT_BASED_VISUALIZATION_TYPES.includes(
+                                  chartVizType,
+                                )
+                              ? Object.values(FORMAT_OPTIONS)
+                              : ['pdf', 'png', 'csv'].map(
+                                  key =>
+                                    FORMAT_OPTIONS[key as FORMAT_OPTIONS_KEY],
+                                )
+                        }
+                        placeholder={t('Select format')}
+                      />
+                    </>
+                  )}
+                </StyledInputContainer>
+                {tabsEnabled && contentType === ContentType.Dashboard && (
+                  <StyledInputContainer>
+                    <>
+                      <div className="control-label">{t('Select tab')}</div>
+                      <StyledTreeSelect
+                        disabled={tabOptions?.length === 0}
+                        treeData={tabOptions}
+                        value={currentAlert?.extra?.dashboard?.anchor}
+                        onSelect={updateAnchorState}
+                        placeholder={t('Select a tab')}
+                      />
+                    </>
+                  </StyledInputContainer>
+                )}
+                {isScreenshot && (
+                  <StyledInputContainer
+                    css={
+                      !isReport &&
+                      contentType === ContentType.Chart &&
+                      noMarginBottom
+                    }
+                  >
+                    <div className="control-label">{t('Screenshot width')}</div>
+                    <div className="input-container">
+                      <InputNumber
+                        type="number"
+                        name="custom_width"
+                        value={currentAlert?.custom_width || undefined}
+                        min={600}
+                        max={2400}
+                        placeholder={t('Input custom width in pixels')}
+                        onChange={onCustomWidthChange}
+                      />
+                    </div>
+                  </StyledInputContainer>
+                )}
+                {(isReport || contentType === ContentType.Dashboard) && (
+                  <div className="inline-container">
+                    <Checkbox
+                      data-test="bypass-cache"
+                      checked={forceScreenshot}
+                      onChange={onForceScreenshotChange}
+                    >
+                      {t('Ignore cache when generating report')}
+                    </Checkbox>
+                  </div>
+                )}
+              </>
+            ),
+          },
+          {
+            key: 'schedule',
+            label: (
+              <CollapseLabelInModal
+                title={TRANSLATIONS.SCHEDULE_TITLE}
+                subtitle={t(
+                  'Define delivery schedule, timezone, and frequency settings.',
+                )}
+                validateCheckStatus={
+                  !validationStatus[Sections.Schedule].hasErrors
+                }
+                testId="schedule-panel"
+              />
+            ),
+            children: (
+              <>
+                <AlertReportCronScheduler
+                  value={currentAlert?.crontab || ''}
+                  onChange={newVal => updateAlertState('crontab', newVal)}
+                />
+                <StyledInputContainer>
+                  <div className="control-label">
+                    {t('Timezone')} <span className="required">*</span>
+                  </div>
+                  <TimezoneSelector
+                    onTimezoneChange={onTimezoneChange}
+                    timezone={currentAlert?.timezone}
+                    minWidth="100%"
+                  />
+                </StyledInputContainer>
+                <StyledInputContainer>
+                  <div className="control-label">
+                    {t('Log retention')}
+                    <span className="required">*</span>
+                  </div>
+                  <div className="input-container">
+                    <Select
+                      ariaLabel={t('Log retention')}
+                      placeholder={t('Log retention')}
+                      onChange={onLogRetentionChange}
+                      value={currentAlert?.log_retention}
+                      options={RETENTION_OPTIONS}
+                      sortComparator={propertyComparator('value')}
+                    />
+                  </div>
+                </StyledInputContainer>
+                <StyledInputContainer css={noMarginBottom}>
+                  {isReport ? (
+                    <>
+                      <div className="control-label">
+                        {t('Working timeout')}
+                        <span className="required">*</span>
+                      </div>
+                      <div className="input-container">
+                        <NumberInput
+                          min={1}
+                          name="working_timeout"
+                          value={currentAlert?.working_timeout || ''}
+                          placeholder={t('Time in seconds')}
+                          onChange={onTimeoutVerifyChange}
+                          timeUnit={t('seconds')}
+                        />
+                      </div>
+                    </>
+                  ) : (
+                    <>
+                      <div className="control-label">{t('Grace period')}</div>
+                      <div className="input-container">
+                        <NumberInput
+                          min={1}
+                          name="grace_period"
+                          value={currentAlert?.grace_period || ''}
+                          placeholder={t('Time in seconds')}
+                          onChange={onTimeoutVerifyChange}
+                          timeUnit={t('seconds')}
+                        />
+                      </div>
+                    </>
+                  )}
+                </StyledInputContainer>
+              </>
+            ),
+          },
+          {
+            key: 'notification',
+            label: (
+              <CollapseLabelInModal
+                title={TRANSLATIONS.NOTIFICATION_TITLE}
+                subtitle={t('Choose notification method and recipients.')}
+                validateCheckStatus={
+                  !validationStatus[Sections.Notification].hasErrors
+                }
+                testId="notification-method-panel"
+              />
+            ),
+            children: (
+              <>
+                {notificationSettings.map((notificationSetting, i) => (
+                  <StyledNotificationMethodWrapper>
+                    <NotificationMethod
+                      setting={notificationSetting}
+                      index={i}
+                      key={`NotificationMethod-${i}`}
+                      onUpdate={updateNotificationSetting}
+                      onRemove={removeNotificationSetting}
+                      onInputChange={onInputChange}
+                      email_subject={currentAlert?.email_subject || ''}
+                      defaultSubject={emailSubject || ''}
+                      setErrorSubject={handleErrorUpdate}
+                    />
+                  </StyledNotificationMethodWrapper>
+                ))}
+                {
+                  // Prohibit 'add notification method' button if only one present
+                  allowedNotificationMethodsCount >
+                    notificationSettings.length && (
+                    <NotificationMethodAdd
+                      data-test="notification-add"
+                      status={notificationAddState}
+                      onClick={onNotificationAdd}
+                    />
+                  )
+                }
+              </>
+            ),
+          },
+        ]}
+      />
     </StyledModal>
   );
 };
diff --git a/superset-frontend/src/features/alerts/buildErrorTooltipMessage.tsx b/superset-frontend/src/features/alerts/buildErrorTooltipMessage.tsx
index 02f8583075b..b6d1694311e 100644
--- a/superset-frontend/src/features/alerts/buildErrorTooltipMessage.tsx
+++ b/superset-frontend/src/features/alerts/buildErrorTooltipMessage.tsx
@@ -16,15 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { styled } from '@superset-ui/core';
+import { css } from '@superset-ui/core';
+import { List } from '@superset-ui/core/components';
 import { ValidationObject } from './types';
 import { TRANSLATIONS } from './AlertReportModal';
 
-const StyledList = styled.ul`
-  margin-left: ${({ theme }) => theme.gridUnit * 2}px;
-  padding-inline-start: ${({ theme }) => theme.gridUnit * 3}px;
-`;
-
 export const buildErrorTooltipMessage = (
   validationStatus: ValidationObject,
 ) => {
@@ -38,11 +34,23 @@ export const buildErrorTooltipMessage = (
   return (
     <div>
       {TRANSLATIONS.ERROR_TOOLTIP_MESSAGE}
-      <StyledList>
-        {sectionErrors.map(err => (
-          <li key={err}>{err}</li>
-        ))}
-      </StyledList>
+      <List
+        dataSource={sectionErrors}
+        renderItem={err => (
+          <List.Item
+            css={theme => css`
+              &&& {
+                color: ${theme.colorWhite};
+              }
+            `}
+            compact
+          >
+            • {err}
+          </List.Item>
+        )}
+        size="small"
+        split={false}
+      />
     </div>
   );
 };
diff --git a/superset-frontend/src/features/alerts/components/AlertReportCronScheduler.tsx b/superset-frontend/src/features/alerts/components/AlertReportCronScheduler.tsx
index 7a6cd995042..2ea0971e5b3 100644
--- a/superset-frontend/src/features/alerts/components/AlertReportCronScheduler.tsx
+++ b/superset-frontend/src/features/alerts/components/AlertReportCronScheduler.tsx
@@ -20,9 +20,12 @@ import { useState, useCallback, FocusEvent, FC } from 'react';
 
 import { t, useTheme } from '@superset-ui/core';
 
-import { Select } from 'src/components';
-import { Input } from 'src/components/Input';
-import { CronPicker, CronError } from 'src/components/CronPicker';
+import {
+  Input,
+  CronPicker,
+  Select,
+  type CronError,
+} from '@superset-ui/core/components';
 import { StyledInputContainer } from '../AlertReportModal';
 
 export interface AlertReportCronSchedulerProps {
@@ -104,7 +107,7 @@ export const AlertReportCronScheduler: FC<AlertReportCronSchedulerProps> = ({
           <Input
             type="text"
             name="crontab"
-            style={error ? { borderColor: theme.colors.error.base } : {}}
+            style={error ? { borderColor: theme.colorError } : {}}
             placeholder={t('CRON expression')}
             value={value}
             onBlur={handleBlur}
diff --git a/superset-frontend/src/features/alerts/components/AlertStatusIcon.tsx b/superset-frontend/src/features/alerts/components/AlertStatusIcon.tsx
index d80d982e946..1258ea6aad5 100644
--- a/superset-frontend/src/features/alerts/components/AlertStatusIcon.tsx
+++ b/superset-frontend/src/features/alerts/components/AlertStatusIcon.tsx
@@ -17,8 +17,8 @@
  * under the License.
  */
 import { t, SupersetTheme, useTheme } from '@superset-ui/core';
-import { Tooltip } from 'src/components/Tooltip';
-import { Icons } from 'src/components/Icons';
+import { Tooltip } from '@superset-ui/core/components';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { AlertState } from '../types';
 
 function getStatusColor(
@@ -28,19 +28,17 @@ function getStatusColor(
 ) {
   switch (status) {
     case AlertState.Working:
-      return theme.colors.primary.base;
+      return theme.colorPrimaryText;
     case AlertState.Error:
-      return theme.colors.error.base;
+      return theme.colorErrorText;
     case AlertState.Success:
-      return isReportEnabled
-        ? theme.colors.success.base
-        : theme.colors.warning.base;
+      return isReportEnabled ? theme.colorSuccessText : theme.colorErrorText;
     case AlertState.Noop:
-      return theme.colors.success.base;
+      return theme.colorSuccessText;
     case AlertState.Grace:
-      return theme.colors.warning.base;
+      return theme.colorErrorText;
     default:
-      return theme.colors.grayscale.base;
+      return theme.colorText;
   }
 }
 
diff --git a/superset-frontend/src/features/alerts/components/NotificationMethod.tsx b/superset-frontend/src/features/alerts/components/NotificationMethod.tsx
index 0266b5c64e9..f785bddce51 100644
--- a/superset-frontend/src/features/alerts/components/NotificationMethod.tsx
+++ b/superset-frontend/src/features/alerts/components/NotificationMethod.tsx
@@ -34,9 +34,9 @@ import {
   t,
   useTheme,
 } from '@superset-ui/core';
-import { Select } from 'src/components';
-import { Icons } from 'src/components/Icons';
-import RefreshLabel from 'src/components/RefreshLabel';
+import { Icons } from '@superset-ui/core/components/Icons';
+import { Input, Select } from '@superset-ui/core/components';
+import RefreshLabel from '@superset-ui/core/components/RefreshLabel';
 import {
   NotificationMethodOption,
   NotificationSetting,
@@ -46,7 +46,7 @@ import { StyledInputContainer } from '../AlertReportModal';
 
 const StyledNotificationMethod = styled.div`
   ${({ theme }) => `
-    margin-bottom: ${theme.gridUnit * 3}px;
+    margin-bottom: ${theme.sizeUnit * 3}px;
 
     .input-container {
       textarea {
@@ -55,50 +55,50 @@ const StyledNotificationMethod = styled.div`
 
       &.error {
         input {
-          border-color: ${theme.colors.error.base};
+          border-color: ${theme.colorError};
         }
       }
 
       .helper {
-        margin-top: ${theme.gridUnit * 2}px;
-        font-size: ${theme.typography.sizes.s}px;
+        margin-top: ${theme.sizeUnit * 2}px;
+        font-size: ${theme.fontSizeSM}px;
         color: ${theme.colors.grayscale.base};
       }
     }
 
     .inline-container {
-      margin-bottom: ${theme.gridUnit * 2}px;
+      margin-bottom: ${theme.sizeUnit * 2}px;
 
       > div {
         margin: 0px;
       }
 
       .delete-button {
-        margin-left: ${theme.gridUnit * 2}px;
-        padding-top: ${theme.gridUnit}px;
+        margin-left: ${theme.sizeUnit * 2}px;
+        padding-top: ${theme.sizeUnit}px;
       }
       .anticon {
-        margin-left: ${theme.gridUnit}px;
+        margin-left: ${theme.sizeUnit}px;
       }
     }
 
     .ghost-button {
-      color: ${theme.colors.primary.dark1};
+      color: ${theme.colorPrimaryText};
       display: inline-flex;
       align-items: center;
-      font-size: ${theme.typography.sizes.s}px;
+      font-size: ${theme.fontSizeSM}px;
       cursor: pointer;
 
       .icon {
-        width: ${theme.gridUnit * 3}px;
-        height: ${theme.gridUnit * 3}px;
-        font-size: ${theme.typography.sizes.s}px;
-        margin-right: ${theme.gridUnit}px;
+        width: ${theme.sizeUnit * 3}px;
+        height: ${theme.sizeUnit * 3}px;
+        font-size: ${theme.fontSizeSM}px;
+        margin-right: ${theme.sizeUnit}px;
       }
     }
 
     .ghost-button + .ghost-button {
-      margin-left: ${theme.gridUnit * 4}px;
+      margin-left: ${theme.sizeUnit * 4}px;
     }
 
     .ghost-button:first-child[style*='none'] + .ghost-button {
@@ -485,7 +485,7 @@ export const NotificationMethod: FunctionComponent<NotificationMethodProps> = ({
                     {TRANSLATIONS.EMAIL_SUBJECT_NAME}
                   </div>
                   <div className={`input-container ${error ? 'error' : ''}`}>
-                    <input
+                    <Input
                       type="text"
                       name="email_subject"
                       value={email_subject}
@@ -496,8 +496,8 @@ export const NotificationMethod: FunctionComponent<NotificationMethodProps> = ({
                   {error && (
                     <div
                       style={{
-                        color: theme.colors.error.base,
-                        fontSize: theme.gridUnit * 3,
+                        color: theme.colorError,
+                        fontSize: theme.sizeUnit * 3,
                       }}
                     >
                       {TRANSLATIONS.EMAIL_SUBJECT_ERROR_TEXT}
@@ -525,7 +525,7 @@ export const NotificationMethod: FunctionComponent<NotificationMethodProps> = ({
                 ].includes(method) ? (
                   <>
                     <div className="input-container">
-                      <textarea
+                      <Input.TextArea
                         name="To"
                         data-test="recipients"
                         value={recipientValue}
@@ -573,7 +573,7 @@ export const NotificationMethod: FunctionComponent<NotificationMethodProps> = ({
                     {TRANSLATIONS.EMAIL_CC_NAME}
                   </div>
                   <div className="input-container">
-                    <textarea
+                    <Input.TextArea
                       name="CC"
                       data-test="cc"
                       value={ccValue}
@@ -594,7 +594,7 @@ export const NotificationMethod: FunctionComponent<NotificationMethodProps> = ({
                     {TRANSLATIONS.EMAIL_BCC_NAME}
                   </div>
                   <div className="input-container">
-                    <textarea
+                    <Input.TextArea
                       name="BCC"
                       data-test="bcc"
                       value={bccValue}
diff --git a/superset-frontend/src/features/alerts/components/NumberInput.tsx b/superset-frontend/src/features/alerts/components/NumberInput.tsx
index 29756405479..4605cd6b86f 100644
--- a/superset-frontend/src/features/alerts/components/NumberInput.tsx
+++ b/superset-frontend/src/features/alerts/components/NumberInput.tsx
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import { Input } from '@superset-ui/core/components';
 import { useState, ChangeEvent } from 'react';
 
 interface NumberInputProps {
@@ -34,11 +35,12 @@ export default function NumberInput({
   value,
   placeholder,
   onChange,
+  ...rest
 }: NumberInputProps) {
   const [isFocused, setIsFocused] = useState<boolean>(false);
 
   return (
-    <input
+    <Input
       type="text"
       min={min}
       name={name}
@@ -47,6 +49,7 @@ export default function NumberInput({
       onFocus={() => setIsFocused(true)}
       onBlur={() => setIsFocused(false)}
       onChange={onChange}
+      {...rest}
     />
   );
 }
diff --git a/superset-frontend/src/features/alerts/components/RecipientIcon.tsx b/superset-frontend/src/features/alerts/components/RecipientIcon.tsx
index 05a131bf136..b86e21136e8 100644
--- a/superset-frontend/src/features/alerts/components/RecipientIcon.tsx
+++ b/superset-frontend/src/features/alerts/components/RecipientIcon.tsx
@@ -18,13 +18,13 @@
  */
 import { SupersetTheme, css } from '@superset-ui/core';
 import { ReactElement } from 'react';
-import { Tooltip } from 'src/components/Tooltip';
-import { Icons } from 'src/components/Icons';
+import { Tooltip } from '@superset-ui/core/components';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { NotificationMethodOption } from '../types';
 
 const notificationStyledIcon = (theme: SupersetTheme) => css`
   color: ${theme.colors.grayscale.light1};
-  margin-right: ${theme.gridUnit * 2}px;
+  margin-right: ${theme.sizeUnit * 2}px;
 `;
 
 export default function RecipientIcon({ type }: { type: string }) {
diff --git a/superset-frontend/src/features/alerts/components/StyledPanel.tsx b/superset-frontend/src/features/alerts/components/StyledPanel.tsx
deleted file mode 100644
index 736200f2229..00000000000
--- a/superset-frontend/src/features/alerts/components/StyledPanel.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 { ReactNode } from 'react';
-import { css, SupersetTheme } from '@superset-ui/core';
-// eslint-disable-next-line no-restricted-imports
-import { Collapse as AntdCollapse } from 'antd'; // TODO: Remove antd
-// eslint-disable-next-line no-restricted-imports
-import { CollapsePanelProps } from 'antd/lib/collapse'; // TODO: Remove antd
-
-const anticonHeight = 12;
-const antdPanelStyles = (theme: SupersetTheme) => css`
-  .ant-collapse-header {
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: flex-start;
-    padding: 0px ${theme.gridUnit * 4}px;
-
-    .anticon.anticon-right.ant-collapse-arrow {
-      padding: 0;
-      top: calc(50% - ${anticonHeight / 2}px);
-    }
-
-    .collapse-panel-title {
-      font-size: ${theme.gridUnit * 4}px;
-      font-weight: ${theme.typography.weights.bold};
-      line-height: 130%;
-    }
-
-    .collapse-panel-subtitle {
-      color: ${theme.colors.grayscale.base};
-      font-size: ${theme.typography.sizes.s}px;
-      font-weight: ${theme.typography.weights.normal};
-      line-height: 150%;
-      margin-bottom: 0;
-      padding-top: ${theme.gridUnit}px;
-    }
-
-    .collapse-panel-asterisk {
-      color: var(--semantic-error-base, ${theme.colors.warning.dark1});
-    }
-    .validation-checkmark {
-      width: ${theme.gridUnit * 4}px;
-      height: ${theme.gridUnit * 4}px;
-      margin-left: ${theme.gridUnit}px;
-      color: ${theme.colors.success.base};
-    }
-  }
-`;
-
-export interface PanelProps extends CollapsePanelProps {
-  children?: ReactNode;
-}
-const StyledPanel = (props: PanelProps) => (
-  <AntdCollapse.Panel
-    css={(theme: SupersetTheme) => antdPanelStyles(theme)}
-    {...props}
-  />
-);
-
-export default StyledPanel;
diff --git a/superset-frontend/src/features/alerts/components/ValidatedPanelHeader.tsx b/superset-frontend/src/features/alerts/components/ValidatedPanelHeader.tsx
deleted file mode 100644
index 46411bbc3fa..00000000000
--- a/superset-frontend/src/features/alerts/components/ValidatedPanelHeader.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 { t, useTheme } from '@superset-ui/core';
-import { Icons } from 'src/components/Icons';
-
-const ValidatedPanelHeader = ({
-  title,
-  subtitle,
-  validateCheckStatus,
-  testId,
-}: {
-  title: string;
-  subtitle: string;
-  validateCheckStatus: boolean;
-  testId?: string;
-}): JSX.Element => {
-  const theme = useTheme();
-  const checkmark = (
-    <Icons.CheckCircleOutlined
-      iconSize="m"
-      iconColor={theme.colors.success.base}
-    />
-  );
-  return (
-    <div className="collapse-panel-header">
-      <div className="collapse-panel-title" data-test={testId}>
-        <span>{t(title)}</span>
-        {validateCheckStatus ? (
-          <span className="validation-checkmark">{checkmark}</span>
-        ) : (
-          <span className="collapse-panel-asterisk">{' *'}</span>
-        )}
-      </div>
-      <p className="collapse-panel-subtitle">
-        {subtitle ? t(subtitle) : undefined}
-      </p>
-    </div>
-  );
-};
-
-export default ValidatedPanelHeader;
diff --git a/superset-frontend/src/features/allEntities/AllEntitiesTable.tsx b/superset-frontend/src/features/allEntities/AllEntitiesTable.tsx
index 4f4bad18568..56565cd11e0 100644
--- a/superset-frontend/src/features/allEntities/AllEntitiesTable.tsx
+++ b/superset-frontend/src/features/allEntities/AllEntitiesTable.tsx
@@ -16,21 +16,23 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { extendedDayjs } from 'src/utils/dates';
+import { extendedDayjs } from '@superset-ui/core/utils/dates';
 import { t, styled } from '@superset-ui/core';
-import TableView, { EmptyWrapperType } from 'src/components/TableView';
-import { TagsList } from 'src/components/Tags';
-import FacePile from 'src/components/FacePile';
-import Tag from 'src/types/TagType';
-import { EmptyState } from 'src/components/EmptyState';
+import {
+  TableView,
+  EmptyWrapperType,
+} from '@superset-ui/core/components/TableView';
+import { EmptyState } from '@superset-ui/core/components';
+import { FacePile, TagsList, type TagType } from 'src/components';
 import { TaggedObject, TaggedObjects } from 'src/types/TaggedObject';
+import { Typography } from '@superset-ui/core/components/Typography';
 
 const MAX_TAGS_TO_SHOW = 3;
 const PAGE_SIZE = 10;
 
 const AllEntitiesTableContainer = styled.div`
   text-align: left;
-  border-radius: ${({ theme }) => theme.gridUnit * 1}px 0;
+  border-radius: ${({ theme }) => theme.borderRadius}px 0;
   .table {
     table-layout: fixed;
   }
@@ -39,12 +41,12 @@ const AllEntitiesTableContainer = styled.div`
   }
   .entity-title {
     font-family: Inter;
-    font-size: ${({ theme }) => theme.typography.sizes.m}px;
-    font-weight: ${({ theme }) => theme.typography.weights.medium};
+    font-size: ${({ theme }) => theme.fontSize}px;
+    font-weight: ${({ theme }) => theme.fontWeightStrong};
     line-height: 17px;
     letter-spacing: 0px;
     text-align: left;
-    margin: ${({ theme }) => theme.gridUnit * 4}px 0;
+    margin: ${({ theme }) => theme.sizeUnit * 4}px 0;
   }
 `;
 
@@ -70,7 +72,7 @@ export default function AllEntitiesTable({
 
   const renderTable = (type: objectType) => {
     const data = objects[type].map((o: TaggedObject) => ({
-      [type]: <a href={o.url}>{o.name}</a>,
+      [type]: <Typography.Link href={o.url}>{o.name}</Typography.Link>,
       modified: extendedDayjs.utc(o.changed_on).fromNow(),
       tags: o.tags,
       owners: o.owners,
@@ -86,6 +88,7 @@ export default function AllEntitiesTable({
           {
             accessor: type,
             Header: 'Title',
+            id: type,
           },
           {
             Cell: ({
@@ -95,14 +98,14 @@ export default function AllEntitiesTable({
             }: {
               row: {
                 original: {
-                  tags: Tag[];
+                  tags: TagType[];
                 };
               };
             }) => (
               // Only show custom type tags
               <TagsList
                 tags={tags.filter(
-                  (tag: Tag) =>
+                  (tag: TagType) =>
                     tag.type !== undefined &&
                     ['TagType.custom', 1].includes(tag.type),
                 )}
@@ -112,6 +115,7 @@ export default function AllEntitiesTable({
             Header: t('Tags'),
             accessor: 'tags',
             disableSortBy: true,
+            id: 'tags',
           },
           {
             Cell: ({
@@ -123,6 +127,7 @@ export default function AllEntitiesTable({
             accessor: 'owners',
             disableSortBy: true,
             size: 'xl',
+            id: 'owners',
           },
         ]}
       />
diff --git a/superset-frontend/src/features/annotationLayers/AnnotationLayerModal.tsx b/superset-frontend/src/features/annotationLayers/AnnotationLayerModal.tsx
index 726c2a51ce3..2495e520c01 100644
--- a/superset-frontend/src/features/annotationLayers/AnnotationLayerModal.tsx
+++ b/superset-frontend/src/features/annotationLayers/AnnotationLayerModal.tsx
@@ -21,8 +21,9 @@ import { FunctionComponent, useState, useEffect, ChangeEvent } from 'react';
 import { css, styled, t, useTheme } from '@superset-ui/core';
 import { useSingleViewResource } from 'src/views/CRUD/hooks';
 
-import { Icons } from 'src/components/Icons';
-import Modal from 'src/components/Modal';
+import { Icons } from '@superset-ui/core/components/Icons';
+import { Typography } from '@superset-ui/core/components/Typography';
+import { Input, Modal } from '@superset-ui/core/components';
 import withToasts from 'src/components/MessageToasts/withToasts';
 
 import { OnlyKeyWithType } from 'src/utils/types';
@@ -43,28 +44,28 @@ interface AnnotationLayerModalProps {
 }
 
 const StyledAnnotationLayerTitle = styled.div`
-  margin: ${({ theme }) => theme.gridUnit * 2}px auto
-    ${({ theme }) => theme.gridUnit * 4}px auto;
+  margin: ${({ theme }) => theme.sizeUnit * 2}px auto
+    ${({ theme }) => theme.sizeUnit * 4}px auto;
 `;
 
 const LayerContainer = styled.div`
-  margin-bottom: ${({ theme }) => theme.gridUnit * 10}px;
+  margin-bottom: ${({ theme }) => theme.sizeUnit * 10}px;
 
   .control-label {
-    margin-bottom: ${({ theme }) => theme.gridUnit * 2}px;
+    margin-bottom: ${({ theme }) => theme.sizeUnit * 2}px;
   }
 
   .required {
-    margin-left: ${({ theme }) => theme.gridUnit / 2}px;
-    color: ${({ theme }) => theme.colors.error.base};
+    margin-left: ${({ theme }) => theme.sizeUnit / 2}px;
+    color: ${({ theme }) => theme.colorError};
   }
 
   textarea,
   input[type='text'] {
-    padding: ${({ theme }) => theme.gridUnit * 1.5}px
-      ${({ theme }) => theme.gridUnit * 2}px;
-    border: 1px solid ${({ theme }) => theme.colors.grayscale.light2};
-    border-radius: ${({ theme }) => theme.gridUnit}px;
+    padding: ${({ theme }) => theme.sizeUnit * 1.5}px
+      ${({ theme }) => theme.sizeUnit * 2}px;
+    border: 1px solid ${({ theme }) => theme.colorBorder};
+    border-radius: ${({ theme }) => theme.borderRadius}px;
     width: 50%;
   }
 
@@ -235,19 +236,19 @@ const AnnotationLayerModal: FunctionComponent<AnnotationLayerModalProps> = ({
       show={show}
       width="55%"
       title={
-        <h4 data-test="annotation-layer-modal-title">
+        <Typography.Title level={4} data-test="annotation-layer-modal-title">
           {isEditMode ? (
             <Icons.EditOutlined
               iconSize="l"
               css={css`
-                margin: auto ${theme.gridUnit * 2}px auto 0;
+                margin: auto ${theme.sizeUnit * 2}px auto 0;
               `}
             />
           ) : (
             <Icons.PlusOutlined
               iconSize="m"
               css={css`
-                margin: auto ${theme.gridUnit * 2}px auto 0;
+                margin: auto ${theme.sizeUnit * 2}px auto 0;
                 vertical-align: text-top;
               `}
             />
@@ -255,18 +256,18 @@ const AnnotationLayerModal: FunctionComponent<AnnotationLayerModalProps> = ({
           {isEditMode
             ? t('Edit annotation layer properties')
             : t('Add annotation layer')}
-        </h4>
+        </Typography.Title>
       }
     >
       <StyledAnnotationLayerTitle>
-        <h4>{t('Basic information')}</h4>
+        <Typography.Title level={4}>{t('Basic information')}</Typography.Title>
       </StyledAnnotationLayerTitle>
       <LayerContainer>
         <div className="control-label">
           {t('Annotation layer name')}
           <span className="required">*</span>
         </div>
-        <input
+        <Input
           name="name"
           onChange={onTextChange}
           type="text"
@@ -275,7 +276,7 @@ const AnnotationLayerModal: FunctionComponent<AnnotationLayerModalProps> = ({
       </LayerContainer>
       <LayerContainer>
         <div className="control-label">{t('description')}</div>
-        <textarea
+        <Input.TextArea
           name="descr"
           value={currentLayer?.descr}
           placeholder={t('Description (this can be seen in the list)')}
diff --git a/superset-frontend/src/features/annotations/AnnotationModal.tsx b/superset-frontend/src/features/annotations/AnnotationModal.tsx
index 3b1fc92bdf5..ba7de524128 100644
--- a/superset-frontend/src/features/annotations/AnnotationModal.tsx
+++ b/superset-frontend/src/features/annotations/AnnotationModal.tsx
@@ -20,12 +20,15 @@ import { FunctionComponent, useState, useEffect, ChangeEvent } from 'react';
 
 import { css, styled, t, useTheme } from '@superset-ui/core';
 import { useSingleViewResource } from 'src/views/CRUD/hooks';
-import { RangePicker } from 'src/components/DatePicker';
-import { extendedDayjs } from 'src/utils/dates';
-import { Icons } from 'src/components/Icons';
-import Modal from 'src/components/Modal';
+import { extendedDayjs } from '@superset-ui/core/utils/dates';
+import { Icons } from '@superset-ui/core/components/Icons';
 import withToasts from 'src/components/MessageToasts/withToasts';
-import { JsonEditor } from 'src/components/AsyncAceEditor';
+import {
+  Input,
+  JsonEditor,
+  Modal,
+  RangePicker,
+} from '@superset-ui/core/components';
 
 import { OnlyKeyWithType } from 'src/utils/types';
 import { AnnotationObject } from './types';
@@ -41,40 +44,25 @@ interface AnnotationModalProps {
 }
 
 const StyledAnnotationTitle = styled.div`
-  margin: ${({ theme }) => theme.gridUnit * 2}px auto
-    ${({ theme }) => theme.gridUnit * 4}px auto;
+  margin: ${({ theme }) => theme.sizeUnit * 2}px auto
+    ${({ theme }) => theme.sizeUnit * 4}px auto;
 `;
 
 const StyledJsonEditor = styled(JsonEditor)`
   border-radius: ${({ theme }) => theme.borderRadius}px;
-  border: 1px solid ${({ theme }) => theme.colors.secondary.light2};
+  border: 1px solid ${({ theme }) => theme.colorPrimaryBorder};
 `;
 
 const AnnotationContainer = styled.div`
-  margin-bottom: ${({ theme }) => theme.gridUnit * 5}px;
+  margin-bottom: ${({ theme }) => theme.sizeUnit * 5}px;
 
   .control-label {
-    margin-bottom: ${({ theme }) => theme.gridUnit * 2}px;
+    margin-bottom: ${({ theme }) => theme.sizeUnit * 2}px;
   }
 
   .required {
-    margin-left: ${({ theme }) => theme.gridUnit / 2}px;
-    color: ${({ theme }) => theme.colors.error.base};
-  }
-
-  textarea {
-    flex: 1 1 auto;
-    height: ${({ theme }) => theme.gridUnit * 17}px;
-    resize: none;
-    width: 100%;
-  }
-
-  textarea,
-  input[type='text'] {
-    padding: ${({ theme }) => theme.gridUnit * 1.5}px
-      ${({ theme }) => theme.gridUnit * 2}px;
-    border: 1px solid ${({ theme }) => theme.colors.grayscale.light2};
-    border-radius: ${({ theme }) => theme.gridUnit}px;
+    margin-left: ${({ theme }) => theme.sizeUnit / 2}px;
+    color: ${({ theme }) => theme.colorError};
   }
 
   input[type='text'] {
@@ -282,14 +270,14 @@ const AnnotationModal: FunctionComponent<AnnotationModalProps> = ({
             <Icons.EditOutlined
               iconSize="l"
               css={css`
-                margin: auto ${theme.gridUnit * 2}px auto 0;
+                margin: auto ${theme.sizeUnit * 2}px auto 0;
               `}
             />
           ) : (
             <Icons.PlusOutlined
               iconSize="l"
               css={css`
-                margin: auto ${theme.gridUnit * 2}px auto 0;
+                margin: auto ${theme.sizeUnit * 2}px auto 0;
               `}
             />
           )}
@@ -305,7 +293,7 @@ const AnnotationModal: FunctionComponent<AnnotationModalProps> = ({
           {t('Name')}
           <span className="required">*</span>
         </div>
-        <input
+        <Input
           name="short_descr"
           onChange={onAnnotationTextChange}
           type="text"
@@ -339,7 +327,7 @@ const AnnotationModal: FunctionComponent<AnnotationModalProps> = ({
       </StyledAnnotationTitle>
       <AnnotationContainer>
         <div className="control-label">{t('description')}</div>
-        <textarea
+        <Input.TextArea
           name="long_descr"
           value={currentAnnotation ? currentAnnotation.long_descr : ''}
           placeholder={t('Description (this can be seen in the list)')}
diff --git a/superset-frontend/src/features/charts/ChartCard.tsx b/superset-frontend/src/features/charts/ChartCard.tsx
index 56a2beea546..84c08d8e6fb 100644
--- a/superset-frontend/src/features/charts/ChartCard.tsx
+++ b/superset-frontend/src/features/charts/ChartCard.tsx
@@ -18,18 +18,19 @@
  */
 import { isFeatureEnabled, FeatureFlag, t, css } from '@superset-ui/core';
 import { Link, useHistory } from 'react-router-dom';
-import ConfirmStatusChange from 'src/components/ConfirmStatusChange';
-import { Icons } from 'src/components/Icons';
+import {
+  ConfirmStatusChange,
+  Button,
+  Dropdown,
+  FaveStar,
+  Label,
+  ListViewCard,
+  Icons,
+  MenuItem,
+} from '@superset-ui/core/components';
 import Chart from 'src/types/Chart';
-
-import ListViewCard from 'src/components/ListViewCard';
-import Label from 'src/components/Label';
-import { Dropdown } from 'src/components/Dropdown';
-import { Menu } from 'src/components/Menu';
-import FaveStar from 'src/components/FaveStar';
-import FacePile from 'src/components/FacePile';
+import { FacePile } from 'src/components';
 import { handleChartDelete, CardStyles } from 'src/views/CRUD/utils';
-import Button from 'src/components/Button';
 import { assetUrl } from 'src/utils/assetUrl';
 
 interface ChartCardProps {
@@ -69,86 +70,95 @@ export default function ChartCard({
   const canEdit = hasPerm('can_write');
   const canDelete = hasPerm('can_write');
   const canExport = hasPerm('can_export');
-  const menu = (
-    <Menu>
-      {canEdit && (
-        <Menu.Item>
-          <div
-            data-test="chart-list-edit-option"
-            role="button"
-            tabIndex={0}
-            onClick={() => openChartEditModal(chart)}
-          >
-            <Icons.EditOutlined
-              iconSize="l"
-              css={css`
-                vertical-align: text-top;
-              `}
-            />{' '}
-            {t('Edit')}
-          </div>
-        </Menu.Item>
-      )}
-      {canExport && (
-        <Menu.Item>
-          <div
-            role="button"
-            tabIndex={0}
-            onClick={() => handleBulkChartExport([chart])}
-          >
-            <Icons.UploadOutlined
-              iconSize="l"
-              css={css`
-                vertical-align: text-top;
-              `}
-            />{' '}
-            {t('Export')}
-          </div>
-        </Menu.Item>
-      )}
-      {canDelete && (
-        <Menu.Item>
-          <ConfirmStatusChange
-            title={t('Please confirm')}
-            description={
-              <>
-                {t('Are you sure you want to delete')} <b>{chart.slice_name}</b>
-                ?
-              </>
-            }
-            onConfirm={() =>
-              handleChartDelete(
-                chart,
-                addSuccessToast,
-                addDangerToast,
-                refreshData,
-                chartFilter,
-                userId,
-              )
-            }
-          >
-            {confirmDelete => (
-              <div
-                data-test="chart-list-delete-option"
-                role="button"
-                tabIndex={0}
-                className="action-button"
-                onClick={confirmDelete}
-              >
-                <Icons.DeleteOutlined
-                  iconSize="l"
-                  css={css`
-                    vertical-align: text-top;
-                  `}
-                />{' '}
-                {t('Delete')}
-              </div>
-            )}
-          </ConfirmStatusChange>
-        </Menu.Item>
-      )}
-    </Menu>
-  );
+  const menuItems: MenuItem[] = [];
+
+  if (canEdit) {
+    menuItems.push({
+      key: 'edit',
+      label: (
+        <div
+          data-test="chart-list-edit-option"
+          role="button"
+          tabIndex={0}
+          onClick={() => openChartEditModal(chart)}
+        >
+          <Icons.EditOutlined
+            iconSize="l"
+            css={css`
+              vertical-align: text-top;
+            `}
+          />{' '}
+          {t('Edit')}
+        </div>
+      ),
+    });
+  }
+
+  if (canExport) {
+    menuItems.push({
+      key: 'export',
+      label: (
+        <div
+          role="button"
+          tabIndex={0}
+          onClick={() => handleBulkChartExport([chart])}
+        >
+          <Icons.UploadOutlined
+            iconSize="l"
+            css={css`
+              vertical-align: text-top;
+            `}
+          />{' '}
+          {t('Export')}
+        </div>
+      ),
+    });
+  }
+
+  if (canDelete) {
+    menuItems.push({
+      key: 'delete',
+      label: (
+        <ConfirmStatusChange
+          title={t('Please confirm')}
+          description={
+            <>
+              {t('Are you sure you want to delete')} <b>{chart.slice_name}</b>?
+            </>
+          }
+          onConfirm={() =>
+            handleChartDelete(
+              chart,
+              addSuccessToast,
+              addDangerToast,
+              refreshData,
+              chartFilter,
+              userId,
+            )
+          }
+        >
+          {confirmDelete => (
+            <div
+              data-test="chart-list-delete-option"
+              role="button"
+              tabIndex={0}
+              className="action-button"
+              onClick={confirmDelete}
+            >
+              <Icons.DeleteOutlined
+                iconSize="l"
+                css={css`
+                  vertical-align: text-top;
+                `}
+              />{' '}
+              {t('Delete')}
+            </div>
+          )}
+        </ConfirmStatusChange>
+      ),
+    });
+  }
+
   return (
     <CardStyles
       onClick={() => {
@@ -174,9 +184,7 @@ export default function ChartCard({
         )}
         description={t('Modified %s', chart.changed_on_delta_humanized)}
         coverLeft={<FacePile users={chart.owners || []} />}
-        coverRight={
-          <Label type="secondary">{chart.datasource_name_text}</Label>
-        }
+        coverRight={<Label>{chart.datasource_name_text}</Label>}
         linkComponent={Link}
         actions={
           <ListViewCard.Actions
@@ -192,8 +200,8 @@ export default function ChartCard({
                 isStarred={favoriteStatus}
               />
             )}
-            <Dropdown dropdownRender={() => menu} trigger={['click', 'hover']}>
-              <Button buttonSize="xsmall" type="link">
+            <Dropdown menu={{ items: menuItems }} trigger={['click', 'hover']}>
+              <Button buttonSize="xsmall" type="link" buttonStyle="link">
                 <Icons.MoreOutlined iconSize="xl" />
               </Button>
             </Dropdown>
diff --git a/superset-frontend/src/features/cssTemplates/CssTemplateModal.tsx b/superset-frontend/src/features/cssTemplates/CssTemplateModal.tsx
index 85a90d60898..abe5085800b 100644
--- a/superset-frontend/src/features/cssTemplates/CssTemplateModal.tsx
+++ b/superset-frontend/src/features/cssTemplates/CssTemplateModal.tsx
@@ -21,10 +21,10 @@ import { FunctionComponent, useState, useEffect, ChangeEvent } from 'react';
 import { css, styled, t, useTheme } from '@superset-ui/core';
 import { useSingleViewResource } from 'src/views/CRUD/hooks';
 
-import { Icons } from 'src/components/Icons';
-import Modal from 'src/components/Modal';
+import { Icons } from '@superset-ui/core/components/Icons';
 import withToasts from 'src/components/MessageToasts/withToasts';
-import { CssEditor } from 'src/components/AsyncAceEditor';
+import { Input, CssEditor, Modal } from '@superset-ui/core/components';
+import { Typography } from '@superset-ui/core/components/Typography';
 
 import { OnlyKeyWithType } from 'src/utils/types';
 import { TemplateObject } from './types';
@@ -44,34 +44,34 @@ type CssTemplateStringKeys = keyof Pick<
 
 const StyledCssTemplateTitle = styled.div(
   ({ theme }) => css`
-    margin: ${theme.gridUnit * 2}px auto ${theme.gridUnit * 4}px auto;
+    margin: ${theme.sizeUnit * 2}px auto ${theme.sizeUnit * 4}px auto;
   `,
 );
 
 const StyledCssEditor = styled(CssEditor)`
   ${({ theme }) => css`
     border-radius: ${theme.borderRadius}px;
-    border: 1px solid ${theme.colors.secondary.light2};
+    border: 1px solid ${theme.colorPrimaryBg};
   `}
 `;
 
 const TemplateContainer = styled.div(
   ({ theme }) => css`
-    margin-bottom: ${theme.gridUnit * 10}px;
+    margin-bottom: ${theme.sizeUnit * 10}px;
 
     .control-label {
-      margin-bottom: ${theme.gridUnit * 2}px;
+      margin-bottom: ${theme.sizeUnit * 2}px;
     }
 
     .required {
-      margin-left: ${theme.gridUnit / 2}px;
-      color: ${theme.colors.error.base};
+      margin-left: ${theme.sizeUnit / 2}px;
+      color: ${theme.colorErrorText};
     }
 
     input[type='text'] {
-      padding: ${theme.gridUnit * 1.5}px ${theme.gridUnit * 2}px;
-      border: 1px solid ${theme.colors.grayscale.light2};
-      border-radius: ${theme.gridUnit}px;
+      padding: ${theme.sizeUnit * 1.5}px ${theme.sizeUnit * 2}px;
+      border: 1px solid ${theme.colorBorder};
+      border-radius: ${theme.borderRadius}px;
       width: 50%;
     }
   `,
@@ -105,8 +105,8 @@ const CssTemplateModal: FunctionComponent<CssTemplateModalProps> = ({
 
   // Functions
   const hide = () => {
-    setIsHidden(true);
     onHide();
+    setCurrentCssTemplate(null);
   };
 
   const onSave = () => {
@@ -202,7 +202,7 @@ const CssTemplateModal: FunctionComponent<CssTemplateModalProps> = ({
         css: '',
       });
     }
-  }, [cssTemplate]);
+  }, [cssTemplate, show]);
 
   useEffect(() => {
     if (resource) {
@@ -232,37 +232,37 @@ const CssTemplateModal: FunctionComponent<CssTemplateModalProps> = ({
       show={show}
       width="55%"
       title={
-        <h4 data-test="css-template-modal-title">
+        <Typography.Title level={4} data-test="css-template-modal-title">
           {isEditMode ? (
             <Icons.EditOutlined
               iconSize="l"
               css={css`
-                margin: auto ${theme.gridUnit * 2}px auto 0;
+                margin: auto ${theme.sizeUnit * 2}px auto 0;
               `}
             />
           ) : (
             <Icons.PlusOutlined
               iconSize="l"
               css={css`
-                margin: auto ${theme.gridUnit * 2}px auto 0;
+                margin: auto ${theme.sizeUnit * 2}px auto 0;
               `}
             />
           )}
           {isEditMode
             ? t('Edit CSS template properties')
             : t('Add CSS template')}
-        </h4>
+        </Typography.Title>
       }
     >
       <StyledCssTemplateTitle>
-        <h4>{t('Basic information')}</h4>
+        <Typography.Title level={4}>{t('Basic information')}</Typography.Title>
       </StyledCssTemplateTitle>
       <TemplateContainer>
         <div className="control-label">
           {t('Name')}
           <span className="required">*</span>
         </div>
-        <input
+        <Input
           name="template_name"
           onChange={onTemplateNameChange}
           type="text"
diff --git a/superset-frontend/src/features/dashboards/DashboardCard.tsx b/superset-frontend/src/features/dashboards/DashboardCard.tsx
index d8d50f5a7f7..5ae14f9a6c8 100644
--- a/superset-frontend/src/features/dashboards/DashboardCard.tsx
+++ b/superset-frontend/src/features/dashboards/DashboardCard.tsx
@@ -25,16 +25,18 @@ import {
   SupersetClient,
 } from '@superset-ui/core';
 import { CardStyles } from 'src/views/CRUD/utils';
-import { Dropdown } from 'src/components/Dropdown';
-import { Menu } from 'src/components/Menu';
-import ListViewCard from 'src/components/ListViewCard';
-import { Icons } from 'src/components/Icons';
-import { PublishedLabel } from 'src/components/Label';
-import FacePile from 'src/components/FacePile';
-import FaveStar from 'src/components/FaveStar';
+import {
+  Dropdown,
+  Button,
+  FaveStar,
+  PublishedLabel,
+  ListViewCard,
+} from '@superset-ui/core/components';
+import { MenuItem } from '@superset-ui/core/components/Menu';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { Dashboard } from 'src/views/CRUD/types';
-import { Button } from 'src/components';
 import { assetUrl } from 'src/utils/assetUrl';
+import { FacePile } from 'src/components';
 
 interface DashboardCardProps {
   isChart?: boolean;
@@ -95,49 +97,59 @@ function DashboardCard({
     }
   }, [dashboard, thumbnailUrl]);
 
-  const menu = (
-    <Menu>
-      {canEdit && openDashboardEditModal && (
-        <Menu.Item>
-          <div
-            role="button"
-            tabIndex={0}
-            className="action-button"
-            onClick={() => openDashboardEditModal?.(dashboard)}
-            data-test="dashboard-card-option-edit-button"
-          >
-            <Icons.EditOutlined iconSize="l" data-test="edit-alt" /> {t('Edit')}
-          </div>
-        </Menu.Item>
-      )}
-      {canExport && (
-        <Menu.Item>
-          <div
-            role="button"
-            tabIndex={0}
-            onClick={() => handleBulkDashboardExport([dashboard])}
-            className="action-button"
-            data-test="dashboard-card-option-export-button"
-          >
-            <Icons.UploadOutlined iconSize="l" /> {t('Export')}
-          </div>
-        </Menu.Item>
-      )}
-      {canDelete && (
-        <Menu.Item>
-          <div
-            role="button"
-            tabIndex={0}
-            className="action-button"
-            onClick={() => onDelete(dashboard)}
-            data-test="dashboard-card-option-delete-button"
-          >
-            <Icons.DeleteOutlined iconSize="l" /> {t('Delete')}
-          </div>
-        </Menu.Item>
-      )}
-    </Menu>
-  );
+  const menuItems: MenuItem[] = [];
+
+  if (canEdit && openDashboardEditModal) {
+    menuItems.push({
+      key: 'edit',
+      label: (
+        <div
+          role="button"
+          tabIndex={0}
+          className="action-button"
+          onClick={() => openDashboardEditModal(dashboard)}
+          data-test="dashboard-card-option-edit-button"
+        >
+          <Icons.EditOutlined iconSize="l" data-test="edit-alt" /> {t('Edit')}
+        </div>
+      ),
+    });
+  }
+
+  if (canExport) {
+    menuItems.push({
+      key: 'export',
+      label: (
+        <div
+          role="button"
+          tabIndex={0}
+          onClick={() => handleBulkDashboardExport([dashboard])}
+          className="action-button"
+          data-test="dashboard-card-option-export-button"
+        >
+          <Icons.UploadOutlined iconSize="l" /> {t('Export')}
+        </div>
+      ),
+    });
+  }
+
+  if (canDelete) {
+    menuItems.push({
+      key: 'delete',
+      label: (
+        <div
+          role="button"
+          tabIndex={0}
+          className="action-button"
+          onClick={() => onDelete(dashboard)}
+          data-test="dashboard-card-option-delete-button"
+        >
+          <Icons.DeleteOutlined iconSize="l" /> {t('Delete')}
+        </div>
+      ),
+    });
+  }
+
   return (
     <CardStyles
       onClick={() => {
@@ -159,7 +171,7 @@ function DashboardCard({
         }
         url={bulkSelectEnabled ? undefined : dashboard.url}
         linkComponent={Link}
-        imgURL={dashboard.thumbnail_url}
+        imgURL={thumbnailUrl}
         imgFallbackURL={assetUrl(
           '/static/assets/images/dashboard-card-fallback.svg',
         )}
@@ -179,8 +191,8 @@ function DashboardCard({
                 isStarred={favoriteStatus}
               />
             )}
-            <Dropdown dropdownRender={() => menu} trigger={['hover', 'click']}>
-              <Button buttonSize="xsmall" type="link">
+            <Dropdown menu={{ items: menuItems }} trigger={['hover', 'click']}>
+              <Button buttonSize="xsmall" buttonStyle="link">
                 <Icons.MoreOutlined iconSize="xl" />
               </Button>
             </Dropdown>
diff --git a/superset-frontend/src/features/databases/DatabaseModal/DatabaseConnectionForm/CommonParameters.tsx b/superset-frontend/src/features/databases/DatabaseModal/DatabaseConnectionForm/CommonParameters.tsx
index 696f52baa0a..e40a1dcd12a 100644
--- a/superset-frontend/src/features/databases/DatabaseModal/DatabaseConnectionForm/CommonParameters.tsx
+++ b/superset-frontend/src/features/databases/DatabaseModal/DatabaseConnectionForm/CommonParameters.tsx
@@ -17,9 +17,11 @@
  * under the License.
  */
 import { SupersetTheme, t } from '@superset-ui/core';
-import { Switch } from 'src/components/Switch';
-import InfoTooltip from 'src/components/InfoTooltip';
-import ValidatedInput from 'src/components/Form/LabeledErrorBoundInput';
+import { Switch } from '@superset-ui/core/components/Switch';
+import {
+  InfoTooltip,
+  LabeledErrorBoundInput as ValidatedInput,
+} from '@superset-ui/core/components';
 import { FieldPropTypes } from '../../types';
 import { toggleStyle, infoTooltip } from '../styles';
 
@@ -29,8 +31,10 @@ export const hostField = ({
   getValidation,
   validationErrors,
   db,
+  isValidating,
 }: FieldPropTypes) => (
   <ValidatedInput
+    isValidating={isValidating}
     id="host"
     name="host"
     value={db?.parameters?.host}
@@ -54,12 +58,14 @@ export const portField = ({
   getValidation,
   validationErrors,
   db,
+  isValidating,
 }: FieldPropTypes) => (
   <>
     <ValidatedInput
       id="port"
       name="port"
       type="number"
+      isValidating={isValidating}
       required={required}
       value={db?.parameters?.port as number}
       validationMethods={{ onBlur: getValidation }}
@@ -77,10 +83,12 @@ export const httpPath = ({
   getValidation,
   validationErrors,
   db,
+  isValidating,
 }: FieldPropTypes) => {
   const extraJson = JSON.parse(db?.extra || '{}');
   return (
     <ValidatedInput
+      isValidating={isValidating}
       id="http_path"
       name="http_path"
       required={required}
@@ -101,8 +109,10 @@ export const databaseField = ({
   validationErrors,
   placeholder,
   db,
+  isValidating,
 }: FieldPropTypes) => (
   <ValidatedInput
+    isValidating={isValidating}
     id="database"
     name="database"
     required={required}
@@ -121,8 +131,10 @@ export const defaultCatalogField = ({
   getValidation,
   validationErrors,
   db,
+  isValidating,
 }: FieldPropTypes) => (
   <ValidatedInput
+    isValidating={isValidating}
     id="default_catalog"
     name="default_catalog"
     required={required}
@@ -141,11 +153,13 @@ export const defaultSchemaField = ({
   getValidation,
   validationErrors,
   db,
+  isValidating,
 }: FieldPropTypes) => (
   <ValidatedInput
     id="default_schema"
     name="default_schema"
     required={required}
+    isValidating={isValidating}
     value={db?.parameters?.default_schema}
     validationMethods={{ onBlur: getValidation }}
     errorMessage={validationErrors?.default_schema}
@@ -161,11 +175,13 @@ export const httpPathField = ({
   getValidation,
   validationErrors,
   db,
+  isValidating,
 }: FieldPropTypes) => (
   <ValidatedInput
     id="http_path_field"
     name="http_path_field"
     required={required}
+    isValidating={isValidating}
     value={db?.parameters?.http_path_field}
     validationMethods={{ onBlur: getValidation }}
     errorMessage={validationErrors?.http_path}
@@ -181,11 +197,13 @@ export const usernameField = ({
   getValidation,
   validationErrors,
   db,
+  isValidating,
 }: FieldPropTypes) => (
   <ValidatedInput
     id="username"
     name="username"
     required={required}
+    isValidating={isValidating}
     value={db?.parameters?.username}
     validationMethods={{ onBlur: getValidation }}
     errorMessage={validationErrors?.username}
@@ -201,11 +219,13 @@ export const passwordField = ({
   validationErrors,
   db,
   isEditMode,
+  isValidating,
 }: FieldPropTypes) => (
   <ValidatedInput
     id="password"
     name="password"
     required={required}
+    isValidating={isValidating}
     visibilityToggle={!isEditMode}
     value={db?.parameters?.password}
     validationMethods={{ onBlur: getValidation }}
@@ -249,12 +269,14 @@ export const displayField = ({
   getValidation,
   validationErrors,
   db,
+  isValidating,
 }: FieldPropTypes) => (
   <>
     <ValidatedInput
       id="database_name"
       name="database_name"
       required
+      isValidating={isValidating}
       value={db?.database_name}
       validationMethods={{ onBlur: getValidation }}
       errorMessage={validationErrors?.database_name}
@@ -274,11 +296,13 @@ export const queryField = ({
   getValidation,
   validationErrors,
   db,
+  isValidating,
 }: FieldPropTypes) => (
   <ValidatedInput
     id="query_input"
     name="query_input"
     required={required}
+    isValidating={isValidating}
     value={db?.query_input || ''}
     validationMethods={{ onBlur: getValidation }}
     errorMessage={validationErrors?.query}
@@ -314,7 +338,6 @@ export const forceSSLField = ({
     <InfoTooltip
       tooltip={t('SSL Mode "require" will be used.')}
       placement="right"
-      viewBox="0 -5 24 24"
     />
   </div>
 );
@@ -324,12 +347,14 @@ export const projectIdfield = ({
   getValidation,
   validationErrors,
   db,
+  isValidating,
 }: FieldPropTypes) => (
   <>
     <ValidatedInput
       id="project_id"
       name="project_id"
       required
+      isValidating={isValidating}
       value={db?.parameters?.project_id}
       validationMethods={{ onBlur: getValidation }}
       errorMessage={validationErrors?.project_id}
diff --git a/superset-frontend/src/features/databases/DatabaseModal/DatabaseConnectionForm/EncryptedField.tsx b/superset-frontend/src/features/databases/DatabaseModal/DatabaseConnectionForm/EncryptedField.tsx
index c10859993a2..53020018ab7 100644
--- a/superset-frontend/src/features/databases/DatabaseModal/DatabaseConnectionForm/EncryptedField.tsx
+++ b/superset-frontend/src/features/databases/DatabaseModal/DatabaseConnectionForm/EncryptedField.tsx
@@ -16,11 +16,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { useRef, useState } from 'react';
-import { SupersetTheme, t } from '@superset-ui/core';
-import { Button, AntdSelect } from 'src/components';
-import FormLabel from 'src/components/Form/FormLabel';
-import { Icons } from 'src/components/Icons';
+import { useState, useEffect } from 'react';
+import { SupersetTheme, css, t } from '@superset-ui/core';
+import {
+  Input,
+  Button,
+  FormLabel,
+  Select,
+  Upload,
+  type UploadFile,
+} from '@superset-ui/core/components';
+import { Icons } from '@superset-ui/core/components/Icons';
+import { useToasts } from 'src/components/MessageToasts/withToasts';
 import { DatabaseParameters, FieldPropTypes } from '../../types';
 import { infoTooltip, CredentialInfoForm } from '../styles';
 
@@ -43,13 +50,11 @@ export const EncryptedField = ({
   db,
   editNewDb,
 }: FieldPropTypes) => {
-  const selectedFileInputRef = useRef<HTMLInputElement | null>(null);
+  const [fileList, setFileList] = useState<UploadFile[]>([]);
   const [uploadOption, setUploadOption] = useState<number>(
     CredentialInfoOptions.JsonUpload.valueOf(),
   );
-  const [fileToUpload, setFileToUpload] = useState<string | null | undefined>(
-    null,
-  );
+  const { addDangerToast } = useToasts();
   const showCredentialsInfo = !isEditMode;
   const encryptedField =
     db?.engine &&
@@ -60,6 +65,24 @@ export const EncryptedField = ({
     paramValue && typeof paramValue === 'object'
       ? JSON.stringify(paramValue)
       : paramValue;
+
+  const readTextFile = (file: File): Promise<string> =>
+    new Promise((resolve, reject) => {
+      const reader = new FileReader();
+      reader.readAsText(file);
+      reader.onload = () => resolve(reader.result as string);
+      reader.onerror = reject;
+    });
+
+  useEffect(() => {
+    changeMethods.onParametersChange({
+      target: {
+        name: encryptedField,
+        value: '',
+      },
+    });
+  }, []);
+
   return (
     <CredentialInfoForm>
       {showCredentialsInfo && (
@@ -67,19 +90,23 @@ export const EncryptedField = ({
           <FormLabel>
             {t('How do you want to enter service account credentials?')}
           </FormLabel>
-          <AntdSelect
+          <Select
             defaultValue={uploadOption}
-            style={{ width: '100%' }}
-            onChange={option => setUploadOption(option)}
-          >
-            <AntdSelect.Option value={CredentialInfoOptions.JsonUpload}>
-              {t('Upload JSON file')}
-            </AntdSelect.Option>
-
-            <AntdSelect.Option value={CredentialInfoOptions.CopyPaste}>
-              {t('Copy and Paste JSON credentials')}
-            </AntdSelect.Option>
-          </AntdSelect>
+            css={css`
+              width: 100%;
+            `}
+            onChange={option => setUploadOption(option as number)}
+            options={[
+              {
+                value: CredentialInfoOptions.JsonUpload,
+                label: t('Upload JSON file'),
+              },
+              {
+                value: CredentialInfoOptions.CopyPaste,
+                label: t('Copy and Paste JSON credentials'),
+              },
+            ]}
+          />
         </>
       )}
       {uploadOption === CredentialInfoOptions.CopyPaste ||
@@ -87,7 +114,7 @@ export const EncryptedField = ({
       editNewDb ? (
         <div className="input-container">
           <FormLabel>{t('Service Account')}</FormLabel>
-          <textarea
+          <Input.TextArea
             className="input-form"
             name={encryptedField}
             value={
@@ -107,58 +134,58 @@ export const EncryptedField = ({
             className="input-container"
             css={(theme: SupersetTheme) => infoTooltip(theme)}
           >
-            {!fileToUpload && (
-              <Button onClick={() => selectedFileInputRef.current?.click()}>
-                <Icons.LinkOutlined iconSize="m" />
-                {t('Upload credentials')}
-              </Button>
-            )}
-            {fileToUpload && (
-              <div className="credentials-uploaded">
-                <Button block disabled>
-                  <Icons.LinkOutlined iconSize="m" />
-                  {t('Credentials uploaded')}
-                </Button>
-                <Icons.DeleteFilled
-                  iconSize="m"
-                  onClick={() => {
-                    setFileToUpload(null);
-                    changeMethods.onParametersChange({
-                      target: {
-                        name: encryptedField,
-                        value: '',
-                      },
-                    });
-                  }}
-                />
-              </div>
-            )}
-
-            <input
-              ref={selectedFileInputRef}
-              id="selectedFile"
+            <Upload
               accept=".json"
-              className="input-upload"
-              type="file"
-              onChange={async event => {
-                let file;
-                if (event.target.files) {
-                  file = event.target.files[0];
-                }
-                setFileToUpload(file?.name);
+              maxCount={1}
+              fileList={fileList}
+              // avoid automatic upload
+              beforeUpload={() => false}
+              onRemove={() => {
+                setFileList([]);
                 changeMethods.onParametersChange({
                   target: {
-                    type: null,
                     name: encryptedField,
-                    value: await file?.text(),
-                    checked: false,
+                    value: '',
                   },
                 });
-                if (selectedFileInputRef.current) {
-                  selectedFileInputRef.current.value = null as any;
+                return true;
+              }}
+              onChange={async info => {
+                const file = info.fileList?.[0]?.originFileObj;
+                if (file) {
+                  try {
+                    const fileContent = await readTextFile(file);
+                    changeMethods.onParametersChange({
+                      target: {
+                        type: null,
+                        name: encryptedField,
+                        value: fileContent,
+                        checked: false,
+                      },
+                    });
+                    setFileList(info.fileList);
+                  } catch (error) {
+                    setFileList([]);
+                    addDangerToast(
+                      t(
+                        'Unable to read the file, please refresh and try again.',
+                      ),
+                    );
+                  }
+                } else {
+                  changeMethods.onParametersChange({
+                    target: {
+                      name: encryptedField,
+                      value: '',
+                    },
+                  });
                 }
               }}
-            />
+            >
+              <Button icon={<Icons.LinkOutlined iconSize="m" />}>
+                {t('Upload credentials')}
+              </Button>
+            </Upload>
           </div>
         )
       )}
diff --git a/superset-frontend/src/features/databases/DatabaseModal/DatabaseConnectionForm/OAuth2ClientField.test.tsx b/superset-frontend/src/features/databases/DatabaseModal/DatabaseConnectionForm/OAuth2ClientField.test.tsx
index ef5ce14f7a6..31410e47b7a 100644
--- a/superset-frontend/src/features/databases/DatabaseModal/DatabaseConnectionForm/OAuth2ClientField.test.tsx
+++ b/superset-frontend/src/features/databases/DatabaseModal/DatabaseConnectionForm/OAuth2ClientField.test.tsx
@@ -43,6 +43,7 @@ describe('OAuth2ClientField', () => {
     getValidation: jest.fn(),
     clearValidationErrors: jest.fn(),
     field: 'test',
+    isValidating: false,
     db: {
       configuration_method: 'dynamic_form',
       database_name: 'test',
diff --git a/superset-frontend/src/features/databases/DatabaseModal/DatabaseConnectionForm/OAuth2ClientField.tsx b/superset-frontend/src/features/databases/DatabaseModal/DatabaseConnectionForm/OAuth2ClientField.tsx
index 5cfcfd50813..6499b04dcfd 100644
--- a/superset-frontend/src/features/databases/DatabaseModal/DatabaseConnectionForm/OAuth2ClientField.tsx
+++ b/superset-frontend/src/features/databases/DatabaseModal/DatabaseConnectionForm/OAuth2ClientField.tsx
@@ -18,11 +18,7 @@
  */
 
 import { useState } from 'react';
-import { css, SupersetTheme } from '@superset-ui/core';
-
-import Collapse from 'src/components/Collapse';
-import { Input } from 'src/components/Input';
-import { FormItem } from 'src/components/Form';
+import { Input, Collapse, FormItem } from '@superset-ui/core/components';
 import { CustomParametersChangeType, FieldPropTypes } from '../../types';
 
 const LABELS = {
@@ -33,16 +29,6 @@ const LABELS = {
   SCOPE: 'Scope',
 };
 
-const collapseStyle = (theme: SupersetTheme) => css`
-  .ant-collapse-header {
-    padding-bottom: ${theme.gridUnit * 1.5}px !important;
-    padding-top: ${theme.gridUnit * 1.5}px !important;
-  }
-  .anticon.ant-collapse-arrow {
-    top: 0 !important;
-  }
-`;
-
 interface OAuth2ClientInfo {
   id: string;
   secret: string;
@@ -91,51 +77,55 @@ export const OAuth2ClientField = ({
   };
 
   return (
-    <Collapse>
-      <Collapse.Panel
-        header="OAuth2 client information"
-        key="1"
-        css={collapseStyle}
-      >
-        <FormItem label={LABELS.CLIENT_ID}>
-          <Input
-            data-test="client-id"
-            value={oauth2ClientInfo.id}
-            onChange={handleChange('id')}
-          />
-        </FormItem>
-        <FormItem label={LABELS.SECRET}>
-          <Input
-            data-test="client-secret"
-            type="password"
-            value={oauth2ClientInfo.secret}
-            onChange={handleChange('secret')}
-          />
-        </FormItem>
-        <FormItem label={LABELS.AUTH_URI}>
-          <Input
-            data-test="client-authorization-request-uri"
-            placeholder="https://"
-            value={oauth2ClientInfo.authorization_request_uri}
-            onChange={handleChange('authorization_request_uri')}
-          />
-        </FormItem>
-        <FormItem label={LABELS.TOKEN_URI}>
-          <Input
-            data-test="client-token-request-uri"
-            placeholder="https://"
-            value={oauth2ClientInfo.token_request_uri}
-            onChange={handleChange('token_request_uri')}
-          />
-        </FormItem>
-        <FormItem label={LABELS.SCOPE}>
-          <Input
-            data-test="client-scope"
-            value={oauth2ClientInfo.scope}
-            onChange={handleChange('scope')}
-          />
-        </FormItem>
-      </Collapse.Panel>
-    </Collapse>
+    <Collapse
+      items={[
+        {
+          key: 'oauth2-client-information',
+          label: 'OAuth2 client information',
+          children: (
+            <>
+              <FormItem label={LABELS.CLIENT_ID}>
+                <Input
+                  data-test="client-id"
+                  value={oauth2ClientInfo.id}
+                  onChange={handleChange('id')}
+                />
+              </FormItem>
+              <FormItem label={LABELS.SECRET}>
+                <Input
+                  data-test="client-secret"
+                  type="password"
+                  value={oauth2ClientInfo.secret}
+                  onChange={handleChange('secret')}
+                />
+              </FormItem>
+              <FormItem label={LABELS.AUTH_URI}>
+                <Input
+                  data-test="client-authorization-request-uri"
+                  placeholder="https://"
+                  value={oauth2ClientInfo.authorization_request_uri}
+                  onChange={handleChange('authorization_request_uri')}
+                />
+              </FormItem>
+              <FormItem label={LABELS.TOKEN_URI}>
+                <Input
+                  data-test="client-token-request-uri"
+                  placeholder="https://"
+                  value={oauth2ClientInfo.token_request_uri}
+                  onChange={handleChange('token_request_uri')}
+                />
+              </FormItem>
+              <FormItem label={LABELS.SCOPE}>
+                <Input
+                  data-test="client-scope"
+                  value={oauth2ClientInfo.scope}
+                  onChange={handleChange('scope')}
+                />
+              </FormItem>
+            </>
+          ),
+        },
+      ]}
+    />
   );
 };
diff --git a/superset-frontend/src/features/databases/DatabaseModal/DatabaseConnectionForm/TableCatalog.tsx b/superset-frontend/src/features/databases/DatabaseModal/DatabaseConnectionForm/TableCatalog.tsx
index cb300543647..f7318029cca 100644
--- a/superset-frontend/src/features/databases/DatabaseModal/DatabaseConnectionForm/TableCatalog.tsx
+++ b/superset-frontend/src/features/databases/DatabaseModal/DatabaseConnectionForm/TableCatalog.tsx
@@ -17,9 +17,12 @@
  * under the License.
  */
 import { css, SupersetTheme, t } from '@superset-ui/core';
-import ValidatedInput from 'src/components/Form/LabeledErrorBoundInput';
-import FormLabel from 'src/components/Form/FormLabel';
-import { Icons } from 'src/components/Icons';
+import {
+  FormLabel,
+  LabeledErrorBoundInput as ValidatedInput,
+} from '@superset-ui/core/components';
+import { Icons } from '@superset-ui/core/components/Icons';
+import { Typography } from '@superset-ui/core/components/Typography';
 import { StyledFooterButton, StyledCatalogTable } from '../styles';
 import { CatalogObject, FieldPropTypes } from '../../types';
 
@@ -34,9 +37,9 @@ export const TableCatalog = ({
   const catalogError = validationErrors || {};
   return (
     <StyledCatalogTable>
-      <h4 className="gsheet-title">
+      <Typography.Title level={4} className="gsheet-title">
         {t('Connect Google Sheets as tables to this database')}
-      </h4>
+      </Typography.Title>
       <div>
         {tableCatalog?.map((sheet: CatalogObject, idx: number) => (
           <>
diff --git a/superset-frontend/src/features/databases/DatabaseModal/DatabaseConnectionForm/ValidatedInputField.tsx b/superset-frontend/src/features/databases/DatabaseModal/DatabaseConnectionForm/ValidatedInputField.tsx
index 1b6d206ed18..548ae77398b 100644
--- a/superset-frontend/src/features/databases/DatabaseModal/DatabaseConnectionForm/ValidatedInputField.tsx
+++ b/superset-frontend/src/features/databases/DatabaseModal/DatabaseConnectionForm/ValidatedInputField.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { t } from '@superset-ui/core';
-import ValidatedInput from 'src/components/Form/LabeledErrorBoundInput';
+import { LabeledErrorBoundInput as ValidatedInput } from '@superset-ui/core/components';
 import { DatabaseParameters, FieldPropTypes } from '../../types';
 
 const FIELD_TEXT_MAP = {
diff --git a/superset-frontend/src/features/databases/DatabaseModal/DatabaseConnectionForm/index.tsx b/superset-frontend/src/features/databases/DatabaseModal/DatabaseConnectionForm/index.tsx
index 0f375f3fe6e..423427354db 100644
--- a/superset-frontend/src/features/databases/DatabaseModal/DatabaseConnectionForm/index.tsx
+++ b/superset-frontend/src/features/databases/DatabaseModal/DatabaseConnectionForm/index.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { SupersetTheme } from '@superset-ui/core';
-import { Form } from 'src/components/Form';
+import { Form } from '@superset-ui/core/components';
 import { FormFieldOrder, FORM_FIELD_MAP } from './constants';
 import { formScrollableStyles, validatedFormStyles } from '../styles';
 import { DatabaseConnectionFormProps } from '../../types';
@@ -40,6 +40,7 @@ const DatabaseConnectionForm = ({
   sslForced,
   validationErrors,
   clearValidationErrors,
+  isValidating,
 }: DatabaseConnectionFormProps) => {
   const parameters = dbModel?.parameters as {
     properties: {
@@ -90,6 +91,7 @@ const DatabaseConnectionForm = ({
               isEditMode,
               sslForced,
               editNewDb,
+              isValidating,
               placeholder: getPlaceholder ? getPlaceholder(field) : undefined,
             }),
           )}
diff --git a/superset-frontend/src/features/databases/DatabaseModal/ExtraOptions.tsx b/superset-frontend/src/features/databases/DatabaseModal/ExtraOptions.tsx
index 30132111428..392ead72645 100644
--- a/superset-frontend/src/features/databases/DatabaseModal/ExtraOptions.tsx
+++ b/superset-frontend/src/features/databases/DatabaseModal/ExtraOptions.tsx
@@ -22,18 +22,21 @@ import {
   t,
   DatabaseConnectionExtension,
   isFeatureEnabled,
-  SupersetTheme,
   useTheme,
   FeatureFlag,
 } from '@superset-ui/core';
-import InfoTooltip from 'src/components/InfoTooltip';
-import IndeterminateCheckbox from 'src/components/IndeterminateCheckbox';
-import Collapse from 'src/components/Collapse';
+import {
+  Input,
+  Checkbox,
+  Collapse,
+  InfoTooltip,
+  CollapseLabelInModal,
+  type CheckboxChangeEvent,
+} from '@superset-ui/core/components';
 import {
   StyledInputContainer,
   StyledJsonEditor,
   StyledExpandableForm,
-  antdCollapseStyles,
   no_margin_bottom,
 } from './styles';
 import { DatabaseObject, ExtraJson } from '../types';
@@ -48,10 +51,14 @@ const ExtraOptions = ({
   extraExtension,
 }: {
   db: DatabaseObject | null;
-  onInputChange: EventHandler<ChangeEvent<HTMLInputElement>>;
+  onInputChange: (
+    e: CheckboxChangeEvent | React.ChangeEvent<HTMLInputElement>,
+  ) => void;
   onTextChange: EventHandler<ChangeEvent<HTMLTextAreaElement>>;
   onEditorChange: Function;
-  onExtraInputChange: EventHandler<ChangeEvent<HTMLInputElement>>;
+  onExtraInputChange: (
+    e: CheckboxChangeEvent | ChangeEvent<HTMLInputElement>,
+  ) => void;
   onExtraEditorChange: Function;
   extraExtension: DatabaseConnectionExtension | undefined;
 }) => {
@@ -84,552 +91,611 @@ const ExtraOptions = ({
 
   return (
     <Collapse
-      expandIconPosition="right"
+      expandIconPosition="end"
       accordion
-      css={(theme: SupersetTheme) => antdCollapseStyles(theme)}
-    >
-      <Collapse.Panel
-        header={
-          <div>
-            <h4>{t('SQL Lab')}</h4>
-            <p className="helper">
-              {t('Adjust how this database will interact with SQL Lab.')}
-            </p>
-          </div>
-        }
-        key="1"
-      >
-        <StyledInputContainer css={no_margin_bottom}>
-          <div className="input-container">
-            <IndeterminateCheckbox
-              id="expose_in_sqllab"
-              indeterminate={false}
-              checked={!!db?.expose_in_sqllab}
-              onChange={onInputChange}
-              labelText={t('Expose database in SQL Lab')}
+      modalMode
+      items={[
+        {
+          key: 'sql-lab',
+          label: (
+            <CollapseLabelInModal
+              title={t('SQL Lab')}
+              subtitle={t(
+                'Adjust how this database will interact with SQL Lab.',
+              )}
+              testId="sql-lab-label-test"
             />
-            <InfoTooltip
-              tooltip={t('Allow this database to be queried in SQL Lab')}
-            />
-          </div>
-          <StyledExpandableForm
-            className={cx('expandable', {
-              open: expandableModalIsOpen,
-              'ctas-open': createAsOpen,
-            })}
-          >
-            <StyledInputContainer css={no_margin_bottom}>
-              <div className="input-container">
-                <IndeterminateCheckbox
-                  id="allow_ctas"
-                  indeterminate={false}
-                  checked={!!db?.allow_ctas}
-                  onChange={onInputChange}
-                  labelText={t('Allow CREATE TABLE AS')}
-                />
-                <InfoTooltip
-                  tooltip={t('Allow creation of new tables based on queries')}
-                />
-              </div>
-            </StyledInputContainer>
-            <StyledInputContainer css={no_margin_bottom}>
-              <div className="input-container">
-                <IndeterminateCheckbox
-                  id="allow_cvas"
-                  indeterminate={false}
-                  checked={!!db?.allow_cvas}
-                  onChange={onInputChange}
-                  labelText={t('Allow CREATE VIEW AS')}
-                />
-                <InfoTooltip
-                  tooltip={t('Allow creation of new views based on queries')}
-                />
-              </div>
-              <StyledInputContainer
-                className={cx('expandable', { open: createAsOpen })}
-              >
-                <div className="control-label">{t('CTAS & CVAS SCHEMA')}</div>
+          ),
+          children: (
+            <>
+              <StyledInputContainer css={no_margin_bottom}>
                 <div className="input-container">
-                  <input
-                    type="text"
-                    name="force_ctas_schema"
-                    placeholder={t('Create or select schema...')}
+                  <Checkbox
+                    id="expose_in_sqllab"
+                    name="expose_in_sqllab"
+                    indeterminate={false}
+                    checked={!!db?.expose_in_sqllab}
                     onChange={onInputChange}
-                    value={db?.force_ctas_schema || ''}
+                  >
+                    {t('Expose database in SQL Lab')}
+                  </Checkbox>
+                  <InfoTooltip
+                    tooltip={t('Allow this database to be queried in SQL Lab')}
+                  />
+                </div>
+                <StyledExpandableForm
+                  className={cx('expandable', {
+                    open: expandableModalIsOpen,
+                    'ctas-open': createAsOpen,
+                  })}
+                >
+                  <StyledInputContainer css={no_margin_bottom}>
+                    <div className="input-container">
+                      <Checkbox
+                        id="allow_ctas"
+                        name="allow_ctas"
+                        indeterminate={false}
+                        checked={!!db?.allow_ctas}
+                        onChange={onInputChange}
+                      >
+                        {t('Allow CREATE TABLE AS')}
+                      </Checkbox>
+                      <InfoTooltip
+                        tooltip={t(
+                          'Allow creation of new tables based on queries',
+                        )}
+                      />
+                    </div>
+                  </StyledInputContainer>
+                  <StyledInputContainer css={no_margin_bottom}>
+                    <div className="input-container">
+                      <Checkbox
+                        id="allow_cvas"
+                        name="allow_cvas"
+                        indeterminate={false}
+                        checked={!!db?.allow_cvas}
+                        onChange={onInputChange}
+                      >
+                        {t('Allow CREATE VIEW AS')}
+                      </Checkbox>
+                      <InfoTooltip
+                        tooltip={t(
+                          'Allow creation of new views based on queries',
+                        )}
+                      />
+                    </div>
+                    <StyledInputContainer
+                      className={cx('expandable', { open: createAsOpen })}
+                    >
+                      <div className="control-label">
+                        {t('CTAS & CVAS SCHEMA')}
+                      </div>
+                      <div className="input-container">
+                        <Input
+                          type="text"
+                          name="force_ctas_schema"
+                          placeholder={t('Create or select schema...')}
+                          onChange={onInputChange}
+                          value={db?.force_ctas_schema || ''}
+                        />
+                      </div>
+                      <div className="helper">
+                        {t(
+                          'Force all tables and views to be created in this schema when clicking CTAS or CVAS in SQL Lab.',
+                        )}
+                      </div>
+                    </StyledInputContainer>
+                  </StyledInputContainer>
+                  <StyledInputContainer css={no_margin_bottom}>
+                    <div className="input-container">
+                      <Checkbox
+                        id="allow_dml"
+                        name="allow_dml"
+                        indeterminate={false}
+                        checked={!!db?.allow_dml}
+                        onChange={onInputChange}
+                      >
+                        {t('Allow DDL and DML')}
+                      </Checkbox>
+                      <InfoTooltip
+                        tooltip={t(
+                          'Allow the execution of DDL (Data Definition Language: CREATE, DROP, TRUNCATE, etc.) and DML (Data Modification Language: INSERT, UPDATE, DELETE, etc)',
+                        )}
+                      />
+                    </div>
+                  </StyledInputContainer>
+                  <StyledInputContainer css={no_margin_bottom}>
+                    <div className="input-container">
+                      <Checkbox
+                        id="cost_estimate_enabled"
+                        name="cost_estimate_enabled"
+                        indeterminate={false}
+                        checked={!!extraJson?.cost_estimate_enabled}
+                        onChange={onExtraInputChange}
+                      >
+                        {t('Enable query cost estimation')}
+                      </Checkbox>
+                      <InfoTooltip
+                        tooltip={t(
+                          'For Bigquery, Presto and Postgres, shows a button to compute cost before running a query.',
+                        )}
+                      />
+                    </div>
+                  </StyledInputContainer>
+                  <StyledInputContainer css={no_margin_bottom}>
+                    <div className="input-container">
+                      <Checkbox
+                        id="allows_virtual_table_explore"
+                        name="allows_virtual_table_explore"
+                        indeterminate={false}
+                        // when `allows_virtual_table_explore` is not present in `extra` it defaults to true
+                        checked={
+                          extraJson?.allows_virtual_table_explore !== false
+                        }
+                        onChange={onExtraInputChange}
+                      >
+                        {t('Allow this database to be explored')}
+                      </Checkbox>
+                      <InfoTooltip
+                        tooltip={t(
+                          'When enabled, users are able to visualize SQL Lab results in Explore.',
+                        )}
+                      />
+                    </div>
+                  </StyledInputContainer>
+                  <StyledInputContainer css={no_margin_bottom}>
+                    <div className="input-container">
+                      <Checkbox
+                        id="disable_data_preview"
+                        name="disable_data_preview"
+                        indeterminate={false}
+                        checked={!!extraJson?.disable_data_preview}
+                        onChange={onExtraInputChange}
+                      >
+                        {t('Disable SQL Lab data preview queries')}
+                      </Checkbox>
+                      <InfoTooltip
+                        tooltip={t(
+                          'Disable data preview when fetching table metadata in SQL Lab. ' +
+                            ' Useful to avoid browser performance issues when using ' +
+                            ' databases with very wide tables.',
+                        )}
+                      />
+                    </div>
+                  </StyledInputContainer>
+                  <StyledInputContainer>
+                    <div className="input-container">
+                      <Checkbox
+                        id="expand_rows"
+                        name="expand_rows"
+                        indeterminate={false}
+                        checked={!!extraJson?.schema_options?.expand_rows}
+                        onChange={onExtraInputChange}
+                      >
+                        {t('Enable row expansion in schemas')}
+                      </Checkbox>
+                      <InfoTooltip
+                        tooltip={t(
+                          'For Trino, describe full schemas of nested ROW types, expanding them with dotted paths',
+                        )}
+                      />
+                    </div>
+                  </StyledInputContainer>
+                </StyledExpandableForm>
+              </StyledInputContainer>
+            </>
+          ),
+        },
+        {
+          key: 'performance',
+          label: (
+            <CollapseLabelInModal
+              title={t('Performance')}
+              subtitle={t('Adjust performance settings of this database.')}
+              testId="performance-label-test"
+            />
+          ),
+          children: (
+            <>
+              <StyledInputContainer className="mb-8">
+                <div className="control-label">{t('Chart cache timeout')}</div>
+                <div className="input-container">
+                  <Input
+                    type="number"
+                    name="cache_timeout"
+                    value={db?.cache_timeout || ''}
+                    placeholder={t('Enter duration in seconds')}
+                    onChange={onInputChange}
+                    data-test="cache-timeout-test"
                   />
                 </div>
                 <div className="helper">
                   {t(
-                    'Force all tables and views to be created in this schema when clicking CTAS or CVAS in SQL Lab.',
+                    'Duration (in seconds) of the caching timeout for charts of this database.' +
+                      ' A timeout of 0 indicates that the cache never expires, and -1 bypasses the cache.' +
+                      ' Note this defaults to the global timeout if undefined.',
                   )}
                 </div>
               </StyledInputContainer>
-            </StyledInputContainer>
-            <StyledInputContainer css={no_margin_bottom}>
-              <div className="input-container">
-                <IndeterminateCheckbox
-                  id="allow_dml"
-                  indeterminate={false}
-                  checked={!!db?.allow_dml}
-                  onChange={onInputChange}
-                  labelText={t('Allow DDL and DML')}
-                />
-                <InfoTooltip
-                  tooltip={t(
-                    'Allow the execution of DDL (Data Definition Language: CREATE, DROP, TRUNCATE, etc.) and DML (Data Modification Language: INSERT, UPDATE, DELETE, etc)',
+              <StyledInputContainer>
+                <div className="control-label">{t('Schema cache timeout')}</div>
+                <div className="input-container">
+                  <Input
+                    type="number"
+                    name="schema_cache_timeout"
+                    value={
+                      extraJson?.metadata_cache_timeout?.schema_cache_timeout ||
+                      ''
+                    }
+                    placeholder={t('Enter duration in seconds')}
+                    onChange={onExtraInputChange}
+                    data-test="schema-cache-timeout-test"
+                  />
+                </div>
+                <div className="helper">
+                  {t(
+                    'Duration (in seconds) of the metadata caching timeout for schemas of ' +
+                      'this database. If left unset, the cache never expires.',
                   )}
-                />
-              </div>
-            </StyledInputContainer>
-            <StyledInputContainer css={no_margin_bottom}>
-              <div className="input-container">
-                <IndeterminateCheckbox
-                  id="cost_estimate_enabled"
-                  indeterminate={false}
-                  checked={!!extraJson?.cost_estimate_enabled}
-                  onChange={onExtraInputChange}
-                  labelText={t('Enable query cost estimation')}
-                />
-                <InfoTooltip
-                  tooltip={t(
-                    'For Bigquery, Presto and Postgres, shows a button to compute cost before running a query.',
+                </div>
+              </StyledInputContainer>
+              <StyledInputContainer>
+                <div className="control-label">{t('Table cache timeout')}</div>
+                <div className="input-container">
+                  <Input
+                    type="number"
+                    name="table_cache_timeout"
+                    value={
+                      extraJson?.metadata_cache_timeout?.table_cache_timeout ||
+                      ''
+                    }
+                    placeholder={t('Enter duration in seconds')}
+                    onChange={onExtraInputChange}
+                    data-test="table-cache-timeout-test"
+                  />
+                </div>
+                <div className="helper">
+                  {t(
+                    'Duration (in seconds) of the metadata caching timeout for tables of ' +
+                      'this database. If left unset, the cache never expires. ',
                   )}
-                />
-              </div>
-            </StyledInputContainer>
-            <StyledInputContainer css={no_margin_bottom}>
-              <div className="input-container">
-                <IndeterminateCheckbox
-                  id="allows_virtual_table_explore"
-                  indeterminate={false}
-                  // when `allows_virtual_table_explore` is not present in `extra` it defaults to true
-                  checked={extraJson?.allows_virtual_table_explore !== false}
-                  onChange={onExtraInputChange}
-                  labelText={t('Allow this database to be explored')}
-                />
-                <InfoTooltip
-                  tooltip={t(
-                    'When enabled, users are able to visualize SQL Lab results in Explore.',
+                </div>
+              </StyledInputContainer>
+              <StyledInputContainer css={{ no_margin_bottom }}>
+                <div className="input-container">
+                  <Checkbox
+                    id="allow_run_async"
+                    name="allow_run_async"
+                    indeterminate={false}
+                    checked={allowRunAsync}
+                    onChange={onInputChange}
+                  >
+                    {t('Asynchronous query execution')}
+                  </Checkbox>
+                  <InfoTooltip
+                    tooltip={t(
+                      'Operate the database in asynchronous mode, meaning that the queries ' +
+                        'are executed on remote workers as opposed to on the web server itself. ' +
+                        'This assumes that you have a Celery worker setup as well as a results ' +
+                        'backend. Refer to the installation docs for more information.',
+                    )}
+                  />
+                  {isAllowRunAsyncDisabled && (
+                    <InfoTooltip
+                      iconStyle={{ color: theme.colorError }}
+                      tooltip={t(
+                        'This option has been disabled by the administrator.',
+                      )}
+                    />
                   )}
-                />
-              </div>
-            </StyledInputContainer>
-            <StyledInputContainer css={no_margin_bottom}>
-              <div className="input-container">
-                <IndeterminateCheckbox
-                  id="disable_data_preview"
-                  indeterminate={false}
-                  checked={!!extraJson?.disable_data_preview}
-                  onChange={onExtraInputChange}
-                  labelText={t('Disable SQL Lab data preview queries')}
-                />
-                <InfoTooltip
-                  tooltip={t(
-                    'Disable data preview when fetching table metadata in SQL Lab. ' +
-                      ' Useful to avoid browser performance issues when using ' +
-                      ' databases with very wide tables.',
+                </div>
+              </StyledInputContainer>
+              <StyledInputContainer css={{ no_margin_bottom }}>
+                <div className="input-container">
+                  <Checkbox
+                    id="cancel_query_on_windows_unload"
+                    name="cancel_query_on_windows_unload"
+                    indeterminate={false}
+                    checked={!!extraJson?.cancel_query_on_windows_unload}
+                    onChange={onExtraInputChange}
+                  >
+                    {t('Cancel query on window unload event')}
+                  </Checkbox>
+                  <InfoTooltip
+                    tooltip={t(
+                      'Terminate running queries when browser window closed or navigated ' +
+                        'to another page. Available for Presto, Hive, MySQL, Postgres and ' +
+                        'Snowflake databases.',
+                    )}
+                  />
+                </div>
+              </StyledInputContainer>
+            </>
+          ),
+        },
+        {
+          key: 'security',
+          label: (
+            <CollapseLabelInModal
+              title={t('Security')}
+              testId="security-label-test"
+              subtitle={t('Add extra connection information.')}
+            />
+          ),
+          children: (
+            <>
+              <StyledInputContainer>
+                <div className="control-label">{t('Secure extra')}</div>
+                <div className="input-container">
+                  <StyledJsonEditor
+                    name="masked_encrypted_extra"
+                    value={db?.masked_encrypted_extra || ''}
+                    placeholder={t('Secure extra')}
+                    onChange={(json: string) =>
+                      onEditorChange({ json, name: 'masked_encrypted_extra' })
+                    }
+                    width="100%"
+                    height="160px"
+                  />
+                </div>
+                <div className="helper">
+                  <div>
+                    {t(
+                      'JSON string containing additional connection configuration. ' +
+                        'This is used to provide connection information for systems ' +
+                        'like Hive, Presto and BigQuery which do not conform to the ' +
+                        'username:password syntax normally used by SQLAlchemy.',
+                    )}
+                  </div>
+                </div>
+              </StyledInputContainer>
+              <StyledInputContainer>
+                <div className="control-label">{t('Root certificate')}</div>
+                <div className="input-container">
+                  <Input.TextArea
+                    name="server_cert"
+                    value={db?.server_cert || ''}
+                    placeholder={t('Enter CA_BUNDLE')}
+                    onChange={onTextChange}
+                  />
+                </div>
+                <div className="helper">
+                  {t(
+                    'Optional CA_BUNDLE contents to validate HTTPS requests. Only ' +
+                      'available on certain database engines.',
                   )}
-                />
-              </div>
-            </StyledInputContainer>
-            <StyledInputContainer>
-              <div className="input-container">
-                <IndeterminateCheckbox
-                  id="expand_rows"
-                  indeterminate={false}
-                  checked={!!extraJson?.schema_options?.expand_rows}
-                  onChange={onExtraInputChange}
-                  labelText={t('Enable row expansion in schemas')}
-                />
-                <InfoTooltip
-                  tooltip={t(
-                    'For Trino, describe full schemas of nested ROW types, expanding them with dotted paths',
-                  )}
-                />
-              </div>
-            </StyledInputContainer>
-          </StyledExpandableForm>
-        </StyledInputContainer>
-      </Collapse.Panel>
-      <Collapse.Panel
-        header={
-          <div>
-            <h4>{t('Performance')}</h4>
-            <p className="helper">
-              {t('Adjust performance settings of this database.')}
-            </p>
-          </div>
-        }
-        key="2"
-      >
-        <StyledInputContainer className="mb-8">
-          <div className="control-label">{t('Chart cache timeout')}</div>
-          <div className="input-container">
-            <input
-              type="number"
-              name="cache_timeout"
-              value={db?.cache_timeout || ''}
-              placeholder={t('Enter duration in seconds')}
-              onChange={onInputChange}
-              data-test="cache-timeout-test"
-            />
-          </div>
-          <div className="helper">
-            {t(
-              'Duration (in seconds) of the caching timeout for charts of this database.' +
-                ' A timeout of 0 indicates that the cache never expires, and -1 bypasses the cache.' +
-                ' Note this defaults to the global timeout if undefined.',
-            )}
-          </div>
-        </StyledInputContainer>
-        <StyledInputContainer>
-          <div className="control-label">{t('Schema cache timeout')}</div>
-          <div className="input-container">
-            <input
-              type="number"
-              name="schema_cache_timeout"
-              value={
-                extraJson?.metadata_cache_timeout?.schema_cache_timeout || ''
-              }
-              placeholder={t('Enter duration in seconds')}
-              onChange={onExtraInputChange}
-              data-test="schema-cache-timeout-test"
-            />
-          </div>
-          <div className="helper">
-            {t(
-              'Duration (in seconds) of the metadata caching timeout for schemas of ' +
-                'this database. If left unset, the cache never expires.',
-            )}
-          </div>
-        </StyledInputContainer>
-        <StyledInputContainer>
-          <div className="control-label">{t('Table cache timeout')}</div>
-          <div className="input-container">
-            <input
-              type="number"
-              name="table_cache_timeout"
-              value={
-                extraJson?.metadata_cache_timeout?.table_cache_timeout || ''
-              }
-              placeholder={t('Enter duration in seconds')}
-              onChange={onExtraInputChange}
-              data-test="table-cache-timeout-test"
-            />
-          </div>
-          <div className="helper">
-            {t(
-              'Duration (in seconds) of the metadata caching timeout for tables of ' +
-                'this database. If left unset, the cache never expires. ',
-            )}
-          </div>
-        </StyledInputContainer>
-        <StyledInputContainer css={{ no_margin_bottom }}>
-          <div className="input-container">
-            <IndeterminateCheckbox
-              id="allow_run_async"
-              indeterminate={false}
-              checked={allowRunAsync}
-              onChange={onInputChange}
-              labelText={t('Asynchronous query execution')}
-            />
-            <InfoTooltip
-              tooltip={t(
-                'Operate the database in asynchronous mode, meaning that the queries ' +
-                  'are executed on remote workers as opposed to on the web server itself. ' +
-                  'This assumes that you have a Celery worker setup as well as a results ' +
-                  'backend. Refer to the installation docs for more information.',
-              )}
-            />
-            {isAllowRunAsyncDisabled && (
-              <InfoTooltip
-                iconStyle={{ color: theme.colors.error.base }}
-                tooltip={t(
-                  'This option has been disabled by the administrator.',
-                )}
-              />
-            )}
-          </div>
-        </StyledInputContainer>
-        <StyledInputContainer css={{ no_margin_bottom }}>
-          <div className="input-container">
-            <IndeterminateCheckbox
-              id="cancel_query_on_windows_unload"
-              indeterminate={false}
-              checked={!!extraJson?.cancel_query_on_windows_unload}
-              onChange={onExtraInputChange}
-              labelText={t('Cancel query on window unload event')}
-            />
-            <InfoTooltip
-              tooltip={t(
-                'Terminate running queries when browser window closed or navigated ' +
-                  'to another page. Available for Presto, Hive, MySQL, Postgres and ' +
-                  'Snowflake databases.',
-              )}
-            />
-          </div>
-        </StyledInputContainer>
-      </Collapse.Panel>
-      <Collapse.Panel
-        header={
-          <div>
-            <h4>{t('Security')}</h4>
-            <p className="helper">{t('Add extra connection information.')}</p>
-          </div>
-        }
-        key="3"
-      >
-        <StyledInputContainer>
-          <div className="control-label">{t('Secure extra')}</div>
-          <div className="input-container">
-            <StyledJsonEditor
-              name="masked_encrypted_extra"
-              value={db?.masked_encrypted_extra || ''}
-              placeholder={t('Secure extra')}
-              onChange={(json: string) =>
-                onEditorChange({ json, name: 'masked_encrypted_extra' })
-              }
-              width="100%"
-              height="160px"
-            />
-          </div>
-          <div className="helper">
-            <div>
-              {t(
-                'JSON string containing additional connection configuration. ' +
-                  'This is used to provide connection information for systems ' +
-                  'like Hive, Presto and BigQuery which do not conform to the ' +
-                  'username:password syntax normally used by SQLAlchemy.',
-              )}
-            </div>
-          </div>
-        </StyledInputContainer>
-        <StyledInputContainer>
-          <div className="control-label">{t('Root certificate')}</div>
-          <div className="input-container">
-            <textarea
-              name="server_cert"
-              value={db?.server_cert || ''}
-              placeholder={t('Enter CA_BUNDLE')}
-              onChange={onTextChange}
-            />
-          </div>
-          <div className="helper">
-            {t(
-              'Optional CA_BUNDLE contents to validate HTTPS requests. Only ' +
-                'available on certain database engines.',
-            )}
-          </div>
-        </StyledInputContainer>
-        <StyledInputContainer
-          css={!isFileUploadSupportedByEngine ? no_margin_bottom : {}}
-        >
-          <div className="input-container">
-            <IndeterminateCheckbox
-              id="impersonate_user"
-              indeterminate={false}
-              checked={!!db?.impersonate_user}
-              onChange={onInputChange}
-              labelText={t(
-                'Impersonate logged in user (Presto, Trino, Drill, Hive, and GSheets)',
-              )}
-            />
-            <InfoTooltip
-              tooltip={t(
-                'If Presto or Trino, all the queries in SQL Lab are going to be executed as the ' +
-                  'currently logged on user who must have permission to run them. If Hive ' +
-                  'and hive.server2.enable.doAs is enabled, will run the queries as ' +
-                  'service account, but impersonate the currently logged on user via ' +
-                  'hive.server2.proxy.user property.',
-              )}
-            />
-          </div>
-        </StyledInputContainer>
-        {isFileUploadSupportedByEngine && (
-          <StyledInputContainer
-            css={!db?.allow_file_upload ? no_margin_bottom : {}}
-          >
-            <div className="input-container">
-              <IndeterminateCheckbox
-                id="allow_file_upload"
-                indeterminate={false}
-                checked={!!db?.allow_file_upload}
-                onChange={onInputChange}
-                labelText={t('Allow file uploads to database')}
-              />
-            </div>
-          </StyledInputContainer>
-        )}
-        {isFileUploadSupportedByEngine && !!db?.allow_file_upload && (
-          <StyledInputContainer css={no_margin_bottom}>
-            <div className="control-label">
-              {t('Schemas allowed for File upload')}
-            </div>
-            <div className="input-container">
-              <input
-                type="text"
-                name="schemas_allowed_for_file_upload"
-                value={(extraJson?.schemas_allowed_for_file_upload || []).join(
-                  ',',
-                )}
-                placeholder="schema1,schema2"
-                onChange={onExtraInputChange}
-              />
-            </div>
-            <div className="helper">
-              {t(
-                'A comma-separated list of schemas that files are allowed to upload to.',
-              )}
-            </div>
-          </StyledInputContainer>
-        )}
-      </Collapse.Panel>
-      {extraExtension && ExtraExtensionComponent && ExtensionDescription && (
-        <Collapse.Panel
-          header={
-            <div>
-              {ExtraExtensionLogo && <ExtraExtensionLogo />}
-              <span
-                css={(theme: SupersetTheme) => ({
-                  fontSize: theme.typography.sizes.l,
-                  fontWeight: theme.typography.weights.bold,
-                })}
+                </div>
+              </StyledInputContainer>
+              <StyledInputContainer
+                css={!isFileUploadSupportedByEngine ? no_margin_bottom : {}}
               >
-                {extraExtension?.title}
-              </span>
-              <p className="helper">
-                <ExtensionDescription />
-              </p>
-            </div>
-          }
-          key={extraExtension?.title}
-          // @ts-ignore, 'icon' is valid in >=4.9.0 but missing from `CollapsibleType`
-          collapsible={extraExtension.enabled?.() ? 'icon' : 'disabled'}
-        >
-          <StyledInputContainer css={no_margin_bottom}>
-            <ExtraExtensionComponent db={db} onEdit={extraExtension.onEdit} />
-          </StyledInputContainer>
-        </Collapse.Panel>
-      )}
-      <Collapse.Panel
-        header={
-          <div>
-            <h4>{t('Other')}</h4>
-            <p className="helper">{t('Additional settings.')}</p>
-          </div>
-        }
-        key="4"
-      >
-        <StyledInputContainer>
-          <div className="control-label">{t('Metadata Parameters')}</div>
-          <div className="input-container">
-            <StyledJsonEditor
-              name="metadata_params"
-              placeholder={t('Metadata Parameters')}
-              onChange={(json: string) =>
-                onExtraEditorChange({ json, name: 'metadata_params' })
-              }
-              width="100%"
-              height="160px"
-              value={
-                !Object.keys(extraJson?.metadata_params || {}).length
-                  ? ''
-                  : typeof extraJson?.metadata_params === 'string'
-                    ? extraJson?.metadata_params
-                    : JSON.stringify(extraJson?.metadata_params)
-              }
-            />
-          </div>
-          <div className="helper">
-            <div>
-              {t(
-                'The metadata_params object gets unpacked into the sqlalchemy.MetaData call.',
+                <div className="input-container">
+                  <Checkbox
+                    id="impersonate_user"
+                    name="impersonate_user"
+                    indeterminate={false}
+                    checked={!!db?.impersonate_user}
+                    onChange={onInputChange}
+                  >
+                    {t(
+                      'Impersonate logged in user (Presto, Trino, Drill, Hive, and GSheets)',
+                    )}
+                  </Checkbox>
+                  <InfoTooltip
+                    tooltip={t(
+                      'If Presto or Trino, all the queries in SQL Lab are going to be executed as the ' +
+                        'currently logged on user who must have permission to run them. If Hive ' +
+                        'and hive.server2.enable.doAs is enabled, will run the queries as ' +
+                        'service account, but impersonate the currently logged on user via ' +
+                        'hive.server2.proxy.user property.',
+                    )}
+                  />
+                </div>
+              </StyledInputContainer>
+              {isFileUploadSupportedByEngine && (
+                <StyledInputContainer
+                  css={!db?.allow_file_upload ? no_margin_bottom : {}}
+                >
+                  <div className="input-container">
+                    <Checkbox
+                      id="allow_file_upload"
+                      name="allow_file_upload"
+                      indeterminate={false}
+                      checked={!!db?.allow_file_upload}
+                      onChange={onInputChange}
+                    >
+                      {t('Allow file uploads to database')}
+                    </Checkbox>
+                  </div>
+                </StyledInputContainer>
               )}
-            </div>
-          </div>
-        </StyledInputContainer>
-        <StyledInputContainer>
-          <div className="control-label">{t('Engine Parameters')}</div>
-          <div className="input-container">
-            <StyledJsonEditor
-              name="engine_params"
-              placeholder={t('Engine Parameters')}
-              onChange={(json: string) =>
-                onExtraEditorChange({ json, name: 'engine_params' })
-              }
-              width="100%"
-              height="160px"
-              value={
-                !Object.keys(extraJson?.engine_params || {}).length
-                  ? ''
-                  : extraJson?.engine_params
-              }
-            />
-          </div>
-          <div className="helper">
-            <div>
-              {t(
-                'The engine_params object gets unpacked into the sqlalchemy.create_engine call.',
+              {isFileUploadSupportedByEngine && !!db?.allow_file_upload && (
+                <StyledInputContainer css={no_margin_bottom}>
+                  <div className="control-label">
+                    {t('Schemas allowed for File upload')}
+                  </div>
+                  <div className="input-container">
+                    <Input
+                      type="text"
+                      name="schemas_allowed_for_file_upload"
+                      value={(
+                        extraJson?.schemas_allowed_for_file_upload || []
+                      ).join(',')}
+                      placeholder="schema1,schema2"
+                      onChange={onExtraInputChange}
+                    />
+                  </div>
+                  <div className="helper">
+                    {t(
+                      'A comma-separated list of schemas that files are allowed to upload to.',
+                    )}
+                  </div>
+                </StyledInputContainer>
               )}
-            </div>
-          </div>
-        </StyledInputContainer>
-        <StyledInputContainer>
-          <div className="control-label" data-test="version-label-test">
-            {t('Version')}
-          </div>
-          <div className="input-container" data-test="version-spinbutton-test">
-            <input
-              type="text"
-              name="version"
-              placeholder={t('Version number')}
-              onChange={onExtraInputChange}
-              value={extraJson?.version || ''}
+            </>
+          ),
+        },
+        ...(extraExtension && ExtraExtensionComponent && ExtensionDescription
+          ? [
+              {
+                key: extraExtension?.title,
+                collapsible: extraExtension.enabled?.()
+                  ? ('icon' as const)
+                  : ('disabled' as const),
+                label: (
+                  <CollapseLabelInModal
+                    key={extraExtension?.title}
+                    title={
+                      <>
+                        {ExtraExtensionLogo && <ExtraExtensionLogo />}
+                        {extraExtension?.title}
+                      </>
+                    }
+                    subtitle={<ExtensionDescription />}
+                  />
+                ),
+                children: (
+                  <StyledInputContainer css={no_margin_bottom}>
+                    <ExtraExtensionComponent
+                      db={db}
+                      onEdit={extraExtension.onEdit}
+                    />
+                  </StyledInputContainer>
+                ),
+              },
+            ]
+          : []),
+        {
+          key: 'other',
+          label: (
+            <CollapseLabelInModal
+              title={t('Other')}
+              subtitle={t('Additional settings.')}
+              testId="other-label-test"
             />
-          </div>
-          <div className="helper">
-            {t(
-              'Specify the database version. This is used with Presto for query cost ' +
-                'estimation, and Dremio for syntax changes, among others.',
-            )}
-          </div>
-        </StyledInputContainer>
-        <StyledInputContainer css={no_margin_bottom}>
-          <div className="input-container">
-            <IndeterminateCheckbox
-              id="disable_drill_to_detail"
-              indeterminate={false}
-              checked={!!extraJson?.disable_drill_to_detail}
-              onChange={onExtraInputChange}
-              labelText={t('Disable drill to detail')}
-            />
-            <InfoTooltip
-              tooltip={t(
-                'Disables the drill to detail feature for this database.',
+          ),
+          children: (
+            <>
+              <StyledInputContainer>
+                <div className="control-label">{t('Metadata Parameters')}</div>
+                <div className="input-container">
+                  <StyledJsonEditor
+                    name="metadata_params"
+                    placeholder={t('Metadata Parameters')}
+                    onChange={(json: string) =>
+                      onExtraEditorChange({ json, name: 'metadata_params' })
+                    }
+                    width="100%"
+                    height="160px"
+                    value={
+                      !Object.keys(extraJson?.metadata_params || {}).length
+                        ? ''
+                        : typeof extraJson?.metadata_params === 'string'
+                          ? extraJson?.metadata_params
+                          : JSON.stringify(extraJson?.metadata_params)
+                    }
+                  />
+                </div>
+                <div className="helper">
+                  <div>
+                    {t(
+                      'The metadata_params object gets unpacked into the sqlalchemy.MetaData call.',
+                    )}
+                  </div>
+                </div>
+              </StyledInputContainer>
+              <StyledInputContainer>
+                <div className="control-label">{t('Engine Parameters')}</div>
+                <div className="input-container">
+                  <StyledJsonEditor
+                    name="engine_params"
+                    placeholder={t('Engine Parameters')}
+                    onChange={(json: string) =>
+                      onExtraEditorChange({ json, name: 'engine_params' })
+                    }
+                    width="100%"
+                    height="160px"
+                    value={
+                      !Object.keys(extraJson?.engine_params || {}).length
+                        ? ''
+                        : extraJson?.engine_params
+                    }
+                  />
+                </div>
+                <div className="helper">
+                  <div>
+                    {t(
+                      'The engine_params object gets unpacked into the sqlalchemy.create_engine call.',
+                    )}
+                  </div>
+                </div>
+              </StyledInputContainer>
+              <StyledInputContainer>
+                <div className="control-label" data-test="version-label-test">
+                  {t('Version')}
+                </div>
+                <div
+                  className="input-container"
+                  data-test="version-spinbutton-test"
+                >
+                  <Input
+                    type="text"
+                    name="version"
+                    placeholder={t('Version number')}
+                    onChange={onExtraInputChange}
+                    value={extraJson?.version || ''}
+                  />
+                </div>
+                <div className="helper">
+                  {t(
+                    'Specify the database version. This is used with Presto for query cost ' +
+                      'estimation, and Dremio for syntax changes, among others.',
+                  )}
+                </div>
+              </StyledInputContainer>
+              <StyledInputContainer css={no_margin_bottom}>
+                <div className="input-container">
+                  <Checkbox
+                    id="disable_drill_to_detail"
+                    name="disable_drill_to_detail"
+                    indeterminate={false}
+                    checked={!!extraJson?.disable_drill_to_detail}
+                    onChange={onExtraInputChange}
+                  >
+                    {t('Disable drill to detail')}
+                  </Checkbox>
+                  <InfoTooltip
+                    tooltip={t(
+                      'Disables the drill to detail feature for this database.',
+                    )}
+                  />
+                </div>
+              </StyledInputContainer>
+              {supportsDynamicCatalog && (
+                <StyledInputContainer css={no_margin_bottom}>
+                  <div className="input-container">
+                    <Checkbox
+                      id="allow_multi_catalog"
+                      name="allow_multi_catalog"
+                      indeterminate={false}
+                      checked={!!extraJson?.allow_multi_catalog}
+                      onChange={onExtraInputChange}
+                    >
+                      {t('Allow changing catalogs')}
+                    </Checkbox>
+                    <InfoTooltip
+                      tooltip={t(
+                        'Give access to multiple catalogs in a single database connection.',
+                      )}
+                    />
+                  </div>
+                </StyledInputContainer>
               )}
-            />
-          </div>
-        </StyledInputContainer>
-        {supportsDynamicCatalog && (
-          <StyledInputContainer css={no_margin_bottom}>
-            <div className="input-container">
-              <IndeterminateCheckbox
-                id="allow_multi_catalog"
-                indeterminate={false}
-                checked={!!extraJson?.allow_multi_catalog}
-                onChange={onExtraInputChange}
-                labelText={t('Allow changing catalogs')}
-              />
-              <InfoTooltip
-                tooltip={t(
-                  'Give access to multiple catalogs in a single database connection.',
-                )}
-              />
-            </div>
-          </StyledInputContainer>
-        )}
-      </Collapse.Panel>
-    </Collapse>
+            </>
+          ),
+        },
+      ]}
+    />
   );
 };
 
diff --git a/superset-frontend/src/features/databases/DatabaseModal/ModalHeader.tsx b/superset-frontend/src/features/databases/DatabaseModal/ModalHeader.tsx
index 6ab47cb2473..627e7782344 100644
--- a/superset-frontend/src/features/databases/DatabaseModal/ModalHeader.tsx
+++ b/superset-frontend/src/features/databases/DatabaseModal/ModalHeader.tsx
@@ -17,17 +17,17 @@
  * under the License.
  */
 
-import { getDatabaseDocumentationLinks } from 'src/views/CRUD/hooks';
-// eslint-disable-next-line no-restricted-imports
-import { UploadFile } from 'antd/lib/upload/interface'; // TODO: Remove antd
 import { t } from '@superset-ui/core';
+import { getDatabaseDocumentationLinks } from 'src/views/CRUD/hooks';
+import { UploadFile } from '@superset-ui/core/components/Upload';
+import { Typography } from '@superset-ui/core/components/Typography';
+import { DatabaseForm, DatabaseObject } from '../types';
 import {
   EditHeaderTitle,
   EditHeaderSubtitle,
   StyledFormHeader,
   StyledStickyHeader,
 } from './styles';
-import { DatabaseForm, DatabaseObject } from '../types';
 
 const supersetTextDocs = getDatabaseDocumentationLinks();
 
@@ -101,7 +101,9 @@ const ModalHeader = ({
           stepLast: 2,
         })}
       </p>
-      <h4>{t('Enter Primary Credentials')}</h4>
+      <Typography.Title level={4}>
+        {t('Enter Primary Credentials')}
+      </Typography.Title>
       <p className="helper-bottom">
         {t('Need help? Learn how to connect your database')}{' '}
         <a
@@ -125,7 +127,9 @@ const ModalHeader = ({
             stepLast: 3,
           })}
         </p>
-        <h4 className="step-3-text">{t('Database connected')}</h4>
+        <Typography.Title level={4} className="step-3-text">
+          {t('Database connected')}
+        </Typography.Title>
         <p className="subheader-text">
           {t(`Create a dataset to begin visualizing your data as a chart or go to
           SQL Lab to query your data.`)}
@@ -143,11 +147,11 @@ const ModalHeader = ({
             stepLast: 3,
           })}
         </p>
-        <h4>
+        <Typography.Title level={4}>
           {t('Enter the required %(dbModelName)s credentials', {
             dbModelName: dbModel.name,
           })}
-        </h4>
+        </Typography.Title>
         <p className="helper-bottom">
           {t('Need help? Learn more about')}{' '}
           <a
@@ -163,17 +167,21 @@ const ModalHeader = ({
   );
 
   const noDbHeader = (
-    <StyledFormHeader>
-      <div className="select-db">
-        <p className="helper-top">
-          {t('STEP %(stepCurr)s OF %(stepLast)s', {
-            stepCurr: 1,
-            stepLast: 3,
-          })}
-        </p>
-        <h4>{t('Select a database to connect')}</h4>
-      </div>
-    </StyledFormHeader>
+    <StyledStickyHeader>
+      <StyledFormHeader>
+        <div className="select-db">
+          <p className="helper-top">
+            {t('STEP %(stepCurr)s OF %(stepLast)s', {
+              stepCurr: 1,
+              stepLast: 3,
+            })}
+          </p>
+          <Typography.Title level={4}>
+            {t('Select a database to connect')}
+          </Typography.Title>
+        </div>
+      </StyledFormHeader>
+    </StyledStickyHeader>
   );
 
   const importDbHeader = (
@@ -185,11 +193,11 @@ const ModalHeader = ({
             stepLast: 2,
           })}
         </p>
-        <h4>
+        <Typography.Title level={4}>
           {t('Enter the required %(dbModelName)s credentials', {
             dbModelName: dbModel.name,
           })}
-        </h4>
+        </Typography.Title>
         <p className="helper-bottom">{fileCheck ? fileList[0].name : ''}</p>
       </StyledFormHeader>
     </StyledStickyHeader>
diff --git a/superset-frontend/src/features/databases/DatabaseModal/SSHTunnelForm.tsx b/superset-frontend/src/features/databases/DatabaseModal/SSHTunnelForm.tsx
index 2a1daf4823b..fc55ab95ee0 100644
--- a/superset-frontend/src/features/databases/DatabaseModal/SSHTunnelForm.tsx
+++ b/superset-frontend/src/features/databases/DatabaseModal/SSHTunnelForm.tsx
@@ -18,34 +18,37 @@
  */
 import { useState } from 'react';
 import { t, styled } from '@superset-ui/core';
-import { AntdForm, Col, Row } from 'src/components';
-import { Form, FormLabel } from 'src/components/Form';
-import { Radio } from 'src/components/Radio';
-import { Input, TextArea } from 'src/components/Input';
-// eslint-disable-next-line no-restricted-imports
-import { Input as AntdInput, Tooltip } from 'antd'; // TODO: Remove antd
-import { Icons } from 'src/components/Icons';
+import {
+  Input,
+  Form,
+  FormLabel,
+  Col,
+  Row,
+  Tooltip,
+} from '@superset-ui/core/components';
+import { Radio } from '@superset-ui/core/components/Radio';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { DatabaseObject, FieldPropTypes } from '../types';
 import { AuthType } from '.';
 
 const StyledDiv = styled.div`
-  padding-top: ${({ theme }) => theme.gridUnit * 2}px;
+  padding-top: ${({ theme }) => theme.sizeUnit * 2}px;
   label {
     color: ${({ theme }) => theme.colors.grayscale.base};
-    margin-bottom: ${({ theme }) => theme.gridUnit * 2}px;
+    margin-bottom: ${({ theme }) => theme.sizeUnit * 2}px;
   }
 `;
 
 const StyledRow = styled(Row)`
-  padding-bottom: ${({ theme }) => theme.gridUnit * 2}px;
+  padding-bottom: ${({ theme }) => theme.sizeUnit * 2}px;
 `;
 
-const StyledFormItem = styled(AntdForm.Item)`
+const StyledFormItem = styled(Form.Item)`
   margin-bottom: 0 !important;
 `;
 
-const StyledInputPassword = styled(AntdInput.Password)`
-  margin: ${({ theme }) => `${theme.gridUnit}px 0 ${theme.gridUnit * 2}px`};
+const StyledInputPassword = styled(Input.Password)`
+  margin: ${({ theme }) => `${theme.sizeUnit}px 0 ${theme.sizeUnit * 2}px`};
 `;
 
 const SSHTunnelForm = ({
@@ -178,7 +181,7 @@ const SSHTunnelForm = ({
                 <FormLabel htmlFor="private_key" required>
                   {t('Private Key')}
                 </FormLabel>
-                <TextArea
+                <Input.TextArea
                   name="private_key"
                   placeholder={t('Paste Private Key here')}
                   value={db?.ssh_tunnel?.private_key || ''}
diff --git a/superset-frontend/src/features/databases/DatabaseModal/SSHTunnelSwitch.test.tsx b/superset-frontend/src/features/databases/DatabaseModal/SSHTunnelSwitch.test.tsx
index e11b077e942..dd8b74e643e 100644
--- a/superset-frontend/src/features/databases/DatabaseModal/SSHTunnelSwitch.test.tsx
+++ b/superset-frontend/src/features/databases/DatabaseModal/SSHTunnelSwitch.test.tsx
@@ -25,7 +25,7 @@ jest.mock('@superset-ui/core', () => ({
   isFeatureEnabled: jest.fn().mockReturnValue(true),
 }));
 
-jest.mock('src/components/Switch', () => ({
+jest.mock('@superset-ui/core/components/Switch', () => ({
   Switch: ({
     checked,
     onChange,
diff --git a/superset-frontend/src/features/databases/DatabaseModal/SSHTunnelSwitch.tsx b/superset-frontend/src/features/databases/DatabaseModal/SSHTunnelSwitch.tsx
index 623091f397c..a58c96d23a0 100644
--- a/superset-frontend/src/features/databases/DatabaseModal/SSHTunnelSwitch.tsx
+++ b/superset-frontend/src/features/databases/DatabaseModal/SSHTunnelSwitch.tsx
@@ -23,8 +23,8 @@ import {
   isFeatureEnabled,
   FeatureFlag,
 } from '@superset-ui/core';
-import { Switch } from 'src/components/Switch';
-import InfoTooltip from 'src/components/InfoTooltip';
+import { Switch } from '@superset-ui/core/components/Switch';
+import { InfoTooltip } from '@superset-ui/core/components';
 import { isEmpty } from 'lodash';
 import { infoTooltip, toggleStyle } from './styles';
 import { SwitchProps } from '../types';
@@ -89,7 +89,6 @@ const SSHTunnelSwitch = ({
       <InfoTooltip
         tooltip={t('SSH Tunnel configuration parameters')}
         placement="right"
-        viewBox="0 -5 24 24"
       />
     </div>
   ) : null;
diff --git a/superset-frontend/src/features/databases/DatabaseModal/SqlAlchemyForm.tsx b/superset-frontend/src/features/databases/DatabaseModal/SqlAlchemyForm.tsx
index d763a8e17d3..45e2e34024d 100644
--- a/superset-frontend/src/features/databases/DatabaseModal/SqlAlchemyForm.tsx
+++ b/superset-frontend/src/features/databases/DatabaseModal/SqlAlchemyForm.tsx
@@ -19,7 +19,7 @@
 import { EventHandler, ChangeEvent, MouseEvent, ReactNode } from 'react';
 import { t, SupersetTheme } from '@superset-ui/core';
 import SupersetText from 'src/utils/textUtils';
-import Button from 'src/components/Button';
+import { Input, Button } from '@superset-ui/core/components';
 import { StyledInputContainer, wideButton } from './styles';
 import { DatabaseObject } from '../types';
 
@@ -53,8 +53,7 @@ const SqlAlchemyTab = ({
           <span className="required">*</span>
         </div>
         <div className="input-container">
-          <input
-            type="text"
+          <Input
             name="database_name"
             data-test="database-name-input"
             value={db?.database_name || ''}
@@ -72,8 +71,7 @@ const SqlAlchemyTab = ({
           <span className="required">*</span>
         </div>
         <div className="input-container">
-          <input
-            type="text"
+          <Input
             name="sqlalchemy_uri"
             data-test="sqlalchemy-uri-input"
             value={db?.sqlalchemy_uri || ''}
diff --git a/superset-frontend/src/features/databases/DatabaseModal/index.test.tsx b/superset-frontend/src/features/databases/DatabaseModal/index.test.tsx
index 4a0dd068d62..8b75e15467d 100644
--- a/superset-frontend/src/features/databases/DatabaseModal/index.test.tsx
+++ b/superset-frontend/src/features/databases/DatabaseModal/index.test.tsx
@@ -332,7 +332,8 @@ describe('DatabaseModal', () => {
 
       // ---------- Components ----------
       // <TabHeader> - AntD header
-      const closeButton = await screen.findByLabelText('Close');
+      const closeButtons = await screen.findAllByLabelText('Close');
+      const closeButton = closeButtons[0];
       const step1Header = screen.getByRole('heading', {
         name: /connect a database/i,
       });
@@ -382,7 +383,7 @@ describe('DatabaseModal', () => {
       // ---------- TODO (lyndsiWilliams): Selector options, can't seem to get these to render properly.
 
       // renderAvailableSelector() => <Alert> - Supported databases alert
-      const alertIcon = screen.getByRole('img', { name: /info-circle/i });
+      const alertIcon = screen.getAllByRole('img', { name: /info-circle/i });
       const alertMessage = screen.getByText(/want to add a new database\?/i);
       const alertDescription = screen.getByText(
         /any databases that allow connections via sql alchemy uris can be added\. learn about how to connect a database driver \./i,
@@ -399,7 +400,7 @@ describe('DatabaseModal', () => {
         selectorLabel,
         selectorPlaceholder,
         selectorArrow,
-        alertIcon,
+        alertIcon[0],
         alertMessage,
         alertDescription,
         alertLink,
@@ -433,7 +434,7 @@ describe('DatabaseModal', () => {
 
       // ---------- Components ----------
       // <TabHeader> - AntD header
-      const closeButton = await screen.findByRole('button', { name: 'Close' });
+      const closeButton = screen.getByRole('img', { name: 'close' });
 
       const basicHeader = screen.getByRole('heading', {
         name: /connect a database/i,
@@ -482,7 +483,10 @@ describe('DatabaseModal', () => {
         name: /test connection/i,
       });
       // <Alert> - Basic tab's alert
-      const alertIcon = screen.getByRole('img', { name: /info-circle/i });
+      const alertIcons = screen.getAllByRole('img', { name: /info-circle/i });
+      const alertIcon =
+        alertIcons.find(icon => icon.closest('.ant-alert-icon') !== null) ||
+        alertIcons[0];
       const alertMessage = screen.getByText(
         /additional fields may be required/i,
       );
@@ -562,39 +566,19 @@ describe('DatabaseModal', () => {
       const basicTab = screen.getByRole('tab', { name: /basic/i });
       const advancedTab = screen.getByRole('tab', { name: /advanced/i });
       // <ExtraOptions> - Advanced tabs
-      const sqlLabTab = screen.getByRole('tab', {
-        name: /right sql lab adjust how this database will interact with sql lab\./i,
-      });
-      const sqlLabTabArrow = within(sqlLabTab).getByRole('img', {
-        name: /right/i,
-      });
+      const sqlLabTab = screen.getByTestId('sql-lab-label-test');
       const sqlLabTabHeading = screen.getByRole('heading', {
         name: /sql lab/i,
       });
-      const performanceTab = screen.getByRole('tab', {
-        name: /right performance adjust performance settings of this database\./i,
-      });
-      const performanceTabArrow = within(performanceTab).getByRole('img', {
-        name: /right/i,
-      });
+      const performanceTab = screen.getByTestId('performance-label-test');
       const performanceTabHeading = screen.getByRole('heading', {
         name: /performance/i,
       });
-      const securityTab = screen.getByRole('tab', {
-        name: /right security add extra connection information\./i,
-      });
-      const securityTabArrow = within(securityTab).getByRole('img', {
-        name: /right/i,
-      });
+      const securityTab = screen.getByTestId('security-label-test');
       const securityTabHeading = screen.getByRole('heading', {
         name: /security/i,
       });
-      const otherTab = screen.getByRole('tab', {
-        name: /right other additional settings\./i,
-      });
-      const otherTabArrow = within(otherTab).getByRole('img', {
-        name: /right/i,
-      });
+      const otherTab = screen.getByTestId('other-label-test');
       const otherTabHeading = screen.getByRole('heading', { name: /other/i });
       // renderModalFooter() - Advanced tab's footer
       const backButton = screen.getByRole('button', { name: /back/i });
@@ -611,16 +595,12 @@ describe('DatabaseModal', () => {
         basicTab,
         advancedTab,
         sqlLabTab,
-        sqlLabTabArrow,
         sqlLabTabHeading,
         performanceTab,
-        performanceTabArrow,
         performanceTabHeading,
         securityTab,
-        securityTabArrow,
         securityTabHeading,
         otherTab,
-        otherTabArrow,
         otherTabHeading,
         backButton,
         connectButton,
@@ -644,11 +624,7 @@ describe('DatabaseModal', () => {
       // Click the "Advanced" tab
       userEvent.click(await screen.findByRole('tab', { name: /advanced/i }));
       // Click the "SQL Lab" tab
-      userEvent.click(
-        await screen.findByRole('tab', {
-          name: /right sql lab adjust how this database will interact with sql lab\./i,
-        }),
-      );
+      userEvent.click(screen.getByTestId('sql-lab-label-test'));
       expect(await screen.findByText(/step 2 of 2/i)).toBeInTheDocument();
 
       // ----- BEGIN STEP 2 (ADVANCED - SQL LAB)
@@ -673,15 +649,14 @@ describe('DatabaseModal', () => {
         name: /advanced/i,
       });
       // <ExtraOptions> - Advanced tabs
-      const sqlLabTab = screen.getByRole('tab', {
-        name: /right sql lab adjust how this database will interact with sql lab\./i,
-      });
+      const sqlLabTab = screen.getByTestId('sql-lab-label-test');
       // These are the checkbox SVGs that cover the actual checkboxes
-      const checkboxOffSVGs = screen.getAllByRole('img', {
-        name: /checkbox-off/i,
-      });
-      const tooltipIcons = within(advancedTabPanel).getAllByRole('img', {
-        name: /info-tooltip/i,
+      const allCheckboxes = screen.getAllByRole(
+        'checkbox',
+      ) as HTMLInputElement[];
+      const checkboxOff = allCheckboxes.filter(checkbox => !checkbox.checked);
+      const tooltipButtons = within(advancedTabPanel).getAllByRole('button', {
+        name: /Show info tooltip/i,
       });
 
       const exposeInSQLLabCheckbox = screen.getByRole('checkbox', {
@@ -752,20 +727,20 @@ describe('DatabaseModal', () => {
         basicTab,
         advancedTab,
         sqlLabTab,
-        checkboxOffSVGs[0],
-        checkboxOffSVGs[1],
-        checkboxOffSVGs[2],
-        checkboxOffSVGs[3],
-        checkboxOffSVGs[4],
-        checkboxOffSVGs[5],
-        tooltipIcons[0],
-        tooltipIcons[1],
-        tooltipIcons[2],
-        tooltipIcons[3],
-        tooltipIcons[4],
-        tooltipIcons[5],
-        tooltipIcons[6],
-        tooltipIcons[7],
+        checkboxOff[0],
+        checkboxOff[1],
+        checkboxOff[2],
+        checkboxOff[3],
+        checkboxOff[4],
+        checkboxOff[5],
+        tooltipButtons[0],
+        tooltipButtons[1],
+        tooltipButtons[2],
+        tooltipButtons[3],
+        tooltipButtons[4],
+        tooltipButtons[5],
+        tooltipButtons[6],
+        tooltipButtons[7],
         exposeInSQLLabText,
         allowCTASText,
         allowCVASText,
@@ -795,8 +770,8 @@ describe('DatabaseModal', () => {
       invisibleComponents.forEach(component => {
         expect(component).not.toBeVisible();
       });
-      expect(checkboxOffSVGs).toHaveLength(6);
-      expect(tooltipIcons).toHaveLength(8);
+      expect(checkboxOff).toHaveLength(6);
+      expect(tooltipButtons).toHaveLength(8);
     });
 
     test('renders the "Advanced" - PERFORMANCE tab correctly', async () => {
@@ -812,11 +787,7 @@ describe('DatabaseModal', () => {
       // Click the "Advanced" tab
       userEvent.click(screen.getByRole('tab', { name: /advanced/i }));
       // Click the "Performance" tab
-      userEvent.click(
-        screen.getByRole('tab', {
-          name: /right performance adjust performance settings of this database\./i,
-        }),
-      );
+      userEvent.click(screen.getByTestId('performance-label-test'));
       expect(await screen.findByText(/step 2 of 2/i)).toBeInTheDocument();
 
       // ----- BEGIN STEP 2 (ADVANCED - PERFORMANCE)
@@ -838,12 +809,8 @@ describe('DatabaseModal', () => {
       const basicTab = screen.getByRole('tab', { name: /basic/i });
       const advancedTab = screen.getByRole('tab', { name: /advanced/i });
       // <ExtraOptions> - Advanced tabs
-      const sqlLabTab = screen.getByRole('tab', {
-        name: /right sql lab adjust how this database will interact with sql lab\./i,
-      });
-      const performanceTab = screen.getByRole('tab', {
-        name: /right performance adjust performance settings of this database\./i,
-      });
+      const sqlLabTab = screen.getByTestId('sql-lab-label-test');
+      const performanceTab = screen.getByTestId('performance-label-test');
 
       // ---------- Assertions ----------
       const visibleComponents = [
@@ -877,11 +844,7 @@ describe('DatabaseModal', () => {
       // Click the "Advanced" tab
       userEvent.click(screen.getByRole('tab', { name: /advanced/i }));
       // Click the "Security" tab
-      userEvent.click(
-        screen.getByRole('tab', {
-          name: /right security add extra connection information\./i,
-        }),
-      );
+      userEvent.click(screen.getByTestId('security-label-test'));
       expect(await screen.findByText(/step 2 of 2/i)).toBeInTheDocument();
 
       // ----- BEGIN STEP 2 (ADVANCED - SECURITY)
@@ -903,15 +866,9 @@ describe('DatabaseModal', () => {
       const basicTab = screen.getByRole('tab', { name: /basic/i });
       const advancedTab = screen.getByRole('tab', { name: /advanced/i });
       // <ExtraOptions> - Advanced tabs
-      const sqlLabTab = screen.getByRole('tab', {
-        name: /right sql lab adjust how this database will interact with sql lab\./i,
-      });
-      const performanceTab = screen.getByRole('tab', {
-        name: /right performance adjust performance settings of this database\./i,
-      });
-      const securityTab = screen.getByRole('tab', {
-        name: /right security add extra connection information\./i,
-      });
+      const sqlLabTab = screen.getByTestId('sql-lab-label-test');
+      const performanceTab = screen.getByTestId('performance-label-test');
+      const securityTab = screen.getByTestId('security-label-test');
       const allowFileUploadCheckbox = screen.getByRole('checkbox', {
         name: /Allow file uploads to database/i,
       });
@@ -963,11 +920,7 @@ describe('DatabaseModal', () => {
       // Click the "Advanced" tab
       userEvent.click(screen.getByRole('tab', { name: /advanced/i }));
       // Click the "Security" tab
-      userEvent.click(
-        screen.getByRole('tab', {
-          name: /right security add extra connection information\./i,
-        }),
-      );
+      userEvent.click(screen.getByTestId('security-label-test'));
       // Click the "Allow file uploads" tab
 
       const allowFileUploadCheckbox = screen.getByRole('checkbox', {
@@ -994,15 +947,9 @@ describe('DatabaseModal', () => {
       const basicTab = screen.getByRole('tab', { name: /basic/i });
       const advancedTab = screen.getByRole('tab', { name: /advanced/i });
       // <ExtraOptions> - Advanced tabs
-      const sqlLabTab = screen.getByRole('tab', {
-        name: /right sql lab adjust how this database will interact with sql lab\./i,
-      });
-      const performanceTab = screen.getByRole('tab', {
-        name: /right performance adjust performance settings of this database\./i,
-      });
-      const securityTab = screen.getByRole('tab', {
-        name: /right security add extra connection information\./i,
-      });
+      const sqlLabTab = screen.getByTestId('sql-lab-label-test');
+      const performanceTab = screen.getByTestId('performance-label-test');
+      const securityTab = screen.getByTestId('security-label-test');
       const allowFileUploadText = screen.getByText(
         /Allow file uploads to database/i,
       );
@@ -1051,11 +998,7 @@ describe('DatabaseModal', () => {
       // Click the "Advanced" tab
       userEvent.click(screen.getByRole('tab', { name: /advanced/i }));
       // Click the "Other" tab
-      userEvent.click(
-        screen.getByRole('tab', {
-          name: /right other additional settings\./i,
-        }),
-      );
+      userEvent.click(screen.getByTestId('other-label-test'));
       expect(await screen.findByText(/step 2 of 2/i)).toBeInTheDocument();
 
       // ----- BEGIN STEP 2 (ADVANCED - OTHER)
@@ -1077,18 +1020,10 @@ describe('DatabaseModal', () => {
       const basicTab = screen.getByRole('tab', { name: /basic/i });
       const advancedTab = screen.getByRole('tab', { name: /advanced/i });
       // <ExtraOptions> - Advanced tabs
-      const sqlLabTab = screen.getByRole('tab', {
-        name: /right sql lab adjust how this database will interact with sql lab\./i,
-      });
-      const performanceTab = screen.getByRole('tab', {
-        name: /right performance adjust performance settings of this database\./i,
-      });
-      const securityTab = screen.getByRole('tab', {
-        name: /right security add extra connection information\./i,
-      });
-      const otherTab = screen.getByRole('tab', {
-        name: /right other additional settings\./i,
-      });
+      const sqlLabTab = screen.getByTestId('sql-lab-label-test');
+      const performanceTab = screen.getByTestId('performance-label-test');
+      const securityTab = screen.getByTestId('security-label-test');
+      const otherTab = screen.getByTestId('other-label-test');
 
       // ---------- Assertions ----------
       const visibleComponents = [
@@ -1418,12 +1353,16 @@ describe('DatabaseModal', () => {
         expect(usernameField).toHaveValue('');
         expect(passwordField).toHaveValue('');
 
+        expect(connectButton).toBeDisabled();
+
         userEvent.type(hostField, 'localhost');
         userEvent.type(portField, '5432');
         userEvent.type(databaseNameField, 'postgres');
         userEvent.type(usernameField, 'testdb');
         userEvent.type(passwordField, 'demoPassword');
 
+        await waitFor(() => expect(connectButton).toBeEnabled());
+
         expect(await screen.findByDisplayValue(/5432/i)).toBeInTheDocument();
         expect(hostField).toHaveValue('localhost');
         expect(portField).toHaveValue(5432);
@@ -1431,9 +1370,10 @@ describe('DatabaseModal', () => {
         expect(usernameField).toHaveValue('testdb');
         expect(passwordField).toHaveValue('demoPassword');
 
+        expect(connectButton).toBeEnabled();
         userEvent.click(connectButton);
         await waitFor(() => {
-          expect(fetchMock.calls(VALIDATE_PARAMS_ENDPOINT).length).toEqual(6);
+          expect(fetchMock.calls(VALIDATE_PARAMS_ENDPOINT).length).toEqual(5);
         });
       });
     });
@@ -1482,11 +1422,7 @@ describe('DatabaseModal', () => {
       // Click the "Advanced" tab
       userEvent.click(await screen.findByRole('tab', { name: /advanced/i }));
       // Click the "Security" tab
-      userEvent.click(
-        screen.getByRole('tab', {
-          name: /right security add extra connection information\./i,
-        }),
-      );
+      userEvent.click(screen.getByTestId('security-label-test'));
 
       // ----- BEGIN STEP 2 (ADVANCED - SECURITY)
       // <ExtraOptions> - Advanced tabs
@@ -1585,12 +1521,12 @@ describe('DatabaseModal', () => {
 
       const step2of3text = await screen.findByText(/step 2 of 3/i);
       const errorTitleMessage = screen.getByText(/Database Creation Error/i);
+      expect(errorTitleMessage).toBeInTheDocument();
       const button = screen.getByText('See more');
       userEvent.click(button);
       const errorMessage = screen.getByText(/Test Error With String/i);
       expect(errorMessage).toBeInTheDocument();
       expect(step2of3text).toBeInTheDocument();
-      expect(errorTitleMessage).toBeInTheDocument();
     });
   });
 
@@ -1727,40 +1663,40 @@ describe('dbReducer', () => {
   test('it will set state to payload from extra input change when schema_cache_timeout', () => {
     const action: DBReducerActionType = {
       type: ActionType.ExtraInputChange,
-      payload: { name: 'schema_cache_timeout', value: 'bar' },
+      payload: { name: 'schema_cache_timeout', value: '10' },
     };
     const currentState = dbReducer(databaseFixture, action);
 
     // extra should be serialized
     expect(currentState).toEqual({
       ...databaseFixture,
-      extra: '{"metadata_cache_timeout":{"schema_cache_timeout":"bar"}}',
+      extra: '{"metadata_cache_timeout":{"schema_cache_timeout":10}}',
     });
   });
 
   test('it will set state to payload from extra input change when table_cache_timeout', () => {
     const action: DBReducerActionType = {
       type: ActionType.ExtraInputChange,
-      payload: { name: 'table_cache_timeout', value: 'bar' },
+      payload: { name: 'table_cache_timeout', value: '10' },
     };
     const currentState = dbReducer(databaseFixture, action);
 
     // extra should be serialized
     expect(currentState).toEqual({
       ...databaseFixture,
-      extra: '{"metadata_cache_timeout":{"table_cache_timeout":"bar"}}',
+      extra: '{"metadata_cache_timeout":{"table_cache_timeout":10}}',
     });
   });
 
   test('it will overwrite state to payload from extra input change when table_cache_timeout', () => {
     const action: DBReducerActionType = {
       type: ActionType.ExtraInputChange,
-      payload: { name: 'table_cache_timeout', value: 'bar' },
+      payload: { name: 'table_cache_timeout', value: '10' },
     };
     const currentState = dbReducer(
       {
         ...databaseFixture,
-        extra: '{"metadata_cache_timeout":{"table_cache_timeout":"foo"}}',
+        extra: '{"metadata_cache_timeout":{"table_cache_timeout":5}}',
       },
       action,
     );
@@ -1768,7 +1704,7 @@ describe('dbReducer', () => {
     // extra should be serialized
     expect(currentState).toEqual({
       ...databaseFixture,
-      extra: '{"metadata_cache_timeout":{"table_cache_timeout":"bar"}}',
+      extra: '{"metadata_cache_timeout":{"table_cache_timeout":10}}',
     });
   });
 
diff --git a/superset-frontend/src/features/databases/DatabaseModal/index.tsx b/superset-frontend/src/features/databases/DatabaseModal/index.tsx
index 8b359cc141b..cbb6ced2a98 100644
--- a/superset-frontend/src/features/databases/DatabaseModal/index.tsx
+++ b/superset-frontend/src/features/databases/DatabaseModal/index.tsx
@@ -35,23 +35,28 @@ import {
   useCallback,
   ChangeEvent,
 } from 'react';
+import { CheckboxChangeEvent } from '@superset-ui/core/components/Checkbox/types';
 
 import { useHistory } from 'react-router-dom';
 import { setItem, LocalStorageKeys } from 'src/utils/localStorageHelpers';
-// eslint-disable-next-line no-restricted-imports
-import { UploadChangeParam, UploadFile } from 'antd/lib/upload/interface'; // TODO: Remove antd
-import Tabs from 'src/components/Tabs';
-import { AntdSelect, Upload } from 'src/components';
-import Alert from 'src/components/Alert';
-import Modal from 'src/components/Modal';
-import Button from 'src/components/Button';
-import { IconButton } from 'src/components/IconButton';
-import InfoTooltip from 'src/components/InfoTooltip';
+import Tabs from '@superset-ui/core/components/Tabs';
+import {
+  Alert,
+  Button,
+  Icons,
+  LabeledErrorBoundInput as ValidatedInput,
+  Modal,
+  Select,
+  IconButton,
+  InfoTooltip,
+  Loading,
+  Upload,
+  type UploadChangeParam,
+  type UploadFile,
+  FormLabel,
+} from '@superset-ui/core/components';
+import { ErrorAlert, ErrorMessageWithStackTrace } from 'src/components';
 import withToasts from 'src/components/MessageToasts/withToasts';
-import ValidatedInput from 'src/components/Form/LabeledErrorBoundInput';
-import ErrorMessageWithStackTrace from 'src/components/ErrorMessage/ErrorMessageWithStackTrace';
-import ErrorAlert from 'src/components/ImportModal/ErrorAlert';
-import { Icons } from 'src/components/Icons';
 import {
   testDatabaseConnection,
   useSingleViewResource,
@@ -62,7 +67,6 @@ import {
   useImportResource,
 } from 'src/views/CRUD/hooks';
 import { useCommonConf } from 'src/features/databases/state';
-import Loading from 'src/components/Loading';
 import { isEmpty, pick } from 'lodash';
 import { OnlyKeyWithType } from 'src/utils/types';
 import {
@@ -107,6 +111,11 @@ const extensionsRegistry = getExtensionsRegistry();
 
 const DEFAULT_EXTRA = JSON.stringify({ allows_virtual_table_explore: true });
 
+const TABS_KEYS = {
+  BASIC: 'basic',
+  ADVANCED: 'advanced',
+};
+
 const engineSpecificAlertMapping = {
   [Engines.GSheet]: {
     message: 'Why do I need to create a database?',
@@ -121,7 +130,6 @@ const engineSpecificAlertMapping = {
 
 const TabsStyled = styled(Tabs)`
   .ant-tabs-content {
-    display: flex;
     width: 100%;
     overflow: inherit;
 
@@ -133,13 +141,13 @@ const TabsStyled = styled(Tabs)`
 
 const ErrorAlertContainer = styled.div`
   ${({ theme }) => `
-    margin: ${theme.gridUnit * 8}px ${theme.gridUnit * 4}px;
+    margin: ${theme.sizeUnit * 8}px ${theme.sizeUnit * 4}px;
   `};
 `;
 
 const SSHTunnelContainer = styled.div`
   ${({ theme }) => `
-    padding: 0px ${theme.gridUnit * 4}px;
+    padding: 0px ${theme.sizeUnit * 4}px;
   `};
 `;
 
@@ -244,8 +252,8 @@ export type DBReducerActionType =
     };
 
 const StyledBtns = styled.div`
-  margin-bottom: ${({ theme }) => theme.gridUnit * 3}px;
-  margin-left: ${({ theme }) => theme.gridUnit * 3}px;
+  margin-bottom: ${({ theme }) => theme.sizeUnit * 3}px;
+  margin-left: ${({ theme }) => theme.sizeUnit * 3}px;
 `;
 
 export function dbReducer(
@@ -286,7 +294,6 @@ export function dbReducer(
         }),
       };
     case ActionType.ExtraInputChange:
-      // "extra" payload in state is a string
       if (
         action.payload.name === 'schema_cache_timeout' ||
         action.payload.name === 'table_cache_timeout'
@@ -297,7 +304,7 @@ export function dbReducer(
             ...extraJson,
             metadata_cache_timeout: {
               ...extraJson?.metadata_cache_timeout,
-              [action.payload.name]: action.payload.value,
+              [action.payload.name]: Number(action.payload.value),
             },
           }),
         };
@@ -333,7 +340,10 @@ export function dbReducer(
             ...extraJson,
             schema_options: {
               ...extraJson?.schema_options,
-              [action.payload.name]: !!action.payload.value,
+              [action.payload.name]:
+                'checked' in action.payload
+                  ? !!action.payload.checked
+                  : !!action.payload.value,
             },
           }),
         };
@@ -553,7 +563,7 @@ export function dbReducer(
   }
 }
 
-const DEFAULT_TAB_KEY = '1';
+const DEFAULT_TAB_KEY = TABS_KEYS.BASIC;
 
 const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
   addDangerToast,
@@ -584,8 +594,14 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
 
   const [tabKey, setTabKey] = useState<string>(DEFAULT_TAB_KEY);
   const [availableDbs, getAvailableDbs] = useAvailableDatabases();
-  const [validationErrors, getValidation, setValidationErrors] =
-    useDatabaseValidation();
+  const [
+    validationErrors,
+    getValidation,
+    setValidationErrors,
+    isValidating,
+    hasValidated,
+    setHasValidated,
+  ] = useDatabaseValidation();
   const [hasConnectedDb, setHasConnectedDb] = useState<boolean>(false);
   const [showCTAbtns, setShowCTAbtns] = useState(false);
   const [dbName, setDbName] = useState('');
@@ -744,7 +760,8 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
 
   const handleClearValidationErrors = useCallback(() => {
     setValidationErrors(null);
-  }, [setValidationErrors]);
+    setHasValidated(false);
+  }, [setValidationErrors, setHasValidated]);
 
   const handleParametersChange = useCallback(
     ({ target }: { target: HTMLInputElement }) => {
@@ -802,7 +819,6 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
 
   const onSave = async () => {
     let dbConfigExtraExtensionOnSaveError;
-
     setLoading(true);
 
     dbConfigExtraExtension
@@ -1060,27 +1076,27 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
       <h4 className="available-label">
         {t('Or choose from a list of other databases we support:')}
       </h4>
-      <div className="control-label">{t('Supported databases')}</div>
-      <AntdSelect
+      <FormLabel className="control-label">
+        {t('Supported databases')}
+      </FormLabel>
+      <Select
         className="available-select"
         onChange={setDatabaseModel}
         placeholder={t('Choose a database...')}
+        options={[
+          ...(availableDbs?.databases || [])
+            .sort((a: DatabaseForm, b: DatabaseForm) =>
+              a.name.localeCompare(b.name),
+            )
+            .map((database: DatabaseForm, index: number) => ({
+              value: database.name,
+              label: database.name,
+              key: `database-${index}`,
+            })),
+          { value: 'Other', label: t('Other'), key: 'Other' },
+        ]}
         showSearch
-      >
-        {[...(availableDbs?.databases || [])]
-          ?.sort((a: DatabaseForm, b: DatabaseForm) =>
-            a.name.localeCompare(b.name),
-          )
-          .map((database: DatabaseForm, index: number) => (
-            <AntdSelect.Option value={database.name} key={`database-${index}`}>
-              {database.name}
-            </AntdSelect.Option>
-          ))}
-        {/* Allow users to connect to DB via legacy SQLA form */}
-        <AntdSelect.Option value="Other" key="Other">
-          {t('Other')}
-        </AntdSelect.Option>
-      </AntdSelect>
+      />
       <Alert
         showIcon
         closable={false}
@@ -1190,14 +1206,26 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
       if (!hasConnectedDb || editNewDb) {
         return (
           <>
-            <StyledFooterButton key="back" onClick={handleBackButtonOnConnect}>
+            <StyledFooterButton
+              key="back"
+              onClick={handleBackButtonOnConnect}
+              buttonStyle="secondary"
+            >
               {t('Back')}
             </StyledFooterButton>
             <StyledFooterButton
+              data-test="btn-submit-connection"
               key="submit"
               buttonStyle="primary"
               onClick={onSave}
               loading={isLoading}
+              disabled={
+                !!(
+                  !hasValidated ||
+                  isValidating ||
+                  (validationErrors && Object.keys(validationErrors).length > 0)
+                )
+              }
             >
               {t('Connect')}
             </StyledFooterButton>
@@ -1248,7 +1276,7 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
 
   const renderEditModalFooter = (db: Partial<DatabaseObject> | null) => (
     <>
-      <StyledFooterButton key="close" onClick={onClose}>
+      <StyledFooterButton key="close" onClick={onClose} buttonStyle="secondary">
         {t('Close')}
       </StyledFooterButton>
       <StyledFooterButton
@@ -1438,6 +1466,7 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
             onChange={(event: ChangeEvent<HTMLInputElement>) =>
               setPasswords({ ...passwords, [database]: event.target.value })
             }
+            isValidating={isValidating}
             validationMethods={{ onBlur: () => {} }}
             errorMessage={validationErrors?.password_needed}
             label={t('%s PASSWORD', database.slice(10))}
@@ -1446,6 +1475,7 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
         )}
         {sshTunnelPasswordFields?.indexOf(database) >= 0 && (
           <ValidatedInput
+            isValidating={isValidating}
             id="ssh_tunnel_password_needed"
             name="ssh_tunnel_password_needed"
             required
@@ -1466,6 +1496,7 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
           <ValidatedInput
             id="ssh_tunnel_private_key_needed"
             name="ssh_tunnel_private_key_needed"
+            isValidating={isValidating}
             required
             value={sshTunnelPrivateKeys[database]}
             onChange={(event: ChangeEvent<HTMLInputElement>) =>
@@ -1484,6 +1515,7 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
           <ValidatedInput
             id="ssh_tunnel_private_key_password_needed"
             name="ssh_tunnel_private_key_password_needed"
+            isValidating={isValidating}
             required
             value={sshTunnelPrivateKeyPasswords[database]}
             onChange={(event: ChangeEvent<HTMLInputElement>) =>
@@ -1509,10 +1541,7 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
 
     return (
       <StyledAlertMargin>
-        <ErrorAlert
-          errorMessage={importingErrorMessage}
-          showDbInstallInstructions={passwordFields.length > 0}
-        />
+        <ErrorAlert message={importingErrorMessage} />
       </StyledAlertMargin>
     );
   };
@@ -1542,6 +1571,7 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
         <ValidatedInput
           id="confirm_overwrite"
           name="confirm_overwrite"
+          isValidating={isValidating}
           required
           validationMethods={{ onBlur: () => {} }}
           errorMessage={validationErrors?.confirm_overwrite}
@@ -1610,12 +1640,11 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
         <ErrorAlertContainer>
           <ErrorMessageWithStackTrace
             title={t('Database Creation Error')}
-            description={t(
-              'We are unable to connect to your database. Click "See more" for database-provided information that may help troubleshoot the issue.',
-            )}
+            subtitle={t('We are unable to connect to your database.')}
             descriptionDetails={
               alertErrors?.[0] || validationErrors?.description
             }
+            copyText={validationErrors?.description}
           />
         </ErrorAlertContainer>
       );
@@ -1660,7 +1689,7 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
           redirectURL('/dataset/add/');
         }}
       >
-        {t('CREATE DATASET')}
+        {t('Create dataset')}
       </Button>
       <Button
         buttonStyle="secondary"
@@ -1670,7 +1699,7 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
           redirectURL(`/sqllab?db=true`);
         }}
       >
-        {t('QUERY DATA IN SQL LAB')}
+        {t('Query data in SQL Lab')}
       </Button>
     </StyledBtns>
   );
@@ -1678,6 +1707,7 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
   const renderDatabaseConnectionForm = () => (
     <>
       <DatabaseConnectionForm
+        isValidating={isValidating}
         isEditMode={isEditMode}
         db={db as DatabaseObject}
         sslForced={false}
@@ -1737,14 +1767,17 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
         <ExtraOptions
           extraExtension={dbConfigExtraExtension}
           db={db as DatabaseObject}
-          onInputChange={({ target }: { target: HTMLInputElement }) =>
+          onInputChange={(
+            e: CheckboxChangeEvent | React.ChangeEvent<HTMLInputElement>,
+          ) => {
+            const { target } = e;
             onChange(ActionType.InputChange, {
               type: target.type,
               name: target.name,
-              checked: target.checked,
+              checked: 'checked' in target ? target.checked : false,
               value: target.value,
-            })
-          }
+            });
+          }}
           onTextChange={({ target }: { target: HTMLTextAreaElement }) =>
             onChange(ActionType.TextChange, {
               name: target.name,
@@ -1754,11 +1787,14 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
           onEditorChange={(payload: { name: string; json: any }) =>
             onChange(ActionType.EditorChange, payload)
           }
-          onExtraInputChange={({ target }: { target: HTMLInputElement }) => {
+          onExtraInputChange={(
+            e: CheckboxChangeEvent | React.ChangeEvent<HTMLInputElement>,
+          ) => {
+            const { target } = e;
             onChange(ActionType.ExtraInputChange, {
               type: target.type,
               name: target.name,
-              checked: target.checked,
+              checked: 'checked' in target ? target.checked : false,
               value: target.value,
             });
           }}
@@ -1840,14 +1876,14 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
             <Icons.EditOutlined
               iconSize="l"
               css={css`
-                margin: auto ${theme.gridUnit * 2}px auto 0;
+                margin: auto ${theme.sizeUnit * 2}px auto 0;
               `}
             />
           ) : (
             <Icons.InsertRowAboveOutlined
               iconSize="l"
               css={css`
-                margin: auto ${theme.gridUnit * 2}px auto 0;
+                margin: auto ${theme.sizeUnit * 2}px auto 0;
               `}
             />
           )}
@@ -1875,128 +1911,149 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
         activeKey={tabKey}
         onTabClick={tabChange}
         animated={{ inkBar: true, tabPane: true }}
-      >
-        <Tabs.TabPane tab={<span>{t('Basic')}</span>} key="1">
-          {useSqlAlchemyForm ? (
-            <StyledAlignment>
-              <SqlAlchemyForm
+        items={[
+          {
+            key: TABS_KEYS.BASIC,
+            label: <span>{t('Basic')}</span>,
+            children: (
+              <>
+                {useSqlAlchemyForm ? (
+                  <StyledAlignment>
+                    <SqlAlchemyForm
+                      db={db as DatabaseObject}
+                      onInputChange={({
+                        target,
+                      }: {
+                        target: HTMLInputElement;
+                      }) =>
+                        onChange(ActionType.InputChange, {
+                          type: target.type,
+                          name: target.name,
+                          checked: target.checked,
+                          value: target.value,
+                        })
+                      }
+                      conf={conf}
+                      testConnection={testConnection}
+                      testInProgress={testInProgress}
+                    >
+                      <SSHTunnelSwitchComponent
+                        dbModel={dbModel}
+                        db={db as DatabaseObject}
+                        changeMethods={{
+                          onParametersChange: handleParametersChange,
+                        }}
+                        clearValidationErrors={handleClearValidationErrors}
+                      />
+                      {useSSHTunneling && renderSSHTunnelForm()}
+                    </SqlAlchemyForm>
+                    {isDynamic(db?.backend || db?.engine) && !isEditMode && (
+                      <div css={(theme: SupersetTheme) => infoTooltip(theme)}>
+                        <Button
+                          buttonStyle="link"
+                          onClick={() =>
+                            setDB({
+                              type: ActionType.ConfigMethodChange,
+                              payload: {
+                                database_name: db?.database_name,
+                                configuration_method:
+                                  ConfigurationMethod.DynamicForm,
+                                engine: db?.engine,
+                              },
+                            })
+                          }
+                          css={theme => alchemyButtonLinkStyles(theme)}
+                        >
+                          {t(
+                            'Connect this database using the dynamic form instead',
+                          )}
+                        </Button>
+                        <InfoTooltip
+                          tooltip={t(
+                            'Click this link to switch to an alternate form that exposes only the required fields needed to connect this database.',
+                          )}
+                        />
+                      </div>
+                    )}
+                  </StyledAlignment>
+                ) : (
+                  renderDatabaseConnectionForm()
+                )}
+                {!isEditMode && (
+                  <StyledAlertMargin>
+                    <Alert
+                      closable={false}
+                      css={(theme: SupersetTheme) => antDAlertStyles(theme)}
+                      message={t('Additional fields may be required')}
+                      showIcon
+                      description={
+                        <>
+                          {t(
+                            'Select databases require additional fields to be completed in the Advanced tab to successfully connect the database. Learn what requirements your databases has ',
+                          )}
+                          <a
+                            href={DOCUMENTATION_LINK}
+                            target="_blank"
+                            rel="noopener noreferrer"
+                            className="additional-fields-alert-description"
+                          >
+                            {t('here')}
+                          </a>
+                          .
+                        </>
+                      }
+                      type="info"
+                    />
+                  </StyledAlertMargin>
+                )}
+                {showDBError && errorAlert()}
+              </>
+            ),
+          },
+          {
+            key: TABS_KEYS.ADVANCED,
+            label: <span>{t('Advanced')}</span>,
+            children: (
+              <ExtraOptions
+                extraExtension={dbConfigExtraExtension}
                 db={db as DatabaseObject}
-                onInputChange={({ target }: { target: HTMLInputElement }) =>
+                onInputChange={(e: CheckboxChangeEvent) => {
+                  const { target } = e;
                   onChange(ActionType.InputChange, {
                     type: target.type,
                     name: target.name,
                     checked: target.checked,
                     value: target.value,
-                  })
-                }
-                conf={conf}
-                testConnection={testConnection}
-                testInProgress={testInProgress}
-              >
-                <SSHTunnelSwitchComponent
-                  dbModel={dbModel}
-                  db={db as DatabaseObject}
-                  changeMethods={{
-                    onParametersChange: handleParametersChange,
-                  }}
-                  clearValidationErrors={handleClearValidationErrors}
-                />
-                {useSSHTunneling && renderSSHTunnelForm()}
-              </SqlAlchemyForm>
-              {isDynamic(db?.backend || db?.engine) && !isEditMode && (
-                <div css={(theme: SupersetTheme) => infoTooltip(theme)}>
-                  <Button
-                    buttonStyle="link"
-                    onClick={() =>
-                      setDB({
-                        type: ActionType.ConfigMethodChange,
-                        payload: {
-                          database_name: db?.database_name,
-                          configuration_method: ConfigurationMethod.DynamicForm,
-                          engine: db?.engine,
-                        },
-                      })
-                    }
-                    css={theme => alchemyButtonLinkStyles(theme)}
-                  >
-                    {t('Connect this database using the dynamic form instead')}
-                  </Button>
-                  <InfoTooltip
-                    tooltip={t(
-                      'Click this link to switch to an alternate form that exposes only the required fields needed to connect this database.',
-                    )}
-                    viewBox="0 -6 24 24"
-                  />
-                </div>
-              )}
-            </StyledAlignment>
-          ) : (
-            renderDatabaseConnectionForm()
-          )}
-          {!isEditMode && (
-            <StyledAlertMargin>
-              <Alert
-                closable={false}
-                css={(theme: SupersetTheme) => antDAlertStyles(theme)}
-                message={t('Additional fields may be required')}
-                showIcon
-                description={
-                  <>
-                    {t(
-                      'Select databases require additional fields to be completed in the Advanced tab to successfully connect the database. Learn what requirements your databases has ',
-                    )}
-                    <a
-                      href={DOCUMENTATION_LINK}
-                      target="_blank"
-                      rel="noopener noreferrer"
-                      className="additional-fields-alert-description"
-                    >
-                      {t('here')}
-                    </a>
-                    .
-                  </>
-                }
-                type="info"
+                  });
+                }}
+                onTextChange={({ target }: { target: HTMLTextAreaElement }) => {
+                  onChange(ActionType.TextChange, {
+                    name: target.name,
+                    value: target.value,
+                  });
+                }}
+                onEditorChange={(payload: { name: string; json: any }) => {
+                  onChange(ActionType.EditorChange, payload);
+                }}
+                onExtraInputChange={(
+                  e: React.ChangeEvent<HTMLInputElement> | CheckboxChangeEvent,
+                ) => {
+                  const { target } = e;
+                  onChange(ActionType.ExtraInputChange, {
+                    type: target.type,
+                    name: target.name,
+                    checked: target.checked,
+                    value: target.value,
+                  });
+                }}
+                onExtraEditorChange={(payload: { name: string; json: any }) => {
+                  onChange(ActionType.ExtraEditorChange, payload);
+                }}
               />
-            </StyledAlertMargin>
-          )}
-          {showDBError && errorAlert()}
-        </Tabs.TabPane>
-        <Tabs.TabPane tab={<span>{t('Advanced')}</span>} key="2">
-          <ExtraOptions
-            extraExtension={dbConfigExtraExtension}
-            db={db as DatabaseObject}
-            onInputChange={({ target }: { target: HTMLInputElement }) =>
-              onChange(ActionType.InputChange, {
-                type: target.type,
-                name: target.name,
-                checked: target.checked,
-                value: target.value,
-              })
-            }
-            onTextChange={({ target }: { target: HTMLTextAreaElement }) =>
-              onChange(ActionType.TextChange, {
-                name: target.name,
-                value: target.value,
-              })
-            }
-            onEditorChange={(payload: { name: string; json: any }) =>
-              onChange(ActionType.EditorChange, payload)
-            }
-            onExtraInputChange={({ target }: { target: HTMLInputElement }) => {
-              onChange(ActionType.ExtraInputChange, {
-                type: target.type,
-                name: target.name,
-                checked: target.checked,
-                value: target.value,
-              });
-            }}
-            onExtraEditorChange={(payload: { name: string; json: any }) => {
-              onChange(ActionType.ExtraEditorChange, payload);
-            }}
-          />
-        </Tabs.TabPane>
-      </TabsStyled>
+            ),
+          },
+        ]}
+      />
     </Modal>
   ) : (
     <Modal
@@ -2018,7 +2075,7 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
           <Icons.InsertRowAboveOutlined
             iconSize="l"
             css={css`
-              margin: auto ${theme.gridUnit * 2}px auto 0;
+              margin: auto ${theme.sizeUnit * 2}px auto 0;
             `}
           />
           {t('Connect a database')}
@@ -2072,7 +2129,6 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
                     <Button
                       data-test="import-database-btn"
                       buttonStyle="link"
-                      type="link"
                       css={importDbButtonLinkStyles}
                     >
                       {t('Import database from file')}
@@ -2121,7 +2177,6 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
                         tooltip={t(
                           'Click this link to switch to an alternate form that allows you to input the SQLAlchemy URL for this database manually.',
                         )}
-                        viewBox="0 -6 24 24"
                       />
                     </>
                   )}
diff --git a/superset-frontend/src/features/databases/DatabaseModal/styles.ts b/superset-frontend/src/features/databases/DatabaseModal/styles.ts
index 7c2718f8d85..e8e18c5cc5a 100644
--- a/superset-frontend/src/features/databases/DatabaseModal/styles.ts
+++ b/superset-frontend/src/features/databases/DatabaseModal/styles.ts
@@ -18,94 +18,68 @@
  */
 
 import { css, styled, SupersetTheme } from '@superset-ui/core';
-import { JsonEditor } from 'src/components/AsyncAceEditor';
-import Button from 'src/components/Button';
+import { Button, JsonEditor } from '@superset-ui/core/components';
 
 const CTAS_CVAS_SCHEMA_FORM_HEIGHT = 108;
 const EXPOSE_IN_SQLLAB_FORM_HEIGHT = CTAS_CVAS_SCHEMA_FORM_HEIGHT + 153;
 const EXPOSE_ALL_FORM_HEIGHT = EXPOSE_IN_SQLLAB_FORM_HEIGHT + 102;
 const MODAL_BODY_HEIGHT = 180.5;
 
-const anticonHeight = 12;
-
 export const no_margin_bottom = css`
   margin-bottom: 0;
 `;
 
 export const labelMarginBottom = (theme: SupersetTheme) => css`
-  margin-bottom: ${theme.gridUnit * 2}px;
+  margin-bottom: ${theme.sizeUnit * 2}px;
 `;
 
 export const marginBottom = (theme: SupersetTheme) => css`
-  margin-bottom: ${theme.gridUnit * 4}px;
+  margin-bottom: ${theme.sizeUnit * 4}px;
 `;
 
 export const StyledFormHeader = styled.header`
-  padding: ${({ theme }) => theme.gridUnit * 2}px
-    ${({ theme }) => theme.gridUnit * 4}px;
-  line-height: ${({ theme }) => theme.gridUnit * 6}px;
+  padding: ${({ theme }) => theme.sizeUnit * 2}px
+    ${({ theme }) => theme.sizeUnit * 4}px;
+  line-height: ${({ theme }) => theme.sizeUnit * 6}px;
 
   .helper-top {
     padding-bottom: 0;
-    color: ${({ theme }) => theme.colors.grayscale.base};
-    font-size: ${({ theme }) => theme.typography.sizes.s}px;
+    color: ${({ theme }) => theme.colorText};
+    font-size: ${({ theme }) => theme.fontSizeSM}px;
     margin: 0;
   }
 
   .subheader-text {
-    line-height: ${({ theme }) => theme.gridUnit * 4.25}px;
+    line-height: ${({ theme }) => theme.sizeUnit * 4.25}px;
   }
 
   .helper-bottom {
     padding-top: 0;
-    color: ${({ theme }) => theme.colors.grayscale.base};
-    font-size: ${({ theme }) => theme.typography.sizes.s}px;
+    color: ${({ theme }) => theme.colorText};
+    font-size: ${({ theme }) => theme.fontSizeSM}px;
     margin: 0;
   }
 
   h4 {
-    color: ${({ theme }) => theme.colors.grayscale.dark2};
-    font-size: ${({ theme }) => theme.typography.sizes.l}px;
+    color: ${({ theme }) => theme.colorText};
+    font-size: ${({ theme }) => theme.fontSizeLG}px;
     margin: 0;
     padding: 0;
-    line-height: ${({ theme }) => theme.gridUnit * 8}px;
+    line-height: ${({ theme }) => theme.sizeUnit * 8}px;
   }
 
   .select-db {
-    padding-bottom: ${({ theme }) => theme.gridUnit * 2}px;
+    padding-bottom: ${({ theme }) => theme.sizeUnit * 2}px;
     .helper {
       margin: 0;
     }
 
     h4 {
-      margin: 0 0 ${({ theme }) => theme.gridUnit * 4}px;
+      margin: 0 0 ${({ theme }) => theme.sizeUnit * 4}px;
     }
   }
 `;
 
-export const antdCollapseStyles = (theme: SupersetTheme) => css`
-  .ant-collapse-header {
-    padding-top: ${theme.gridUnit * 3.5}px;
-    padding-bottom: ${theme.gridUnit * 2.5}px;
-
-    .anticon.ant-collapse-arrow {
-      top: calc(50% - ${anticonHeight / 2}px);
-    }
-    .helper {
-      color: ${theme.colors.grayscale.base};
-    }
-  }
-  h4 {
-    font-size: 16px;
-    margin-top: 0;
-    margin-bottom: ${theme.gridUnit}px;
-  }
-  p.helper {
-    margin-bottom: 0;
-    padding: 0;
-  }
-`;
-
 export const antDTabsStyles = css`
   .ant-tabs-top {
     margin-top: 0;
@@ -119,7 +93,7 @@ export const antDTabsStyles = css`
 `;
 
 export const antDModalNoPaddingStyles = css`
-  .antd5-modal-body {
+  .ant-modal-body {
     padding-left: 0;
     padding-right: 0;
     padding-top: 0;
@@ -127,112 +101,108 @@ export const antDModalNoPaddingStyles = css`
 `;
 
 export const infoTooltip = (theme: SupersetTheme) => css`
-  margin-bottom: ${theme.gridUnit * 5}px;
+  margin-bottom: ${theme.sizeUnit * 5}px;
   svg {
-    margin-bottom: ${theme.gridUnit * 0.25}px;
+    margin-bottom: ${theme.sizeUnit * 0.25}px;
   }
   display: flex;
 `;
 
 export const toggleStyle = (theme: SupersetTheme) => css`
-  padding-left: ${theme.gridUnit * 2}px;
-  padding-right: ${theme.gridUnit * 2}px;
+  padding-left: ${theme.sizeUnit * 2}px;
+  padding-right: ${theme.sizeUnit * 2}px;
 `;
 
 export const formScrollableStyles = (theme: SupersetTheme) => css`
-  padding: ${theme.gridUnit * 4}px ${theme.gridUnit * 4}px 0;
+  padding: ${theme.sizeUnit * 4}px ${theme.sizeUnit * 4}px 0;
 `;
 
 export const antDModalStyles = (theme: SupersetTheme) => css`
   .ant-select-dropdown {
-    height: ${theme.gridUnit * 40}px;
+    height: ${theme.sizeUnit * 40}px;
   }
 
-  .antd5-modal-header {
-    padding: ${theme.gridUnit * 4.5}px ${theme.gridUnit * 4}px
-      ${theme.gridUnit * 4}px;
+  .ant-modal-header {
+    padding: ${theme.sizeUnit * 4.5}px ${theme.sizeUnit * 4}px
+      ${theme.sizeUnit * 4}px;
   }
 
-  .antd5-modal-close-x .close {
+  .ant-modal-close-x .close {
     opacity: 1;
   }
 
-  .antd5-modal-body {
-    height: ${theme.gridUnit * MODAL_BODY_HEIGHT}px;
+  .ant-modal-body {
+    height: ${theme.sizeUnit * MODAL_BODY_HEIGHT}px;
   }
 
-  .antd5-modal-footer {
-    height: ${theme.gridUnit * 16.25}px;
+  .ant-modal-footer {
+    height: ${theme.sizeUnit * 16.25}px;
   }
 `;
 
 export const antDAlertStyles = (theme: SupersetTheme) => css`
-  margin: ${theme.gridUnit * 4}px 0;
+  margin: ${theme.sizeUnit * 4}px 0;
 `;
 
 export const StyledAlertMargin = styled.div`
   ${({ theme }) => css`
-    margin: 0 ${theme.gridUnit * 4}px ${theme.gridUnit * 4}px;
+    margin: 0 ${theme.sizeUnit * 4}px ${theme.sizeUnit * 4}px;
   `}
 `;
 
 export const antDErrorAlertStyles = (theme: SupersetTheme) => css`
-  margin: ${theme.gridUnit * 8}px ${theme.gridUnit * 4}px;
+  margin: ${theme.sizeUnit * 8}px ${theme.sizeUnit * 4}px;
 `;
 
 export const antdWarningAlertStyles = (theme: SupersetTheme) => css`
-  margin: ${theme.gridUnit * 4}px 0;
+  margin: ${theme.sizeUnit * 4}px 0;
 
-  .antd5-alert-message {
+  .ant-alert-message {
     margin: 0;
   }
 `;
 
 export const formHelperStyles = (theme: SupersetTheme) => css`
   .required {
-    margin-left: ${theme.gridUnit / 2}px;
-    color: ${theme.colors.error.base};
+    margin-left: ${theme.sizeUnit / 2}px;
+    color: ${theme.colorError};
   }
 
   .helper {
     display: block;
-    padding: ${theme.gridUnit}px 0;
+    padding: ${theme.sizeUnit}px 0;
     color: ${theme.colors.grayscale.light1};
-    font-size: ${theme.typography.sizes.s}px;
+    font-size: ${theme.fontSizeSM}px;
     text-align: left;
   }
 `;
 
 export const wideButton = (theme: SupersetTheme) => css`
   width: 100%;
-  border: 1px solid ${theme.colors.primary.dark2};
-  color: ${theme.colors.primary.dark2};
+  border: 1px solid ${theme.colorPrimaryText};
+  color: ${theme.colorPrimaryText};
   &:hover,
   &:focus {
-    border: 1px solid ${theme.colors.primary.dark1};
-    color: ${theme.colors.primary.dark1};
+    border: 1px solid ${theme.colorPrimary};
+    color: ${theme.colorPrimary};
   }
 `;
 
 export const formStyles = (theme: SupersetTheme) => css`
   .form-group {
-    margin-bottom: ${theme.gridUnit * 4}px;
+    margin-bottom: ${theme.sizeUnit * 4}px;
     &-w-50 {
       display: inline-block;
-      width: ${`calc(50% - ${theme.gridUnit * 4}px)`};
+      width: ${`calc(50% - ${theme.sizeUnit * 4}px)`};
       & + .form-group-w-50 {
-        margin-left: ${theme.gridUnit * 8}px;
+        margin-left: ${theme.sizeUnit * 8}px;
       }
     }
   }
-  .control-label {
-    color: ${theme.colors.grayscale.dark1};
-    font-size: ${theme.typography.sizes.s}px;
-  }
   .helper {
     color: ${theme.colors.grayscale.light1};
-    font-size: ${theme.typography.sizes.s}px;
-    margin-top: ${theme.gridUnit * 1.5}px;
+    font-size: ${theme.fontSizeSM}px;
+    margin-top: ${theme.sizeUnit * 1.5}px;
   }
   .ant-tabs-content-holder {
     overflow: auto;
@@ -242,30 +212,24 @@ export const formStyles = (theme: SupersetTheme) => css`
 
 export const validatedFormStyles = (theme: SupersetTheme) => css`
   label {
-    color: ${theme.colors.grayscale.dark1};
-    font-size: ${theme.typography.sizes.s}px;
+    color: ${theme.colorText};
+    font-size: ${theme.fontSizeSM}px;
     margin-bottom: 0;
   }
 `;
 
 export const StyledInputContainer = styled.div`
   ${({ theme }) => css`
-    margin-bottom: ${theme.gridUnit * 6}px;
+    margin-bottom: ${theme.sizeUnit * 6}px;
     &.mb-0 {
       margin-bottom: 0;
     }
     &.mb-8 {
-      margin-bottom: ${theme.gridUnit * 2}px;
-    }
-
-    .control-label {
-      color: ${theme.colors.grayscale.dark1};
-      font-size: ${theme.typography.sizes.s}px;
-      margin-bottom: ${theme.gridUnit * 2}px;
+      margin-bottom: ${theme.sizeUnit * 2}px;
     }
 
     &.extra-container {
-      padding-top: ${theme.gridUnit * 2}px;
+      padding-top: ${theme.sizeUnit * 2}px;
     }
 
     .input-container {
@@ -274,14 +238,14 @@ export const StyledInputContainer = styled.div`
 
       label {
         display: flex;
-        margin-left: ${theme.gridUnit * 2}px;
-        margin-top: ${theme.gridUnit * 0.75}px;
-        font-family: ${theme.typography.families.sansSerif};
-        font-size: ${theme.typography.sizes.m}px;
+        margin-left: ${theme.sizeUnit * 2}px;
+        margin-top: ${theme.sizeUnit * 0.75}px;
+        font-family: ${theme.fontFamily};
+        font-size: ${theme.fontSize}px;
       }
 
       i {
-        margin: 0 ${theme.gridUnit}px;
+        margin: 0 ${theme.sizeUnit}px;
       }
     }
 
@@ -303,10 +267,10 @@ export const StyledInputContainer = styled.div`
     textarea,
     input[type='text'],
     input[type='number'] {
-      padding: ${theme.gridUnit * 1.5}px ${theme.gridUnit * 2}px;
+      padding: ${theme.sizeUnit * 1.5}px ${theme.sizeUnit * 2}px;
       border-style: none;
-      border: 1px solid ${theme.colors.grayscale.light2};
-      border-radius: ${theme.gridUnit}px;
+      border: 1px solid ${theme.colorBorder};
+      border-radius: ${theme.borderRadius}px;
 
       &[name='name'] {
         flex: 0 1 auto;
@@ -317,15 +281,12 @@ export const StyledInputContainer = styled.div`
       height: 0;
       overflow: hidden;
       transition: height 0.25s;
-      margin-left: ${theme.gridUnit * 8}px;
+      margin-left: ${theme.sizeUnit * 8}px;
       margin-bottom: 0;
       padding: 0;
-      .control-label {
-        margin-bottom: 0;
-      }
       &.open {
         height: ${CTAS_CVAS_SCHEMA_FORM_HEIGHT}px;
-        padding-right: ${theme.gridUnit * 5}px;
+        padding-right: ${theme.sizeUnit * 5}px;
       }
     }
   `}
@@ -333,21 +294,21 @@ export const StyledInputContainer = styled.div`
 
 export const StyledJsonEditor = styled(JsonEditor)`
   flex: 1 1 auto;
-  border: 1px solid ${({ theme }) => theme.colors.grayscale.light2};
-  border-radius: ${({ theme }) => theme.gridUnit}px;
+  border: 1px solid ${({ theme }) => theme.colorBorder};
+  border-radius: ${({ theme }) => theme.borderRadius}px;
 `;
 
 export const StyledExpandableForm = styled.div`
-  padding-top: ${({ theme }) => theme.gridUnit}px;
+  padding-top: ${({ theme }) => theme.sizeUnit}px;
   .input-container {
-    padding-top: ${({ theme }) => theme.gridUnit}px;
-    padding-bottom: ${({ theme }) => theme.gridUnit}px;
+    padding-top: ${({ theme }) => theme.sizeUnit}px;
+    padding-bottom: ${({ theme }) => theme.sizeUnit}px;
   }
   &.expandable {
     height: 0;
     overflow: hidden;
     transition: height 0.25s;
-    margin-left: ${({ theme }) => theme.gridUnit * 7}px;
+    margin-left: ${({ theme }) => theme.sizeUnit * 7}px;
     &.open {
       height: ${EXPOSE_IN_SQLLAB_FORM_HEIGHT}px;
       &.ctas-open {
@@ -358,27 +319,24 @@ export const StyledExpandableForm = styled.div`
 `;
 
 export const StyledAlignment = styled.div`
-  padding: 0 ${({ theme }) => theme.gridUnit * 4}px;
-  margin-top: ${({ theme }) => theme.gridUnit * 6}px;
+  padding: 0 ${({ theme }) => theme.sizeUnit * 4}px;
+  margin-top: ${({ theme }) => theme.sizeUnit * 6}px;
 `;
 
 export const buttonLinkStyles = (theme: SupersetTheme) => css`
-  font-weight: ${theme.typography.weights.normal};
   text-transform: initial;
-  padding-right: ${theme.gridUnit * 2}px;
+  padding-right: ${theme.sizeUnit * 2}px;
 `;
 
 export const importDbButtonLinkStyles = (theme: SupersetTheme) => css`
-  font-size: ${theme.gridUnit * 3.5}px;
-  font-weight: ${theme.typography.weights.normal};
+  font-size: ${theme.sizeUnit * 3.5}px;
   text-transform: initial;
-  padding-right: ${theme.gridUnit * 2}px;
+  padding-right: ${theme.sizeUnit * 2}px;
 `;
 
 export const alchemyButtonLinkStyles = (theme: SupersetTheme) => css`
-  font-weight: ${theme.typography.weights.normal};
   text-transform: initial;
-  padding: ${theme.gridUnit * 8}px 0 0;
+  padding: ${theme.sizeUnit * 8}px 0 0;
   margin-left: 0px;
 `;
 
@@ -390,31 +348,31 @@ export const TabHeader = styled.div`
 
   .helper {
     color: ${({ theme }) => theme.colors.grayscale.base};
-    font-size: ${({ theme }) => theme.typography.sizes.s}px;
+    font-size: ${({ theme }) => theme.fontSizeSM}px;
     margin: 0px;
   }
 `;
 
 export const CreateHeaderTitle = styled.div`
-  color: ${({ theme }) => theme.colors.grayscale.dark2};
-  font-weight: ${({ theme }) => theme.typography.weights.bold};
-  font-size: ${({ theme }) => theme.typography.sizes.m}px;
+  color: ${({ theme }) => theme.colorText};
+  font-weight: ${({ theme }) => theme.fontWeightStrong};
+  font-size: ${({ theme }) => theme.fontSize}px;
 `;
 
 export const CreateHeaderSubtitle = styled.div`
-  color: ${({ theme }) => theme.colors.grayscale.dark1};
-  font-size: ${({ theme }) => theme.typography.sizes.s}px;
+  color: ${({ theme }) => theme.colorText};
+  font-size: ${({ theme }) => theme.fontSizeSM}px;
 `;
 
 export const EditHeaderTitle = styled.div`
   color: ${({ theme }) => theme.colors.grayscale.light1};
-  font-size: ${({ theme }) => theme.typography.sizes.s}px;
+  font-size: ${({ theme }) => theme.fontSizeSM}px;
 `;
 
 export const EditHeaderSubtitle = styled.div`
-  color: ${({ theme }) => theme.colors.grayscale.dark1};
-  font-size: ${({ theme }) => theme.typography.sizes.l}px;
-  font-weight: ${({ theme }) => theme.typography.weights.bold};
+  color: ${({ theme }) => theme.colorText};
+  font-size: ${({ theme }) => theme.fontSizeLG}px;
+  font-weight: ${({ theme }) => theme.fontWeightStrong};
 `;
 
 export const CredentialInfoForm = styled.div`
@@ -423,9 +381,9 @@ export const CredentialInfoForm = styled.div`
   }
 
   .label-select {
-    color: ${({ theme }) => theme.colors.grayscale.dark1};
+    color: ${({ theme }) => theme.colorText};
     font-size: 11px;
-    margin: 0 5px ${({ theme }) => theme.gridUnit * 2}px;
+    margin: 0 5px ${({ theme }) => theme.sizeUnit * 2}px;
   }
 
   .label-paste {
@@ -435,7 +393,7 @@ export const CredentialInfoForm = styled.div`
   }
 
   .input-container {
-    margin: ${({ theme }) => theme.gridUnit * 4}px 0;
+    margin: ${({ theme }) => theme.sizeUnit * 4}px 0;
     display: flex;
     flex-direction: column;
 }
@@ -443,11 +401,11 @@ export const CredentialInfoForm = styled.div`
   .input-form {
     height: 100px;
     width: 100%;
-    border: 1px solid ${({ theme }) => theme.colors.grayscale.light2};
-    border-radius: ${({ theme }) => theme.gridUnit}px;
+    border: 1px solid ${({ theme }) => theme.colorBorder};
+    border-radius: ${({ theme }) => theme.borderRadius}px;
     resize: vertical;
-    padding: ${({ theme }) => theme.gridUnit * 1.5}px
-      ${({ theme }) => theme.gridUnit * 2}px;
+    padding: ${({ theme }) => theme.sizeUnit * 1.5}px
+      ${({ theme }) => theme.sizeUnit * 2}px;
     &::placeholder {
       color: ${({ theme }) => theme.colors.grayscale.light1};
     }
@@ -463,7 +421,7 @@ export const CredentialInfoForm = styled.div`
     .credentials-uploaded {
       display: flex;
       align-items: center;
-      gap: ${({ theme }) => theme.gridUnit * 3}px;
+      gap: ${({ theme }) => theme.sizeUnit * 3}px;
       width: fit-content;
     }
 
@@ -485,20 +443,20 @@ export const SelectDatabaseStyles = styled.div`
     display: flex;
     flex-wrap: wrap;
     justify-content: space-between;
-    margin: ${({ theme }) => theme.gridUnit * 4}px;
+    margin: ${({ theme }) => theme.sizeUnit * 4}px;
   }
 
   .preferred-item {
     width: 32%;
-    margin-bottom: ${({ theme }) => theme.gridUnit * 2.5}px;
+    margin-bottom: ${({ theme }) => theme.sizeUnit * 2.5}px;
   }
 
   .available {
-    margin: ${({ theme }) => theme.gridUnit * 4}px;
+    margin: ${({ theme }) => theme.sizeUnit * 4}px;
     .available-label {
-      font-size: ${({ theme }) => theme.typography.sizes.l}px;
-      font-weight: ${({ theme }) => theme.typography.weights.bold};
-      margin: ${({ theme }) => theme.gridUnit * 6}px 0;
+      font-size: ${({ theme }) => theme.fontSizeLG}px;
+      font-weight: ${({ theme }) => theme.fontWeightStrong};
+      margin: ${({ theme }) => theme.sizeUnit * 6}px 0;
     }
     .available-select {
       width: 100%;
@@ -506,25 +464,19 @@ export const SelectDatabaseStyles = styled.div`
   }
 
   .label-available-select {
-    font-size: ${({ theme }) => theme.typography.sizes.s}px;
-  }
-
-  .control-label {
-    color: ${({ theme }) => theme.colors.grayscale.dark1};
-    font-size: ${({ theme }) => theme.typography.sizes.s}px;
-    margin-bottom: ${({ theme }) => theme.gridUnit * 2}px;
+    font-size: ${({ theme }) => theme.fontSizeSM}px;
   }
 `;
 
 export const StyledFooterButton = styled(Button)`
-  width: ${({ theme }) => theme.gridUnit * 40}px;
+  width: ${({ theme }) => theme.sizeUnit * 40}px;
 `;
 
 export const StyledStickyHeader = styled.div`
   position: sticky;
   top: 0;
-  z-index: ${({ theme }) => theme.zIndex.max};
-  background: ${({ theme }) => theme.colors.grayscale.light5};
+  z-index: ${({ theme }) => theme.zIndexPopupBase};
+  background: ${({ theme }) => theme.colorBgLayout};
   height: auto;
 `;
 
@@ -536,9 +488,9 @@ export const StyledCatalogTable = styled.div`
   }
 
   .gsheet-title {
-    font-size: ${({ theme }) => theme.typography.sizes.l}px;
-    font-weight: ${({ theme }) => theme.typography.weights.bold};
-    margin: ${({ theme }) => theme.gridUnit * 10}px 0 16px;
+    font-size: ${({ theme }) => theme.fontSizeLG}px;
+    font-weight: ${({ theme }) => theme.fontWeightStrong};
+    margin: ${({ theme }) => theme.sizeUnit * 10}px 0 16px;
   }
 
   .catalog-label {
@@ -564,6 +516,7 @@ export const StyledCatalogTable = styled.div`
 `;
 
 export const StyledUploadWrapper = styled.div`
+  margin: ${({ theme }) => theme.sizeUnit * 4}px;
   .ant-progress-inner {
     display: none;
   }
diff --git a/superset-frontend/src/features/databases/UploadDataModel/ColumnsPreview.tsx b/superset-frontend/src/features/databases/UploadDataModel/ColumnsPreview.tsx
index 5b482af8599..fbd59fe213e 100644
--- a/superset-frontend/src/features/databases/UploadDataModel/ColumnsPreview.tsx
+++ b/superset-frontend/src/features/databases/UploadDataModel/ColumnsPreview.tsx
@@ -18,10 +18,8 @@
  */
 import { FC } from 'react';
 import { styled, t } from '@superset-ui/core';
-
-import { Typography } from 'src/components';
-import TagsList from 'src/components/Tags/TagsList';
-import TagType from 'src/types/TagType';
+import { Typography } from '@superset-ui/core/components';
+import { type TagType, TagsList } from 'src/components';
 
 interface ColumnsPreviewProps {
   columns: string[];
diff --git a/superset-frontend/src/features/databases/UploadDataModel/StyledFormItemWithTip.tsx b/superset-frontend/src/features/databases/UploadDataModel/StyledFormItemWithTip.tsx
index a9d89c01c18..e4eaafed551 100644
--- a/superset-frontend/src/features/databases/UploadDataModel/StyledFormItemWithTip.tsx
+++ b/superset-frontend/src/features/databases/UploadDataModel/StyledFormItemWithTip.tsx
@@ -18,7 +18,7 @@
  */
 
 import { FC, ReactNode } from 'react';
-import InfoTooltip from 'src/components/InfoTooltip';
+import { InfoTooltip } from '@superset-ui/core/components';
 import { StyledFormItem } from './styles';
 
 interface StyledFormItemWithTipProps {
diff --git a/superset-frontend/src/features/databases/UploadDataModel/UploadDataModal.test.tsx b/superset-frontend/src/features/databases/UploadDataModel/UploadDataModal.test.tsx
index 97cc9c1bb8c..37f1ff0b1e9 100644
--- a/superset-frontend/src/features/databases/UploadDataModel/UploadDataModal.test.tsx
+++ b/superset-frontend/src/features/databases/UploadDataModel/UploadDataModal.test.tsx
@@ -25,8 +25,8 @@ import {
   screen,
   waitFor,
   userEvent,
+  fireEvent,
 } from 'spec/helpers/testing-library';
-import { UploadFile } from 'antd/lib/upload/interface';
 
 const csvProps = {
   show: true,
@@ -49,10 +49,9 @@ const columnarProps = {
   type: 'columnar',
 };
 
-beforeEach(() => {
+// Helper function to setup common mocks
+const setupMocks = () => {
   fetchMock.post('glob:*api/v1/database/1/upload/', {});
-
-  // 4 mocks below are not necessary
   fetchMock.post('glob:*api/v1/database/csv_metadata/', {});
   fetchMock.post('glob:*api/v1/database/excel_metadata/', {});
   fetchMock.post('glob:*api/v1/database/columnar_metadata/', {});
@@ -85,794 +84,520 @@ beforeEach(() => {
   fetchMock.get('glob:*api/v1/database/2/schemas/?q=(upload_allowed:!t)', {
     result: ['schema1', 'schema2'],
   });
+};
+
+// Set timeout for all tests in this file to 30 seconds
+jest.setTimeout(30000);
+
+beforeEach(() => {
+  setupMocks();
 });
 
 afterEach(() => {
   fetchMock.restore();
 });
 
-test('CSV, renders the general information elements correctly', () => {
-  render(<UploadDataModal {...csvProps} />, {
-    useRedux: true,
+// Helper function to get common elements
+const getCommonElements = () => ({
+  cancelButton: screen.getByRole('button', { name: 'Cancel' }),
+  uploadButton: screen.getByRole('button', { name: 'Upload' }),
+  selectButton: screen.getByRole('button', { name: 'Select' }),
+  panel1: screen.getByRole('heading', { name: /General information/i }),
+  panel2: screen.getByRole('heading', { name: /file settings/i }),
+  panel3: screen.getByRole('heading', { name: /columns/i }),
+  selectDatabase: screen.getByRole('combobox', { name: /select a database/i }),
+  inputTableName: screen.getByRole('textbox', { name: /table name/i }),
+  inputSchema: screen.getByRole('combobox', { name: /schema/i }),
+});
+
+// Helper function to check element visibility
+const expectElementsVisible = (elements: any[]) => {
+  elements.forEach((element: any) => {
+    expect(element).toBeInTheDocument();
+  });
+};
+
+// Helper function to check element absence
+const expectElementsNotVisible = (elements: any[]) => {
+  elements.forEach((element: any) => {
+    expect(element).not.toBeInTheDocument();
+  });
+};
+
+describe('UploadDataModal - General Information Elements', () => {
+  test('CSV renders correctly', () => {
+    render(<UploadDataModal {...csvProps} />, { useRedux: true });
+
+    const common = getCommonElements();
+    const title = screen.getByRole('heading', { name: /csv upload/i });
+    const panel4 = screen.getByRole('heading', { name: /rows/i });
+    const selectDelimiter = screen.getByRole('combobox', {
+      name: /choose a delimiter/i,
+    });
+
+    expectElementsVisible([
+      common.cancelButton,
+      common.uploadButton,
+      common.selectButton,
+      title,
+      common.panel1,
+      common.panel2,
+      common.panel3,
+      panel4,
+      common.selectDatabase,
+      selectDelimiter,
+      common.inputTableName,
+      common.inputSchema,
+    ]);
   });
 
-  const cancelButton = screen.getByRole('button', {
-    name: 'Cancel',
-  });
-  const uploadButton = screen.getByRole('button', {
-    name: 'Upload',
-  });
-  const selectButton = screen.getByRole('button', {
-    name: 'Select',
+  test('Excel renders correctly', () => {
+    render(<UploadDataModal {...excelProps} />, { useRedux: true });
+
+    const common = getCommonElements();
+    const title = screen.getByRole('heading', { name: /excel upload/i });
+    const panel4 = screen.getByRole('heading', { name: /rows/i });
+    const selectSheetName = screen.getByRole('combobox', {
+      name: /choose sheet name/i,
+    });
+
+    expectElementsVisible([
+      common.cancelButton,
+      common.uploadButton,
+      common.selectButton,
+      title,
+      common.panel1,
+      common.panel2,
+      common.panel3,
+      panel4,
+      common.selectDatabase,
+      selectSheetName,
+      common.inputTableName,
+      common.inputSchema,
+    ]);
+
+    // Check elements that should NOT be visible
+    expect(
+      screen.queryByRole('heading', { name: /csv upload/i }),
+    ).not.toBeInTheDocument();
+    expect(
+      screen.queryByRole('combobox', { name: /choose a delimiter/i }),
+    ).not.toBeInTheDocument();
   });
 
-  const title = screen.getByRole('heading', {
-    name: /csv upload/i,
-  });
-  const panel1 = screen.getByRole('heading', {
-    name: /General information/i,
-  });
-  const panel2 = screen.getByRole('heading', {
-    name: /file settings/i,
-  });
-  const panel3 = screen.getByRole('heading', {
-    name: /columns/i,
-  });
-  const panel4 = screen.getByRole('heading', {
-    name: /rows/i,
-  });
-  const selectDatabase = screen.getByRole('combobox', {
-    name: /select a database/i,
-  });
-  const selectDelimiter = screen.getByRole('combobox', {
-    name: /choose a delimiter/i,
-  });
-  const inputTableName = screen.getByRole('textbox', {
-    name: /table name/i,
-  });
-  const inputSchema = screen.getByRole('combobox', {
-    name: /schema/i,
-  });
+  test('Columnar renders correctly', () => {
+    render(<UploadDataModal {...columnarProps} />, { useRedux: true });
 
-  const visibleComponents = [
-    cancelButton,
-    uploadButton,
-    selectButton,
-    title,
-    panel1,
-    panel2,
-    panel3,
-    panel4,
-    selectDatabase,
-    selectDelimiter,
-    inputTableName,
-    inputSchema,
-  ];
-  visibleComponents.forEach(component => {
-    expect(component).toBeInTheDocument();
+    const common = getCommonElements();
+    const title = screen.getByRole('heading', { name: /columnar upload/i });
+
+    expectElementsVisible([
+      common.cancelButton,
+      common.uploadButton,
+      common.selectButton,
+      title,
+      common.panel1,
+      common.panel2,
+      common.panel3,
+      common.selectDatabase,
+      common.inputTableName,
+      common.inputSchema,
+    ]);
+
+    // Check elements that should NOT be visible
+    expectElementsNotVisible([
+      screen.queryByRole('heading', { name: /csv upload/i }),
+      screen.queryByRole('heading', { name: /rows/i }),
+      screen.queryByRole('combobox', { name: /choose a delimiter/i }),
+      screen.queryByRole('combobox', { name: /choose sheet name/i }),
+    ]);
   });
 });
 
-test('Excel, renders the general information elements correctly', () => {
-  render(<UploadDataModal {...excelProps} />, {
-    useRedux: true,
+describe('UploadDataModal - File Settings Elements', () => {
+  const openFileSettings = async () => {
+    const panelHeader = screen.getByRole('heading', { name: /file settings/i });
+    await userEvent.click(panelHeader);
+  };
+
+  test('CSV file settings render correctly', async () => {
+    render(<UploadDataModal {...csvProps} />, { useRedux: true });
+
+    expect(
+      screen.queryByText('If Table Already Exists'),
+    ).not.toBeInTheDocument();
+    await openFileSettings();
+
+    const elements = [
+      screen.getByRole('combobox', { name: /choose already exists/i }),
+      screen.getByTestId('skipInitialSpace'),
+      screen.getByTestId('skipBlankLines'),
+      screen.getByTestId('dayFirst'),
+      screen.getByRole('textbox', { name: /decimal character/i }),
+      screen.getByRole('combobox', { name: /null values/i }),
+    ];
+
+    expectElementsVisible(elements);
   });
 
-  const cancelButton = screen.getByRole('button', {
-    name: 'Cancel',
-  });
-  const uploadButton = screen.getByRole('button', {
-    name: 'Upload',
-  });
-  const selectButton = screen.getByRole('button', {
-    name: 'Select',
+  test('Excel file settings render correctly', async () => {
+    render(<UploadDataModal {...excelProps} />, { useRedux: true });
+
+    expect(
+      screen.queryByText('If Table Already Exists'),
+    ).not.toBeInTheDocument();
+    await openFileSettings();
+
+    const visibleElements = [
+      screen.getByRole('combobox', { name: /choose already exists/i }),
+      screen.getByRole('textbox', { name: /decimal character/i }),
+      screen.getByRole('combobox', { name: /null values/i }),
+    ];
+
+    expectElementsVisible(visibleElements);
+
+    // Check elements that should NOT be visible
+    expectElementsNotVisible([
+      screen.queryByText('skipInitialSpace'),
+      screen.queryByText('skipBlankLines'),
+      screen.queryByText('dayFirst'),
+    ]);
   });
 
-  const title = screen.getByRole('heading', {
-    name: /excel upload/i,
-  });
-  const missingTitle = screen.queryByRole('heading', {
-    name: /csv upload/i,
-  });
-  expect(missingTitle).not.toBeInTheDocument();
-  const panel1 = screen.getByRole('heading', {
-    name: /General information/i,
-  });
-  const panel2 = screen.getByRole('heading', {
-    name: /file settings/i,
-  });
-  const panel3 = screen.getByRole('heading', {
-    name: /columns/i,
-  });
-  const panel4 = screen.getByRole('heading', {
-    name: /rows/i,
-  });
-  const selectDatabase = screen.getByRole('combobox', {
-    name: /select a database/i,
-  });
-  const selectDelimiter = screen.queryByRole('combobox', {
-    name: /choose a delimiter/i,
-  });
-  expect(selectDelimiter).not.toBeInTheDocument();
-  const selectSheetName = screen.getByRole('combobox', {
-    name: /choose sheet name/i,
-  });
-  const inputTableName = screen.getByRole('textbox', {
-    name: /table name/i,
-  });
-  const inputSchema = screen.getByRole('combobox', {
-    name: /schema/i,
-  });
+  test('Columnar file settings render correctly', async () => {
+    render(<UploadDataModal {...columnarProps} />, { useRedux: true });
 
-  const visibleComponents = [
-    cancelButton,
-    uploadButton,
-    selectButton,
-    title,
-    panel1,
-    panel2,
-    panel3,
-    panel4,
-    selectDatabase,
-    selectSheetName,
-    inputTableName,
-    inputSchema,
-  ];
-  visibleComponents.forEach(component => {
-    expect(component).toBeInTheDocument();
+    expect(
+      screen.queryByText('If Table Already Exists'),
+    ).not.toBeInTheDocument();
+    await openFileSettings();
+
+    const visibleElements = [
+      screen.getByRole('combobox', { name: /choose already exists/i }),
+    ];
+
+    expectElementsVisible(visibleElements);
+
+    // Check elements that should NOT be visible
+    expectElementsNotVisible([
+      screen.queryByRole('textbox', { name: /decimal character/i }),
+      screen.queryByRole('combobox', {
+        name: /choose columns to be parsed as dates/i,
+      }),
+      screen.queryByRole('combobox', { name: /null values/i }),
+      screen.queryByText('skipInitialSpace'),
+      screen.queryByText('skipBlankLines'),
+      screen.queryByText('dayFirst'),
+    ]);
   });
 });
 
-test('Columnar, renders the general information elements correctly', () => {
-  render(<UploadDataModal {...columnarProps} />, {
-    useRedux: true,
+describe('UploadDataModal - Columns Elements', () => {
+  const openColumns = async () => {
+    const panelHeader = screen.getByRole('heading', { name: /columns/i });
+    await userEvent.click(panelHeader);
+  };
+
+  test('CSV columns render correctly', async () => {
+    render(<UploadDataModal {...csvProps} />, { useRedux: true });
+
+    await openColumns();
+    const switchDataFrameIndex = screen.getByTestId('dataFrameIndex');
+    await userEvent.click(switchDataFrameIndex);
+
+    const elements = [
+      screen.getByRole('combobox', { name: /Choose index column/i }),
+      switchDataFrameIndex,
+      screen.getByRole('textbox', { name: /Index label/i }),
+      screen.getByRole('combobox', { name: /Choose columns to read/i }),
+      screen.getByRole('textbox', { name: /Column data types/i }),
+    ];
+
+    expectElementsVisible(elements);
   });
 
-  const cancelButton = screen.getByRole('button', {
-    name: 'Cancel',
-  });
-  const uploadButton = screen.getByRole('button', {
-    name: 'Upload',
-  });
-  const selectButton = screen.getByRole('button', {
-    name: 'Select',
+  test('Excel columns render correctly', async () => {
+    render(<UploadDataModal {...excelProps} />, { useRedux: true });
+
+    await openColumns();
+    const switchDataFrameIndex = screen.getByTestId('dataFrameIndex');
+    await userEvent.click(switchDataFrameIndex);
+
+    const visibleElements = [
+      screen.getByRole('combobox', { name: /Choose index column/i }),
+      switchDataFrameIndex,
+      screen.getByRole('textbox', { name: /Index label/i }),
+      screen.getByRole('combobox', { name: /Choose columns to read/i }),
+    ];
+
+    expectElementsVisible(visibleElements);
+
+    // Check elements that should NOT be visible
+    expect(
+      screen.queryByRole('textbox', { name: /Column data types/i }),
+    ).not.toBeInTheDocument();
   });
 
-  const title = screen.getByRole('heading', {
-    name: /columnar upload/i,
-  });
-  const missingTitle = screen.queryByRole('heading', {
-    name: /csv upload/i,
-  });
-  expect(missingTitle).not.toBeInTheDocument();
-  const panel1 = screen.getByRole('heading', {
-    name: /General information/i,
-  });
-  const panel2 = screen.getByRole('heading', {
-    name: /file settings/i,
-  });
-  const panel3 = screen.getByRole('heading', {
-    name: /columns/i,
-  });
-  const panel4 = screen.queryByRole('heading', {
-    name: /rows/i,
-  });
-  expect(panel4).not.toBeInTheDocument();
+  test('Columnar columns render correctly', async () => {
+    render(<UploadDataModal {...columnarProps} />, { useRedux: true });
 
-  const selectDatabase = screen.getByRole('combobox', {
-    name: /select a database/i,
-  });
-  const selectDelimiter = screen.queryByRole('combobox', {
-    name: /choose a delimiter/i,
-  });
-  expect(selectDelimiter).not.toBeInTheDocument();
+    await openColumns();
+    const switchDataFrameIndex = screen.getByTestId('dataFrameIndex');
+    await userEvent.click(switchDataFrameIndex);
 
-  const selectSheetName = screen.queryByRole('combobox', {
-    name: /choose sheet name/i,
-  });
-  expect(selectSheetName).not.toBeInTheDocument();
-  const inputTableName = screen.getByRole('textbox', {
-    name: /table name/i,
-  });
-  const inputSchema = screen.getByRole('combobox', {
-    name: /schema/i,
-  });
+    const visibleElements = [
+      switchDataFrameIndex,
+      screen.getByRole('textbox', { name: /Index label/i }),
+      screen.getByRole('combobox', { name: /Choose columns to read/i }),
+    ];
 
-  const visibleComponents = [
-    cancelButton,
-    uploadButton,
-    selectButton,
-    title,
-    panel1,
-    panel2,
-    panel3,
-    selectDatabase,
-    inputTableName,
-    inputSchema,
-  ];
-  visibleComponents.forEach(component => {
-    expect(component).toBeInTheDocument();
+    expectElementsVisible(visibleElements);
+
+    // Check elements that should NOT be visible
+    expectElementsNotVisible([
+      screen.queryByRole('combobox', { name: /Choose index column/i }),
+      screen.queryByRole('textbox', { name: /Column data types/i }),
+    ]);
   });
 });
 
-test('CSV, renders the file settings elements correctly', () => {
-  render(<UploadDataModal {...csvProps} />, {
-    useRedux: true,
+describe('UploadDataModal - Rows Elements', () => {
+  test('CSV/Excel rows render correctly', async () => {
+    render(<UploadDataModal {...csvProps} />, { useRedux: true });
+
+    const panelHeader = screen.getByRole('heading', { name: /rows/i });
+    await userEvent.click(panelHeader);
+
+    const elements = [
+      screen.getByRole('spinbutton', { name: /header row/i }),
+      screen.getByRole('spinbutton', { name: /rows to read/i }),
+      screen.getByRole('spinbutton', { name: /skip rows/i }),
+    ];
+
+    expectElementsVisible(elements);
   });
 
-  expect(screen.queryByText('If Table Already Exists')).not.toBeInTheDocument();
-  const panelHeader = screen.getByRole('heading', {
-    name: /file settings/i,
-  });
-  userEvent.click(panelHeader);
-  const selectTableAlreadyExists = screen.getByRole('combobox', {
-    name: /choose already exists/i,
-  });
-  const switchSkipInitialSpace = screen.getByTestId('skipInitialSpace');
-  const switchSkipBlankLines = screen.getByTestId('skipBlankLines');
-  const switchDayFirst = screen.getByTestId('dayFirst');
-  const inputDecimalCharacter = screen.getByRole('textbox', {
-    name: /decimal character/i,
-  });
-  const selectColumnsDates = screen.getByRole('combobox', {
-    name: /choose columns to be parsed as dates/i,
-  });
-  const selectNullValues = screen.getByRole('combobox', {
-    name: /null values/i,
-  });
-  userEvent.click(selectColumnsDates);
-  userEvent.click(selectNullValues);
-  const visibleComponents = [
-    selectTableAlreadyExists,
-    switchSkipInitialSpace,
-    switchDayFirst,
-    switchSkipBlankLines,
-    inputDecimalCharacter,
-    selectNullValues,
-  ];
-  visibleComponents.forEach(component => {
-    expect(component).toBeInTheDocument();
+  test('Columnar does not render rows', () => {
+    render(<UploadDataModal {...columnarProps} />, { useRedux: true });
+
+    const panelHeader = screen.queryByRole('heading', { name: /rows/i });
+    expect(panelHeader).not.toBeInTheDocument();
   });
 });
 
-test('Excel, renders the file settings elements correctly', () => {
-  render(<UploadDataModal {...excelProps} />, {
-    useRedux: true,
-  });
+describe('UploadDataModal - Database and Schema Population', () => {
+  test('database and schema are correctly populated', async () => {
+    render(<UploadDataModal {...csvProps} />, { useRedux: true });
 
-  expect(screen.queryByText('If Table Already Exists')).not.toBeInTheDocument();
-  const panelHeader = screen.getByRole('heading', {
-    name: /file settings/i,
-  });
-  userEvent.click(panelHeader);
-  const selectTableAlreadyExists = screen.getByRole('combobox', {
-    name: /choose already exists/i,
-  });
-  const inputDecimalCharacter = screen.getByRole('textbox', {
-    name: /decimal character/i,
-  });
-  const selectColumnsDates = screen.getByRole('combobox', {
-    name: /choose columns to be parsed as dates/i,
-  });
-  const selectNullValues = screen.getByRole('combobox', {
-    name: /null values/i,
-  });
-  userEvent.click(selectColumnsDates);
-  userEvent.click(selectNullValues);
+    const selectDatabase = screen.getByRole('combobox', {
+      name: /select a database/i,
+    });
+    const selectSchema = screen.getByRole('combobox', { name: /schema/i });
 
-  const switchSkipInitialSpace = screen.queryByText('skipInitialSpace');
-  expect(switchSkipInitialSpace).not.toBeInTheDocument();
-  const switchSkipBlankLines = screen.queryByText('skipBlankLines');
-  expect(switchSkipBlankLines).not.toBeInTheDocument();
-  const switchDayFirst = screen.queryByText('dayFirst');
-  expect(switchDayFirst).not.toBeInTheDocument();
+    // Test database selection
+    await userEvent.click(selectDatabase);
+    await waitFor(() => screen.getByText('database1'));
+    await waitFor(() => screen.getByText('database2'));
 
-  const visibleComponents = [
-    selectTableAlreadyExists,
-    inputDecimalCharacter,
-    selectNullValues,
-  ];
-  visibleComponents.forEach(component => {
-    expect(component).toBeInTheDocument();
+    // Select database1 and check schemas
+    await userEvent.click(screen.getByText('database1'));
+    await userEvent.click(selectSchema);
+    await waitFor(() => screen.getAllByText('information_schema'));
+    await waitFor(() => screen.getAllByText('public'));
+
+    // Switch to database2 and check schemas
+    await userEvent.click(selectDatabase);
+    await userEvent.click(screen.getByText('database2'));
+    await userEvent.click(selectSchema);
+    await waitFor(() => screen.getAllByText('schema1'));
+    await waitFor(() => screen.getAllByText('schema2'));
   });
 });
 
-test('Columnar, renders the file settings elements correctly', () => {
-  render(<UploadDataModal {...columnarProps} />, {
-    useRedux: true,
-  });
+describe('UploadDataModal - Form Validation', () => {
+  test('form validation without required fields', async () => {
+    render(<UploadDataModal {...csvProps} />, { useRedux: true });
 
-  expect(screen.queryByText('If Table Already Exists')).not.toBeInTheDocument();
-  const panelHeader = screen.getByRole('heading', {
-    name: /file settings/i,
-  });
-  userEvent.click(panelHeader);
-  const selectTableAlreadyExists = screen.getByRole('combobox', {
-    name: /choose already exists/i,
-  });
-  const inputDecimalCharacter = screen.queryByRole('textbox', {
-    name: /decimal character/i,
-  });
-  expect(inputDecimalCharacter).not.toBeInTheDocument();
-  const selectColumnsDates = screen.queryByRole('combobox', {
-    name: /choose columns to be parsed as dates/i,
-  });
-  expect(selectColumnsDates).not.toBeInTheDocument();
-  const selectNullValues = screen.queryByRole('combobox', {
-    name: /null values/i,
-  });
-  expect(selectNullValues).not.toBeInTheDocument();
+    const uploadButton = screen.getByRole('button', { name: 'Upload' });
+    await userEvent.click(uploadButton);
 
-  const switchSkipInitialSpace = screen.queryByText('skipInitialSpace');
-  expect(switchSkipInitialSpace).not.toBeInTheDocument();
-  const switchSkipBlankLines = screen.queryByText('skipBlankLines');
-  expect(switchSkipBlankLines).not.toBeInTheDocument();
-  const switchDayFirst = screen.queryByText('dayFirst');
-  expect(switchDayFirst).not.toBeInTheDocument();
-
-  const visibleComponents = [selectTableAlreadyExists];
-  visibleComponents.forEach(component => {
-    expect(component).toBeInTheDocument();
+    await waitFor(() => {
+      expect(
+        screen.getByText('Uploading a file is required'),
+      ).toBeInTheDocument();
+      expect(
+        screen.getByText('Selecting a database is required'),
+      ).toBeInTheDocument();
+      expect(screen.getByText('Table name is required')).toBeInTheDocument();
+    });
   });
 });
 
-test('CSV, renders the columns elements correctly', () => {
-  render(<UploadDataModal {...csvProps} />, {
-    useRedux: true,
+describe('UploadDataModal - Form Submission', () => {
+  // Helper function to fill out form
+  const fillForm = async (
+    fileType: string,
+    fileName: string,
+    mimeType = 'text/csv',
+  ) => {
+    const selectButton = screen.getByRole('button', { name: 'Select' });
+    await userEvent.click(selectButton);
+
+    const file = new File(['test'], fileName, { type: mimeType });
+    const inputElement = screen.getByTestId('model-file-input');
+    fireEvent.change(inputElement, { target: { files: [file] } });
+
+    const selectDatabase = screen.getByRole('combobox', {
+      name: /select a database/i,
+    });
+    await userEvent.click(selectDatabase);
+
+    await waitFor(() => screen.getByText('database1'));
+    await userEvent.click(screen.getByText('database1'));
+
+    const selectSchema = screen.getByRole('combobox', { name: /schema/i });
+    await userEvent.click(selectSchema);
+
+    await waitFor(() => screen.getAllByText('public'));
+    await userEvent.click(screen.getAllByText('public')[1]);
+
+    const inputTableName = screen.getByRole('textbox', { name: /table name/i });
+    await userEvent.type(inputTableName, 'table1');
+
+    const uploadButton = screen.getByRole('button', { name: 'Upload' });
+    await userEvent.click(uploadButton);
+
+    await waitFor(() => fetchMock.called('glob:*api/v1/database/1/upload/'), {
+      timeout: 10000,
+    });
+    return fetchMock.calls('glob:*api/v1/database/1/upload/')[0];
+  };
+
+  test('CSV form submission', async () => {
+    render(<UploadDataModal {...csvProps} />, { useRedux: true });
+
+    const [, options] = await fillForm('csv', 'test.csv');
+    const formData = options?.body as FormData;
+
+    expect(formData.get('type')).toBe('csv');
+    expect(formData.get('table_name')).toBe('table1');
+    expect(formData.get('schema')).toBe('public');
+    expect((formData.get('file') as File).name).toBe('test.csv');
   });
 
-  const panelHeader = screen.getByRole('heading', {
-    name: /columns/i,
-  });
-  userEvent.click(panelHeader);
-  const switchDataFrameIndex = screen.getByTestId('dataFrameIndex');
-  userEvent.click(switchDataFrameIndex);
-  const selectIndexColumn = screen.getByRole('combobox', {
-    name: /Choose index column/i,
-  });
-  const inputColumnLabels = screen.getByRole('textbox', {
-    name: /Index label/i,
-  });
-  const selectColumnsToRead = screen.getByRole('combobox', {
-    name: /Choose columns to read/i,
-  });
-  const inputColumnDataTypes = screen.getByRole('textbox', {
-    name: /Column data types/i,
-  });
-  userEvent.click(selectColumnsToRead);
+  test('Excel form submission', async () => {
+    render(<UploadDataModal {...excelProps} />, { useRedux: true });
 
-  const visibleComponents = [
-    selectIndexColumn,
-    switchDataFrameIndex,
-    inputColumnLabels,
-    selectColumnsToRead,
-    inputColumnDataTypes,
-  ];
-  visibleComponents.forEach(component => {
-    expect(component).toBeInTheDocument();
+    const [, options] = await fillForm('excel', 'test.xls', 'text');
+    const formData = options?.body as FormData;
+
+    expect(formData.get('type')).toBe('excel');
+    expect(formData.get('table_name')).toBe('table1');
+    expect(formData.get('schema')).toBe('public');
+    expect((formData.get('file') as File).name).toBe('test.xls');
+  });
+
+  test('Columnar form submission', async () => {
+    render(<UploadDataModal {...columnarProps} />, { useRedux: true });
+
+    const [, options] = await fillForm('columnar', 'test.parquet', 'text');
+    const formData = options?.body as FormData;
+
+    expect(formData.get('type')).toBe('columnar');
+    expect(formData.get('table_name')).toBe('table1');
+    expect(formData.get('schema')).toBe('public');
+    expect((formData.get('file') as File).name).toBe('test.parquet');
   });
 });
 
-test('Excel, renders the columns elements correctly', () => {
-  render(<UploadDataModal {...excelProps} />, {
-    useRedux: true,
+describe('File Extension Validation', () => {
+  const createTestFile = (fileName: string) => ({
+    name: fileName,
+    uid: 'xp',
+    size: 100,
+    type: 'text/csv',
   });
 
-  const panelHeader = screen.getByRole('heading', {
-    name: /columns/i,
-  });
-  userEvent.click(panelHeader);
-  const switchDataFrameIndex = screen.getByTestId('dataFrameIndex');
-  userEvent.click(switchDataFrameIndex);
-  const selectIndexColumn = screen.getByRole('combobox', {
-    name: /Choose index column/i,
-  });
-  const inputIndexLabel = screen.getByRole('textbox', {
-    name: /Index label/i,
-  });
-  const selectColumnsToRead = screen.getByRole('combobox', {
-    name: /Choose columns to read/i,
-  });
-  userEvent.click(selectColumnsToRead);
+  describe('CSV validation', () => {
+    test('returns false for invalid extensions', () => {
+      const invalidFiles = ['out', 'out.exe', 'out.csv.exe', '.csv', 'out.xls'];
+      invalidFiles.forEach(fileName => {
+        expect(
+          validateUploadFileExtension(createTestFile(fileName), ['csv', 'tsv']),
+        ).toBe(false);
+      });
+    });
 
-  const columnDataTypes = screen.queryByRole('textbox', {
-    name: /Column data types/i,
+    test('returns true for valid extensions', () => {
+      const validFiles = ['out.csv', 'out.tsv', 'out.exe.csv', 'out a.csv'];
+      validFiles.forEach(fileName => {
+        expect(
+          validateUploadFileExtension(createTestFile(fileName), ['csv', 'tsv']),
+        ).toBe(true);
+      });
+    });
   });
 
-  expect(columnDataTypes).not.toBeInTheDocument();
+  describe('Excel validation', () => {
+    test('returns false for invalid extensions', () => {
+      const invalidFiles = ['out', 'out.exe', 'out.xls.exe', '.csv', 'out.csv'];
+      invalidFiles.forEach(fileName => {
+        expect(
+          validateUploadFileExtension(createTestFile(fileName), [
+            'xls',
+            'xlsx',
+          ]),
+        ).toBe(false);
+      });
+    });
 
-  const visibleComponents = [
-    selectIndexColumn,
-    switchDataFrameIndex,
-    inputIndexLabel,
-    selectColumnsToRead,
-  ];
-  visibleComponents.forEach(component => {
-    expect(component).toBeInTheDocument();
-  });
-});
-
-test('Columnar, renders the columns elements correctly', () => {
-  render(<UploadDataModal {...columnarProps} />, {
-    useRedux: true,
-  });
-
-  const panelHeader = screen.getByRole('heading', {
-    name: /columns/i,
-  });
-  userEvent.click(panelHeader);
-  const selectIndexColumn = screen.queryByRole('combobox', {
-    name: /Choose index column/i,
-  });
-  expect(selectIndexColumn).not.toBeInTheDocument();
-  const switchDataFrameIndex = screen.getByTestId('dataFrameIndex');
-  userEvent.click(switchDataFrameIndex);
-  const inputIndexLabel = screen.getByRole('textbox', {
-    name: /Index label/i,
-  });
-  const selectColumnsToRead = screen.getByRole('combobox', {
-    name: /Choose columns to read/i,
-  });
-  userEvent.click(selectColumnsToRead);
-
-  const columnDataTypes = screen.queryByRole('textbox', {
-    name: /Column data types/i,
-  });
-  expect(columnDataTypes).not.toBeInTheDocument();
-
-  const visibleComponents = [
-    switchDataFrameIndex,
-    inputIndexLabel,
-    selectColumnsToRead,
-  ];
-  visibleComponents.forEach(component => {
-    expect(component).toBeInTheDocument();
-  });
-});
-
-test('renders the rows elements correctly', () => {
-  render(<UploadDataModal {...csvProps} />, {
-    useRedux: true,
-  });
-
-  const panelHeader = screen.getByRole('heading', {
-    name: /rows/i,
-  });
-  userEvent.click(panelHeader);
-  const inputHeaderRow = screen.getByRole('spinbutton', {
-    name: /header row/i,
-  });
-  const inputRowsToRead = screen.getByRole('spinbutton', {
-    name: /rows to read/i,
-  });
-  const inputSkipRows = screen.getByRole('spinbutton', {
-    name: /skip rows/i,
-  });
-
-  const visibleComponents = [inputHeaderRow, inputRowsToRead, inputSkipRows];
-  visibleComponents.forEach(component => {
-    expect(component).toBeInTheDocument();
-  });
-});
-
-test('Columnar, does not render the rows', () => {
-  render(<UploadDataModal {...columnarProps} />, {
-    useRedux: true,
-  });
-
-  const panelHeader = screen.queryByRole('heading', {
-    name: /rows/i,
-  });
-  expect(panelHeader).not.toBeInTheDocument();
-});
-
-test('database and schema are correctly populated', async () => {
-  jest.setTimeout(10000);
-  render(<UploadDataModal {...csvProps} />, {
-    useRedux: true,
-  });
-
-  const selectDatabase = screen.getByRole('combobox', {
-    name: /select a database/i,
-  });
-  const selectSchema = screen.getByRole('combobox', {
-    name: /schema/i,
-  });
-
-  userEvent.click(selectDatabase);
-
-  await waitFor(() => screen.getByText('database1'));
-  await waitFor(() => screen.getByText('database2'));
-
-  screen.getByText('database1').click();
-  userEvent.click(selectSchema);
-  // make sure the schemas for database1 are displayed
-  await waitFor(() => screen.getAllByText('information_schema'));
-  await waitFor(() => screen.getAllByText('public'));
-
-  screen.getByText('database2').click();
-  userEvent.click(selectSchema);
-  // make sure the schemas for database2 are displayed
-  await waitFor(() => screen.getAllByText('schema1'));
-  await waitFor(() => screen.getAllByText('schema2'));
-});
-
-test('form without required fields', async () => {
-  render(<UploadDataModal {...csvProps} />, {
-    useRedux: true,
-  });
-
-  const uploadButton = screen.getByRole('button', {
-    name: 'Upload',
-  });
-
-  // Submit form without filling any fields
-  userEvent.click(uploadButton);
-
-  await waitFor(() => screen.getByText('Uploading a file is required'));
-  await waitFor(() => screen.getByText('Selecting a database is required'));
-  await waitFor(() => screen.getByText('Table name is required'));
-});
-
-test('CSV form post', async () => {
-  render(<UploadDataModal {...csvProps} />, {
-    useRedux: true,
-  });
-
-  const selectButton = screen.getByRole('button', {
-    name: 'Select',
-  });
-  userEvent.click(selectButton);
-
-  // Select a file from the file dialog
-  const file = new File(['test'], 'test.csv', { type: 'text' });
-  const inputElement = screen.getByTestId('model-file-input');
-
-  if (inputElement) {
-    userEvent.upload(inputElement as HTMLElement, file);
-  }
-
-  const selectDatabase = screen.getByRole('combobox', {
-    name: /select a database/i,
-  });
-  userEvent.click(selectDatabase);
-  await screen.findByText('database1');
-  await screen.findByText('database2');
-
-  screen.getByText('database1').click();
-  const selectSchema = screen.getByRole('combobox', {
-    name: /schema/i,
-  });
-  userEvent.click(selectSchema);
-  await screen.findAllByText('public');
-  screen.getAllByText('public')[1].click();
-
-  // Fill out form fields
-  const inputTableName = screen.getByRole('textbox', {
-    name: /table name/i,
-  });
-  userEvent.type(inputTableName, 'table1');
-  const uploadButton = screen.getByRole('button', {
-    name: 'Upload',
-  });
-
-  userEvent.click(uploadButton);
-  await waitFor(() => fetchMock.called('glob:*api/v1/database/1/upload/'));
-
-  // Get the matching fetch calls made
-  const matchingCalls = fetchMock.calls('glob:*api/v1/database/1/upload/');
-  expect(matchingCalls).toHaveLength(1);
-  const [, options] = matchingCalls[0];
-  const formData = options?.body as FormData;
-  expect(formData.get('type')).toBe('csv');
-  expect(formData.get('table_name')).toBe('table1');
-  expect(formData.get('schema')).toBe('public');
-  expect(formData.get('table_name')).toBe('table1');
-  const fileData = formData.get('file') as File;
-  expect(fileData.name).toBe('test.csv');
-});
-
-test('Excel form post', async () => {
-  render(<UploadDataModal {...excelProps} />, {
-    useRedux: true,
-  });
-
-  const selectButton = screen.getByRole('button', {
-    name: 'Select',
-  });
-  userEvent.click(selectButton);
-
-  // Select a file from the file dialog
-  const file = new File(['test'], 'test.xls', { type: 'text' });
-  const inputElement = screen.getByTestId('model-file-input');
-
-  if (inputElement) {
-    userEvent.upload(inputElement as HTMLElement, file);
-  }
-
-  const selectDatabase = screen.getByRole('combobox', {
-    name: /select a database/i,
-  });
-  userEvent.click(selectDatabase);
-  await screen.findByText('database1');
-  await screen.findByText('database2');
-
-  screen.getByText('database1').click();
-  const selectSchema = screen.getByRole('combobox', {
-    name: /schema/i,
-  });
-  userEvent.click(selectSchema);
-  await screen.findAllByText('public');
-  screen.getAllByText('public')[1].click();
-
-  // Fill out form fields
-  const inputTableName = screen.getByRole('textbox', {
-    name: /table name/i,
-  });
-  userEvent.type(inputTableName, 'table1');
-  const uploadButton = screen.getByRole('button', {
-    name: 'Upload',
-  });
-
-  userEvent.click(uploadButton);
-  await waitFor(() => fetchMock.called('glob:*api/v1/database/1/upload/'));
-
-  // Get the matching fetch calls made
-  const matchingCalls = fetchMock.calls('glob:*api/v1/database/1/upload/');
-  expect(matchingCalls).toHaveLength(1);
-  const [, options] = matchingCalls[0];
-  const formData = options?.body as FormData;
-  expect(formData.get('type')).toBe('excel');
-  expect(formData.get('table_name')).toBe('table1');
-  expect(formData.get('schema')).toBe('public');
-  expect(formData.get('table_name')).toBe('table1');
-  const fileData = formData.get('file') as File;
-  expect(fileData.name).toBe('test.xls');
-});
-
-test('Columnar form post', async () => {
-  render(<UploadDataModal {...columnarProps} />, {
-    useRedux: true,
-  });
-
-  const selectButton = screen.getByRole('button', {
-    name: 'Select',
-  });
-  userEvent.click(selectButton);
-
-  // Select a file from the file dialog
-  const file = new File(['test'], 'test.parquet', { type: 'text' });
-  const inputElement = screen.getByTestId('model-file-input');
-
-  if (inputElement) {
-    userEvent.upload(inputElement as HTMLElement, file);
-  }
-
-  const selectDatabase = screen.getByRole('combobox', {
-    name: /select a database/i,
-  });
-  userEvent.click(selectDatabase);
-  await screen.findByText('database1');
-  await screen.findByText('database2');
-
-  screen.getByText('database1').click();
-  const selectSchema = screen.getByRole('combobox', {
-    name: /schema/i,
-  });
-  userEvent.click(selectSchema);
-  await screen.findAllByText('public');
-  screen.getAllByText('public')[1].click();
-
-  // Fill out form fields
-  const inputTableName = screen.getByRole('textbox', {
-    name: /table name/i,
-  });
-  userEvent.type(inputTableName, 'table1');
-  const uploadButton = screen.getByRole('button', {
-    name: 'Upload',
-  });
-
-  userEvent.click(uploadButton);
-  await waitFor(() => fetchMock.called('glob:*api/v1/database/1/upload/'));
-
-  // Get the matching fetch calls made
-  const matchingCalls = fetchMock.calls('glob:*api/v1/database/1/upload/');
-  expect(matchingCalls).toHaveLength(1);
-  const [, options] = matchingCalls[0];
-  const formData = options?.body as FormData;
-  expect(formData.get('type')).toBe('columnar');
-  expect(formData.get('table_name')).toBe('table1');
-  expect(formData.get('schema')).toBe('public');
-  expect(formData.get('table_name')).toBe('table1');
-  const fileData = formData.get('file') as File;
-  expect(fileData.name).toBe('test.parquet');
-});
-
-test('CSV, validate file extension returns false', () => {
-  const invalidFileNames = ['out', 'out.exe', 'out.csv.exe', '.csv', 'out.xls'];
-  invalidFileNames.forEach(fileName => {
-    const file: UploadFile<any> = {
-      name: fileName,
-      uid: 'xp',
-      size: 100,
-      type: 'text/csv',
-    };
-    expect(validateUploadFileExtension(file, ['csv', 'tsv'])).toBe(false);
-  });
-});
-
-test('Excel, validate file extension returns false', () => {
-  const invalidFileNames = ['out', 'out.exe', 'out.xls.exe', '.csv', 'out.csv'];
-  invalidFileNames.forEach(fileName => {
-    const file: UploadFile<any> = {
-      name: fileName,
-      uid: 'xp',
-      size: 100,
-      type: 'text/csv',
-    };
-    expect(validateUploadFileExtension(file, ['xls', 'xlsx'])).toBe(false);
-  });
-});
-
-test('Columnar, validate file extension returns false', () => {
-  const invalidFileNames = [
-    'out',
-    'out.exe',
-    'out.parquet.exe',
-    '.parquet',
-    'out.excel',
-  ];
-  invalidFileNames.forEach(fileName => {
-    const file: UploadFile<any> = {
-      name: fileName,
-      uid: 'xp',
-      size: 100,
-      type: 'text/csv',
-    };
-    expect(validateUploadFileExtension(file, ['parquet', 'zip'])).toBe(false);
-  });
-});
-
-test('CSV, validate file extension returns true', () => {
-  const invalidFileNames = ['out.csv', 'out.tsv', 'out.exe.csv', 'out a.csv'];
-  invalidFileNames.forEach(fileName => {
-    const file: UploadFile<any> = {
-      name: fileName,
-      uid: 'xp',
-      size: 100,
-      type: 'text/csv',
-    };
-    expect(validateUploadFileExtension(file, ['csv', 'tsv'])).toBe(true);
-  });
-});
-
-test('Excel, validate file extension returns true', () => {
-  const invalidFileNames = ['out.xls', 'out.xlsx', 'out.exe.xls', 'out a.xls'];
-  invalidFileNames.forEach(fileName => {
-    const file: UploadFile<any> = {
-      name: fileName,
-      uid: 'xp',
-      size: 100,
-      type: 'text/csv',
-    };
-    expect(validateUploadFileExtension(file, ['xls', 'xlsx'])).toBe(true);
-  });
-});
-
-test('Columnar, validate file extension returns true', () => {
-  const invalidFileNames = [
-    'out.parquet',
-    'out.zip',
-    'out.exe.zip',
-    'out a.parquet',
-  ];
-  invalidFileNames.forEach(fileName => {
-    const file: UploadFile<any> = {
-      name: fileName,
-      uid: 'xp',
-      size: 100,
-      type: 'text/csv',
-    };
-    expect(validateUploadFileExtension(file, ['parquet', 'zip'])).toBe(true);
+    test('returns true for valid extensions', () => {
+      const validFiles = ['out.xls', 'out.xlsx', 'out.exe.xls', 'out a.xls'];
+      validFiles.forEach(fileName => {
+        expect(
+          validateUploadFileExtension(createTestFile(fileName), [
+            'xls',
+            'xlsx',
+          ]),
+        ).toBe(true);
+      });
+    });
+  });
+
+  describe('Columnar validation', () => {
+    test('returns false for invalid extensions', () => {
+      const invalidFiles = [
+        'out',
+        'out.exe',
+        'out.parquet.exe',
+        '.parquet',
+        'out.excel',
+      ];
+      invalidFiles.forEach(fileName => {
+        expect(
+          validateUploadFileExtension(createTestFile(fileName), [
+            'parquet',
+            'zip',
+          ]),
+        ).toBe(false);
+      });
+    });
+
+    test('returns true for valid extensions', () => {
+      const validFiles = [
+        'out.parquet',
+        'out.zip',
+        'out.exe.zip',
+        'out a.parquet',
+      ];
+      validFiles.forEach(fileName => {
+        expect(
+          validateUploadFileExtension(createTestFile(fileName), [
+            'parquet',
+            'zip',
+          ]),
+        ).toBe(true);
+      });
+    });
   });
 });
diff --git a/superset-frontend/src/features/databases/UploadDataModel/index.tsx b/superset-frontend/src/features/databases/UploadDataModel/index.tsx
index 55681b5c1b8..de15ffa10e4 100644
--- a/superset-frontend/src/features/databases/UploadDataModel/index.tsx
+++ b/superset-frontend/src/features/databases/UploadDataModel/index.tsx
@@ -31,26 +31,26 @@ import {
   SupersetTheme,
   t,
 } from '@superset-ui/core';
-import Modal from 'src/components/Modal';
-import Button from 'src/components/Button';
-import { Switch, SwitchProps } from 'src/components/Switch';
-import Collapse from 'src/components/Collapse';
 import {
-  AntdForm,
-  AsyncSelect,
-  Col,
-  Row,
+  Button,
+  Collapse,
+  Form,
   Select,
+  AsyncSelect,
+  Modal,
+  Row,
+  Col,
+  Input,
+  InputNumber,
   Upload,
-} from 'src/components';
-import { Icons } from 'src/components/Icons';
-import { Input, InputNumber } from 'src/components/Input';
+  type UploadChangeParam,
+  type UploadFile,
+} from '@superset-ui/core/components';
+import { Switch, SwitchProps } from '@superset-ui/core/components/Switch';
+import { Icons } from '@superset-ui/core/components/Icons';
 import rison from 'rison';
-// eslint-disable-next-line no-restricted-imports
-import { UploadChangeParam, UploadFile } from 'antd/lib/upload/interface'; // TODO: Remove antd
 import withToasts from 'src/components/MessageToasts/withToasts';
 import {
-  antdCollapseStyles,
   antDModalNoPaddingStyles,
   antDModalStyles,
   formStyles,
@@ -218,7 +218,7 @@ const UploadDataModal: FunctionComponent<UploadDataModalProps> = ({
   allowedExtensions,
   type = 'csv',
 }) => {
-  const [form] = AntdForm.useForm();
+  const [form] = Form.useForm();
   const [currentDatabaseId, setCurrentDatabaseId] = useState<number>(0);
   const [fileList, setFileList] = useState<UploadFile[]>([]);
   const [columns, setColumns] = useState<string[]>([]);
@@ -589,7 +589,7 @@ const UploadDataModal: FunctionComponent<UploadDataModalProps> = ({
       show={show}
       title={<UploadTitle />}
     >
-      <AntdForm
+      <Form
         form={form}
         onFinish={onFinish}
         data-test="dashboard-edit-properties-form"
@@ -597,444 +597,478 @@ const UploadDataModal: FunctionComponent<UploadDataModalProps> = ({
         initialValues={defaultUploadInfo}
       >
         <Collapse
-          expandIconPosition="right"
+          expandIconPosition="end"
           accordion
           defaultActiveKey="general"
-          css={(theme: SupersetTheme) => antdCollapseStyles(theme)}
-        >
-          <Collapse.Panel
-            header={
-              <div>
-                <h4>{t('General information')}</h4>
-                <p className="helper">{t('Upload a file to a database.')}</p>
-              </div>
-            }
-            key="general"
-          >
-            <Row>
-              <Col span={24}>
-                <StyledFormItem
-                  label={t('%(label)s file', {
-                    label: extensionsToLabel[type],
-                  })}
-                  name="file"
-                  required
-                  rules={[{ validator: validateUpload }]}
-                >
-                  <Upload
-                    name="modelFile"
-                    id="modelFile"
-                    data-test="model-file-input"
-                    accept={allowedExtensionsToAccept[type]}
-                    fileList={fileList}
-                    onChange={onChangeFile}
-                    onRemove={onRemoveFile}
-                    // upload is handled by hook
-                    customRequest={() => {}}
-                  >
-                    <Button
-                      aria-label={t('Select')}
-                      icon={<Icons.UploadOutlined />}
-                      loading={fileLoading}
-                    >
-                      {t('Select')}
-                    </Button>
-                  </Upload>
-                </StyledFormItem>
-              </Col>
-            </Row>
-            <Row>
-              <Col span={24}>
-                <StyledFormItem>
-                  <SwitchContainer
-                    label={t('Preview uploaded file')}
-                    dataTest="previewUploadedFile"
-                    onChange={onChangePreviewUploadedFile}
-                    checked={previewUploadedFile}
-                  />
-                </StyledFormItem>
-              </Col>
-            </Row>
-            {previewUploadedFile && (
-              <Row>
-                <Col span={24}>
-                  <ColumnsPreview columns={columns} />
-                </Col>
-              </Row>
-            )}
-            <Row>
-              <Col span={24}>
-                <StyledFormItem
-                  label={t('Database')}
-                  required
-                  name="database"
-                  rules={[{ validator: validateDatabase }]}
-                >
-                  <AsyncSelect
-                    ariaLabel={t('Select a database')}
-                    options={loadDatabaseOptions}
-                    onChange={onChangeDatabase}
-                    allowClear
-                    placeholder={t('Select a database to upload the file to')}
-                  />
-                </StyledFormItem>
-              </Col>
-            </Row>
-            <Row>
-              <Col span={24}>
-                <StyledFormItem label={t('Schema')} name="schema">
-                  <AsyncSelect
-                    ariaLabel={t('Select a schema')}
-                    options={loadSchemaOptions}
-                    onChange={onChangeSchema}
-                    allowClear
-                    placeholder={t(
-                      'Select a schema if the database supports this',
-                    )}
-                  />
-                </StyledFormItem>
-              </Col>
-            </Row>
-            <Row>
-              <Col span={24}>
-                <StyledFormItem
-                  label={t('Table name')}
-                  name="table_name"
-                  required
-                  rules={[
-                    { required: true, message: 'Table name is required' },
-                  ]}
-                >
-                  <Input
-                    aria-label={t('Table Name')}
-                    name="table_name"
-                    data-test="properties-modal-name-input"
-                    type="text"
-                    placeholder={t('Name of table to be created')}
-                  />
-                </StyledFormItem>
-              </Col>
-            </Row>
-            {isFieldATypeSpecificField('delimiter', type) && (
-              <Row>
-                <Col span={24}>
-                  <StyledFormItemWithTip
-                    label={t('Delimiter')}
-                    tip={t('Select a delimiter for this data')}
-                    name="delimiter"
-                  >
-                    <Select
-                      ariaLabel={t('Choose a delimiter')}
-                      options={delimiterOptions}
-                      onChange={onChangeDelimiter}
-                      allowNewOptions
-                    />
-                  </StyledFormItemWithTip>
-                </Col>
-              </Row>
-            )}
-            {isFieldATypeSpecificField('sheet_name', type) && (
-              <Row>
-                <Col span={24}>
-                  <StyledFormItem label={t('Sheet name')} name="sheet_name">
-                    <Select
-                      ariaLabel={t('Choose sheet name')}
-                      options={sheetNamesToOptions()}
-                      onChange={onSheetNameChange}
-                      allowNewOptions
-                      placeholder={t(
-                        'Select a sheet name from the uploaded file',
-                      )}
-                    />
-                  </StyledFormItem>
-                </Col>
-              </Row>
-            )}
-          </Collapse.Panel>
-          <Collapse.Panel
-            header={
-              <div>
-                <h4>{t('File settings')}</h4>
-                <p className="helper">
-                  {t(
-                    'Adjust how spaces, blank lines, null values are handled and other file wide settings.',
+          modalMode
+          items={[
+            {
+              key: 'general',
+              label: (
+                <div>
+                  <h4>{t('General information')}</h4>
+                  <p className="helper">{t('Upload a file to a database.')}</p>
+                </div>
+              ),
+              children: (
+                <>
+                  <Row>
+                    <Col span={24}>
+                      <StyledFormItem
+                        label={t('%(label)s file', {
+                          label: extensionsToLabel[type],
+                        })}
+                        name="file"
+                        required
+                        rules={[{ validator: validateUpload }]}
+                      >
+                        <Upload
+                          name="modelFile"
+                          id="modelFile"
+                          data-test="model-file-input"
+                          accept={allowedExtensionsToAccept[type]}
+                          fileList={fileList}
+                          onChange={onChangeFile}
+                          onRemove={onRemoveFile}
+                          // upload is handled by hook
+                          customRequest={() => {}}
+                        >
+                          <Button
+                            aria-label={t('Select')}
+                            icon={<Icons.UploadOutlined />}
+                            loading={fileLoading}
+                          >
+                            {t('Select')}
+                          </Button>
+                        </Upload>
+                      </StyledFormItem>
+                    </Col>
+                  </Row>
+                  <Row>
+                    <Col span={24}>
+                      <StyledFormItem>
+                        <SwitchContainer
+                          label={t('Preview uploaded file')}
+                          dataTest="previewUploadedFile"
+                          onChange={onChangePreviewUploadedFile}
+                          checked={previewUploadedFile}
+                        />
+                      </StyledFormItem>
+                    </Col>
+                  </Row>
+                  {previewUploadedFile && (
+                    <Row>
+                      <Col span={24}>
+                        <ColumnsPreview columns={columns} />
+                      </Col>
+                    </Row>
                   )}
-                </p>
-              </div>
-            }
-            key="2"
-          >
-            <Row>
-              <Col span={24}>
-                <StyledFormItemWithTip
-                  label={t('If table already exists')}
-                  tip={t('What should happen if the table already exists')}
-                  name="already_exists"
-                >
-                  <Select
-                    ariaLabel={t('Choose already exists')}
-                    options={tableAlreadyExistsOptions}
-                    onChange={() => {}}
-                  />
-                </StyledFormItemWithTip>
-              </Col>
-            </Row>
-            {isFieldATypeSpecificField('column_dates', type) && (
-              <Row>
-                <Col span={24}>
-                  <StyledFormItem
-                    label={t('Columns to be parsed as dates')}
-                    name="column_dates"
-                  >
-                    <Select
-                      ariaLabel={t('Choose columns to be parsed as dates')}
-                      mode="multiple"
-                      options={columnsToOptions()}
-                      allowClear
-                      allowNewOptions
-                      placeholder={t(
-                        'Select column names from a dropdown list that should be parsed as dates.',
-                      )}
-                    />
-                  </StyledFormItem>
-                </Col>
-              </Row>
-            )}
-            {isFieldATypeSpecificField('decimal_character', type) && (
-              <Row>
-                <Col span={24}>
-                  <StyledFormItemWithTip
-                    label={t('Decimal character')}
-                    tip={t('Character to interpret as decimal point')}
-                    name="decimal_character"
-                  >
-                    <Input type="text" />
-                  </StyledFormItemWithTip>
-                </Col>
-              </Row>
-            )}
-            {isFieldATypeSpecificField('null_values', type) && (
-              <Row>
-                <Col span={24}>
-                  <StyledFormItemWithTip
-                    label={t('Null Values')}
-                    tip={t(
-                      'Choose values that should be treated as null. Warning: Hive database supports only a single value',
-                    )}
-                    name="null_values"
-                  >
-                    <Select
-                      mode="multiple"
-                      options={nullValuesOptions}
-                      allowClear
-                      allowNewOptions
-                    />
-                  </StyledFormItemWithTip>
-                </Col>
-              </Row>
-            )}
-            {isFieldATypeSpecificField('skip_initial_space', type) && (
-              <Row>
-                <Col span={24}>
-                  <StyledFormItem name="skip_initial_space">
-                    <SwitchContainer
-                      label={t('Skip spaces after delimiter')}
-                      dataTest="skipInitialSpace"
-                    />
-                  </StyledFormItem>
-                </Col>
-              </Row>
-            )}
-            {isFieldATypeSpecificField('skip_blank_lines', type) && (
-              <Row>
-                <Col span={24}>
-                  <StyledFormItem name="skip_blank_lines">
-                    <SwitchContainer
-                      label={t(
-                        'Skip blank lines rather than interpreting them as Not A Number values',
-                      )}
-                      dataTest="skipBlankLines"
-                    />
-                  </StyledFormItem>
-                </Col>
-              </Row>
-            )}
-            {isFieldATypeSpecificField('day_first', type) && (
-              <Row>
-                <Col span={24}>
-                  <StyledFormItem name="day_first">
-                    <SwitchContainer
-                      label={t(
-                        'DD/MM format dates, international and European format',
-                      )}
-                      dataTest="dayFirst"
-                    />
-                  </StyledFormItem>
-                </Col>
-              </Row>
-            )}
-          </Collapse.Panel>
-          <Collapse.Panel
-            header={
-              <div>
-                <h4>{t('Columns')}</h4>
-                <p className="helper">
-                  {t(
-                    'Adjust column settings such as specifying the columns to read, how duplicates are handled, column data types, and more.',
+                  <Row>
+                    <Col span={24}>
+                      <StyledFormItem
+                        label={t('Database')}
+                        required
+                        name="database"
+                        rules={[{ validator: validateDatabase }]}
+                      >
+                        <AsyncSelect
+                          ariaLabel={t('Select a database')}
+                          options={loadDatabaseOptions}
+                          onChange={onChangeDatabase}
+                          allowClear
+                          placeholder={t(
+                            'Select a database to upload the file to',
+                          )}
+                        />
+                      </StyledFormItem>
+                    </Col>
+                  </Row>
+                  <Row>
+                    <Col span={24}>
+                      <StyledFormItem label={t('Schema')} name="schema">
+                        <AsyncSelect
+                          ariaLabel={t('Select a schema')}
+                          options={loadSchemaOptions}
+                          onChange={onChangeSchema}
+                          allowClear
+                          placeholder={t(
+                            'Select a schema if the database supports this',
+                          )}
+                        />
+                      </StyledFormItem>
+                    </Col>
+                  </Row>
+                  <Row>
+                    <Col span={24}>
+                      <StyledFormItem
+                        label={t('Table name')}
+                        name="table_name"
+                        required
+                        rules={[
+                          { required: true, message: 'Table name is required' },
+                        ]}
+                      >
+                        <Input
+                          aria-label={t('Table Name')}
+                          name="table_name"
+                          data-test="properties-modal-name-input"
+                          type="text"
+                          placeholder={t('Name of table to be created')}
+                        />
+                      </StyledFormItem>
+                    </Col>
+                  </Row>
+                  {isFieldATypeSpecificField('delimiter', type) && (
+                    <Row>
+                      <Col span={24}>
+                        <StyledFormItemWithTip
+                          label={t('Delimiter')}
+                          tip={t('Select a delimiter for this data')}
+                          name="delimiter"
+                        >
+                          <Select
+                            ariaLabel={t('Choose a delimiter')}
+                            options={delimiterOptions}
+                            onChange={onChangeDelimiter}
+                            allowNewOptions
+                          />
+                        </StyledFormItemWithTip>
+                      </Col>
+                    </Row>
                   )}
-                </p>
-              </div>
-            }
-            key="3"
-          >
-            <Row>
-              <Col span={24}>
-                <StyledFormItem
-                  label={t('Columns to read')}
-                  name="columns_read"
-                >
-                  <Select
-                    ariaLabel={t('Choose columns to read')}
-                    mode="multiple"
-                    options={columnsToOptions()}
-                    allowClear
-                    allowNewOptions
-                    placeholder={t(
-                      'List of the column names that should be read',
+                  {isFieldATypeSpecificField('sheet_name', type) && (
+                    <Row>
+                      <Col span={24}>
+                        <StyledFormItem
+                          label={t('Sheet name')}
+                          name="sheet_name"
+                        >
+                          <Select
+                            ariaLabel={t('Choose sheet name')}
+                            options={sheetNamesToOptions()}
+                            onChange={onSheetNameChange}
+                            allowNewOptions
+                            placeholder={t(
+                              'Select a sheet name from the uploaded file',
+                            )}
+                          />
+                        </StyledFormItem>
+                      </Col>
+                    </Row>
+                  )}
+                </>
+              ),
+            },
+            {
+              key: 'file-settings',
+              label: (
+                <div>
+                  <h4>{t('File settings')}</h4>
+                  <p className="helper">
+                    {t(
+                      'Adjust how spaces, blank lines, null values are handled and other file wide settings.',
                     )}
-                  />
-                </StyledFormItem>
-              </Col>
-            </Row>
-            {isFieldATypeSpecificField('column_data_types', type) && (
-              <Row>
-                <Col span={24}>
-                  <StyledFormItemWithTip
-                    label={t('Column data types')}
-                    tip={t(
-                      'A dictionary with column names and their data types if you need to change the defaults. Example: {"user_id":"int"}. Check Python\'s Pandas library for supported data types.',
+                  </p>
+                </div>
+              ),
+              children: (
+                <>
+                  <Row>
+                    <Col span={24}>
+                      <StyledFormItemWithTip
+                        label={t('If table already exists')}
+                        tip={t(
+                          'What should happen if the table already exists',
+                        )}
+                        name="already_exists"
+                      >
+                        <Select
+                          ariaLabel={t('Choose already exists')}
+                          options={tableAlreadyExistsOptions}
+                          onChange={() => {}}
+                        />
+                      </StyledFormItemWithTip>
+                    </Col>
+                  </Row>
+                  {isFieldATypeSpecificField('column_dates', type) && (
+                    <Row>
+                      <Col span={24}>
+                        <StyledFormItem
+                          label={t('Columns to be parsed as dates')}
+                          name="column_dates"
+                        >
+                          <Select
+                            ariaLabel={t(
+                              'Choose columns to be parsed as dates',
+                            )}
+                            mode="multiple"
+                            options={columnsToOptions()}
+                            allowClear
+                            allowNewOptions
+                            placeholder={t(
+                              'A comma separated list of columns that should be parsed as dates',
+                            )}
+                          />
+                        </StyledFormItem>
+                      </Col>
+                    </Row>
+                  )}
+                  {isFieldATypeSpecificField('decimal_character', type) && (
+                    <Row>
+                      <Col span={24}>
+                        <StyledFormItemWithTip
+                          label={t('Decimal character')}
+                          tip={t('Character to interpret as decimal point')}
+                          name="decimal_character"
+                        >
+                          <Input type="text" />
+                        </StyledFormItemWithTip>
+                      </Col>
+                    </Row>
+                  )}
+                  {isFieldATypeSpecificField('null_values', type) && (
+                    <Row>
+                      <Col span={24}>
+                        <StyledFormItemWithTip
+                          label={t('Null Values')}
+                          tip={t(
+                            'Choose values that should be treated as null. Warning: Hive database supports only a single value',
+                          )}
+                          name="null_values"
+                        >
+                          <Select
+                            mode="multiple"
+                            options={nullValuesOptions}
+                            allowClear
+                            allowNewOptions
+                          />
+                        </StyledFormItemWithTip>
+                      </Col>
+                    </Row>
+                  )}
+                  {isFieldATypeSpecificField('skip_initial_space', type) && (
+                    <Row>
+                      <Col span={24}>
+                        <StyledFormItem name="skip_initial_space">
+                          <SwitchContainer
+                            label={t('Skip spaces after delimiter')}
+                            dataTest="skipInitialSpace"
+                          />
+                        </StyledFormItem>
+                      </Col>
+                    </Row>
+                  )}
+                  {isFieldATypeSpecificField('skip_blank_lines', type) && (
+                    <Row>
+                      <Col span={24}>
+                        <StyledFormItem name="skip_blank_lines">
+                          <SwitchContainer
+                            label={t(
+                              'Skip blank lines rather than interpreting them as Not A Number values',
+                            )}
+                            dataTest="skipBlankLines"
+                          />
+                        </StyledFormItem>
+                      </Col>
+                    </Row>
+                  )}
+                  {isFieldATypeSpecificField('day_first', type) && (
+                    <Row>
+                      <Col span={24}>
+                        <StyledFormItem name="day_first">
+                          <SwitchContainer
+                            label={t(
+                              'DD/MM format dates, international and European format',
+                            )}
+                            dataTest="dayFirst"
+                          />
+                        </StyledFormItem>
+                      </Col>
+                    </Row>
+                  )}
+                </>
+              ),
+            },
+            {
+              key: 'columns',
+              label: (
+                <div>
+                  <h4>{t('Columns')}</h4>
+                  <p className="helper">
+                    {t(
+                      'Adjust column settings such as specifying the columns to read, how duplicates are handled, column data types, and more.',
                     )}
-                    name="column_data_types"
-                  >
-                    <Input aria-label={t('Column data types')} type="text" />
-                  </StyledFormItemWithTip>
-                </Col>
-              </Row>
-            )}
-            <Row>
-              <Col span={24}>
-                <StyledFormItem name="dataframe_index">
-                  <SwitchContainer
-                    label={t('Create dataframe index')}
-                    dataTest="dataFrameIndex"
-                    onChange={setCurrentDataframeIndex}
-                  />
-                </StyledFormItem>
-              </Col>
-            </Row>
-            {currentDataframeIndex &&
-              isFieldATypeSpecificField('index_column', type) && (
-                <Row>
-                  <Col span={24}>
-                    <StyledFormItemWithTip
-                      label={t('Index column')}
-                      tip={t(
-                        'Column to use as the index of the dataframe. If None is given, Index label is used.',
-                      )}
-                      name="index_column"
-                    >
-                      <Select
-                        ariaLabel={t('Choose index column')}
-                        options={columns.map(column => ({
-                          value: column,
-                          label: column,
-                        }))}
-                        allowClear
-                        allowNewOptions
-                      />
-                    </StyledFormItemWithTip>
-                  </Col>
-                </Row>
-              )}
-            {currentDataframeIndex && (
-              <Row>
-                <Col span={24}>
-                  <StyledFormItemWithTip
-                    label={t('Index label')}
-                    tip={t(
-                      "Label for the index column. Don't use an existing column name.",
+                  </p>
+                </div>
+              ),
+              children: (
+                <>
+                  <Row>
+                    <Col span={24}>
+                      <StyledFormItem
+                        label={t('Columns to read')}
+                        name="columns_read"
+                      >
+                        <Select
+                          ariaLabel={t('Choose columns to read')}
+                          mode="multiple"
+                          options={columnsToOptions()}
+                          allowClear
+                          allowNewOptions
+                          placeholder={t(
+                            'List of the column names that should be read',
+                          )}
+                        />
+                      </StyledFormItem>
+                    </Col>
+                  </Row>
+                  {isFieldATypeSpecificField('column_data_types', type) && (
+                    <Row>
+                      <Col span={24}>
+                        <StyledFormItemWithTip
+                          label={t('Column data types')}
+                          tip={t(
+                            'A dictionary with column names and their data types if you need to change the defaults. Example: {"user_id":"int"}. Check Python\'s Pandas library for supported data types.',
+                          )}
+                          name="column_data_types"
+                        >
+                          <Input
+                            aria-label={t('Column data types')}
+                            type="text"
+                          />
+                        </StyledFormItemWithTip>
+                      </Col>
+                    </Row>
+                  )}
+                  <Row>
+                    <Col span={24}>
+                      <StyledFormItem name="dataframe_index">
+                        <SwitchContainer
+                          label={t('Create dataframe index')}
+                          dataTest="dataFrameIndex"
+                          onChange={setCurrentDataframeIndex}
+                        />
+                      </StyledFormItem>
+                    </Col>
+                  </Row>
+                  {currentDataframeIndex &&
+                    isFieldATypeSpecificField('index_column', type) && (
+                      <Row>
+                        <Col span={24}>
+                          <StyledFormItemWithTip
+                            label={t('Index column')}
+                            tip={t(
+                              'Column to use as the index of the dataframe. If None is given, Index label is used.',
+                            )}
+                            name="index_column"
+                          >
+                            <Select
+                              ariaLabel={t('Choose index column')}
+                              options={columns.map(column => ({
+                                value: column,
+                                label: column,
+                              }))}
+                              allowClear
+                              allowNewOptions
+                            />
+                          </StyledFormItemWithTip>
+                        </Col>
+                      </Row>
                     )}
-                    name="index_label"
-                  >
-                    <Input aria-label={t('Index label')} type="text" />
-                  </StyledFormItemWithTip>
-                </Col>
-              </Row>
-            )}
-          </Collapse.Panel>
-          {isFieldATypeSpecificField('header_row', type) &&
+                  {currentDataframeIndex && (
+                    <Row>
+                      <Col span={24}>
+                        <StyledFormItemWithTip
+                          label={t('Index label')}
+                          tip={t(
+                            "Label for the index column. Don't use an existing column name.",
+                          )}
+                          name="index_label"
+                        >
+                          <Input aria-label={t('Index label')} type="text" />
+                        </StyledFormItemWithTip>
+                      </Col>
+                    </Row>
+                  )}
+                </>
+              ),
+            },
+            ...(isFieldATypeSpecificField('header_row', type) &&
             isFieldATypeSpecificField('rows_to_read', type) &&
-            isFieldATypeSpecificField('skip_rows', type) && (
-              <Collapse.Panel
-                header={
-                  <div>
-                    <h4>{t('Rows')}</h4>
-                    <p className="helper">
-                      {t(
-                        'Set header rows and the number of rows to read or skip.',
-                      )}
-                    </p>
-                  </div>
-                }
-                key="4"
-              >
-                <Row>
-                  <Col span={8}>
-                    <StyledFormItemWithTip
-                      label={t('Header row')}
-                      tip={t(
-                        'Row containing the headers to use as column names (0 is first line of data).',
-                      )}
-                      name="header_row"
-                      rules={[
-                        { required: true, message: 'Header row is required' },
-                      ]}
-                    >
-                      <InputNumber
-                        aria-label={t('Header row')}
-                        type="text"
-                        min={0}
-                      />
-                    </StyledFormItemWithTip>
-                  </Col>
-                  <Col span={8}>
-                    <StyledFormItemWithTip
-                      label={t('Rows to read')}
-                      tip={t(
-                        'Number of rows of file to read. Leave empty (default) to read all rows',
-                      )}
-                      name="rows_to_read"
-                    >
-                      <InputNumber aria-label={t('Rows to read')} min={1} />
-                    </StyledFormItemWithTip>
-                  </Col>
-                  <Col span={8}>
-                    <StyledFormItemWithTip
-                      label={t('Skip rows')}
-                      tip={t('Number of rows to skip at start of file.')}
-                      name="skip_rows"
-                      rules={[
-                        { required: true, message: 'Skip rows is required' },
-                      ]}
-                    >
-                      <InputNumber aria-label={t('Skip rows')} min={0} />
-                    </StyledFormItemWithTip>
-                  </Col>
-                </Row>
-              </Collapse.Panel>
-            )}
-        </Collapse>
-      </AntdForm>
+            isFieldATypeSpecificField('skip_rows', type)
+              ? [
+                  {
+                    key: 'rows',
+                    label: (
+                      <div>
+                        <h4>{t('Rows')}</h4>
+                        <p className="helper">
+                          {t(
+                            'Set header rows and the number of rows to read or skip.',
+                          )}
+                        </p>
+                      </div>
+                    ),
+                    children: (
+                      <Row>
+                        <Col span={8}>
+                          <StyledFormItemWithTip
+                            label={t('Header row')}
+                            tip={t(
+                              'Row containing the headers to use as column names (0 is first line of data).',
+                            )}
+                            name="header_row"
+                            rules={[
+                              {
+                                required: true,
+                                message: 'Header row is required',
+                              },
+                            ]}
+                          >
+                            <InputNumber
+                              aria-label={t('Header row')}
+                              type="text"
+                              min={0}
+                            />
+                          </StyledFormItemWithTip>
+                        </Col>
+                        <Col span={8}>
+                          <StyledFormItemWithTip
+                            label={t('Rows to read')}
+                            tip={t(
+                              'Number of rows of file to read. Leave empty (default) to read all rows',
+                            )}
+                            name="rows_to_read"
+                          >
+                            <InputNumber
+                              aria-label={t('Rows to read')}
+                              min={1}
+                            />
+                          </StyledFormItemWithTip>
+                        </Col>
+                        <Col span={8}>
+                          <StyledFormItemWithTip
+                            label={t('Skip rows')}
+                            tip={t('Number of rows to skip at start of file.')}
+                            name="skip_rows"
+                            rules={[
+                              {
+                                required: true,
+                                message: 'Skip rows is required',
+                              },
+                            ]}
+                          >
+                            <InputNumber aria-label={t('Skip rows')} min={0} />
+                          </StyledFormItemWithTip>
+                        </Col>
+                      </Row>
+                    ),
+                  },
+                ]
+              : []),
+          ]}
+        />
+      </Form>
     </Modal>
   );
 };
diff --git a/superset-frontend/src/features/databases/UploadDataModel/styles.ts b/superset-frontend/src/features/databases/UploadDataModel/styles.ts
index f4aedf45717..98952d8ee33 100644
--- a/superset-frontend/src/features/databases/UploadDataModel/styles.ts
+++ b/superset-frontend/src/features/databases/UploadDataModel/styles.ts
@@ -16,17 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { FormItem } from 'src/components/Form';
+import { FormItem } from '@superset-ui/core/components';
 import { css, styled, SupersetTheme } from '@superset-ui/core';
 
 const MODAL_BODY_HEIGHT = 180.5;
-const antIconHeight = 12;
 
 export const StyledFormItem = styled(FormItem)`
   ${({ theme }) => css`
     flex: 1;
     margin-top: 0;
-    margin-bottom: ${theme.gridUnit * 2.5}px;
+    margin-bottom: ${theme.sizeUnit * 2.5}px;
   }
   `}
 `;
@@ -37,31 +36,8 @@ export const StyledSwitchContainer = styled.div`
   margin-top: 0;
 `;
 
-export const antdCollapseStyles = (theme: SupersetTheme) => css`
-  .ant-collapse-header {
-    padding-top: ${theme.gridUnit * 3.5}px;
-    padding-bottom: ${theme.gridUnit * 2.5}px;
-    .anticon.ant-collapse-arrow {
-      top: calc(50% - ${antIconHeight / 2}px);
-    }
-    .helper {
-      color: ${theme.colors.grayscale.base};
-      font-size: ${theme.typography.sizes.s}px;
-    }
-  }
-  h4 {
-    font-size: ${theme.typography.sizes.l}px;
-    margin-top: 0;
-    margin-bottom: ${theme.gridUnit}px;
-  }
-  p.helper {
-    margin-bottom: 0;
-    padding: 0;
-  }
-`;
-
 export const antDModalNoPaddingStyles = css`
-  .antd5-modal-body {
+  .ant-modal-body {
     padding-left: 0;
     padding-right: 0;
     padding-top: 0;
@@ -71,26 +47,26 @@ export const antDModalNoPaddingStyles = css`
 export const formStyles = (theme: SupersetTheme) => css`
   .switch-label {
     color: ${theme.colors.grayscale.base};
-    margin-left: ${theme.gridUnit * 4}px;
+    margin-left: ${theme.sizeUnit * 4}px;
   }
 `;
 
 export const antDModalStyles = (theme: SupersetTheme) => css`
-  .antd5-modal-header {
-    padding: ${theme.gridUnit * 4.5}px ${theme.gridUnit * 4}px
-      ${theme.gridUnit * 4}px;
+  .ant-modal-header {
+    padding: ${theme.sizeUnit * 4.5}px ${theme.sizeUnit * 4}px
+      ${theme.sizeUnit * 4}px;
   }
 
-  .antd5-modal-close-x .close {
+  .ant-modal-close-x .close {
     opacity: 1;
   }
 
-  .antd5-modal-body {
-    height: ${theme.gridUnit * MODAL_BODY_HEIGHT}px;
+  .ant-modal-body {
+    height: ${theme.sizeUnit * MODAL_BODY_HEIGHT}px;
   }
 
-  .antd5-modal-footer {
-    height: ${theme.gridUnit * 16.25}px;
+  .ant-modal-footer {
+    height: ${theme.sizeUnit * 16.25}px;
   }
 
   .info-solid-small {
diff --git a/superset-frontend/src/features/databases/types.ts b/superset-frontend/src/features/databases/types.ts
index a3a87b1e476..96f0db390da 100644
--- a/superset-frontend/src/features/databases/types.ts
+++ b/superset-frontend/src/features/databases/types.ts
@@ -1,6 +1,5 @@
 import { JsonObject } from '@superset-ui/core';
-// eslint-disable-next-line no-restricted-imports
-import { InputProps } from 'antd/lib/input'; // TODO: Remove antd
+import { InputProps } from '@superset-ui/core/components';
 import { ChangeEvent, EventHandler, FormEvent } from 'react';
 
 /**
@@ -322,6 +321,7 @@ export interface FieldPropTypes {
   sslForced?: boolean;
   defaultDBName?: string;
   editNewDb?: boolean;
+  isValidating: boolean;
 }
 
 type ChangeMethodsType = FieldPropTypes['changeMethods'];
@@ -344,6 +344,7 @@ export interface DatabaseConnectionFormProps {
   editNewDb?: boolean;
   dbModel: DatabaseForm;
   db: Partial<DatabaseObject> | null;
+  isValidating: boolean;
   onParametersChange: (
     event: FormEvent<InputProps> | { target: HTMLInputElement },
   ) => void;
diff --git a/superset-frontend/src/features/datasets/AddDataset/DatasetPanel/DatasetPanel.stories.tsx b/superset-frontend/src/features/datasets/AddDataset/DatasetPanel/DatasetPanel.stories.tsx
index 4f90e29a951..212b9bb26ba 100644
--- a/superset-frontend/src/features/datasets/AddDataset/DatasetPanel/DatasetPanel.stories.tsx
+++ b/superset-frontend/src/features/datasets/AddDataset/DatasetPanel/DatasetPanel.stories.tsx
@@ -18,7 +18,6 @@
  */
 
 import { StoryFn, Meta } from '@storybook/react';
-import { supersetTheme, ThemeProvider } from '@superset-ui/core';
 import DatasetPanel from './DatasetPanel';
 import { exampleColumns } from './fixtures';
 
@@ -28,11 +27,9 @@ export default {
 } as Meta<typeof DatasetPanel>;
 
 export const Basic: StoryFn<typeof DatasetPanel> = args => (
-  <ThemeProvider theme={supersetTheme}>
-    <div style={{ height: '350px' }}>
-      <DatasetPanel {...args} />
-    </div>
-  </ThemeProvider>
+  <div style={{ height: '350px' }}>
+    <DatasetPanel {...args} />
+  </div>
 );
 
 Basic.args = {
diff --git a/superset-frontend/src/features/datasets/AddDataset/DatasetPanel/DatasetPanel.test.tsx b/superset-frontend/src/features/datasets/AddDataset/DatasetPanel/DatasetPanel.test.tsx
index 8e553632761..03556a5c6fe 100644
--- a/superset-frontend/src/features/datasets/AddDataset/DatasetPanel/DatasetPanel.test.tsx
+++ b/superset-frontend/src/features/datasets/AddDataset/DatasetPanel/DatasetPanel.test.tsx
@@ -36,7 +36,7 @@ import {
 } from './MessageContent';
 
 jest.mock(
-  'src/components/Icons/AsyncIcon',
+  '@superset-ui/core/components/Icons/AsyncIcon',
   () =>
     ({ fileName }: { fileName: string }) => (
       <span role="img" aria-label={fileName.replace('_', '-')} />
diff --git a/superset-frontend/src/features/datasets/AddDataset/DatasetPanel/DatasetPanel.tsx b/superset-frontend/src/features/datasets/AddDataset/DatasetPanel/DatasetPanel.tsx
index f838c86f071..c4bc66c55cf 100644
--- a/superset-frontend/src/features/datasets/AddDataset/DatasetPanel/DatasetPanel.tsx
+++ b/superset-frontend/src/features/datasets/AddDataset/DatasetPanel/DatasetPanel.tsx
@@ -17,9 +17,12 @@
  * under the License.
  */
 import { t, styled } from '@superset-ui/core';
-import { Icons } from 'src/components/Icons';
-import Alert from 'src/components/Alert';
-import Table, { ColumnsType, TableSize } from 'src/components/Table';
+import { Icons } from '@superset-ui/core/components/Icons';
+import { Alert, Image } from '@superset-ui/core/components';
+import Table, {
+  ColumnsType,
+  TableSize,
+} from '@superset-ui/core/components/Table';
 // @ts-ignore
 import LOADING_GIF from 'src/assets/images/loading.gif';
 import { DatasetObject } from 'src/features/datasets/AddDataset/types';
@@ -55,20 +58,20 @@ const MARGIN_MULTIPLIER = 3;
 const StyledHeader = styled.div<StyledHeaderProps>`
   ${({ theme, position }) => `
   position: ${position};
-  margin: ${theme.gridUnit * (MARGIN_MULTIPLIER + 1)}px
-    ${theme.gridUnit * MARGIN_MULTIPLIER}px
-    ${theme.gridUnit * MARGIN_MULTIPLIER}px
-    ${theme.gridUnit * (MARGIN_MULTIPLIER + 3)}px;
-  font-size: ${theme.gridUnit * 6}px;
-  font-weight: ${theme.typography.weights.medium};
-  padding-bottom: ${theme.gridUnit * MARGIN_MULTIPLIER}px;
+  margin: ${theme.sizeUnit * (MARGIN_MULTIPLIER + 1)}px
+    ${theme.sizeUnit * MARGIN_MULTIPLIER}px
+    ${theme.sizeUnit * MARGIN_MULTIPLIER}px
+    ${theme.sizeUnit * (MARGIN_MULTIPLIER + 3)}px;
+  font-size: ${theme.sizeUnit * 6}px;
+  font-weight: ${theme.fontWeightStrong};
+  padding-bottom: ${theme.sizeUnit * MARGIN_MULTIPLIER}px;
 
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
 
   .anticon:first-of-type {
-    margin-right: ${theme.gridUnit * 2}px;
+    margin-right: ${theme.sizeUnit * 2}px;
     vertical-align: text-top;
   }
 
@@ -77,16 +80,16 @@ const StyledHeader = styled.div<StyledHeaderProps>`
 
 const StyledTitle = styled.div`
   ${({ theme }) => `
-  margin-left: ${theme.gridUnit * (MARGIN_MULTIPLIER + 3)}px;
-  margin-bottom: ${theme.gridUnit * MARGIN_MULTIPLIER}px;
-  font-weight: ${theme.typography.weights.bold};
+  margin-left: ${theme.sizeUnit * (MARGIN_MULTIPLIER + 3)}px;
+  margin-bottom: ${theme.sizeUnit * MARGIN_MULTIPLIER}px;
+  font-weight: ${theme.fontWeightStrong};
   `}
 `;
 
 const LoaderContainer = styled.div`
   ${({ theme }) => `
-  padding: ${theme.gridUnit * 8}px
-    ${theme.gridUnit * 6}px;
+  padding: ${theme.sizeUnit * 8}px
+    ${theme.sizeUnit * 6}px;
   box-sizing: border-box;
   display: flex;
   align-items: center;
@@ -105,18 +108,18 @@ const StyledLoader = styled.div`
   max-width: 50%;
   width: ${LOADER_WIDTH}px;
 
-  img {
+  .ant-image {
     width: ${SPINNER_WIDTH}px;
     margin-left: ${(LOADER_WIDTH - SPINNER_WIDTH) * HALF}px;
   }
 
   div {
     width: 100%;
-    margin-top: ${theme.gridUnit * MARGIN_MULTIPLIER}px;
+    margin-top: ${theme.sizeUnit * MARGIN_MULTIPLIER}px;
     text-align: center;
-    font-weight: ${theme.typography.weights.normal};
-    font-size: ${theme.typography.sizes.l}px;
-    color: ${theme.colors.grayscale.light1};
+    font-weight: ${theme.fontWeightNormal};
+    font-size: ${theme.fontSizeLG}px;
+    color: ${theme.colorTextSecondary};
   }
   `}
 `;
@@ -124,9 +127,9 @@ const StyledLoader = styled.div`
 const TableContainerWithBanner = styled.div`
   ${({ theme }) => `
   position: relative;
-  margin: ${theme.gridUnit * MARGIN_MULTIPLIER}px;
-  margin-left: ${theme.gridUnit * (MARGIN_MULTIPLIER + 3)}px;
-  height: calc(100% - ${theme.gridUnit * 60}px);
+  margin: ${theme.sizeUnit * MARGIN_MULTIPLIER}px;
+  margin-left: ${theme.sizeUnit * (MARGIN_MULTIPLIER + 3)}px;
+  height: calc(100% - ${theme.sizeUnit * 60}px);
   overflow: auto;
   `}
 `;
@@ -134,9 +137,9 @@ const TableContainerWithBanner = styled.div`
 const TableContainerWithoutBanner = styled.div`
   ${({ theme }) => `
   position: relative;
-  margin: ${theme.gridUnit * MARGIN_MULTIPLIER}px;
-  margin-left: ${theme.gridUnit * (MARGIN_MULTIPLIER + 3)}px;
-  height: calc(100% - ${theme.gridUnit * 30}px);
+  margin: ${theme.sizeUnit * MARGIN_MULTIPLIER}px;
+  margin-left: ${theme.sizeUnit * (MARGIN_MULTIPLIER + 3)}px;
+  height: calc(100% - ${theme.sizeUnit * 30}px);
   overflow: auto;
   `}
 `;
@@ -151,18 +154,17 @@ const TableScrollContainer = styled.div`
 
 const StyledAlert = styled(Alert)`
   ${({ theme }) => `
-  border: 1px solid ${theme.colors.info.base};
-  padding: ${theme.gridUnit * 4}px;
-  margin: ${theme.gridUnit * 6}px ${theme.gridUnit * 6}px
-    ${theme.gridUnit * 8}px;
+  border: 1px solid ${theme.colorInfoText};
+  padding: ${theme.sizeUnit * 4}px;
+  margin: ${theme.sizeUnit * 6}px ${theme.sizeUnit * 6}px
+    ${theme.sizeUnit * 8}px;
   .view-dataset-button {
     position: absolute;
-    top: ${theme.gridUnit * 4}px;
-    right: ${theme.gridUnit * 4}px;
-    font-weight: ${theme.typography.weights.normal};
+    top: ${theme.sizeUnit * 4}px;
+    right: ${theme.sizeUnit * 4}px;
 
     &:hover {
-      color: ${theme.colors.secondary.dark3};
+      color: ${theme.colorPrimary};
       text-decoration: underline;
     }
   }
@@ -268,7 +270,7 @@ const DatasetPanel = ({
     loader = (
       <LoaderContainer>
         <StyledLoader>
-          <img alt={ALT_LOADING} src={LOADING_GIF} />
+          <Image preview={false} alt={ALT_LOADING} src={LOADING_GIF} />
           <div>{REFRESHING}</div>
         </StyledLoader>
       </LoaderContainer>
diff --git a/superset-frontend/src/features/datasets/AddDataset/DatasetPanel/MessageContent.tsx b/superset-frontend/src/features/datasets/AddDataset/DatasetPanel/MessageContent.tsx
index 5aab7202722..d691a4c9527 100644
--- a/superset-frontend/src/features/datasets/AddDataset/DatasetPanel/MessageContent.tsx
+++ b/superset-frontend/src/features/datasets/AddDataset/DatasetPanel/MessageContent.tsx
@@ -18,12 +18,12 @@
  */
 
 import { t, styled } from '@superset-ui/core';
-import { EmptyState } from 'src/components/EmptyState';
+import { EmptyState } from '@superset-ui/core/components';
 import { Link } from 'react-router-dom';
 
 const StyledContainer = styled.div`
-  padding: ${({ theme }) => theme.gridUnit * 8}px
-    ${({ theme }) => theme.gridUnit * 6}px;
+  padding: ${({ theme }) => theme.sizeUnit * 8}px
+    ${({ theme }) => theme.sizeUnit * 6}px;
 
   display: flex;
   align-items: center;
@@ -35,7 +35,7 @@ const StyledEmptyState = styled(EmptyState)`
   max-width: 50%;
 
   p {
-    width: ${({ theme }) => theme.gridUnit * 115}px;
+    width: ${({ theme }) => theme.sizeUnit * 115}px;
   }
 `;
 
diff --git a/superset-frontend/src/features/datasets/AddDataset/EditDataset/UsageTab/UsageTab.test.tsx b/superset-frontend/src/features/datasets/AddDataset/EditDataset/UsageTab/UsageTab.test.tsx
index 0e278bc94a9..faf40d96965 100644
--- a/superset-frontend/src/features/datasets/AddDataset/EditDataset/UsageTab/UsageTab.test.tsx
+++ b/superset-frontend/src/features/datasets/AddDataset/EditDataset/UsageTab/UsageTab.test.tsx
@@ -94,12 +94,12 @@ const expectLastChartRequest = (params?: {
 };
 
 test('shows loading state', async () => {
-  mockChartsFetch(
-    new Promise(resolve =>
-      setTimeout(() => resolve(getChartResponse([])), 250),
-    ),
-  );
+  let resolveFetch = () => {};
+  const fetchPromise = new Promise(resolve => {
+    resolveFetch = () => resolve(getChartResponse([]));
+  });
 
+  mockChartsFetch(fetchPromise);
   renderDatasetUsage();
 
   const loadingIndicator = await screen.findByRole('status', {
@@ -109,6 +109,10 @@ test('shows loading state', async () => {
   await waitFor(() => {
     expect(loadingIndicator).toBeVisible();
   });
+  resolveFetch();
+  await waitFor(() => {
+    expect(loadingIndicator).not.toBeInTheDocument();
+  });
 });
 
 test('shows error state', async () => {
@@ -222,7 +226,9 @@ const getDate = (msAgo: number) => {
   return date;
 };
 
-test('show and sort by chart last modified', async () => {
+// TODO: This is likely to be removed as the UsageTab is unused
+// eslint-disable-next-line jest/no-disabled-tests
+test.skip('show and sort by chart last modified', async () => {
   mockChartsFetch(
     getChartResponse([
       getMockChart({ id: 2, last_saved_at: getDate(10000).toISOString() }),
@@ -379,7 +385,7 @@ test('paginates', async () => {
   expect(chartNameValues[24]).toHaveTextContent('Sample chart 25');
 
   // Second page
-  userEvent.click(
+  await userEvent.click(
     screen.getByRole('button', {
       name: /right/i,
     }),
@@ -394,7 +400,7 @@ test('paginates', async () => {
   expect(chartNameValues[24]).toHaveTextContent('Sample chart 50');
 
   // Third page
-  userEvent.click(
+  await userEvent.click(
     screen.getByRole('button', {
       name: /right/i,
     }),
diff --git a/superset-frontend/src/features/datasets/AddDataset/EditDataset/UsageTab/index.tsx b/superset-frontend/src/features/datasets/AddDataset/EditDataset/UsageTab/index.tsx
index 32786105b96..43078fc2b87 100644
--- a/superset-frontend/src/features/datasets/AddDataset/EditDataset/UsageTab/index.tsx
+++ b/superset-frontend/src/features/datasets/AddDataset/EditDataset/UsageTab/index.tsx
@@ -31,15 +31,14 @@ import Table, {
   ColumnsType,
   TableSize,
   OnChangeFunction,
-} from 'src/components/Table';
-import { EmptyState } from 'src/components/EmptyState';
-import ChartImage from 'src/assets/images/chart.svg';
-import { Icons } from 'src/components/Icons';
+} from '@superset-ui/core/components/Table';
+import { EmptyState, Icons } from '@superset-ui/core/components';
+import { ListViewFilterOperator as FilterOperator } from 'src/components';
+import { chart as ChartImage } from '@superset-ui/core/components/assets';
 import { useToasts } from 'src/components/MessageToasts/withToasts';
 import { useListViewResource } from 'src/views/CRUD/hooks';
-import { FilterOperator } from 'src/components/ListView';
-import { extendedDayjs } from 'src/utils/dates';
-import TruncatedList from 'src/components/TruncatedList';
+import { extendedDayjs } from '@superset-ui/core/utils/dates';
+import TruncatedList from '@superset-ui/core/components/TruncatedList';
 
 interface DatasetUsageProps {
   datasetId: string;
@@ -148,7 +147,7 @@ const emptyStateButtonText = (
 );
 
 const StyledEmptyState = styled(EmptyState)`
-  margin: ${({ theme }) => 13 * theme.gridUnit}px 0;
+  margin: ${({ theme }) => 13 * theme.sizeUnit}px 0;
 `;
 
 /**
diff --git a/superset-frontend/src/features/datasets/AddDataset/EditDataset/index.tsx b/superset-frontend/src/features/datasets/AddDataset/EditDataset/index.tsx
index b647c4532ab..c7f8bb005ef 100644
--- a/superset-frontend/src/features/datasets/AddDataset/EditDataset/index.tsx
+++ b/superset-frontend/src/features/datasets/AddDataset/EditDataset/index.tsx
@@ -18,18 +18,18 @@
  */
 import { styled, t } from '@superset-ui/core';
 import useGetDatasetRelatedCounts from 'src/features/datasets/hooks/useGetDatasetRelatedCounts';
-import Badge from 'src/components/Badge';
-import Tabs from 'src/components/Tabs';
+import { Badge } from '@superset-ui/core/components';
+import Tabs from '@superset-ui/core/components/Tabs';
 import UsageTab from './UsageTab';
 
 const StyledTabs = styled(Tabs)`
   ${({ theme }) => `
-  margin-top: ${theme.gridUnit * 8.5}px;
-  padding-left: ${theme.gridUnit * 4}px;
-  padding-right: ${theme.gridUnit * 4}px;
+  margin-top: ${theme.sizeUnit * 8.5}px;
+  padding-left: ${theme.sizeUnit * 4}px;
+  padding-right: ${theme.sizeUnit * 4}px;
 
   .ant-tabs-top > .ant-tabs-nav::before {
-    width: ${theme.gridUnit * 50}px;
+    width: ${theme.sizeUnit * 50}px;
   }
   `}
 `;
@@ -37,8 +37,8 @@ const StyledTabs = styled(Tabs)`
 const TabStyles = styled.div`
   ${({ theme }) => `
   .ant-badge {
-    width: ${theme.gridUnit * 8}px;
-    margin-left: ${theme.gridUnit * 2.5}px;
+    width: ${theme.sizeUnit * 8}px;
+    margin-left: ${theme.sizeUnit * 2.5}px;
   }
   `}
 `;
@@ -53,6 +53,12 @@ const TRANSLATIONS = {
   METRICS_TEXT: t('Metrics'),
 };
 
+const TABS_KEYS = {
+  COLUMNS: 'COLUMNS',
+  METRICS: 'METRICS',
+  USAGE: 'USAGE',
+};
+
 const EditPage = ({ id }: EditPageProps) => {
   const { usageCount } = useGetDatasetRelatedCounts(id);
 
@@ -63,15 +69,25 @@ const EditPage = ({ id }: EditPageProps) => {
     </TabStyles>
   );
 
-  return (
-    <StyledTabs moreIcon={null} fullWidth={false}>
-      <Tabs.TabPane tab={TRANSLATIONS.COLUMNS_TEXT} key="1" />
-      <Tabs.TabPane tab={TRANSLATIONS.METRICS_TEXT} key="2" />
-      <Tabs.TabPane tab={usageTab} key="3">
-        <UsageTab datasetId={id} />
-      </Tabs.TabPane>
-    </StyledTabs>
-  );
+  const items = [
+    {
+      key: TABS_KEYS.COLUMNS,
+      label: TRANSLATIONS.COLUMNS_TEXT,
+      children: null,
+    },
+    {
+      key: TABS_KEYS.METRICS,
+      label: TRANSLATIONS.METRICS_TEXT,
+      children: null,
+    },
+    {
+      key: TABS_KEYS.USAGE,
+      label: usageTab,
+      children: <UsageTab datasetId={id} />,
+    },
+  ];
+
+  return <StyledTabs moreIcon={null} items={items} />;
 };
 
 export default EditPage;
diff --git a/superset-frontend/src/features/datasets/AddDataset/Footer/index.tsx b/superset-frontend/src/features/datasets/AddDataset/Footer/index.tsx
index e72bc54f24a..880e948f575 100644
--- a/superset-frontend/src/features/datasets/AddDataset/Footer/index.tsx
+++ b/superset-frontend/src/features/datasets/AddDataset/Footer/index.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { useHistory } from 'react-router-dom';
-import Button from 'src/components/Button';
+import { Button } from '@superset-ui/core/components';
 import { t } from '@superset-ui/core';
 import { useSingleViewResource } from 'src/views/CRUD/hooks';
 import { logEvent } from 'src/logger/actions';
@@ -114,7 +114,9 @@ function Footer({
 
   return (
     <>
-      <Button onClick={cancelButtonOnClick}>{t('Cancel')}</Button>
+      <Button buttonStyle="secondary" onClick={cancelButtonOnClick}>
+        {t('Cancel')}
+      </Button>
       <Button
         buttonStyle="primary"
         disabled={disabledCheck}
diff --git a/superset-frontend/src/features/datasets/AddDataset/Header/index.tsx b/superset-frontend/src/features/datasets/AddDataset/Header/index.tsx
index 60fc8a22a6c..f80b349e8b7 100644
--- a/superset-frontend/src/features/datasets/AddDataset/Header/index.tsx
+++ b/superset-frontend/src/features/datasets/AddDataset/Header/index.tsx
@@ -18,11 +18,11 @@
  */
 import { Dispatch } from 'react';
 import { t } from '@superset-ui/core';
-import { PageHeaderWithActions } from 'src/components/PageHeaderWithActions';
-import Button from 'src/components/Button';
-import { Icons } from 'src/components/Icons';
-import { Menu } from 'src/components/Menu';
-import { TooltipPlacement } from 'src/components/Tooltip';
+import { PageHeaderWithActions } from '@superset-ui/core/components/PageHeaderWithActions';
+import { Button } from '@superset-ui/core/components';
+import { TooltipPlacement } from '@superset-ui/core/components/Tooltip/types';
+import { Icons } from '@superset-ui/core/components/Icons';
+import { Menu } from '@superset-ui/core/components/Menu';
 import {
   DatasetActionType,
   DSReducerActionType,
diff --git a/superset-frontend/src/features/datasets/AddDataset/LeftPanel/LeftPanel.test.tsx b/superset-frontend/src/features/datasets/AddDataset/LeftPanel/LeftPanel.test.tsx
index a9f36e74ac6..4625ce485bf 100644
--- a/superset-frontend/src/features/datasets/AddDataset/LeftPanel/LeftPanel.test.tsx
+++ b/superset-frontend/src/features/datasets/AddDataset/LeftPanel/LeftPanel.test.tsx
@@ -241,36 +241,26 @@ test('searches for a table name', async () => {
 
   // Click 'public' schema to access tables
   userEvent.click(schemaSelect);
-  userEvent.click(screen.getAllByText('public')[1]);
+  userEvent.click(screen.getByText('public'));
   await waitFor(() => expect(fetchMock.calls(tablesEndpoint).length).toBe(1));
   userEvent.click(tableSelect);
 
   await waitFor(() => {
     expect(
-      screen.queryByRole('option', {
-        name: /Sheet1/i,
-      }),
+      screen.queryByRole('option', { name: /Sheet1/i }),
     ).toBeInTheDocument();
     expect(
-      screen.queryByRole('option', {
-        name: /Sheet2/i,
-      }),
+      screen.queryByRole('option', { name: /Sheet2/i }),
     ).toBeInTheDocument();
   });
 
   userEvent.type(tableSelect, 'Sheet3');
 
   await waitFor(() => {
+    expect(screen.queryByText(/Sheet1/i)).not.toBeInTheDocument();
+    expect(screen.queryByText(/Sheet2/i)).not.toBeInTheDocument();
     expect(
-      screen.queryByRole('option', { name: /Sheet1/i }),
-    ).not.toBeInTheDocument();
-    expect(
-      screen.queryByRole('option', { name: /Sheet2/i }),
-    ).not.toBeInTheDocument();
-    expect(
-      screen.queryByRole('option', {
-        name: /Sheet3/i,
-      }),
+      screen.queryByRole('option', { name: /Sheet3/i }),
     ).toBeInTheDocument();
   });
 });
@@ -310,14 +300,12 @@ test('renders a warning icon when a table name has a preexisting dataset', async
 
   // Click 'public' schema to access tables
   userEvent.click(schemaSelect);
-  userEvent.click(screen.getAllByText('public')[1]);
+  userEvent.click(screen.getByText('public'));
   userEvent.click(tableSelect);
 
   await waitFor(() => {
     expect(
-      screen.queryByRole('option', {
-        name: /Sheet2/i,
-      }),
+      screen.queryByRole('option', { name: /Sheet2/i }),
     ).toBeInTheDocument();
   });
 
diff --git a/superset-frontend/src/features/datasets/AddDataset/LeftPanel/index.tsx b/superset-frontend/src/features/datasets/AddDataset/LeftPanel/index.tsx
index adb52234224..b6d5174b616 100644
--- a/superset-frontend/src/features/datasets/AddDataset/LeftPanel/index.tsx
+++ b/superset-frontend/src/features/datasets/AddDataset/LeftPanel/index.tsx
@@ -19,8 +19,8 @@
 import { useEffect, SetStateAction, Dispatch, useCallback } from 'react';
 import { styled, t } from '@superset-ui/core';
 import TableSelector, { TableOption } from 'src/components/TableSelector';
-import { DatabaseObject } from 'src/components/DatabaseSelector';
-import { EmptyState } from 'src/components/EmptyState';
+import { EmptyState } from '@superset-ui/core/components';
+import { type DatabaseObject } from 'src/components';
 import { useToasts } from 'src/components/MessageToasts/withToasts';
 import { LocalStorageKeys, getItem } from 'src/utils/localStorageHelpers';
 import {
@@ -28,6 +28,7 @@ import {
   DatasetObject,
 } from 'src/features/datasets/AddDataset/types';
 import { Table } from 'src/hooks/apiResources';
+import { Typography } from '@superset-ui/core/components/Typography';
 
 interface LeftPanelProps {
   setDataset: Dispatch<SetStateAction<object>>;
@@ -37,39 +38,39 @@ interface LeftPanelProps {
 
 const LeftPanelStyle = styled.div`
   ${({ theme }) => `
-    padding: ${theme.gridUnit * 4}px;
+    padding: ${theme.sizeUnit * 4}px;
     height: 100%;
     background-color: ${theme.colors.grayscale.light5};
     position: relative;
     .emptystate {
       height: auto;
-      margin-top: ${theme.gridUnit * 17.5}px;
+      margin-top: ${theme.sizeUnit * 17.5}px;
     }
     .section-title {
-      margin-top: ${theme.gridUnit * 5.5}px;
-      margin-bottom: ${theme.gridUnit * 11}px;
-      font-weight: ${theme.typography.weights.bold};
+      margin-top: ${theme.sizeUnit * 5.5}px;
+      margin-bottom: ${theme.sizeUnit * 11}px;
+      font-weight: ${theme.fontWeightStrong};
     }
     .table-title {
-      margin-top: ${theme.gridUnit * 11}px;
-      margin-bottom: ${theme.gridUnit * 6}px;
-      font-weight: ${theme.typography.weights.bold};
+      margin-top: ${theme.sizeUnit * 11}px;
+      margin-bottom: ${theme.sizeUnit * 6}px;
+      font-weight: ${theme.fontWeightStrong};
     }
     .options-list {
       overflow: auto;
       position: absolute;
       bottom: 0;
-      top: ${theme.gridUnit * 92.25}px;
-      left: ${theme.gridUnit * 3.25}px;
+      top: ${theme.sizeUnit * 92.25}px;
+      left: ${theme.sizeUnit * 3.25}px;
       right: 0;
 
       .no-scrollbar {
-        margin-right: ${theme.gridUnit * 4}px;
+        margin-right: ${theme.sizeUnit * 4}px;
       }
 
       .options {
         cursor: pointer;
-        padding: ${theme.gridUnit * 1.75}px;
+        padding: ${theme.sizeUnit * 1.75}px;
         border-radius: ${theme.borderRadius}px;
         :hover {
           background-color: ${theme.colors.grayscale.light4}
@@ -78,9 +79,9 @@ const LeftPanelStyle = styled.div`
 
       .options-highlighted {
         cursor: pointer;
-        padding: ${theme.gridUnit * 1.75}px;
+        padding: ${theme.sizeUnit * 1.75}px;
         border-radius: ${theme.borderRadius}px;
-        background-color: ${theme.colors.primary.dark1};
+        background-color: ${theme.colorPrimaryText};
         color: ${theme.colors.grayscale.light5};
       }
 
@@ -92,22 +93,22 @@ const LeftPanelStyle = styled.div`
     }
     form > span[aria-label="refresh"] {
       position: absolute;
-      top: ${theme.gridUnit * 69}px;
-      left: ${theme.gridUnit * 42.75}px;
-      font-size: ${theme.gridUnit * 4.25}px;
+      top: ${theme.sizeUnit * 69}px;
+      left: ${theme.sizeUnit * 42.75}px;
+      font-size: ${theme.sizeUnit * 4.25}px;
     }
     .table-form {
-      margin-bottom: ${theme.gridUnit * 8}px;
+      margin-bottom: ${theme.sizeUnit * 8}px;
     }
     .loading-container {
       position: absolute;
-      top: ${theme.gridUnit * 89.75}px;
+      top: ${theme.sizeUnit * 89.75}px;
       left: 0;
       right: 0;
       text-align: center;
       img {
-        width: ${theme.gridUnit * 20}px;
-        margin-bottom: ${theme.gridUnit * 2.5}px;
+        width: ${theme.sizeUnit * 20}px;
+        margin-bottom: ${theme.sizeUnit * 2.5}px;
       }
       p {
         color: ${theme.colors.grayscale.light1};
@@ -189,7 +190,9 @@ export default function LeftPanel({
       description={
         <span>
           {t('Manage your databases')}{' '}
-          <a href="/databaseview/list">{t('here')}</a>
+          <Typography.Link href="/databaseview/list">
+            {t('here')}
+          </Typography.Link>
         </span>
       }
       size="small"
diff --git a/superset-frontend/src/features/datasets/AddDataset/types.tsx b/superset-frontend/src/features/datasets/AddDataset/types.tsx
index 1c4b16436d3..561d000fed8 100644
--- a/superset-frontend/src/features/datasets/AddDataset/types.tsx
+++ b/superset-frontend/src/features/datasets/AddDataset/types.tsx
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { DatabaseObject } from 'src/components/DatabaseSelector';
+import type { DatabaseObject } from 'src/components';
 
 export enum DatasetActionType {
   SelectDatabase,
diff --git a/superset-frontend/src/features/datasets/DatasetLayout/index.tsx b/superset-frontend/src/features/datasets/DatasetLayout/index.tsx
index 8f6c8c7d593..68f7f1d0c71 100644
--- a/superset-frontend/src/features/datasets/DatasetLayout/index.tsx
+++ b/superset-frontend/src/features/datasets/DatasetLayout/index.tsx
@@ -58,8 +58,8 @@ export default function DatasetLayout({
         {leftPanel && (
           <ResizableSidebar
             id="dataset"
-            initialWidth={theme.gridUnit * 80}
-            minWidth={theme.gridUnit * 80}
+            initialWidth={theme.sizeUnit * 80}
+            minWidth={theme.sizeUnit * 80}
             enable
           >
             {adjustedWidth => (
diff --git a/superset-frontend/src/features/datasets/DatasetSelectLabel/index.tsx b/superset-frontend/src/features/datasets/DatasetSelectLabel/index.tsx
index e68b2fcca3a..b354e76f1d3 100644
--- a/superset-frontend/src/features/datasets/DatasetSelectLabel/index.tsx
+++ b/superset-frontend/src/features/datasets/DatasetSelectLabel/index.tsx
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { Tooltip } from 'src/components/Tooltip';
+import { Tooltip } from '@superset-ui/core/components';
 import { styled, t } from '@superset-ui/core';
 
 type Database = {
@@ -34,12 +34,12 @@ export type Dataset = {
 const TooltipContent = styled.div`
   ${({ theme }) => `
     .tooltip-header {
-      font-size: ${theme.typography.sizes.m}px;
-      font-weight: ${theme.typography.weights.bold};
+      font-size: ${theme.fontSize}px;
+      font-weight: ${theme.fontWeightStrong};
     }
 
     .tooltip-description {
-      margin-top: ${theme.gridUnit * 2}px;
+      margin-top: ${theme.sizeUnit * 2}px;
       display: -webkit-box;
       -webkit-line-clamp: 20;
       -webkit-box-orient: vertical;
@@ -51,8 +51,8 @@ const TooltipContent = styled.div`
 
 const StyledLabelContainer = styled.div`
   ${({ theme }) => `
-    left: ${theme.gridUnit * 3}px;
-    right: ${theme.gridUnit * 3}px;
+    left: ${theme.sizeUnit * 3}px;
+    right: ${theme.sizeUnit * 3}px;
     overflow: hidden;
     text-overflow: ellipsis;
     display: block;
@@ -61,8 +61,8 @@ const StyledLabelContainer = styled.div`
 
 const StyledLabel = styled.span`
   ${({ theme }) => `
-    left: ${theme.gridUnit * 3}px;
-    right: ${theme.gridUnit * 3}px;
+    left: ${theme.sizeUnit * 3}px;
+    right: ${theme.sizeUnit * 3}px;
     overflow: hidden;
     text-overflow: ellipsis;
     display: block;
@@ -77,15 +77,11 @@ const StyledDetailWrapper = styled.div`
 `;
 
 const StyledLabelDetail = styled.span`
-  ${({
-    theme: {
-      typography: { sizes, weights },
-    },
-  }) => `
+  ${({ theme: { fontSizeSM, colorTextSecondary } }) => `
     overflow: hidden;
     text-overflow: ellipsis;
-    font-size: ${sizes.s}px;
-    font-weight: ${weights.light};
+    font-size: ${fontSizeSM}px;
+    color: ${colorTextSecondary};
     line-height: 1.6;
   `}
 `;
diff --git a/superset-frontend/src/features/datasets/DuplicateDatasetModal.tsx b/superset-frontend/src/features/datasets/DuplicateDatasetModal.tsx
index 91440aaf3e2..f8225ad9cc3 100644
--- a/superset-frontend/src/features/datasets/DuplicateDatasetModal.tsx
+++ b/superset-frontend/src/features/datasets/DuplicateDatasetModal.tsx
@@ -18,9 +18,7 @@
  */
 import { t } from '@superset-ui/core';
 import { FunctionComponent, useEffect, useState, ChangeEvent } from 'react';
-import { FormLabel } from 'src/components/Form';
-import { Input } from 'src/components/Input';
-import Modal from 'src/components/Modal';
+import { Input, FormLabel, Modal } from '@superset-ui/core/components';
 import Dataset from 'src/types/Dataset';
 
 interface DuplicateDatasetModalProps {
diff --git a/superset-frontend/src/features/datasets/hooks/useDatasetLists.ts b/superset-frontend/src/features/datasets/hooks/useDatasetLists.ts
index 373d98946f8..8be422ee129 100644
--- a/superset-frontend/src/features/datasets/hooks/useDatasetLists.ts
+++ b/superset-frontend/src/features/datasets/hooks/useDatasetLists.ts
@@ -21,7 +21,7 @@ import { SupersetClient, logging, t } from '@superset-ui/core';
 import rison from 'rison';
 import { addDangerToast } from 'src/components/MessageToasts/actions';
 import { DatasetObject } from 'src/features/datasets/AddDataset/types';
-import { DatabaseObject } from 'src/components/DatabaseSelector';
+import type { DatabaseObject } from 'src/components';
 
 /**
  * Retrieves all pages of dataset results
diff --git a/superset-frontend/src/features/datasets/metadataBar/useDatasetMetadataBar.tsx b/superset-frontend/src/features/datasets/metadataBar/useDatasetMetadataBar.tsx
index 1f26ecc15aa..fee37c57a2a 100644
--- a/superset-frontend/src/features/datasets/metadataBar/useDatasetMetadataBar.tsx
+++ b/superset-frontend/src/features/datasets/metadataBar/useDatasetMetadataBar.tsx
@@ -18,13 +18,13 @@
  */
 import { useEffect, useMemo, useState } from 'react';
 import { css, t, useTheme } from '@superset-ui/core';
-import Alert from 'src/components/Alert';
+import { Alert } from '@superset-ui/core/components';
 import { Dataset } from 'src/components/Chart/types';
-import MetadataBar from 'src/components/MetadataBar';
+import MetadataBar from '@superset-ui/core/components/MetadataBar';
 import {
   ContentType,
   MetadataType,
-} from 'src/components/MetadataBar/ContentType';
+} from '@superset-ui/core/components/MetadataBar/ContentType';
 import { ResourceStatus } from 'src/hooks/apiResources/apiResources';
 import { cachedSupersetGet } from 'src/utils/cachedSupersetGet';
 
@@ -107,7 +107,7 @@ export const useDatasetMetadataBar = ({
       <div
         css={css`
           display: flex;
-          margin-bottom: ${theme.gridUnit * 4}px;
+          margin-bottom: ${theme.sizeUnit * 4}px;
         `}
       >
         {status === ResourceStatus.Complete && (
@@ -121,7 +121,7 @@ export const useDatasetMetadataBar = ({
         )}
       </div>
     );
-  }, [datasetProps, result, status, theme.gridUnit]);
+  }, [datasetProps, result, status, theme.sizeUnit]);
 
   return {
     metadataBar,
diff --git a/superset-frontend/src/features/datasets/styles.ts b/superset-frontend/src/features/datasets/styles.ts
index 108504475ae..32b03dc92f1 100644
--- a/superset-frontend/src/features/datasets/styles.ts
+++ b/superset-frontend/src/features/datasets/styles.ts
@@ -26,8 +26,8 @@ export const StyledLayoutWrapper = styled.div`
 `;
 
 export const LeftColumn = styled.div<{ width?: number }>`
-  width: ${({ theme, width }) => width ?? theme.gridUnit * 80}px;
-  max-width: ${({ theme, width }) => width ?? theme.gridUnit * 80}px;
+  width: ${({ theme, width }) => width ?? theme.sizeUnit * 80}px;
+  max-width: ${({ theme, width }) => width ?? theme.sizeUnit * 80}px;
   flex-direction: column;
   flex: 1 0 auto;
 `;
@@ -57,27 +57,27 @@ export const PanelRow = styled(Row)`
 
 export const FooterRow = styled(Row)`
   flex: 0 0 auto;
-  height: ${({ theme }) => theme.gridUnit * 16}px;
+  height: ${({ theme }) => theme.sizeUnit * 16}px;
   z-index: 0;
 `;
 
 export const StyledLayoutHeader = styled.div`
   ${({ theme }) => `
   flex: 0 0 auto;
-  height: ${theme.gridUnit * 16}px;
+  height: ${theme.sizeUnit * 16}px;
   border-bottom: 2px solid ${theme.colors.grayscale.light2};
 
   .header-with-actions {
-    height: ${theme.gridUnit * 15.5}px;
+    height: ${theme.sizeUnit * 15.5}px;
   }
   `}
 `;
 
 export const StyledCreateDatasetTitle = styled.div`
   ${({ theme }) => `
-  margin: ${theme.gridUnit * 4}px;
-  font-size: ${theme.typography.sizes.xl}px;
-  font-weight: ${theme.typography.weights.bold};
+  margin: ${theme.sizeUnit * 4}px;
+  font-size: ${theme.fontSizeXL}px;
+  font-weight: ${theme.fontWeightStrong};
   `}
 `;
 
@@ -96,29 +96,29 @@ export const StyledLayoutDatasetPanel = styled.div`
 export const StyledLayoutRightPanel = styled.div`
   ${({ theme }) => `
   border-left: 1px solid ${theme.colors.grayscale.light2};
-  color: ${theme.colors.success.base};
+  color: ${theme.colorSuccess};
   `}
 `;
 
 export const StyledLayoutFooter = styled.div`
   ${({ theme }) => `
-  height: ${theme.gridUnit * 16}px;
+  height: ${theme.sizeUnit * 16}px;
   width: 100%;
   border-top: 1px solid ${theme.colors.grayscale.light2};
   border-bottom: 1px solid ${theme.colors.grayscale.light2};
-  color: ${theme.colors.info.base};
-  border-top: ${theme.gridUnit / 4}px solid
+  color: ${theme.colorInfo};
+  border-top: ${theme.sizeUnit / 4}px solid
     ${theme.colors.grayscale.light2};
-  padding: ${theme.gridUnit * 4}px;
+  padding: ${theme.sizeUnit * 4}px;
   display: flex;
   justify-content: flex-end;
   background-color: ${theme.colors.grayscale.light5};
-  z-index: ${theme.zIndex.max}
+  z-index: ${theme.zIndexPopupBase}
   `}
 `;
 
 export const HeaderComponentStyles = styled.div`
-  .antd5-btn {
+  .ant-btn {
     span {
       margin-right: 0;
     }
@@ -132,7 +132,7 @@ export const HeaderComponentStyles = styled.div`
 `;
 
 export const disabledSaveBtnStyles = (theme: SupersetTheme) => css`
-  width: ${theme.gridUnit * 21.5}px;
+  width: ${theme.sizeUnit * 21.5}px;
 
   &:disabled {
     background-color: ${theme.colors.grayscale.light3};
diff --git a/superset-frontend/src/features/groups/GroupListModal.tsx b/superset-frontend/src/features/groups/GroupListModal.tsx
index ed9e708bc71..d20e9066c9a 100644
--- a/superset-frontend/src/features/groups/GroupListModal.tsx
+++ b/superset-frontend/src/features/groups/GroupListModal.tsx
@@ -18,22 +18,18 @@
  */
 import { t } from '@superset-ui/core';
 import { useToasts } from 'src/components/MessageToasts/withToasts';
-import FormModal from 'src/components/Modal/FormModal';
-import { FormItem } from 'src/components/Form';
-import { Input } from 'src/components/Input';
-import Select from 'src/components/Select/Select';
-import { GroupObject, Role } from 'src/pages/GroupsList';
 import { Actions } from 'src/constants';
-import AsyncSelect from 'src/components/Select/AsyncSelect';
-import { BaseGroupListModalProps, FormValues } from './types';
+import { GroupObject } from 'src/pages/GroupsList';
+import {
+  FormItem,
+  FormModal,
+  Input,
+  Select,
+  AsyncSelect,
+} from '@superset-ui/core/components';
+import { FormValues, GroupModalProps } from './types';
 import { createGroup, fetchUserOptions, updateGroup } from './utils';
 
-export interface GroupModalProps extends BaseGroupListModalProps {
-  roles: Role[];
-  isEditMode?: boolean;
-  group?: GroupObject;
-}
-
 function GroupListModal({
   show,
   onHide,
diff --git a/superset-frontend/src/features/groups/types.ts b/superset-frontend/src/features/groups/types.ts
index 4bfab858bc6..d716a5e1aae 100644
--- a/superset-frontend/src/features/groups/types.ts
+++ b/superset-frontend/src/features/groups/types.ts
@@ -16,6 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import { GroupObject, Role } from 'src/pages/GroupsList';
+
 export interface BaseGroupListModalProps {
   show: boolean;
   onHide: () => void;
@@ -29,3 +31,8 @@ export interface FormValues {
   roles: number[];
   users: { value: number; label: string }[];
 }
+export interface GroupModalProps extends BaseGroupListModalProps {
+  roles: Role[];
+  isEditMode?: boolean;
+  group?: GroupObject;
+}
diff --git a/superset-frontend/src/features/home/ActivityTable.tsx b/superset-frontend/src/features/home/ActivityTable.tsx
index 5974855e70d..bb9ce478b08 100644
--- a/superset-frontend/src/features/home/ActivityTable.tsx
+++ b/superset-frontend/src/features/home/ActivityTable.tsx
@@ -17,11 +17,11 @@
  * under the License.
  */
 import { useEffect, useState } from 'react';
-import { extendedDayjs } from 'src/utils/dates';
+import { extendedDayjs } from '@superset-ui/core/utils/dates';
 import { styled, t } from '@superset-ui/core';
 import { setItem, LocalStorageKeys } from 'src/utils/localStorageHelpers';
 import { Link } from 'react-router-dom';
-import ListViewCard from 'src/components/ListViewCard';
+import { ListViewCard } from '@superset-ui/core/components';
 import { Dashboard, SavedQueryObject, TableTab } from 'src/views/CRUD/types';
 import { ActivityData, LoadingCards } from 'src/pages/Home';
 import {
@@ -30,7 +30,7 @@ import {
   getEditedObjects,
 } from 'src/views/CRUD/utils';
 import { Chart } from 'src/types/Chart';
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
 import SubMenu from './SubMenu';
 import EmptyState from './EmptyState';
 import { WelcomeTable, RecentActivity } from './types';
@@ -66,7 +66,7 @@ interface ActivityProps {
 const Styles = styled.div`
   .recentCards {
     max-height: none;
-    grid-gap: ${({ theme }) => `${theme.gridUnit * 4}px`};
+    grid-gap: ${({ theme }) => `${theme.sizeUnit * 4}px`};
   }
 `;
 
@@ -195,7 +195,11 @@ export default function ActivityTable({
   }
   return (
     <Styles>
-      <SubMenu activeChild={activeChild} tabs={tabs} />
+      <SubMenu
+        activeChild={activeChild}
+        tabs={tabs}
+        backgroundColor="transparent"
+      />
       {Number(activityData[activeChild as keyof ActivityData]?.length) > 0 ||
       (activeChild === TableTab.Edited && editedCards?.length) ? (
         <CardContainer className="recentCards">
diff --git a/superset-frontend/src/features/home/ChartTable.tsx b/superset-frontend/src/features/home/ChartTable.tsx
index e4a326b8c64..965e05ddabf 100644
--- a/superset-frontend/src/features/home/ChartTable.tsx
+++ b/superset-frontend/src/features/home/ChartTable.tsx
@@ -42,9 +42,9 @@ import { LoadingCards } from 'src/pages/Home';
 import ChartCard from 'src/features/charts/ChartCard';
 import Chart from 'src/types/Chart';
 import handleResourceExport from 'src/utils/export';
-import Loading from 'src/components/Loading';
-import ErrorBoundary from 'src/components/ErrorBoundary';
-import { Icons } from 'src/components/Icons';
+import { Loading } from '@superset-ui/core/components';
+import { ErrorBoundary } from 'src/components';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { navigateTo } from 'src/utils/navigationUtils';
 import EmptyState from './EmptyState';
 import { WelcomeTable } from './types';
@@ -185,19 +185,20 @@ function ChartTable({
       <SubMenu
         activeChild={activeTab}
         tabs={menuTabs}
+        backgroundColor="transparent"
         buttons={[
           {
             name: (
               <>
                 <Icons.PlusOutlined
-                  iconColor={theme.colors.primary.dark1}
                   iconSize="m"
                   data-test="add-annotation-layer-button"
+                  iconColor={theme.colorPrimary}
                 />
                 {t('Chart')}
               </>
             ),
-            buttonStyle: 'tertiary',
+            buttonStyle: 'secondary',
             onClick: () => {
               navigateTo('/chart/add', { assign: true });
             },
diff --git a/superset-frontend/src/features/home/DashboardTable.tsx b/superset-frontend/src/features/home/DashboardTable.tsx
index f2d5f68c18d..cd59c25c653 100644
--- a/superset-frontend/src/features/home/DashboardTable.tsx
+++ b/superset-frontend/src/features/home/DashboardTable.tsx
@@ -36,11 +36,10 @@ import {
   handleDashboardDelete,
 } from 'src/views/CRUD/utils';
 import withToasts from 'src/components/MessageToasts/withToasts';
-import Loading from 'src/components/Loading';
-import DeleteModal from 'src/components/DeleteModal';
+import { DeleteModal, Loading } from '@superset-ui/core/components';
 import PropertiesModal from 'src/dashboard/components/PropertiesModal';
 import DashboardCard from 'src/features/dashboards/DashboardCard';
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { navigateTo } from 'src/utils/navigationUtils';
 import EmptyState from './EmptyState';
 import SubMenu from './SubMenu';
@@ -184,19 +183,20 @@ function DashboardTable({
     <>
       <SubMenu
         activeChild={activeTab}
+        backgroundColor="transparent"
         tabs={menuTabs}
         buttons={[
           {
             name: (
               <>
                 <Icons.PlusOutlined
-                  iconColor={theme.colors.primary.dark1}
                   iconSize="m"
+                  iconColor={theme.colorPrimary}
                 />
                 {t('Dashboard')}
               </>
             ),
-            buttonStyle: 'tertiary',
+            buttonStyle: 'secondary',
             onClick: () => {
               navigateTo('/dashboard/new', { assign: true });
             },
diff --git a/superset-frontend/src/features/home/EmptyState.tsx b/superset-frontend/src/features/home/EmptyState.tsx
index 6d180e7819b..6700cac1ae3 100644
--- a/superset-frontend/src/features/home/EmptyState.tsx
+++ b/superset-frontend/src/features/home/EmptyState.tsx
@@ -16,8 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import Button from 'src/components/Button';
-import { EmptyState as EmptyStateComponent } from 'src/components/EmptyState';
+import {
+  Button,
+  EmptyState as EmptyStateComponent,
+} from '@superset-ui/core/components';
 import { TableTab } from 'src/views/CRUD/types';
 import { styled, t } from '@superset-ui/core';
 import { navigateTo } from 'src/utils/navigationUtils';
@@ -35,7 +37,7 @@ const ICONS = {
   [WelcomeTable.Charts]: 'empty-charts.svg',
   [WelcomeTable.Dashboards]: 'empty-dashboard.svg',
   [WelcomeTable.Recents]: 'union.svg',
-  [WelcomeTable.SavedQueries]: 'empty-queries.svg',
+  [WelcomeTable.SavedQueries]: 'empty.svg',
 } as const;
 
 const REDIRECTS = {
@@ -57,11 +59,7 @@ export interface EmptyStateProps {
   otherTabTitle?: string;
 }
 
-export default function EmptyState({
-  tableName,
-  tab,
-  otherTabTitle,
-}: EmptyStateProps) {
+export default function EmptyState({ tableName, tab }: EmptyStateProps) {
   const getActionButton = () => {
     if (tableName === WelcomeTable.Recents) {
       return null;
@@ -83,7 +81,7 @@ export default function EmptyState({
 
     return (
       <Button
-        buttonStyle="default"
+        buttonStyle="secondary"
         onClick={() => {
           navigateTo(url);
         }}
diff --git a/superset-frontend/src/features/home/LanguagePicker.stories.tsx b/superset-frontend/src/features/home/LanguagePicker.stories.tsx
index b73d23f0235..aa131821ee6 100644
--- a/superset-frontend/src/features/home/LanguagePicker.stories.tsx
+++ b/superset-frontend/src/features/home/LanguagePicker.stories.tsx
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { MainNav as Menu } from 'src/components/Menu'; // Ensure correct import path
+import { MainNav as Menu } from '@superset-ui/core/components/Menu'; // Ensure correct import path
 import LanguagePicker from './LanguagePicker'; // Ensure correct import path
 
 export default {
diff --git a/superset-frontend/src/features/home/LanguagePicker.test.tsx b/superset-frontend/src/features/home/LanguagePicker.test.tsx
index 6b2e98e4603..59dbeab0ac4 100644
--- a/superset-frontend/src/features/home/LanguagePicker.test.tsx
+++ b/superset-frontend/src/features/home/LanguagePicker.test.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { render, screen, userEvent } from 'spec/helpers/testing-library';
-import { MainNav as Menu } from 'src/components/Menu';
+import { MainNav as Menu } from '@superset-ui/core/components/Menu';
 import LanguagePicker from './LanguagePicker';
 
 const mockedProps = {
diff --git a/superset-frontend/src/features/home/LanguagePicker.tsx b/superset-frontend/src/features/home/LanguagePicker.tsx
index 90a492062ee..0dddff17d09 100644
--- a/superset-frontend/src/features/home/LanguagePicker.tsx
+++ b/superset-frontend/src/features/home/LanguagePicker.tsx
@@ -16,9 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { MainNav as Menu } from 'src/components/Menu';
+import { MainNav as Menu } from '@superset-ui/core/components/Menu';
 import { styled, css, useTheme } from '@superset-ui/core';
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
+import { Typography } from '@superset-ui/core/components/Typography';
 
 const { SubMenu } = Menu;
 export interface Languages {
@@ -39,7 +40,7 @@ const StyledLabel = styled.div`
   align-items: center;
 
   & i {
-    margin-right: ${({ theme }) => theme.gridUnit * 2}px;
+    margin-right: ${({ theme }) => theme.sizeUnit * 2}px;
   }
 
   & a {
@@ -62,8 +63,8 @@ export default function LanguagePicker(props: LanguagePickerProps) {
       css={css`
         [data-icon='caret-down'] {
           color: ${theme.colors.grayscale.base};
-          font-size: ${theme.typography.sizes.xxs}px;
-          margin-left: ${theme.gridUnit}px;
+          font-size: ${theme.fontSizeXS}px;
+          margin-left: ${theme.sizeUnit}px;
         }
       `}
       aria-label="Languages"
@@ -82,7 +83,9 @@ export default function LanguagePicker(props: LanguagePickerProps) {
         >
           <StyledLabel className="f16">
             <i className={`flag ${languages[langKey].flag}`} />
-            <a href={languages[langKey].url}>{languages[langKey].name}</a>
+            <Typography.Link href={languages[langKey].url}>
+              {languages[langKey].name}
+            </Typography.Link>
           </StyledLabel>
         </Menu.Item>
       ))}
diff --git a/superset-frontend/src/features/home/Menu.test.tsx b/superset-frontend/src/features/home/Menu.test.tsx
index d3dd8cdb0b6..530a86fbc3a 100644
--- a/superset-frontend/src/features/home/Menu.test.tsx
+++ b/superset-frontend/src/features/home/Menu.test.tsx
@@ -171,7 +171,7 @@ const mockedProps = {
     brand: {
       path: '/superset/welcome/',
       icon: '/static/assets/images/superset-logo-horiz.png',
-      alt: 'Superset',
+      alt: 'Apache Superset',
       width: '126',
       tooltip: '',
       text: '',
@@ -255,6 +255,7 @@ test('should render', async () => {
     useRedux: true,
     useQueryParams: true,
     useRouter: true,
+    useTheme: true,
   });
   expect(await screen.findByText(/sources/i)).toBeInTheDocument();
   expect(container).toBeInTheDocument();
@@ -266,6 +267,7 @@ test('should render the navigation', async () => {
     useRedux: true,
     useQueryParams: true,
     useRouter: true,
+    useTheme: true,
   });
   expect(await screen.findByRole('navigation')).toBeInTheDocument();
 });
@@ -281,6 +283,7 @@ test('should render the brand', async () => {
     useRedux: true,
     useQueryParams: true,
     useRouter: true,
+    useTheme: true,
   });
   expect(await screen.findByAltText(alt)).toBeInTheDocument();
   const image = screen.getByAltText(alt);
@@ -296,6 +299,7 @@ test('should render the environment tag', async () => {
     useRedux: true,
     useQueryParams: true,
     useRouter: true,
+    useTheme: true,
   });
   expect(await screen.findByText(environment_tag.text)).toBeInTheDocument();
 });
@@ -309,6 +313,7 @@ test('should render all the top navbar menu items', async () => {
     useRedux: true,
     useQueryParams: true,
     useRouter: true,
+    useTheme: true,
   });
   expect(await screen.findByText(menu[0].label)).toBeInTheDocument();
   menu.forEach(item => {
@@ -325,6 +330,7 @@ test('should render the top navbar child menu items', async () => {
     useRedux: true,
     useQueryParams: true,
     useRouter: true,
+    useTheme: true,
   });
   const sources = await screen.findByText('Sources');
   userEvent.hover(sources);
@@ -344,6 +350,7 @@ test('should render the dropdown items', async () => {
     useRedux: true,
     useQueryParams: true,
     useRouter: true,
+    useTheme: true,
   });
   const dropdown = screen.getByTestId('new-dropdown-icon');
   userEvent.hover(dropdown);
@@ -374,6 +381,7 @@ test('should render the Settings', async () => {
     useRedux: true,
     useQueryParams: true,
     useRouter: true,
+    useTheme: true,
   });
   const settings = await screen.findByText('Settings');
   expect(settings).toBeInTheDocument();
@@ -385,6 +393,7 @@ test('should render the Settings menu item', async () => {
     useRedux: true,
     useQueryParams: true,
     useRouter: true,
+    useTheme: true,
   });
   userEvent.hover(screen.getByText('Settings'));
   const label = await screen.findByText('Security');
@@ -400,6 +409,7 @@ test('should render the Settings dropdown child menu items', async () => {
     useRedux: true,
     useQueryParams: true,
     useRouter: true,
+    useTheme: true,
   });
   userEvent.hover(screen.getByText('Settings'));
   const listUsers = await screen.findByText('List Users');
@@ -412,6 +422,7 @@ test('should render the plus menu (+) when user is not anonymous', async () => {
     useRedux: true,
     useQueryParams: true,
     useRouter: true,
+    useTheme: true,
   });
   expect(await screen.findByTestId('new-dropdown')).toBeInTheDocument();
 });
@@ -422,6 +433,7 @@ test('should NOT render the plus menu (+) when user is anonymous', async () => {
     useRedux: true,
     useQueryParams: true,
     useRouter: true,
+    useTheme: true,
   });
   expect(await screen.findByText(/sources/i)).toBeInTheDocument();
   expect(screen.queryByTestId('new-dropdown')).not.toBeInTheDocument();
@@ -439,6 +451,7 @@ test('should render the user actions when user is not anonymous', async () => {
     useRedux: true,
     useQueryParams: true,
     useRouter: true,
+    useTheme: true,
   });
   userEvent.hover(screen.getByText('Settings'));
   const user = await screen.findByText('User');
@@ -457,6 +470,7 @@ test('should NOT render the user actions when user is anonymous', async () => {
     useRedux: true,
     useQueryParams: true,
     useRouter: true,
+    useTheme: true,
   });
   expect(await screen.findByText(/sources/i)).toBeInTheDocument();
   expect(screen.queryByText('User')).not.toBeInTheDocument();
@@ -474,6 +488,7 @@ test('should render the About section and version_string, sha or build_number wh
     useRedux: true,
     useQueryParams: true,
     useRouter: true,
+    useTheme: true,
   });
   userEvent.hover(screen.getByText('Settings'));
   const about = await screen.findByText('About');
@@ -497,6 +512,7 @@ test('should render the Documentation link when available', async () => {
     useRedux: true,
     useQueryParams: true,
     useRouter: true,
+    useTheme: true,
   });
   userEvent.hover(screen.getByText('Settings'));
   const doc = await screen.findByTitle('Documentation');
@@ -515,6 +531,7 @@ test('should render the Bug Report link when available', async () => {
     useRedux: true,
     useQueryParams: true,
     useRouter: true,
+    useTheme: true,
   });
   const bugReport = await screen.findByTitle('Report a bug');
   expect(bugReport).toHaveAttribute('href', bug_report_url);
@@ -532,6 +549,7 @@ test('should render the Login link when user is anonymous', async () => {
     useRedux: true,
     useQueryParams: true,
     useRouter: true,
+    useTheme: true,
   });
   const login = await screen.findByText('Login');
   expect(login).toHaveAttribute('href', user_login_url);
@@ -543,6 +561,7 @@ test('should render the Language Picker', async () => {
     useRedux: true,
     useQueryParams: true,
     useRouter: true,
+    useTheme: true,
   });
   expect(await screen.findByLabelText('Languages')).toBeInTheDocument();
 });
@@ -553,6 +572,7 @@ test('should hide create button without proper roles', async () => {
     useRedux: true,
     useQueryParams: true,
     useRouter: true,
+    useTheme: true,
   });
   expect(await screen.findByText(/sources/i)).toBeInTheDocument();
   expect(screen.queryByTestId('new-dropdown')).not.toBeInTheDocument();
@@ -564,6 +584,7 @@ test('should render without QueryParamProvider', async () => {
     useRedux: true,
     useRouter: true,
     useQueryParams: true,
+    useTheme: true,
   });
   expect(await screen.findByText(/sources/i)).toBeInTheDocument();
   expect(screen.queryByTestId('new-dropdown')).not.toBeInTheDocument();
@@ -582,6 +603,7 @@ test('should render an extension component if one is supplied', async () => {
     useRouter: true,
     useQueryParams: true,
     useRedux: true,
+    useTheme: true,
   });
 
   const extension = await screen.findAllByText(
diff --git a/superset-frontend/src/features/home/Menu.tsx b/superset-frontend/src/features/home/Menu.tsx
index 3a15f4ff5e8..d61bd1e35c9 100644
--- a/superset-frontend/src/features/home/Menu.tsx
+++ b/superset-frontend/src/features/home/Menu.tsx
@@ -17,15 +17,15 @@
  * under the License.
  */
 import { useState, useEffect } from 'react';
-import { styled, css } from '@superset-ui/core';
+import { styled, css, useTheme } from '@superset-ui/core';
 import { debounce } from 'lodash';
 import { getUrlParam } from 'src/utils/urlUtils';
-import { Row, Col, Grid } from 'src/components';
-import { MainNav, MenuMode } from 'src/components/Menu';
-import { Tooltip } from 'src/components/Tooltip';
+import { MainNav, MenuMode } from '@superset-ui/core/components/Menu';
+import { Tooltip, Grid, Row, Col, Image } from '@superset-ui/core/components';
+import { GenericLink } from 'src/components';
 import { NavLink, useLocation } from 'react-router-dom';
-import { GenericLink } from 'src/components/GenericLink/GenericLink';
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
+import { Typography } from '@superset-ui/core/components/Typography';
 import { useUiConfig } from 'src/components/UiConfigContext';
 import { URL_PARAMS } from 'src/constants';
 import {
@@ -42,8 +42,7 @@ interface MenuProps {
 
 const StyledHeader = styled.header`
   ${({ theme }) => `
-      background-color: ${theme.colors.grayscale.light5};
-      margin-bottom: 2px;
+      background-color: ${theme.colorBgContainer};
       z-index: 10;
 
       &:nth-last-of-type(2) nav {
@@ -52,17 +51,23 @@ const StyledHeader = styled.header`
       .caret {
         display: none;
       }
+      & .ant-image{
+        padding: ${theme.sizeUnit}px
+          ${theme.sizeUnit * 2}px
+          ${theme.sizeUnit}px
+          ${theme.sizeUnit * 4}px;
+      }
       .navbar-brand {
         display: flex;
         flex-direction: column;
         justify-content: center;
         /* must be exactly the height of the Antd navbar */
         min-height: 50px;
-        padding: ${theme.gridUnit}px
-          ${theme.gridUnit * 2}px
-          ${theme.gridUnit}px
-          ${theme.gridUnit * 4}px;
-        max-width: ${theme.gridUnit * theme.brandIconMaxWidth}px;
+        padding: ${theme.sizeUnit}px
+          ${theme.sizeUnit * 2}px
+          ${theme.sizeUnit}px
+          ${theme.sizeUnit * 4}px;
+        max-width: ${theme.sizeUnit * theme.brandIconMaxWidth}px;
         img {
           height: 100%;
           object-fit: contain;
@@ -71,25 +76,25 @@ const StyledHeader = styled.header`
           border-color: transparent;
         }
         &:focus-visible {
-          border-color: ${theme.colors.primary.dark1};
+          border-color: ${theme.colorPrimaryText};
         }
       }
       .navbar-brand-text {
         border-left: 1px solid ${theme.colors.grayscale.light2};
         border-right: 1px solid ${theme.colors.grayscale.light2};
         height: 100%;
-        color: ${theme.colors.grayscale.dark1};
-        padding-left: ${theme.gridUnit * 4}px;
-        padding-right: ${theme.gridUnit * 4}px;
-        margin-right: ${theme.gridUnit * 6}px;
-        font-size: ${theme.gridUnit * 4}px;
+        color: ${theme.colorText};
+        padding-left: ${theme.sizeUnit * 4}px;
+        padding-right: ${theme.sizeUnit * 4}px;
+        margin-right: ${theme.sizeUnit * 6}px;
+        font-size: ${theme.sizeUnit * 4}px;
         float: left;
         display: flex;
         flex-direction: column;
         justify-content: center;
 
         span {
-          max-width: ${theme.gridUnit * 58}px;
+          max-width: ${theme.sizeUnit * 58}px;
           white-space: nowrap;
           overflow: hidden;
           text-overflow: ellipsis;
@@ -104,14 +109,14 @@ const StyledHeader = styled.header`
         }
       }
       @media (max-width: 767px) {
-        .antd5-menu-item {
-          padding: 0 ${theme.gridUnit * 6}px 0
-            ${theme.gridUnit * 3}px !important;
+        .ant-menu-item {
+          padding: 0 ${theme.sizeUnit * 6}px 0
+            ${theme.sizeUnit * 3}px !important;
         }
-        .antd5-menu > .antd5-menu-item > span > a {
+        .ant-menu > .ant-menu-item > span > a {
           padding: 0px;
         }
-        .main-nav .antd5-menu-submenu-title > svg:nth-of-type(1) {
+        .main-nav .ant-menu-submenu-title > svg:nth-of-type(1) {
           display: none;
         }
       }
@@ -123,16 +128,16 @@ const StyledSubMenu = styled(SubMenu)`
   ${({ theme }) => css`
     [data-icon="caret-down"] {
       color: ${theme.colors.grayscale.base};
-      font-size: ${theme.typography.sizes.xs}px;
-      margin-left: ${theme.gridUnit}px;
+      font-size: ${theme.fontSizeXS}px;
+      margin-left: ${theme.sizeUnit}px;
     }
-    &.antd5-menu-submenu {
-        padding: ${theme.gridUnit * 2}px ${theme.gridUnit * 4}px;
+    &.ant-menu-submenu {
+        padding: ${theme.sizeUnit * 2}px ${theme.sizeUnit * 4}px;
         display: flex;
         align-items: center;
-        height: 100%;  &.antd5-menu-submenu-active {
-    .antd5-menu-title-content {
-      color: ${theme.colors.primary.base};
+        height: 100%;  &.ant-menu-submenu-active {
+    .ant-menu-title-content {
+      color: ${theme.colorPrimary};
     }
   }
   `}
@@ -152,6 +157,7 @@ export function Menu({
   const [showMenu, setMenu] = useState<MenuMode>('horizontal');
   const screens = useBreakpoint();
   const uiConfig = useUiConfig();
+  const theme = useTheme();
 
   useEffect(() => {
     function handleResize() {
@@ -214,7 +220,7 @@ export function Menu({
     if (url) {
       return (
         <MainNav.Item key={label}>
-          <a href={url}>{label}</a>
+          <Typography.Link href={url}>{label}</Typography.Link>
         </MainNav.Item>
       );
     }
@@ -246,7 +252,9 @@ export function Menu({
                     {child.label}
                   </NavLink>
                 ) : (
-                  <a href={child.url}>{child.label}</a>
+                  <Typography.Link href={child.url}>
+                    {child.label}
+                  </Typography.Link>
                 )}
               </MainNav.Item>
             );
@@ -256,31 +264,64 @@ export function Menu({
       </StyledSubMenu>
     );
   };
+  const renderBrand = () => {
+    let link;
+    if (theme.brandLogoUrl) {
+      let style = { padding: '0px', margin: '0px' } as React.CSSProperties;
+      if (theme.brandLogoHeight) {
+        style = { ...style, height: theme.brandLogoHeight, minHeight: '0px' };
+      }
+      if (theme.brandLogoMargin) {
+        style = { ...style, margin: theme.brandLogoMargin };
+      }
+      link = (
+        <Typography.Link
+          href={theme.brandLogoHref}
+          className="navbar-brand"
+          style={style}
+        >
+          <Image
+            preview={false}
+            src={theme.brandLogoUrl}
+            alt={theme.brandLogoAlt || 'Apache Superset'}
+          />
+        </Typography.Link>
+      );
+    } else if (isFrontendRoute(window.location.pathname)) {
+      // ---------------------------------------------------------------------------------
+      // TODO: deprecate this once Theme is fully rolled out
+      // Kept as is for backwards compatibility with the old theme system / superset_config.py
+      link = (
+        <GenericLink className="navbar-brand" to={brand.path}>
+          <Image preview={false} src={brand.icon} alt={brand.alt} />
+        </GenericLink>
+      );
+    } else {
+      link = (
+        <Typography.Link
+          className="navbar-brand"
+          href={brand.path}
+          tabIndex={-1}
+        >
+          <Image preview={false} src={brand.icon} alt={brand.alt} />
+        </Typography.Link>
+      );
+    }
+    // ---------------------------------------------------------------------------------
+    return <>{link}</>;
+  };
   return (
     <StyledHeader className="top" id="main-menu" role="navigation">
       <Row>
-        <Col md={16} xs={24}>
+        <Col md={16} xs={24} style={{ display: 'flex' }}>
           <Tooltip
             id="brand-tooltip"
             placement="bottomLeft"
             title={brand.tooltip}
             arrow={{ pointAtCenter: true }}
           >
-            {isFrontendRoute(window.location.pathname) ? (
-              <GenericLink className="navbar-brand" to={brand.path}>
-                <img src={brand.icon} alt={brand.alt} />
-              </GenericLink>
-            ) : (
-              <a className="navbar-brand" href={brand.path} tabIndex={-1}>
-                <img src={brand.icon} alt={brand.alt} />
-              </a>
-            )}
+            {renderBrand()}
           </Tooltip>
-          {brand.text && (
-            <div className="navbar-brand-text">
-              <span>{brand.text}</span>
-            </div>
-          )}
           <MainNav
             mode={showMenu}
             data-test="navbar-top"
diff --git a/superset-frontend/src/features/home/RightMenu.test.tsx b/superset-frontend/src/features/home/RightMenu.test.tsx
index e484419228d..e56df38dbde 100644
--- a/superset-frontend/src/features/home/RightMenu.test.tsx
+++ b/superset-frontend/src/features/home/RightMenu.test.tsx
@@ -200,6 +200,7 @@ test('renders', async () => {
   const { container } = render(<RightMenu {...mockedProps} />, {
     useRedux: true,
     useQueryParams: true,
+    useTheme: true,
   });
   // expect(await screen.findByText(/Settings/i)).toBeInTheDocument();
   await waitFor(() => expect(container).toBeInTheDocument());
@@ -212,6 +213,7 @@ test('If user has permission to upload files AND connect DBs we query existing D
   const { container } = render(<RightMenu {...mockedProps} />, {
     useRedux: true,
     useQueryParams: true,
+    useTheme: true,
   });
   await waitFor(() => expect(container).toBeVisible());
   const callsD = fetchMock.calls(/database\/\?q/);
@@ -246,6 +248,7 @@ test('If only examples DB exist we must show the Connect Database option', async
     useRedux: true,
     useQueryParams: true,
     useRouter: true,
+    useTheme: true,
   });
   const dropdown = screen.getByTestId('new-dropdown-icon');
   userEvent.hover(dropdown);
@@ -277,6 +280,7 @@ test('If more than just examples DB exist we must show the Create dataset option
     useRedux: true,
     useQueryParams: true,
     useRouter: true,
+    useTheme: true,
   });
   const dropdown = screen.getByTestId('new-dropdown-icon');
   userEvent.hover(dropdown);
@@ -308,6 +312,7 @@ test('If there is a DB with allow_file_upload set as True the option should be e
     useRedux: true,
     useQueryParams: true,
     useRouter: true,
+    useTheme: true,
   });
   const dropdown = screen.getByTestId('new-dropdown-icon');
   userEvent.hover(dropdown);
@@ -344,6 +349,7 @@ test('If there is NOT a DB with allow_file_upload set as True the option should
     useRedux: true,
     useQueryParams: true,
     useRouter: true,
+    useTheme: true,
   });
   const dropdown = screen.getByTestId('new-dropdown-icon');
   userEvent.hover(dropdown);
@@ -363,6 +369,7 @@ test('Logs out and clears local storage item redux', async () => {
     useRedux: true,
     useQueryParams: true,
     useRouter: true,
+    useTheme: true,
   });
 
   // Set an item in local storage to test if it gets cleared
diff --git a/superset-frontend/src/features/home/RightMenu.tsx b/superset-frontend/src/features/home/RightMenu.tsx
index 773952677a7..b6e9dcdf878 100644
--- a/superset-frontend/src/features/home/RightMenu.tsx
+++ b/superset-frontend/src/features/home/RightMenu.tsx
@@ -16,8 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-// TODO: Remove fa-icon
-/* eslint-disable icons/no-fa-icons-usage */
 import { Fragment, useState, useEffect, FC, PureComponent } from 'react';
 
 import rison from 'rison';
@@ -25,6 +23,7 @@ import { useSelector } from 'react-redux';
 import { Link } from 'react-router-dom';
 import { useQueryParams, BooleanParam } from 'use-query-params';
 import { get, isEmpty } from 'lodash';
+import ThemeEditor from '@superset-ui/core/components/ThemeEditor';
 
 import {
   t,
@@ -34,11 +33,13 @@ import {
   SupersetClient,
   getExtensionsRegistry,
   useTheme,
+  isFeatureEnabled,
+  FeatureFlag,
 } from '@superset-ui/core';
-import { Menu } from 'src/components/Menu';
-import { Tooltip } from 'src/components/Tooltip';
-import { Icons } from 'src/components/Icons';
-import Label from 'src/components/Label';
+import { Menu } from '@superset-ui/core/components/Menu';
+import { Label, Tooltip } from '@superset-ui/core/components';
+import { Icons } from '@superset-ui/core/components/Icons';
+import { Typography } from '@superset-ui/core/components/Typography';
 import { ensureAppRoot } from 'src/utils/pathUtils';
 import { findPermission } from 'src/utils/findPermission';
 import { isUserAdmin } from 'src/dashboard/util/permissionUtils';
@@ -51,7 +52,9 @@ import { RootState } from 'src/dashboard/types';
 import DatabaseModal from 'src/features/databases/DatabaseModal';
 import UploadDataModal from 'src/features/databases/UploadDataModel';
 import { uploadUserPerms } from 'src/views/CRUD/utils';
-import TelemetryPixel from 'src/components/TelemetryPixel';
+import TelemetryPixel from '@superset-ui/core/components/TelemetryPixel';
+import { useThemeContext } from 'src/theme/ThemeProvider';
+import ThemeSelect from '@superset-ui/core/components/ThemeSelect';
 import LanguagePicker from './LanguagePicker';
 import {
   ExtensionConfigs,
@@ -62,10 +65,10 @@ import {
 const extensionsRegistry = getExtensionsRegistry();
 
 const versionInfoStyles = (theme: SupersetTheme) => css`
-  padding: ${theme.gridUnit * 1.5}px ${theme.gridUnit * 4}px
-    ${theme.gridUnit * 4}px ${theme.gridUnit * 7}px;
+  padding: ${theme.sizeUnit * 1.5}px ${theme.sizeUnit * 4}px
+    ${theme.sizeUnit * 4}px ${theme.sizeUnit * 7}px;
   color: ${theme.colors.grayscale.base};
-  font-size: ${theme.typography.sizes.xs}px;
+  font-size: ${theme.fontSizeXS}px;
   white-space: nowrap;
 `;
 
@@ -79,7 +82,7 @@ const StyledDiv = styled.div<{ align: string }>`
   flex-direction: row;
   justify-content: ${({ align }) => align};
   align-items: center;
-  margin-right: ${({ theme }) => theme.gridUnit}px;
+  margin-right: ${({ theme }) => theme.sizeUnit}px;
 `;
 
 const StyledMenuItemWithIcon = styled.div`
@@ -90,8 +93,8 @@ const StyledMenuItemWithIcon = styled.div`
 `;
 
 const StyledAnchor = styled.a`
-  padding-right: ${({ theme }) => theme.gridUnit}px;
-  padding-left: ${({ theme }) => theme.gridUnit}px;
+  padding-right: ${({ theme }) => theme.sizeUnit}px;
+  padding-left: ${({ theme }) => theme.sizeUnit}px;
 `;
 
 const tagStyles = (theme: SupersetTheme) => css`
@@ -100,7 +103,7 @@ const tagStyles = (theme: SupersetTheme) => css`
 
 const styledChildMenu = (theme: SupersetTheme) => css`
   &:hover {
-    color: ${theme.colors.primary.base} !important;
+    color: ${theme.colorPrimary} !important;
     cursor: pointer !important;
   }
 `;
@@ -110,13 +113,13 @@ const { SubMenu } = Menu;
 const StyledSubMenu = styled(SubMenu)`
   ${({ theme }) => css`
     [data-icon='caret-down'] {
-      color: ${theme.colors.grayscale.base};
-      font-size: ${theme.typography.sizes.xxs}px;
-      margin-left: ${theme.gridUnit}px;
+      color: ${theme.colorIcon};
+      font-size: ${theme.fontSizeXS}px;
+      margin-left: ${theme.sizeUnit}px;
     }
-    &.antd5-menu-submenu-active {
-      .antd5-menu-title-content {
-        color: ${theme.colors.primary.base};
+    &.ant-menu-submenu-active {
+      .ant-menu-title-content {
+        color: ${theme.colorPrimary};
       }
     }
   `}
@@ -181,10 +184,16 @@ const RightMenu = ({
     useState<boolean>(false);
   const isAdmin = isUserAdmin(user);
   const showUploads = allowUploads || isAdmin;
+  const {
+    theme: themeEditorTheme,
+    setTheme,
+    changeThemeMode,
+    themeMode,
+  } = useThemeContext();
   const dropdownItems: MenuObjectProps[] = [
     {
       label: t('Data'),
-      icon: 'fa-database',
+      icon: <Icons.DatabaseOutlined data-test={`menu-item-${t('Data')}`} />,
       childs: [
         {
           label: t('Connect database'),
@@ -225,7 +234,7 @@ const RightMenu = ({
     {
       label: t('SQL query'),
       url: '/sqllab?new=true',
-      icon: 'fa-fw fa-search',
+      icon: <Icons.SearchOutlined data-test={`menu-item-${t('SQL query')}`} />,
       perm: 'can_sqllab',
       view: 'Superset',
     },
@@ -234,14 +243,16 @@ const RightMenu = ({
       url: Number.isInteger(dashboardId)
         ? `/chart/add?dashboard_id=${dashboardId}`
         : '/chart/add',
-      icon: 'fa-fw fa-bar-chart',
+      icon: <Icons.BarChartOutlined data-test={`menu-item-${t('Chart')}`} />,
       perm: 'can_write',
       view: 'Chart',
     },
     {
       label: t('Dashboard'),
       url: '/dashboard/new',
-      icon: 'fa-fw fa-dashboard',
+      icon: (
+        <Icons.DashboardOutlined data-test={`menu-item-${t('Dashboard')}`} />
+      ),
       perm: 'can_write',
       view: 'Dashboard',
     },
@@ -289,10 +300,6 @@ const RightMenu = ({
     }
   }, [canDatabase, canDataset]);
 
-  const menuIcon = (menu: MenuObjectProps) => (
-    <i data-test={`menu-item-${menu.label}`} className={`fa ${menu.icon}`} />
-  );
-
   const handleMenuSelection = (itemChose: any) => {
     if (itemChose.key === GlobalMenuDataOptions.DbConnection) {
       setShowDatabaseModal(true);
@@ -327,7 +334,10 @@ const RightMenu = ({
     ) : (
       <Menu.Item key={item.name} css={styledChildMenu}>
         {item.url ? (
-          <a href={ensureAppRoot(item.url)}> {item.label} </a>
+          <Typography.Link href={ensureAppRoot(item.url)}>
+            {' '}
+            {item.label}{' '}
+          </Typography.Link>
         ) : (
           item.label
         )}
@@ -363,7 +373,6 @@ const RightMenu = ({
   };
 
   const theme = useTheme();
-
   return (
     <StyledDiv align={align}>
       {canDatabase && (
@@ -400,7 +409,7 @@ const RightMenu = ({
       )}
       {environmentTag?.text && (
         <Label
-          css={{ borderRadius: `${theme.gridUnit * 125}px` }}
+          css={{ borderRadius: `${theme.sizeUnit * 125}px` }}
           color={
             /^#(?:[0-9a-f]{3}){1,2}$/i.test(environmentTag.color)
               ? environmentTag.color
@@ -414,6 +423,7 @@ const RightMenu = ({
         css={css`
           display: flex;
           flex-direction: row;
+          align-items: center;
         `}
         selectable={false}
         mode="horizontal"
@@ -428,7 +438,7 @@ const RightMenu = ({
             data-test="new-dropdown"
             title={
               <Icons.PlusOutlined
-                iconColor={theme.colors.primary.dark1}
+                iconColor={theme.colorPrimary}
                 data-test="new-dropdown-icon"
               />
             }
@@ -445,7 +455,7 @@ const RightMenu = ({
                       key={`sub2_${menu.label}`}
                       className="data-menu"
                       title={menu.label}
-                      icon={menuIcon(menu)}
+                      icon={menu.icon}
                     >
                       {menu?.childs?.map?.((item, idx) =>
                         typeof item !== 'string' && item.name && item.perm ? (
@@ -471,20 +481,12 @@ const RightMenu = ({
                   <Menu.Item key={menu.label}>
                     {isFrontendRoute(menu.url) ? (
                       <Link to={menu.url || ''}>
-                        <i
-                          data-test={`menu-item-${menu.label}`}
-                          className={`fa ${menu.icon}`}
-                        />{' '}
-                        {menu.label}
+                        {menu.icon} {menu.label}
                       </Link>
                     ) : (
-                      <a href={ensureAppRoot(menu.url || '')}>
-                        <i
-                          data-test={`menu-item-${menu.label}`}
-                          className={`fa ${menu.icon}`}
-                        />{' '}
-                        {menu.label}
-                      </a>
+                      <Typography.Link href={ensureAppRoot(menu.url || '')}>
+                        {menu.icon} {menu.label}
+                      </Typography.Link>
                     )}
                   </Menu.Item>
                 )
@@ -492,6 +494,20 @@ const RightMenu = ({
             })}
           </StyledSubMenu>
         )}
+        {isFeatureEnabled(FeatureFlag.ThemeAllowThemeEditorBeta) && (
+          <span>
+            <ThemeEditor theme={themeEditorTheme} setTheme={setTheme} />
+          </span>
+        )}
+        {isFeatureEnabled(FeatureFlag.ThemeEnableDarkThemeSwitch) && (
+          <span>
+            <ThemeSelect
+              changeThemeMode={changeThemeMode}
+              themeMode={themeMode}
+            />
+          </span>
+        )}
+
         <StyledSubMenu
           key="sub3_settings"
           title={t('Settings')}
@@ -514,7 +530,9 @@ const RightMenu = ({
                       {isFrontendRoute(child.url) ? (
                         <Link to={child.url || ''}>{menuItemDisplay}</Link>
                       ) : (
-                        <a href={child.url || ''}>{menuItemDisplay}</a>
+                        <Typography.Link href={child.url || ''}>
+                          {menuItemDisplay}
+                        </Typography.Link>
                       )}
                     </Menu.Item>
                   );
@@ -532,11 +550,15 @@ const RightMenu = ({
             <Menu.ItemGroup key="user-section" title={t('User')}>
               {navbarRight.user_info_url && (
                 <Menu.Item key="info">
-                  <a href={navbarRight.user_info_url}>{t('Info')}</a>
+                  <Typography.Link href={navbarRight.user_info_url}>
+                    {t('Info')}
+                  </Typography.Link>
                 </Menu.Item>
               )}
               <Menu.Item key="logout" onClick={handleLogout}>
-                <a href={navbarRight.user_logout_url}>{t('Logout')}</a>
+                <Typography.Link href={navbarRight.user_logout_url}>
+                  {t('Logout')}
+                </Typography.Link>
               </Menu.Item>
             </Menu.ItemGroup>,
           ]}
@@ -584,9 +606,9 @@ const RightMenu = ({
             title={navbarRight.documentation_text || t('Documentation')}
           >
             {navbarRight.documentation_icon ? (
-              <i className={navbarRight.documentation_icon} />
+              <Icons.BookOutlined />
             ) : (
-              <i className="fa fa-question" />
+              <Icons.QuestionCircleOutlined />
             )}
           </StyledAnchor>
           <span>&nbsp;</span>
@@ -603,7 +625,7 @@ const RightMenu = ({
             {navbarRight.bug_report_icon ? (
               <i className={navbarRight.bug_report_icon} />
             ) : (
-              <i className="fa fa-bug" />
+              <Icons.BugOutlined />
             )}
           </StyledAnchor>
           <span>&nbsp;</span>
@@ -611,8 +633,7 @@ const RightMenu = ({
       )}
       {navbarRight.user_is_anonymous && (
         <StyledAnchor href={navbarRight.user_login_url}>
-          <i className="fa fa-fw fa-sign-in" />
-          {t('Login')}
+          <Icons.LoginOutlined /> {t('Login')}
         </StyledAnchor>
       )}
       <TelemetryPixel
diff --git a/superset-frontend/src/features/home/SavedQueries.tsx b/superset-frontend/src/features/home/SavedQueries.tsx
index adfb2ab4c68..53dbb7220f4 100644
--- a/superset-frontend/src/features/home/SavedQueries.tsx
+++ b/superset-frontend/src/features/home/SavedQueries.tsx
@@ -16,21 +16,24 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { useCallback, useState } from 'react';
+import { useCallback, useState, useEffect } from 'react';
 import { Link } from 'react-router-dom';
 import { styled, SupersetClient, t, useTheme, css } from '@superset-ui/core';
-import SyntaxHighlighter from 'react-syntax-highlighter/dist/cjs/light';
-import sql from 'react-syntax-highlighter/dist/cjs/languages/hljs/sql';
-import github from 'react-syntax-highlighter/dist/cjs/styles/hljs/github';
+import CodeSyntaxHighlighter, {
+  preloadLanguages,
+} from '@superset-ui/core/components/CodeSyntaxHighlighter';
 import { LoadingCards } from 'src/pages/Home';
 import { TableTab } from 'src/views/CRUD/types';
 import withToasts from 'src/components/MessageToasts/withToasts';
-import { Dropdown } from 'src/components/Dropdown';
-import { Menu } from 'src/components/Menu';
+import {
+  Dropdown,
+  DeleteModal,
+  Button,
+  ListViewCard,
+} from '@superset-ui/core/components';
+import { MenuItem } from '@superset-ui/core/components/Menu';
 import { copyQueryLink, useListViewResource } from 'src/views/CRUD/hooks';
-import ListViewCard from 'src/components/ListViewCard';
-import DeleteModal from 'src/components/DeleteModal';
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { User } from 'src/types/bootstrapTypes';
 import {
   CardContainer,
@@ -42,13 +45,10 @@ import {
 import { assetUrl } from 'src/utils/assetUrl';
 import { ensureAppRoot } from 'src/utils/pathUtils';
 import { navigateTo } from 'src/utils/navigationUtils';
-import { Button } from 'src/components';
 import SubMenu from './SubMenu';
 import EmptyState from './EmptyState';
 import { WelcomeTable } from './types';
 
-SyntaxHighlighter.registerLanguage('sql', sql);
-
 interface Query {
   id?: number;
   sql_tables?: Array<any>;
@@ -78,8 +78,8 @@ export const CardStyles = styled.div`
   a {
     text-decoration: none;
   }
-  .antd5-card-cover {
-    border-bottom: 1px solid ${({ theme }) => theme.colors.grayscale.light2};
+  .ant-card-cover {
+    border-bottom: 1px solid ${({ theme }) => theme.colorBorder};
     & > div {
       height: 171px;
     }
@@ -88,7 +88,7 @@ export const CardStyles = styled.div`
     background-size: contain;
     background-repeat: no-repeat;
     background-position: center;
-    background-color: ${({ theme }) => theme.colors.secondary.light3};
+    background-color: ${({ theme }) => theme.colorPrimaryBg};
     display: inline-block;
     width: 100%;
     height: 179px;
@@ -99,26 +99,33 @@ export const CardStyles = styled.div`
 
 const QueryData = styled.div`
   svg {
-    margin-left: ${({ theme }) => theme.gridUnit * 10}px;
+    margin-left: ${({ theme }) => theme.sizeUnit * 10}px;
   }
   .query-title {
-    padding: ${({ theme }) => theme.gridUnit * 2 + 2}px;
-    font-size: ${({ theme }) => theme.typography.sizes.l}px;
+    padding: ${({ theme }) => theme.sizeUnit * 2 + 2}px;
+    font-size: ${({ theme }) => theme.fontSizeLG}px;
   }
 `;
 
 const QueryContainer = styled.div`
-  pre {
-    height: ${({ theme }) => theme.gridUnit * 40}px;
+  /* Custom styles for the syntax highlighter in cards */
+  & > div {
+    height: ${({ theme }) => theme.sizeUnit * 40}px;
     border: none !important;
-    background-color: ${({ theme }) =>
-      theme.colors.grayscale.light5} !important;
-    overflow: hidden;
-    padding: ${({ theme }) => theme.gridUnit * 4}px !important;
+    overflow: hidden !important;
+
+    pre {
+      height: 100%;
+      margin: 0;
+      border: none;
+      overflow: hidden;
+      word-break: break-all;
+      white-space: pre-wrap;
+    }
   }
 `;
 
-const SavedQueries = ({
+export const SavedQueries = ({
   user,
   addDangerToast,
   addSuccessToast,
@@ -149,6 +156,13 @@ const SavedQueries = ({
 
   const theme = useTheme();
 
+  // Preload SQL language since we'll likely show SQL snippets
+  useEffect(() => {
+    if (showThumbnails && featureFlag) {
+      preloadLanguages(['sql']);
+    }
+  }, [showThumbnails, featureFlag]);
+
   const handleQueryDelete = ({ id, label }: Query) => {
     SupersetClient.delete({
       endpoint: `/api/v1/saved_query/${id}`,
@@ -195,44 +209,47 @@ const SavedQueries = ({
       filters: getFilterValues(tab, WelcomeTable.SavedQueries, user),
     });
 
-  const renderMenu = useCallback(
-    (query: Query) => (
-      <Menu>
-        {canEdit && (
-          <Menu.Item>
-            <Link to={`/sqllab?savedQueryId=${query.id}`}>{t('Edit')}</Link>
-          </Menu.Item>
-        )}
-        <Menu.Item
-          onClick={() => {
-            if (query.id) {
-              copyQueryLink(query.id, addDangerToast, addSuccessToast);
-            }
-          }}
-        >
+  const menuItems = useCallback((query: Query) => {
+    const menuItems: MenuItem[] = [];
+    if (canEdit) {
+      menuItems.push({
+        key: 'edit',
+        label: <Link to={`/sqllab?savedQueryId=${query.id}`}>{t('Edit')}</Link>,
+      });
+    }
+    menuItems.push({
+      key: 'share-query',
+      label: (
+        <>
           <Icons.UploadOutlined
             iconSize="l"
             css={css`
-              margin-right: ${theme.gridUnit}px;
+              margin-right: ${theme.sizeUnit}px;
               vertical-align: baseline;
             `}
           />
           {t('Share')}
-        </Menu.Item>
-        {canDelete && (
-          <Menu.Item
-            onClick={() => {
-              setQueryDeleteModal(true);
-              setCurrentlyEdited(query);
-            }}
-          >
-            {t('Delete')}
-          </Menu.Item>
-        )}
-      </Menu>
-    ),
-    [],
-  );
+        </>
+      ),
+      onClick: () => {
+        if (query.id) {
+          copyQueryLink(query.id, addDangerToast, addSuccessToast);
+        }
+      },
+    });
+
+    if (canDelete) {
+      menuItems.push({
+        key: 'delete-query',
+        label: t('Delete'),
+        onClick: () => {
+          setQueryDeleteModal(true);
+          setCurrentlyEdited(query);
+        },
+      });
+    }
+    return menuItems;
+  }, []);
 
   if (loading) return <LoadingCards cover={showThumbnails} />;
   return (
@@ -256,6 +273,7 @@ const SavedQueries = ({
       )}
       <SubMenu
         activeChild={activeTab}
+        backgroundColor="transparent"
         tabs={[
           {
             name: TableTab.Mine,
@@ -277,17 +295,13 @@ const SavedQueries = ({
                 `}
               >
                 <Icons.PlusOutlined
-                  css={css`
-                    margin: auto ${theme.gridUnit * 2}px auto 0;
-                    vertical-align: text-top;
-                  `}
+                  iconColor={theme.colorPrimary}
                   iconSize="m"
-                  iconColor={theme.colors.primary.dark1}
                 />
                 {t('SQL Query')}
               </Link>
             ),
-            buttonStyle: 'tertiary',
+            buttonStyle: 'secondary',
           },
           {
             name: t('View All »'),
@@ -313,24 +327,21 @@ const SavedQueries = ({
                 cover={
                   q?.sql?.length && showThumbnails && featureFlag ? (
                     <QueryContainer>
-                      <SyntaxHighlighter
+                      <CodeSyntaxHighlighter
                         language="sql"
-                        lineProps={{
-                          style: {
-                            color: theme.colors.grayscale.dark2,
-                            wordBreak: 'break-all',
-                            whiteSpace: 'pre-wrap',
-                          },
-                        }}
-                        style={github}
-                        wrapLines
-                        lineNumberStyle={{
-                          display: 'none',
-                        }}
                         showLineNumbers={false}
+                        wrapLines
+                        customStyle={{
+                          height: theme.sizeUnit * 40,
+                          border: 'none',
+                          overflow: 'hidden',
+                          color: theme.colors.grayscale.dark2,
+                          wordBreak: 'break-all',
+                          whiteSpace: 'pre-wrap',
+                        }}
                       >
                         {shortenSQL(q.sql, 25)}
-                      </SyntaxHighlighter>
+                      </CodeSyntaxHighlighter>
                     </QueryContainer>
                   ) : showThumbnails && !q?.sql?.length ? (
                     false
@@ -347,11 +358,13 @@ const SavedQueries = ({
                       }}
                     >
                       <Dropdown
-                        dropdownRender={() => renderMenu(q)}
+                        menu={{
+                          items: menuItems(q),
+                        }}
                         trigger={['click', 'hover']}
                       >
-                        <Button buttonSize="xsmall" type="link">
-                          <Icons.MoreOutlined iconSize="xl" />
+                        <Button buttonSize="xsmall" buttonStyle="link">
+                          <Icons.MoreOutlined iconColor={theme.colorText} />
                         </Button>
                       </Dropdown>
                     </ListViewCard.Actions>
diff --git a/superset-frontend/src/features/home/SubMenu.tsx b/superset-frontend/src/features/home/SubMenu.tsx
index dd03fba9d13..8bc7c39fb31 100644
--- a/superset-frontend/src/features/home/SubMenu.tsx
+++ b/superset-frontend/src/features/home/SubMenu.tsx
@@ -21,36 +21,48 @@ import { ReactNode, useState, useEffect, FunctionComponent } from 'react';
 import { Link, useHistory } from 'react-router-dom';
 import { styled, SupersetTheme, css, t, useTheme } from '@superset-ui/core';
 import cx from 'classnames';
-import { Tooltip } from 'src/components/Tooltip';
 import { debounce } from 'lodash';
-import { Row } from 'src/components';
-import { Menu, MenuMode, MainNav } from 'src/components/Menu';
-import Button, { OnClickHandler } from 'src/components/Button';
-import { Icons } from 'src/components/Icons';
+import { Menu, MenuMode, MainNav } from '@superset-ui/core/components/Menu';
+import {
+  Button,
+  Tooltip,
+  Row,
+  type OnClickHandler,
+} from '@superset-ui/core/components';
+import { Icons } from '@superset-ui/core/components/Icons';
+import { IconType } from '@superset-ui/core/components/Icons/types';
 import { MenuObjectProps } from 'src/types/bootstrapTypes';
+import { Typography } from '@superset-ui/core/components/Typography';
 
-const StyledHeader = styled.div`
-  margin-bottom: ${({ theme }) => theme.gridUnit * 4}px;
+const StyledHeader = styled.div<{ backgroundColor?: string }>`
+  background-color: ${({ theme, backgroundColor }) =>
+    backgroundColor || theme.colorBgContainer};
+  align-items: center;
+  position: relative;
+  padding: ${({ theme }) => theme.sizeUnit * 2}px
+    ${({ theme }) => theme.sizeUnit * 5}px;
+  margin-bottom: ${({ theme }) => theme.sizeUnit * 4}px;
   .header {
-    font-weight: ${({ theme }) => theme.typography.weights.bold};
-    margin-right: ${({ theme }) => theme.gridUnit * 3}px;
+    font-weight: ${({ theme }) => theme.fontWeightStrong};
+    margin-right: ${({ theme }) => theme.sizeUnit * 3}px;
     text-align: left;
     font-size: 18px;
-    padding: ${({ theme }) => theme.gridUnit * 3}px;
     display: inline-block;
-    line-height: ${({ theme }) => theme.gridUnit * 9}px;
+    line-height: ${({ theme }) => theme.sizeUnit * 9}px;
   }
   .nav-right {
     display: flex;
     align-items: center;
-    padding: ${({ theme }) => theme.gridUnit * 3.5}px 0;
-    margin-right: ${({ theme }) => theme.gridUnit * 3}px;
+    margin-right: ${({ theme }) => theme.sizeUnit * 3}px;
     float: right;
     position: absolute;
     right: 0;
-    ul.antd5-menu-root {
+    ul.ant-menu-root {
       padding: 0px;
     }
+    .ant-row {
+      align-items: center;
+    }
     li[role='menuitem'] {
       border: 0;
       border-bottom: none;
@@ -68,23 +80,24 @@ const StyledHeader = styled.div`
     padding-left: 10px;
   }
   .menu {
-    background-color: ${({ theme }) => theme.colors.grayscale.light5};
+    align-items: center;
   }
 
-  .menu > .antd5-menu {
-    padding: ${({ theme }) => theme.gridUnit * 5}px
-      ${({ theme }) => theme.gridUnit * 8}px;
+  .menu > .ant-menu {
+    padding-left: ${({ theme }) => theme.sizeUnit * 5}px;
+    line-height: ${({ theme }) => theme.sizeUnit * 5}px;
 
-    .antd5-menu-item {
+    .ant-menu-item {
       border-radius: ${({ theme }) => theme.borderRadius}px;
-      font-size: ${({ theme }) => theme.typography.sizes.s}px;
-      padding: ${({ theme }) => theme.gridUnit}px
-        ${({ theme }) => theme.gridUnit * 4}px;
-      margin-right: ${({ theme }) => theme.gridUnit}px;
+      font-size: ${({ theme }) => theme.fontSizeSM}px;
+      padding: ${({ theme }) => theme.sizeUnit}px
+        ${({ theme }) => theme.sizeUnit * 4}px;
+      margin-right: ${({ theme }) => theme.sizeUnit}px;
     }
-    .antd5-menu-item:hover,
-    .antd5-menu-item:has(> span > .active) {
-      background-color: ${({ theme }) => theme.colors.secondary.light4};
+    .ant-menu-item:hover,
+    .ant-menu-item:has(> span > .active) {
+      background-color: ${({ theme }) => theme.colorPrimaryBgHover};
+      color: ${({ theme }) => theme.colorText};
     }
   }
 
@@ -95,7 +108,7 @@ const StyledHeader = styled.div`
     .header,
     .nav-right {
       position: relative;
-      margin-left: ${({ theme }) => theme.gridUnit * 2}px;
+      margin-left: ${({ theme }) => theme.sizeUnit * 2}px;
     }
   }
 `;
@@ -108,7 +121,7 @@ const styledDisabled = (theme: SupersetTheme) => css`
     color: ${theme.colors.grayscale.light1};
   }
 
-  .antd5-menu-item-selected {
+  .ant-menu-item-selected {
     background-color: ${theme.colors.grayscale.light1};
   }
 `;
@@ -120,21 +133,17 @@ type MenuChild = {
   usesRouter?: boolean;
   onClick?: () => void;
   'data-test'?: string;
+  id?: string;
+  'aria-controls'?: string;
 };
 
 export interface ButtonProps {
   name: ReactNode;
   onClick?: OnClickHandler;
   'data-test'?: string;
-  buttonStyle:
-    | 'primary'
-    | 'secondary'
-    | 'dashed'
-    | 'link'
-    | 'warning'
-    | 'success'
-    | 'tertiary';
+  buttonStyle: 'primary' | 'secondary' | 'dashed' | 'link' | 'tertiary';
   loading?: boolean;
+  icon?: IconType;
 }
 
 export interface SubMenuProps {
@@ -148,6 +157,7 @@ export interface SubMenuProps {
   usesRouter?: boolean;
   color?: string;
   dropDownLinks?: Array<MenuObjectProps>;
+  backgroundColor?: string;
 }
 
 const { SubMenu } = MainNav;
@@ -193,52 +203,59 @@ const SubMenuComponent: FunctionComponent<SubMenuProps> = props => {
   }, [props.buttons]);
 
   return (
-    <StyledHeader>
+    <StyledHeader backgroundColor={props.backgroundColor}>
       <Row className="menu" role="navigation">
         {props.name && <div className="header">{props.name}</div>}
-        <Menu mode={showMenu} disabledOverflow>
-          {props.tabs?.map(tab => {
+        <Menu
+          mode={showMenu}
+          disabledOverflow
+          role="tablist"
+          items={props.tabs?.map(tab => {
             if ((props.usesRouter || hasHistory) && !!tab.usesRouter) {
-              return (
-                <Menu.Item key={tab.label}>
-                  <div
+              return {
+                key: tab.label,
+                label: (
+                  <Link
+                    to={tab.url || ''}
                     role="tab"
+                    id={tab.id || tab.name}
                     data-test={tab['data-test']}
+                    aria-selected={tab.name === props.activeChild}
+                    aria-controls={tab['aria-controls'] || ''}
                     className={tab.name === props.activeChild ? 'active' : ''}
                   >
-                    <div>
-                      <Link to={tab.url || ''}>{tab.label}</Link>
-                    </div>
-                  </div>
-                </Menu.Item>
-              );
+                    {tab.label}
+                  </Link>
+                ),
+              };
             }
-
-            return (
-              <Menu.Item key={tab.label}>
+            return {
+              key: tab.label,
+              label: (
                 <div
                   className={cx('no-router', {
                     active: tab.name === props.activeChild,
                   })}
                   role="tab"
+                  aria-selected={tab.name === props.activeChild}
                 >
-                  <a href={tab.url} onClick={tab.onClick}>
+                  <Typography.Link href={tab.url} onClick={tab.onClick}>
                     {tab.label}
-                  </a>
+                  </Typography.Link>
                 </div>
-              </Menu.Item>
-            );
+              ),
+            };
           })}
-        </Menu>
+        />
         <div className={navRightStyle}>
           <Menu mode="horizontal" triggerSubMenuAction="click" disabledOverflow>
             {props.dropDownLinks?.map((link, i) => (
               <SubMenu
                 css={css`
                   [data-icon='caret-down'] {
-                    color: ${theme.colors.grayscale.base};
-                    font-size: ${theme.typography.sizes.xxs}px;
-                    margin-left: ${theme.gridUnit}px;
+                    color: ${theme.colorIcon};
+                    font-size: ${theme.fontSizeXS}px;
+                    margin-left: ${theme.sizeUnit}px;
                   }
                 `}
                 key={i}
@@ -266,9 +283,9 @@ const SubMenuComponent: FunctionComponent<SubMenuProps> = props => {
                       </MainNav.Item>
                     ) : (
                       <MainNav.Item key={item.label}>
-                        <a href={item.url} onClick={item.onClick}>
+                        <Typography.Link href={item.url} onClick={item.onClick}>
                           {item.label}
-                        </a>
+                        </Typography.Link>
                       </MainNav.Item>
                     );
                   }
@@ -281,6 +298,7 @@ const SubMenuComponent: FunctionComponent<SubMenuProps> = props => {
             <Button
               key={i}
               buttonStyle={btn.buttonStyle}
+              icon={btn.icon}
               onClick={btn.onClick}
               data-test={btn['data-test']}
               loading={btn.loading ?? false}
diff --git a/superset-frontend/src/features/queries/QueryPreviewModal.tsx b/superset-frontend/src/features/queries/QueryPreviewModal.tsx
index 3b51eed6256..f4f9e1cf35a 100644
--- a/superset-frontend/src/features/queries/QueryPreviewModal.tsx
+++ b/superset-frontend/src/features/queries/QueryPreviewModal.tsx
@@ -18,9 +18,8 @@
  */
 import { useState } from 'react';
 import { styled, t } from '@superset-ui/core';
-import Modal from 'src/components/Modal';
 import cx from 'classnames';
-import Button from 'src/components/Button';
+import { Button, Modal } from '@superset-ui/core/components';
 import withToasts, {
   ToastProps,
 } from 'src/components/MessageToasts/withToasts';
@@ -29,53 +28,45 @@ import useQueryPreviewState from 'src/features/queries/hooks/useQueryPreviewStat
 import { QueryObject } from 'src/views/CRUD/types';
 
 const QueryTitle = styled.div`
-  color: ${({ theme }) => theme.colors.secondary.light2};
-  font-size: ${({ theme }) => theme.typography.sizes.s}px;
+  color: ${({ theme }) => theme.colors.primary.light2};
+  font-size: ${({ theme }) => theme.fontSizeSM}px;
   margin-bottom: 0;
 `;
 
 const QueryLabel = styled.div`
   color: ${({ theme }) => theme.colors.grayscale.dark2};
-  font-size: ${({ theme }) => theme.typography.sizes.m}px;
+  font-size: ${({ theme }) => theme.fontSize}px;
   padding: 4px 0 24px 0;
 `;
 
 const QueryViewToggle = styled.div`
-  margin: 0 0 ${({ theme }) => theme.gridUnit * 6}px 0;
+  margin: 0 0 ${({ theme }) => theme.sizeUnit * 6}px 0;
 `;
 
 const TabButton = styled.div`
   display: inline;
-  font-size: ${({ theme }) => theme.typography.sizes.s}px;
-  padding: ${({ theme }) => theme.gridUnit * 2}px
-    ${({ theme }) => theme.gridUnit * 4}px;
-  margin-right: ${({ theme }) => theme.gridUnit * 4}px;
-  color: ${({ theme }) => theme.colors.secondary.dark1};
+  font-size: ${({ theme }) => theme.fontSizeSM}px;
+  padding: ${({ theme }) => theme.sizeUnit * 2}px
+    ${({ theme }) => theme.sizeUnit * 4}px;
+  margin-right: ${({ theme }) => theme.sizeUnit * 4}px;
+  color: ${({ theme }) => theme.colorPrimaryText};
 
   &.active,
   &:focus,
   &:hover {
-    background: ${({ theme }) => theme.colors.secondary.light4};
+    background: ${({ theme }) => theme.colors.primary.light4};
     border-bottom: none;
     border-radius: ${({ theme }) => theme.borderRadius}px;
-    margin-bottom: ${({ theme }) => theme.gridUnit * 2}px;
+    margin-bottom: ${({ theme }) => theme.sizeUnit * 2}px;
   }
 
   &:hover:not(.active) {
-    background: ${({ theme }) => theme.colors.secondary.light5};
+    background: ${({ theme }) => theme.colors.primary.light5};
   }
 `;
 const StyledModal = styled(Modal)`
-  .antd5-modal-body {
-    padding: ${({ theme }) => theme.gridUnit * 6}px;
-  }
-
-  pre {
-    font-size: ${({ theme }) => theme.typography.sizes.xs}px;
-    font-weight: ${({ theme }) => theme.typography.weights.normal};
-    line-height: ${({ theme }) => theme.typography.sizes.l}px;
-    height: 375px;
-    border: none;
+  .ant-modal-body {
+    padding: ${({ theme }) => theme.sizeUnit * 6}px;
   }
 `;
 
diff --git a/superset-frontend/src/features/queries/SavedQueryPreviewModal.tsx b/superset-frontend/src/features/queries/SavedQueryPreviewModal.tsx
index 2307623df86..ce888945e0c 100644
--- a/superset-frontend/src/features/queries/SavedQueryPreviewModal.tsx
+++ b/superset-frontend/src/features/queries/SavedQueryPreviewModal.tsx
@@ -18,8 +18,7 @@
  */
 import { FunctionComponent } from 'react';
 import { styled, t } from '@superset-ui/core';
-import Modal from 'src/components/Modal';
-import Button from 'src/components/Button';
+import { Button, Modal } from '@superset-ui/core/components';
 import SyntaxHighlighterCopy from 'src/features/queries/SyntaxHighlighterCopy';
 import withToasts, {
   ToastProps,
@@ -27,29 +26,21 @@ import withToasts, {
 import useQueryPreviewState from 'src/features/queries/hooks/useQueryPreviewState';
 
 const QueryTitle = styled.div`
-  color: ${({ theme }) => theme.colors.secondary.light2};
-  font-size: ${({ theme }) => theme.typography.sizes.s}px;
+  color: ${({ theme }) => theme.colorPrimary};
+  font-size: ${({ theme }) => theme.fontSizeSM}px;
   margin-bottom: 0;
 `;
 
 const QueryLabel = styled.div`
-  color: ${({ theme }) => theme.colors.grayscale.dark2};
-  font-size: ${({ theme }) => theme.typography.sizes.m}px;
+  color: ${({ theme }) => theme.colorTextLabel};
+  font-size: ${({ theme }) => theme.fontSize}px;
   padding: 4px 0 16px 0;
 `;
 
 const StyledModal = styled(Modal)`
-  .antd5-modal-body {
+  .ant-modal-body {
     padding: 24px;
   }
-
-  pre {
-    font-size: ${({ theme }) => theme.typography.sizes.xs}px;
-    font-weight: ${({ theme }) => theme.typography.weights.normal};
-    line-height: ${({ theme }) => theme.typography.sizes.l}px;
-    height: 375px;
-    border: none;
-  }
 `;
 
 type SavedQueryObject = {
@@ -92,6 +83,7 @@ const SavedQueryPreviewModal: FunctionComponent<
         onHide={onHide}
         show={show}
         title={t('Query preview')}
+        width={800}
         footer={
           <>
             <Button
diff --git a/superset-frontend/src/features/queries/SyntaxHighlighterCopy.tsx b/superset-frontend/src/features/queries/SyntaxHighlighterCopy.tsx
index 6a019141c14..ec8a8c6d553 100644
--- a/superset-frontend/src/features/queries/SyntaxHighlighterCopy.tsx
+++ b/superset-frontend/src/features/queries/SyntaxHighlighterCopy.tsx
@@ -16,58 +16,79 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import { useEffect } from 'react';
 import { styled, t } from '@superset-ui/core';
-import { SyntaxHighlighterProps } from 'react-syntax-highlighter';
-import sqlSyntax from 'react-syntax-highlighter/dist/cjs/languages/hljs/sql';
-import htmlSyntax from 'react-syntax-highlighter/dist/cjs/languages/hljs/htmlbars';
-import markdownSyntax from 'react-syntax-highlighter/dist/cjs/languages/hljs/markdown';
-import jsonSyntax from 'react-syntax-highlighter/dist/cjs/languages/hljs/json';
-import github from 'react-syntax-highlighter/dist/cjs/styles/hljs/github';
-import SyntaxHighlighter from 'react-syntax-highlighter/dist/cjs/light';
-import { Icons } from 'src/components/Icons';
+import CodeSyntaxHighlighter, {
+  SupportedLanguage,
+  CodeSyntaxHighlighterProps,
+  preloadLanguages,
+} from '@superset-ui/core/components/CodeSyntaxHighlighter';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { ToastProps } from 'src/components/MessageToasts/withToasts';
 import copyTextToClipboard from 'src/utils/copy';
 
-SyntaxHighlighter.registerLanguage('sql', sqlSyntax);
-SyntaxHighlighter.registerLanguage('markdown', markdownSyntax);
-SyntaxHighlighter.registerLanguage('html', htmlSyntax);
-SyntaxHighlighter.registerLanguage('json', jsonSyntax);
-
 const SyntaxHighlighterWrapper = styled.div`
+  position: relative;
   margin-top: -24px;
 
   &:hover {
-    svg {
+    .copy-button {
       visibility: visible;
     }
   }
 
-  svg {
-    position: relative;
+  .copy-button {
+    position: absolute;
     top: 40px;
-    left: 512px;
+    right: 16px;
+    z-index: 10;
     visibility: hidden;
     margin: -4px;
+    padding: 4px;
+    background: ${({ theme }) => theme.colors.grayscale.light4};
+    border-radius: ${({ theme }) => theme.borderRadius}px;
     color: ${({ theme }) => theme.colors.grayscale.base};
+    cursor: pointer;
+    transition: all 0.2s ease;
+
+    &:hover {
+      background: ${({ theme }) => theme.colors.grayscale.light2};
+      color: ${({ theme }) => theme.colors.grayscale.dark1};
+    }
+
+    &:focus {
+      visibility: visible;
+      outline: 2px solid ${({ theme }) => theme.colors.primary.base};
+      outline-offset: 2px;
+    }
   }
 `;
 
+interface SyntaxHighlighterCopyProps
+  extends Omit<CodeSyntaxHighlighterProps, 'children'> {
+  children: string;
+  addDangerToast?: ToastProps['addDangerToast'];
+  addSuccessToast?: ToastProps['addSuccessToast'];
+  language: SupportedLanguage;
+}
+
 export default function SyntaxHighlighterCopy({
   addDangerToast,
   addSuccessToast,
   children,
+  language,
   ...syntaxHighlighterProps
-}: SyntaxHighlighterProps & {
-  children: string;
-  addDangerToast?: ToastProps['addDangerToast'];
-  addSuccessToast?: ToastProps['addSuccessToast'];
-  language: 'sql' | 'markdown' | 'html' | 'json';
-}) {
+}: SyntaxHighlighterCopyProps) {
+  // Preload the language when component mounts
+  useEffect(() => {
+    preloadLanguages([language]);
+  }, [language]);
+
   function copyToClipboard(textToCopy: string) {
     copyTextToClipboard(() => Promise.resolve(textToCopy))
       .then(() => {
         if (addSuccessToast) {
-          addSuccessToast(t('SQL Copied!'));
+          addSuccessToast(t('Code Copied!'));
         }
       })
       .catch(() => {
@@ -76,20 +97,34 @@ export default function SyntaxHighlighterCopy({
         }
       });
   }
+
+  const handleCopyClick = (e: React.MouseEvent<HTMLElement>) => {
+    e.preventDefault();
+    e.stopPropagation();
+    e.currentTarget.blur();
+    copyToClipboard(children);
+  };
+
+  const handleKeyDown = (e: React.KeyboardEvent<HTMLElement>) => {
+    if (e.key === 'Enter' || e.key === ' ') {
+      e.preventDefault();
+      copyToClipboard(children);
+    }
+  };
+
   return (
     <SyntaxHighlighterWrapper>
       <Icons.CopyOutlined
+        className="copy-button"
         tabIndex={0}
         role="button"
-        onClick={e => {
-          e.preventDefault();
-          e.currentTarget.blur();
-          copyToClipboard(children);
-        }}
+        aria-label={t('Copy code to clipboard')}
+        onClick={handleCopyClick}
+        onKeyDown={handleKeyDown}
       />
-      <SyntaxHighlighter style={github} {...syntaxHighlighterProps}>
+      <CodeSyntaxHighlighter language={language} {...syntaxHighlighterProps}>
         {children}
-      </SyntaxHighlighter>
+      </CodeSyntaxHighlighter>
     </SyntaxHighlighterWrapper>
   );
 }
diff --git a/superset-frontend/src/features/reports/ReportModal/HeaderReportDropdown/index.test.tsx b/superset-frontend/src/features/reports/ReportModal/HeaderReportDropdown/index.test.tsx
index 8c11f78d920..2a2e392c225 100644
--- a/superset-frontend/src/features/reports/ReportModal/HeaderReportDropdown/index.test.tsx
+++ b/superset-frontend/src/features/reports/ReportModal/HeaderReportDropdown/index.test.tsx
@@ -18,7 +18,7 @@
  */
 import { act, render, screen, userEvent } from 'spec/helpers/testing-library';
 import { FeatureFlag, isFeatureEnabled } from '@superset-ui/core';
-import { Menu } from 'src/components/Menu';
+import { Menu } from '@superset-ui/core/components/Menu';
 import HeaderReportDropdown, { HeaderReportProps } from '.';
 
 const createProps = () => ({
diff --git a/superset-frontend/src/features/reports/ReportModal/HeaderReportDropdown/index.tsx b/superset-frontend/src/features/reports/ReportModal/HeaderReportDropdown/index.tsx
index 2fff224dbc7..a094cd3f658 100644
--- a/superset-frontend/src/features/reports/ReportModal/HeaderReportDropdown/index.tsx
+++ b/superset-frontend/src/features/reports/ReportModal/HeaderReportDropdown/index.tsx
@@ -29,11 +29,11 @@ import {
   getExtensionsRegistry,
   usePrevious,
 } from '@superset-ui/core';
-import { Icons } from 'src/components/Icons';
-import { Switch } from 'src/components/Switch';
+import { Icons } from '@superset-ui/core/components/Icons';
+import { Switch } from '@superset-ui/core/components/Switch';
 import { AlertObject } from 'src/features/alerts/types';
-import { Menu } from 'src/components/Menu';
-import Checkbox from 'src/components/Checkbox';
+import { Menu } from '@superset-ui/core/components/Menu';
+import { Checkbox } from '@superset-ui/core/components';
 import { noOp } from 'src/utils/common';
 import { ChartState } from 'src/explore/types';
 import { UserWithPermissionsAndRoles } from 'src/types/bootstrapTypes';
@@ -47,27 +47,27 @@ import { MenuItemWithCheckboxContainer } from 'src/explore/components/useExplore
 const extensionsRegistry = getExtensionsRegistry();
 
 const deleteColor = (theme: SupersetTheme) => css`
-  color: ${theme.colors.error.base};
+  color: ${theme.colorError};
 `;
 
 const onMenuHover = (theme: SupersetTheme) => css`
-  & .antd5-menu-item {
+  & .ant-menu-item {
     padding: 5px 12px;
     margin-top: 0px;
     margin-bottom: 4px;
     :hover {
-      color: ${theme.colors.grayscale.dark1};
+      color: ${theme.colorText};
     }
   }
   :hover {
-    background-color: ${theme.colors.secondary.light5};
+    background-color: ${theme.colorPrimaryBg};
   }
 `;
 
 const onMenuItemHover = (theme: SupersetTheme) => css`
   &:hover {
-    color: ${theme.colors.grayscale.dark1};
-    background-color: ${theme.colors.secondary.light5};
+    color: ${theme.colorText};
+    background-color: ${theme.colorPrimaryBg};
   }
 `;
 
@@ -77,7 +77,7 @@ const StyledDropdownItemWithIcon = styled.div`
   justify-content: space-between;
   align-items: center;
   > *:first-child {
-    margin-right: ${({ theme }) => theme.gridUnit}px;
+    margin-right: ${({ theme }) => theme.sizeUnit}px;
   }
 `;
 
@@ -248,7 +248,7 @@ export default function HeaderReportDropDown({
           onClick={(checked: boolean) => toggleActiveKey(report, checked)}
           size="small"
           css={theme => css`
-            margin-left: ${theme.gridUnit * 2}px;
+            margin-left: ${theme.sizeUnit * 2}px;
           `}
         />
       </Menu.Item>
diff --git a/superset-frontend/src/features/reports/ReportModal/index.tsx b/superset-frontend/src/features/reports/ReportModal/index.tsx
index 2d7e6c85fd9..24f534e2ff0 100644
--- a/superset-frontend/src/features/reports/ReportModal/index.tsx
+++ b/superset-frontend/src/features/reports/ReportModal/index.tsx
@@ -36,13 +36,16 @@ import {
   addReport,
   editReport,
 } from 'src/features/reports/ReportModal/actions';
-import Alert from 'src/components/Alert';
-import TimezoneSelector from 'src/components/TimezoneSelector';
-import LabeledErrorBoundInput from 'src/components/Form/LabeledErrorBoundInput';
-import { Icons } from 'src/components/Icons';
-import { CronError } from 'src/components/CronPicker';
-import { Radio, RadioChangeEvent } from 'src/components/Radio';
-import { Input } from 'src/components/Input';
+import {
+  Alert,
+  Input,
+  LabeledErrorBoundInput,
+  type CronError,
+} from '@superset-ui/core/components';
+import TimezoneSelector from '@superset-ui/core/components/TimezoneSelector';
+import { Icons } from '@superset-ui/core/components/Icons';
+import { Typography } from '@superset-ui/core/components/Typography';
+import { Radio, RadioChangeEvent } from '@superset-ui/core/components/Radio';
 import withToasts from 'src/components/MessageToasts/withToasts';
 import { ChartState } from 'src/explore/types';
 import {
@@ -252,7 +255,7 @@ function ReportModal({
   const renderMessageContentSection = (
     <>
       <StyledMessageContentTitle>
-        <h4>{t('Message content')}</h4>
+        <Typography.Title level={4}>{t('Message content')}</Typography.Title>
       </StyledMessageContentTitle>
       <div className="inline-container">
         <Radio.GroupWrapper
@@ -348,9 +351,12 @@ function ReportModal({
 
       <StyledBottomSection>
         <StyledScheduleTitle>
-          <h4 css={(theme: SupersetTheme) => SectionHeaderStyle(theme)}>
+          <Typography.Title
+            level={5}
+            css={(theme: SupersetTheme) => SectionHeaderStyle(theme)}
+          >
             {t('Schedule')}
-          </h4>
+          </Typography.Title>
           <p>{t('The report will be sent to your email at')}</p>
         </StyledScheduleTitle>
 
diff --git a/superset-frontend/src/features/reports/ReportModal/styles.tsx b/superset-frontend/src/features/reports/ReportModal/styles.tsx
index 0f5c12bd385..0455b391262 100644
--- a/superset-frontend/src/features/reports/ReportModal/styles.tsx
+++ b/superset-frontend/src/features/reports/ReportModal/styles.tsx
@@ -18,42 +18,40 @@
  */
 
 import { styled, css, SupersetTheme } from '@superset-ui/core';
-import Modal from 'src/components/Modal';
-import Button from 'src/components/Button';
-import { Radio } from 'src/components/Radio';
-import { CronPicker } from 'src/components/CronPicker';
+import { Button, CronPicker, Modal } from '@superset-ui/core/components';
+import { Radio } from '@superset-ui/core/components/Radio';
 
 export const StyledModal = styled(Modal)`
-  .antd5-modal-body {
+  .ant-modal-body {
     padding: 0;
   }
 `;
 
 export const StyledTopSection = styled.div`
   padding: ${({ theme }) =>
-    `${theme.gridUnit * 3}px ${theme.gridUnit * 4}px ${theme.gridUnit * 2}px`};
+    `${theme.sizeUnit * 3}px ${theme.sizeUnit * 4}px ${theme.sizeUnit * 2}px`};
   label {
-    font-size: ${({ theme }) => theme.typography.sizes.s}px;
+    font-size: ${({ theme }) => theme.fontSizeSM}px;
     color: ${({ theme }) => theme.colors.grayscale.light1};
   }
 `;
 
 export const StyledBottomSection = styled.div`
-  border-top: 1px solid ${({ theme }) => theme.colors.grayscale.light2};
+  border-top: 1px solid ${({ theme }) => theme.colorSplit};
   padding: ${({ theme }) =>
-    `${theme.gridUnit * 4}px ${theme.gridUnit * 4}px ${theme.gridUnit * 6}px`};
+    `${theme.sizeUnit * 4}px ${theme.sizeUnit * 4}px ${theme.sizeUnit * 6}px`};
   .ant-select {
     width: 100%;
   }
   .control-label {
-    font-size: ${({ theme }) => theme.typography.sizes.s}px;
+    font-size: ${({ theme }) => theme.fontSizeSM}px;
     color: ${({ theme }) => theme.colors.grayscale.light1};
   }
 `;
 
 export const StyledIconWrapper = styled.span`
   span {
-    margin-right: ${({ theme }) => theme.gridUnit * 2}px;
+    margin-right: ${({ theme }) => theme.sizeUnit * 2}px;
     vertical-align: middle;
   }
   .text {
@@ -62,20 +60,20 @@ export const StyledIconWrapper = styled.span`
 `;
 
 export const StyledScheduleTitle = styled.div`
-  margin-bottom: ${({ theme }) => theme.gridUnit * 7}px;
+  margin-bottom: ${({ theme }) => theme.sizeUnit * 7}px;
 
   h4 {
-    margin-bottom: ${({ theme }) => theme.gridUnit * 3}px;
+    margin-bottom: ${({ theme }) => theme.sizeUnit * 3}px;
   }
 `;
 
 export const StyledCronPicker = styled(CronPicker)`
-  margin-bottom: ${({ theme }) => theme.gridUnit * 3}px;
-  width: ${({ theme }) => theme.gridUnit * 120}px;
+  margin-bottom: ${({ theme }) => theme.sizeUnit * 3}px;
+  width: ${({ theme }) => theme.sizeUnit * 120}px;
 `;
 
 export const StyledCronError = styled.p`
-  color: ${({ theme }) => theme.colors.error.base};
+  color: ${({ theme }) => theme.colorError};
 `;
 
 export const noBottomMargin = css`
@@ -83,32 +81,32 @@ export const noBottomMargin = css`
 `;
 
 export const StyledFooterButton = styled(Button)`
-  width: ${({ theme }) => theme.gridUnit * 40}px;
+  width: ${({ theme }) => theme.sizeUnit * 40}px;
 `;
 
 export const TimezoneHeaderStyle = (theme: SupersetTheme) => css`
-  margin: ${theme.gridUnit * 3}px 0 ${theme.gridUnit * 2}px;
+  margin: ${theme.sizeUnit * 3}px 0 ${theme.sizeUnit * 2}px;
 `;
 
 export const CustomWidthHeaderStyle = (theme: SupersetTheme) => css`
-  margin: ${theme.gridUnit * 3}px 0 ${theme.gridUnit * 2}px;
+  margin: ${theme.sizeUnit * 3}px 0 ${theme.sizeUnit * 2}px;
 `;
 
 export const SectionHeaderStyle = (theme: SupersetTheme) => css`
-  margin: ${theme.gridUnit * 3}px 0;
+  margin: ${theme.sizeUnit * 3}px 0;
 `;
 
 export const StyledMessageContentTitle = styled.div`
-  margin: ${({ theme }) => theme.gridUnit * 8}px 0
-    ${({ theme }) => theme.gridUnit * 4}px;
+  margin: ${({ theme }) => theme.sizeUnit * 8}px 0
+    ${({ theme }) => theme.sizeUnit * 4}px;
 `;
 
 export const StyledRadio = styled(Radio)`
   display: block;
-  line-height: ${({ theme }) => theme.gridUnit * 8}px;
+  line-height: ${({ theme }) => theme.sizeUnit * 8}px;
 `;
 
 export const antDErrorAlertStyles = (theme: SupersetTheme) => css`
-  margin: ${theme.gridUnit * 4}px;
+  margin: ${theme.sizeUnit * 4}px;
   margin-top: 0;
 `;
diff --git a/superset-frontend/src/features/rls/RowLevelSecurityModal.tsx b/superset-frontend/src/features/rls/RowLevelSecurityModal.tsx
index 70461fc412a..83bd11754ea 100644
--- a/superset-frontend/src/features/rls/RowLevelSecurityModal.tsx
+++ b/superset-frontend/src/features/rls/RowLevelSecurityModal.tsx
@@ -18,15 +18,18 @@
  */
 
 import { css, styled, SupersetClient, useTheme, t } from '@superset-ui/core';
-import Modal from 'src/components/Modal';
 import { useCallback, useEffect, useMemo, useState } from 'react';
-import { Icons } from 'src/components/Icons';
-import Select from 'src/components/Select/Select';
-import { TextArea } from 'src/components/Input';
-import AsyncSelect from 'src/components/Select/AsyncSelect';
+import { Icons } from '@superset-ui/core/components/Icons';
+import {
+  Modal,
+  Select,
+  AsyncSelect,
+  InfoTooltip,
+  LabeledErrorBoundInput,
+  Input,
+} from '@superset-ui/core/components';
+import { Typography } from '@superset-ui/core/components/Typography';
 import rison from 'rison';
-import { LabeledErrorBoundInput } from 'src/components/Form';
-import InfoTooltip from 'src/components/InfoTooltip';
 import { useSingleViewResource } from 'src/views/CRUD/hooks';
 import { FILTER_OPTIONS } from './constants';
 import { FilterType, RLSObject, RoleObject, TableObject } from './types';
@@ -34,7 +37,7 @@ import { FilterType, RLSObject, RoleObject, TableObject } from './types';
 const noMargins = css`
   margin: 0;
 
-  .antd5-input {
+  .ant-input {
     margin: 0;
   }
 `;
@@ -43,7 +46,7 @@ const StyledModal = styled(Modal)`
   max-width: 1200px;
   min-width: min-content;
   width: 100%;
-  .antd5-modal-footer {
+  .ant-modal-footer {
     white-space: nowrap;
   }
 `;
@@ -52,20 +55,20 @@ const StyledSectionContainer = styled.div`
   ${({ theme }) => css`
     display: flex;
     flex-direction: column;
-    padding: ${theme.gridUnit * 3}px ${theme.gridUnit * 4}px
-      ${theme.gridUnit * 2}px;
+    padding: ${theme.sizeUnit * 3}px ${theme.sizeUnit * 4}px
+      ${theme.sizeUnit * 2}px;
 
     label,
     .control-label {
       display: flex;
-      font-size: ${theme.typography.sizes.s}px;
-      color: ${theme.colors.grayscale.base};
+      font-size: ${theme.fontSizeSM}px;
+      color: ${theme.colorTextLabel};
       align-items: center;
     }
 
     .info-solid-small {
       vertical-align: middle;
-      padding-bottom: ${theme.gridUnit / 2}px;
+      padding-bottom: ${theme.sizeUnit / 2}px;
     }
   `}
 `;
@@ -73,8 +76,8 @@ const StyledInputContainer = styled.div`
   ${({ theme }) => css`
     display: flex;
     flex-direction: column;
-    margin: ${theme.gridUnit}px;
-    margin-bottom: ${theme.gridUnit * 4}px;
+    margin: ${theme.sizeUnit}px;
+    margin-bottom: ${theme.sizeUnit * 4}px;
 
     .input-container {
       display: flex;
@@ -91,15 +94,15 @@ const StyledInputContainer = styled.div`
     }
 
     .required {
-      margin-left: ${theme.gridUnit / 2}px;
-      color: ${theme.colors.error.base};
+      margin-left: ${theme.sizeUnit / 2}px;
+      color: ${theme.colorErrorText};
     }
   `}
 `;
 
-const StyledTextArea = styled(TextArea)`
+const StyledTextArea = styled(Input.TextArea)`
   resize: none;
-  margin-top: ${({ theme }) => theme.gridUnit}px;
+  margin-top: ${({ theme }) => theme.sizeUnit}px;
 `;
 
 export interface RowLevelSecurityModalProps {
@@ -333,23 +336,23 @@ function RowLevelSecurityModal(props: RowLevelSecurityModalProps) {
       width="30%"
       maxWidth="1450px"
       title={
-        <h4 data-test="rls-modal-title">
+        <Typography.Title level={4} data-test="rls-modal-title">
           {isEditMode ? (
             <Icons.EditOutlined
               css={css`
-                margin: auto ${theme.gridUnit * 2}px auto 0;
+                margin: auto ${theme.sizeUnit * 2}px auto 0;
               `}
             />
           ) : (
             <Icons.PlusOutlined
               iconSize="l"
               css={css`
-                margin: auto ${theme.gridUnit * 2}px auto 0;
+                margin: auto ${theme.sizeUnit * 2}px auto 0;
               `}
             />
           )}
           {isEditMode ? t('Edit Rule') : t('Add Rule')}
-        </h4>
+        </Typography.Title>
       }
     >
       <StyledSectionContainer>
@@ -453,25 +456,23 @@ function RowLevelSecurityModal(props: RowLevelSecurityModalProps) {
             />
           </StyledInputContainer>
           <StyledInputContainer>
-            <div className="control-label">
-              <LabeledErrorBoundInput
-                id="clause"
-                name="clause"
-                value={currentRule ? currentRule.clause : ''}
-                required
-                validationMethods={{
-                  onChange: ({ target }: { target: HTMLInputElement }) =>
-                    onTextChange(target),
-                }}
-                css={noMargins}
-                label={t('Clause')}
-                hasTooltip
-                tooltipText={t(
-                  'This is the condition that will be added to the WHERE clause. For example, to only return rows for a particular client, you might define a regular filter with the clause `client_id = 9`. To display no rows unless a user belongs to a RLS filter role, a base filter can be created with the clause `1 = 0` (always false).',
-                )}
-                data-test="clause-test"
-              />
-            </div>
+            <LabeledErrorBoundInput
+              id="clause"
+              name="clause"
+              value={currentRule ? currentRule.clause : ''}
+              required
+              validationMethods={{
+                onChange: ({ target }: { target: HTMLInputElement }) =>
+                  onTextChange(target),
+              }}
+              css={noMargins}
+              label={t('Clause')}
+              hasTooltip
+              tooltipText={t(
+                'This is the condition that will be added to the WHERE clause. For example, to only return rows for a particular client, you might define a regular filter with the clause `client_id = 9`. To display no rows unless a user belongs to a RLS filter role, a base filter can be created with the clause `1 = 0` (always false).',
+              )}
+              data-test="clause-test"
+            />
           </StyledInputContainer>
           <StyledInputContainer>
             <div className="control-label">{t('Description')}</div>
diff --git a/superset-frontend/src/features/roles/RoleFormItems.tsx b/superset-frontend/src/features/roles/RoleFormItems.tsx
index 7d51f159e4b..78075d4dc14 100644
--- a/superset-frontend/src/features/roles/RoleFormItems.tsx
+++ b/superset-frontend/src/features/roles/RoleFormItems.tsx
@@ -16,13 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { FormItem } from 'src/components/Form';
-import Select from 'src/components/Select/Select';
-import { Input } from 'src/components/Input';
+import {
+  FormItem,
+  Input,
+  Select,
+  AsyncSelect,
+} from '@superset-ui/core/components';
 import { t } from '@superset-ui/core';
 import { FC } from 'react';
 import { GroupObject } from 'src/pages/GroupsList';
-import AsyncSelect from 'src/components/Select/AsyncSelect';
 import { FormattedPermission } from './types';
 import { fetchUserOptions } from '../groups/utils';
 
@@ -60,7 +62,7 @@ export const PermissionsField: FC<PermissionsFieldProps> = ({
         label: permission.label,
         value: permission.id,
       }))}
-      getPopupContainer={trigger => trigger.closest('.antd5-modal-content')}
+      getPopupContainer={trigger => trigger.closest('.ant-modal-content')}
       data-test="permissions-select"
     />
   </FormItem>
diff --git a/superset-frontend/src/features/roles/RoleListAddModal.test.tsx b/superset-frontend/src/features/roles/RoleListAddModal.test.tsx
index 69d7eb66365..0c288bc0938 100644
--- a/superset-frontend/src/features/roles/RoleListAddModal.test.tsx
+++ b/superset-frontend/src/features/roles/RoleListAddModal.test.tsx
@@ -35,6 +35,8 @@ jest.mock('./utils');
 const mockCreateRole = jest.mocked(createRole);
 
 jest.mock('src/components/MessageToasts/withToasts', () => ({
+  __esModule: true,
+  default: (Component: any) => Component,
   useToasts: () => mockToasts,
 }));
 
diff --git a/superset-frontend/src/features/roles/RoleListAddModal.tsx b/superset-frontend/src/features/roles/RoleListAddModal.tsx
index 796036ed013..15f51385c3b 100644
--- a/superset-frontend/src/features/roles/RoleListAddModal.tsx
+++ b/superset-frontend/src/features/roles/RoleListAddModal.tsx
@@ -18,7 +18,7 @@
  */
 import { t } from '@superset-ui/core';
 import { useToasts } from 'src/components/MessageToasts/withToasts';
-import FormModal from 'src/components/Modal/FormModal';
+import { FormModal } from '@superset-ui/core/components';
 import { createRole, updateRolePermissions } from './utils';
 import { PermissionsField, RoleNameField } from './RoleFormItems';
 import { BaseModalProps, FormattedPermission, RoleForm } from './types';
diff --git a/superset-frontend/src/features/roles/RoleListDuplicateModal.test.tsx b/superset-frontend/src/features/roles/RoleListDuplicateModal.test.tsx
index db345c6efc8..1b947080088 100644
--- a/superset-frontend/src/features/roles/RoleListDuplicateModal.test.tsx
+++ b/superset-frontend/src/features/roles/RoleListDuplicateModal.test.tsx
@@ -36,9 +36,10 @@ const mockCreateRole = jest.mocked(createRole);
 const mockUpdateRolePermissions = jest.mocked(updateRolePermissions);
 
 jest.mock('src/components/MessageToasts/withToasts', () => ({
+  __esModule: true,
+  default: (Component: any) => Component,
   useToasts: () => mockToasts,
 }));
-
 describe('RoleListDuplicateModal', () => {
   const mockRole = {
     id: 1,
diff --git a/superset-frontend/src/features/roles/RoleListDuplicateModal.tsx b/superset-frontend/src/features/roles/RoleListDuplicateModal.tsx
index 750bcdf075e..323709bafa3 100644
--- a/superset-frontend/src/features/roles/RoleListDuplicateModal.tsx
+++ b/superset-frontend/src/features/roles/RoleListDuplicateModal.tsx
@@ -20,7 +20,7 @@
 import { t } from '@superset-ui/core';
 import { RoleObject } from 'src/pages/RolesList';
 import { useToasts } from 'src/components/MessageToasts/withToasts';
-import FormModal from 'src/components/Modal/FormModal';
+import { FormModal } from '@superset-ui/core/components';
 import { RoleNameField } from './RoleFormItems';
 import { BaseModalProps, RoleForm } from './types';
 import { createRole, updateRolePermissions } from './utils';
diff --git a/superset-frontend/src/features/roles/RoleListEditModal.test.tsx b/superset-frontend/src/features/roles/RoleListEditModal.test.tsx
index 79121f42e2b..0f6c96faf04 100644
--- a/superset-frontend/src/features/roles/RoleListEditModal.test.tsx
+++ b/superset-frontend/src/features/roles/RoleListEditModal.test.tsx
@@ -42,6 +42,8 @@ const mockUpdateRolePermissions = jest.mocked(updateRolePermissions);
 const mockUpdateRoleUsers = jest.mocked(updateRoleUsers);
 
 jest.mock('src/components/MessageToasts/withToasts', () => ({
+  __esModule: true,
+  default: (Component: any) => Component,
   useToasts: () => mockToasts,
 }));
 
diff --git a/superset-frontend/src/features/roles/RoleListEditModal.tsx b/superset-frontend/src/features/roles/RoleListEditModal.tsx
index cc25edf4cb4..7d55d8e91b3 100644
--- a/superset-frontend/src/features/roles/RoleListEditModal.tsx
+++ b/superset-frontend/src/features/roles/RoleListEditModal.tsx
@@ -18,21 +18,23 @@
  */
 import { useEffect, useRef, useState } from 'react';
 import { t } from '@superset-ui/core';
-import Tabs from 'src/components/Tabs';
+import Tabs from '@superset-ui/core/components/Tabs';
 import { RoleObject } from 'src/pages/RolesList';
-import TableView, { EmptyWrapperType } from 'src/components/TableView';
+import {
+  EmptyWrapperType,
+  FormModal,
+  TableView,
+  FormInstance,
+} from '@superset-ui/core/components';
 import {
   BaseModalProps,
   FormattedPermission,
   RoleForm,
 } from 'src/features/roles/types';
-import { CellProps } from 'react-table';
 import { useToasts } from 'src/components/MessageToasts/withToasts';
-import FormModal from 'src/components/Modal/FormModal';
 import { GroupObject } from 'src/pages/GroupsList';
-import { FormInstance } from 'src/components';
 import { fetchPaginatedData } from 'src/utils/fetchOptions';
-import { UserObject } from 'src/pages/UsersList';
+import { type UserObject } from 'src/pages/UsersList/types';
 import {
   GroupsField,
   PermissionsField,
@@ -66,25 +68,29 @@ const roleTabs = {
 const userColumns = [
   {
     accessor: 'first_name',
-    Header: 'First Name',
+    Header: t('First Name'),
+    id: 'first_name',
   },
   {
     accessor: 'last_name',
-    Header: 'Last Name',
+    Header: t('Last Name'),
+    id: 'last_name',
   },
   {
     accessor: 'username',
-    Header: 'User Name',
+    Header: t('User Name'),
+    id: 'username',
   },
   {
     accessor: 'email',
-    Header: 'Email',
+    Header: t('Email'),
+    id: 'email',
   },
   {
     accessor: 'active',
-    Header: 'Is Active?',
-    Cell: ({ cell }: CellProps<{ active: boolean }>) =>
-      cell.value ? 'Yes' : 'No',
+    Header: t('Is Active?'),
+    Cell: ({ value }: { value: boolean }) => (value ? t('Yes') : t('No')),
+    id: 'active',
   },
 ];
 
diff --git a/superset-frontend/src/features/tags/BulkTagModal.tsx b/superset-frontend/src/features/tags/BulkTagModal.tsx
index 31954612853..08830dd586b 100644
--- a/superset-frontend/src/features/tags/BulkTagModal.tsx
+++ b/superset-frontend/src/features/tags/BulkTagModal.tsx
@@ -19,16 +19,18 @@
 import { useState, useEffect, FC } from 'react';
 
 import { t, styled, SupersetClient } from '@superset-ui/core';
-import { FormLabel } from 'src/components/Form';
-import Modal from 'src/components/Modal';
-import AsyncSelect from 'src/components/Select/AsyncSelect';
-import Button from 'src/components/Button';
-import { loadTags } from 'src/components/Tags/utils';
+import {
+  FormLabel,
+  AsyncSelect,
+  Button,
+  Modal,
+} from '@superset-ui/core/components';
+import { loadTags } from 'src/components/Tag/utils';
 import { TaggableResourceOption } from 'src/features/tags/TagModal';
 
 const BulkTagModalContainer = styled.div`
   .bulk-tag-text {
-    margin-bottom: ${({ theme }) => theme.gridUnit * 2.5}px;
+    margin-bottom: ${({ theme }) => theme.sizeUnit * 2.5}px;
   }
 `;
 
diff --git a/superset-frontend/src/features/tags/TagCard.tsx b/superset-frontend/src/features/tags/TagCard.tsx
index b84f82cef4c..909af08e45d 100644
--- a/superset-frontend/src/features/tags/TagCard.tsx
+++ b/superset-frontend/src/features/tags/TagCard.tsx
@@ -19,14 +19,16 @@
 import { Link } from 'react-router-dom';
 import { isFeatureEnabled, FeatureFlag, t } from '@superset-ui/core';
 import { CardStyles } from 'src/views/CRUD/utils';
-import { Dropdown } from 'src/components/Dropdown';
-import { Menu } from 'src/components/Menu';
-import ConfirmStatusChange from 'src/components/ConfirmStatusChange';
-import ListViewCard from 'src/components/ListViewCard';
-import { Icons } from 'src/components/Icons';
+import {
+  Button,
+  Dropdown,
+  ConfirmStatusChange,
+  ListViewCard,
+} from '@superset-ui/core/components';
+import { MenuItem } from '@superset-ui/core/components/Menu';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { Tag } from 'src/views/CRUD/types';
 import { deleteTags } from 'src/features/tags/tags';
-import { Button } from 'src/components';
 import { assetUrl } from 'src/utils/assetUrl';
 
 interface TagCardProps {
@@ -45,10 +47,7 @@ interface TagCardProps {
 function TagCard({
   tag,
   hasPerm,
-  bulkSelectEnabled,
-  tagFilter,
   refreshData,
-  userId,
   addDangerToast,
   addSuccessToast,
   showThumbnails,
@@ -60,35 +59,35 @@ function TagCard({
     refreshData();
   };
 
-  const menu = (
-    <Menu>
-      {canDelete && (
-        <Menu.Item>
-          <ConfirmStatusChange
-            title={t('Please confirm')}
-            description={
-              <>
-                {t('Are you sure you want to delete')} <b>{tag.name}</b>?
-              </>
-            }
-            onConfirm={() => handleTagDelete(tag)}
-          >
-            {confirmDelete => (
-              <div
-                role="button"
-                tabIndex={0}
-                className="action-button"
-                onClick={confirmDelete}
-                data-test="dashboard-card-option-delete-button"
-              >
-                <Icons.DeleteOutlined iconSize="l" /> {t('Delete')}
-              </div>
-            )}
-          </ConfirmStatusChange>
-        </Menu.Item>
-      )}
-    </Menu>
-  );
+  const menuItems: MenuItem[] = [];
+  if (canDelete) {
+    menuItems.push({
+      key: 'delete-tag',
+      label: (
+        <ConfirmStatusChange
+          title={t('Please confirm')}
+          description={
+            <>
+              {t('Are you sure you want to delete')} <b>{tag.name}</b>?
+            </>
+          }
+          onConfirm={() => handleTagDelete(tag)}
+        >
+          {confirmDelete => (
+            <div
+              role="button"
+              tabIndex={0}
+              className="action-button"
+              onClick={confirmDelete}
+              data-test="dashboard-card-option-delete-button"
+            >
+              <Icons.DeleteOutlined iconSize="l" /> {t('Delete')}
+            </div>
+          )}
+        </ConfirmStatusChange>
+      ),
+    });
+  }
   return (
     <CardStyles>
       <ListViewCard
@@ -111,8 +110,8 @@ function TagCard({
               e.preventDefault();
             }}
           >
-            <Dropdown dropdownRender={() => menu} trigger={['click', 'hover']}>
-              <Button buttonSize="xsmall" type="link">
+            <Dropdown menu={{ items: menuItems }} trigger={['click', 'hover']}>
+              <Button buttonSize="xsmall" buttonStyle="link">
                 <Icons.MoreOutlined iconSize="xl" />
               </Button>
             </Dropdown>
diff --git a/superset-frontend/src/features/tags/TagModal.tsx b/superset-frontend/src/features/tags/TagModal.tsx
index b7b7138627d..329f45f2814 100644
--- a/superset-frontend/src/features/tags/TagModal.tsx
+++ b/superset-frontend/src/features/tags/TagModal.tsx
@@ -19,23 +19,24 @@
 import { ChangeEvent, useState, useEffect, FC } from 'react';
 
 import rison from 'rison';
-import Modal from 'src/components/Modal';
-import AsyncSelect from 'src/components/Select/AsyncSelect';
-import { FormLabel } from 'src/components/Form';
+import {
+  AsyncSelect,
+  Button,
+  Divider,
+  FormLabel,
+  Input,
+  Modal,
+} from '@superset-ui/core/components';
 import { t, styled, SupersetClient } from '@superset-ui/core';
-// eslint-disable-next-line no-restricted-imports
-import { Input } from 'antd'; // TODO: Remove antd
-import { Divider } from 'src/components/Divider';
-import Button from 'src/components/Button';
 import { Tag } from 'src/views/CRUD/types';
 import { fetchObjectsByTagIds } from 'src/features/tags/tags';
 
 const StyledModalBody = styled.div`
   .ant-select-dropdown {
-    max-height: ${({ theme }) => theme.gridUnit * 40}px;
+    max-height: ${({ theme }) => theme.sizeUnit * 40}px;
   }
   .tag-input {
-    margin-bottom: ${({ theme }) => theme.gridUnit * 3}px;
+    margin-bottom: ${({ theme }) => theme.sizeUnit * 3}px;
   }
 `;
 
@@ -233,7 +234,7 @@ const TagModal: FC<TagModalProps> = ({
           objects_to_tag: [...dashboards, ...charts, ...savedQueries],
         },
       })
-        .then(({ json = {} }) => {
+        .then(() => {
           refreshData();
           clearTagForm();
           addSuccessToast(t('Tag updated'));
@@ -251,7 +252,7 @@ const TagModal: FC<TagModalProps> = ({
           objects_to_tag: [...dashboards, ...charts, ...savedQueries],
         },
       })
-        .then(({ json = {} }) => {
+        .then(() => {
           refreshData();
           clearTagForm();
           addSuccessToast(t('Tag created'));
diff --git a/superset-frontend/src/features/tags/tags.ts b/superset-frontend/src/features/tags/tags.ts
index ffe8906f147..2bb8fe14240 100644
--- a/superset-frontend/src/features/tags/tags.ts
+++ b/superset-frontend/src/features/tags/tags.ts
@@ -18,7 +18,7 @@
  */
 import { JsonObject, SupersetClient } from '@superset-ui/core';
 import rison from 'rison';
-import Tag from 'src/types/TagType';
+import { TagType } from 'src/components';
 
 export const OBJECT_TYPES_VALUES = Object.freeze([
   'dashboard',
@@ -74,11 +74,10 @@ export function fetchTags(
   {
     objectType,
     objectId,
-    includeTypes = false,
   }: {
     objectType: string;
     objectId: number;
-    includeTypes: boolean;
+    includeTypes?: boolean;
   },
   callback: (json: JsonObject) => void,
   error: (response: Response) => void,
@@ -94,13 +93,13 @@ export function fetchTags(
     endpoint: `/api/v1/${objectType}/${objectId}`,
   })
     .then(({ json }) =>
-      callback(json.result.tags.filter((tag: Tag) => tag.type === 1)),
+      callback(json.result.tags.filter((tag: TagType) => tag.type === 1)),
     )
     .catch(response => error(response));
 }
 export function deleteTaggedObjects(
   { objectType, objectId }: { objectType: string; objectId: number },
-  tag: Tag,
+  tag: TagType,
   callback: (text: string) => void,
   error: (response: string) => void,
 ) {
@@ -128,7 +127,7 @@ export function deleteTaggedObjects(
 }
 
 export function deleteTags(
-  tags: Tag[],
+  tags: TagType[],
   callback: (text: string) => void,
   error: (response: string) => void,
 ) {
@@ -151,11 +150,10 @@ export function addTag(
   {
     objectType,
     objectId,
-    includeTypes = false,
   }: {
     objectType: string;
     objectId: number;
-    includeTypes: boolean;
+    includeTypes?: boolean;
   },
   tag: string,
   callback: (text: string) => void,
diff --git a/superset-frontend/src/features/userInfo/UserInfoModal.tsx b/superset-frontend/src/features/userInfo/UserInfoModal.tsx
index 42426946ad7..2fc82b4e7d0 100644
--- a/superset-frontend/src/features/userInfo/UserInfoModal.tsx
+++ b/superset-frontend/src/features/userInfo/UserInfoModal.tsx
@@ -17,10 +17,8 @@
  * under the License.
  */
 import { SupersetClient, t } from '@superset-ui/core';
+import { FormModal, FormItem, Input } from '@superset-ui/core/components';
 import { useToasts } from 'src/components/MessageToasts/withToasts';
-import FormModal from 'src/components/Modal/FormModal';
-import { FormItem } from 'src/components/Form';
-import { Input } from 'src/components/Input';
 import { User } from 'src/types/bootstrapTypes';
 import { BaseUserListModalProps, FormValues } from '../users/types';
 
@@ -57,7 +55,7 @@ function UserInfoModal({
       addSuccessToast(
         isEditMode
           ? t('The user was updated successfully')
-          : t('The password reset was successfull'),
+          : t('The password reset was successful'),
       );
       onSave();
     } catch (error) {
diff --git a/superset-frontend/src/features/users/UserListModal.tsx b/superset-frontend/src/features/users/UserListModal.tsx
index b230ccdb608..f0a104ba3dd 100644
--- a/superset-frontend/src/features/users/UserListModal.tsx
+++ b/superset-frontend/src/features/users/UserListModal.tsx
@@ -18,13 +18,15 @@
  */
 import { t } from '@superset-ui/core';
 import { useToasts } from 'src/components/MessageToasts/withToasts';
-import FormModal from 'src/components/Modal/FormModal';
-import { FormItem } from 'src/components/Form';
-import { Input } from 'src/components/Input';
-import Checkbox from 'src/components/Checkbox';
-import Select from 'src/components/Select/Select';
-import { Group, Role, UserObject } from 'src/pages/UsersList';
-import { FormInstance } from 'src/components';
+import {
+  Checkbox,
+  FormModal,
+  Select,
+  Input,
+  FormItem,
+  FormInstance,
+} from '@superset-ui/core/components';
+import { Group, Role, UserObject } from 'src/pages/UsersList/types';
 import { Actions } from 'src/constants';
 import { BaseUserListModalProps, FormValues } from './types';
 import { createUser, updateUser, atLeastOneRoleOrGroup } from './utils';
@@ -195,7 +197,7 @@ function UserListModal({
                 label: role.name,
               }))}
               getPopupContainer={trigger =>
-                trigger.closest('.antd5-modal-content')
+                trigger.closest('.ant-modal-content')
               }
             />
           </FormItem>
@@ -214,7 +216,7 @@ function UserListModal({
                 label: group.name,
               }))}
               getPopupContainer={trigger =>
-                trigger.closest('.antd5-modal-content')
+                trigger.closest('.ant-modal-content')
               }
             />
           </FormItem>
diff --git a/superset-frontend/src/filters/components/Range/RangeFilterPlugin.stories.tsx b/superset-frontend/src/filters/components/Range/RangeFilterPlugin.stories.tsx
index 863f2e47eee..1439572a99b 100644
--- a/superset-frontend/src/filters/components/Range/RangeFilterPlugin.stories.tsx
+++ b/superset-frontend/src/filters/components/Range/RangeFilterPlugin.stories.tsx
@@ -30,7 +30,7 @@ new RangeFilterPlugin().configure({ key: 'filter_range' }).register();
 getChartTransformPropsRegistry().registerValue('filter_range', transformProps);
 
 export default {
-  title: 'Filter Plugins',
+  title: 'Components/Filter Plugins',
 };
 
 export const range = ({ width, height }: { width: number; height: number }) => (
diff --git a/superset-frontend/src/filters/components/Range/RangeFilterPlugin.test.tsx b/superset-frontend/src/filters/components/Range/RangeFilterPlugin.test.tsx
index 855482027ef..6cd53f52c49 100644
--- a/superset-frontend/src/filters/components/Range/RangeFilterPlugin.test.tsx
+++ b/superset-frontend/src/filters/components/Range/RangeFilterPlugin.test.tsx
@@ -17,8 +17,10 @@
  * under the License.
  */
 import { AppSection, GenericDataType } from '@superset-ui/core';
-import { fireEvent, render, screen } from 'spec/helpers/testing-library';
+import userEvent from '@testing-library/user-event';
+import { render, screen } from 'spec/helpers/testing-library';
 import RangeFilterPlugin from './RangeFilterPlugin';
+import { RangeDisplayMode } from './types';
 import { SingleValueType } from './SingleValueType';
 import transformProps from './transformProps';
 
@@ -101,7 +103,7 @@ describe('RangeFilterPlugin', () => {
     jest.clearAllMocks();
   });
 
-  it('should render two numerical inputs', () => {
+  it('should render two numerical inputs and a slider by default', () => {
     getWrapper();
 
     const inputs = screen.getAllByRole('spinbutton');
@@ -109,26 +111,32 @@ describe('RangeFilterPlugin', () => {
 
     expect(inputs[0]).toHaveValue('10');
     expect(inputs[1]).toHaveValue('70');
+
+    // For a range slider, there are two slider handles
+    const sliders = screen.getAllByRole('slider');
+    expect(sliders.length).toBeGreaterThan(0);
   });
 
-  it('should set the data mask to error when the range is incorrect', () => {
+  it('should set the data mask to error when the range is incorrect', async () => {
     getWrapper({ filterState: { value: [null, null] } });
 
     const inputs = screen.getAllByRole('spinbutton');
     const fromInput = inputs[0];
     const toInput = inputs[1];
 
-    fireEvent.change(fromInput, { target: { value: 20 } });
+    userEvent.clear(fromInput);
+    userEvent.type(fromInput, '20');
 
-    fireEvent.change(toInput, { target: { value: 10 } });
+    userEvent.clear(toInput);
+    userEvent.type(toInput, '10');
 
-    fireEvent.blur(toInput);
+    userEvent.tab();
 
     expect(setDataMask).toHaveBeenCalledWith({
       extraFormData: {},
       filterState: {
         label: '',
-        validateMessage: 'Please provide a valid range',
+        validateMessage: 'Numbers must be within 10 and 100',
         validateStatus: 'error',
         value: null,
       },
@@ -186,8 +194,10 @@ describe('RangeFilterPlugin', () => {
         value: [20, null],
       },
     });
-    const input = screen.getByRole('spinbutton');
-    expect(input).toHaveValue('20');
+
+    const inputs = screen.getAllByRole('spinbutton');
+    expect(inputs).toHaveLength(1);
+    expect(inputs[0]).toHaveValue('20');
   });
 
   it('should call setDataMask with correct less than filter', () => {
@@ -214,8 +224,10 @@ describe('RangeFilterPlugin', () => {
         validateStatus: undefined,
       },
     });
-    const input = screen.getByRole('spinbutton');
-    expect(input).toHaveValue('60');
+
+    const inputs = screen.getAllByRole('spinbutton');
+    expect(inputs).toHaveLength(1);
+    expect(inputs[0]).toHaveValue('60');
   });
 
   it('should call setDataMask with correct exact filter', () => {
@@ -242,5 +254,69 @@ describe('RangeFilterPlugin', () => {
         validateMessage: '',
       },
     });
+
+    const inputs = screen.getAllByRole('spinbutton');
+    expect(inputs).toHaveLength(1);
+    expect(inputs[0]).toHaveValue('10');
+  });
+
+  describe('Range Display Modes', () => {
+    it('should render only the slider in slider mode', () => {
+      getWrapper({
+        formData: {
+          rangeDisplayMode: RangeDisplayMode.Slider,
+        },
+      });
+
+      const sliders = screen.getAllByRole('slider');
+      expect(sliders.length).toBeGreaterThan(0);
+
+      expect(screen.queryAllByRole('spinbutton')).toHaveLength(0);
+    });
+
+    it('should render only inputs in input mode', () => {
+      getWrapper({
+        formData: {
+          rangeDisplayMode: RangeDisplayMode.Input,
+        },
+      });
+
+      const inputs = screen.getAllByRole('spinbutton');
+      expect(inputs).toHaveLength(2);
+
+      expect(screen.queryAllByRole('slider')).toHaveLength(0);
+    });
+
+    it('should render both slider and inputs in slider-and-input mode', () => {
+      getWrapper({
+        formData: {
+          rangeDisplayMode: RangeDisplayMode.SliderAndInput,
+        },
+      });
+
+      // Should show inputs
+      const inputs = screen.getAllByRole('spinbutton');
+      expect(inputs).toHaveLength(2);
+
+      // Should show slider
+      const sliders = screen.getAllByRole('slider');
+      expect(sliders.length).toBeGreaterThan(0);
+    });
+
+    it('should default to slider-and-input mode when not specified', () => {
+      getWrapper({
+        formData: {
+          // No rangeDisplayMode specified
+        },
+      });
+
+      // Should show inputs
+      const inputs = screen.getAllByRole('spinbutton');
+      expect(inputs).toHaveLength(2);
+
+      // Should show slider
+      const sliders = screen.getAllByRole('slider');
+      expect(sliders.length).toBeGreaterThan(0);
+    });
   });
 });
diff --git a/superset-frontend/src/filters/components/Range/RangeFilterPlugin.tsx b/superset-frontend/src/filters/components/Range/RangeFilterPlugin.tsx
index c717d8c267e..8e6504d9544 100644
--- a/superset-frontend/src/filters/components/Range/RangeFilterPlugin.tsx
+++ b/superset-frontend/src/filters/components/Range/RangeFilterPlugin.tsx
@@ -23,15 +23,18 @@ import {
   isEqualArray,
   NumberFormats,
   styled,
+  useTheme,
   t,
 } from '@superset-ui/core';
-import { useCallback, useEffect, useMemo, useState } from 'react';
-import { InputNumber } from 'src/components/Input';
+import { useCallback, useEffect, useMemo, useState, useRef } from 'react';
 import { FilterBarOrientation } from 'src/dashboard/types';
-import Metadata from 'src/components/Metadata';
+// import Metadata from '@superset-ui/core/components/Metadata';
 import { isNumber } from 'lodash';
-import { PluginFilterRangeProps } from './types';
-import { StatusMessage, StyledFormItem, FilterPluginStyle } from '../common';
+import { InputNumber } from '@superset-ui/core/components/Input';
+import Slider from '@superset-ui/core/components/Slider';
+import { FormItem, Tooltip, Icons } from '@superset-ui/core/components';
+import { PluginFilterRangeProps, RangeDisplayMode } from './types';
+import { StatusMessage, FilterPluginStyle } from '../common';
 import { getRangeExtraFormData } from '../../utils';
 import { SingleValueType } from './SingleValueType';
 
@@ -39,23 +42,85 @@ type InputValue = number | null;
 type RangeValue = [InputValue, InputValue];
 
 const StyledDivider = styled.span`
-  margin: 0 ${({ theme }) => theme.gridUnit * 3}px;
-  color: ${({ theme }) => theme.colors.grayscale.light1};
-  font-weight: ${({ theme }) => theme.typography.weights.bold};
-  font-size: ${({ theme }) => theme.typography.sizes.m}px;
+  margin: 0 ${({ theme }) => theme.sizeUnit * 3}px;
+  color: ${({ theme }) => theme.colorSplit};
+  font-weight: ${({ theme }) => theme.fontWeightStrong};
+  font-size: ${({ theme }) => theme.fontSize}px;
   align-content: center;
 `;
 
 const Wrapper = styled.div`
   display: flex;
   justify-content: space-between;
+  width: 100%;
 
   .antd5-input-number {
-    width: 100%;
+    min-width: 80px;
     position: relative;
   }
 `;
 
+const SliderWrapper = styled.div`
+  ${({ theme }) => `
+    margin: ${theme.sizeUnit * 4}px 0;
+    padding: 0 ${theme.sizeUnit}px;
+  `}
+`;
+
+const TooltipContainer = styled.div`
+  ${({ theme }) => `
+    position: absolute;
+    top: -${theme.sizeUnit * 10}px;
+    right: 0px;
+    z-index: 100;
+    display: flex;
+    align-items: center;
+
+    .tooltip-icon {
+      margin-left: ${theme.sizeUnit * 2}px;
+    }
+  `}
+`;
+
+const HorizontalLayout = styled.div`
+  ${({ theme }) => `
+    display: flex;
+    flex-direction: column;
+    gap: ${theme.sizeUnit * 4}px;
+    width: 100%;
+
+    .controls-container {
+      display: flex;
+      align-items: center;
+      gap: ${theme.sizeUnit * 4}px;
+      width: 100%;
+
+      .slider-wrapper {
+        display: flex;
+        align-items: center;
+        flex: 2;
+      }
+
+      .slider-container {
+        flex: 1;
+        min-width: 180px;
+      }
+
+      .inputs-container {
+        min-width: 160px;
+        max-width: 200px;
+      }
+
+    }
+
+    .message-container {
+      width: 100%;
+      text-align: center;
+      padding-top: ${theme.sizeUnit * 2}px;
+    }
+  `}
+`;
+
 const numberFormatter = getNumberFormatter(NumberFormats.SMART_NUMBER);
 
 const getLabel = (
@@ -89,15 +154,21 @@ const validateRange = (
   enableSingleValue?: SingleValueType,
 ): { isValid: boolean; errorMessage: string | null } => {
   const [inputMin, inputMax] = values;
-  const requiredError = t('Filter value is required');
-  const rangeError = t('Please provide a value within range');
+  const requiredError = t('Please provide a valid min or max value');
+  const minMaxError = t('Min value cannot be greater than max value');
+  const rangeError = t('Numbers must be within %(min)s and %(max)s', {
+    min,
+    max,
+  });
+
+  // Single value validation
   if (enableSingleValue !== undefined) {
     const isSingleMin =
       enableSingleValue === SingleValueType.Minimum ||
       enableSingleValue === SingleValueType.Exact;
     const value = isSingleMin ? inputMin : inputMax;
 
-    if (!value && enableEmptyFilter) {
+    if (!isNumber(value)) {
       return { isValid: false, errorMessage: requiredError };
     }
 
@@ -109,33 +180,43 @@ const validateRange = (
   }
 
   // Range validation
-  if (enableEmptyFilter && (inputMin === null || inputMax === null)) {
-    return { isValid: false, errorMessage: t('Please provide a valid range') };
+  // Allow empty ranges if enableEmptyFilter is false
+  if (!enableEmptyFilter && inputMin === null && inputMax === null) {
+    return { isValid: true, errorMessage: null };
   }
 
-  if (!enableEmptyFilter && (inputMin !== null) !== (inputMax !== null)) {
-    return { isValid: false, errorMessage: t('Please provide a valid range') };
+  // If enableEmptyFilter is true, at least one value is required
+  if (enableEmptyFilter && inputMin === null && inputMax === null) {
+    return {
+      isValid: false,
+      errorMessage: requiredError,
+    };
   }
 
-  if (inputMin !== null && inputMax !== null) {
-    if (inputMin > inputMax) {
-      return {
-        isValid: false,
-        errorMessage: t('Minimum value cannot be higher than maximum value'),
-      };
-    }
-    if (inputMin < min || inputMax > max) {
-      return {
-        isValid: false,
-        errorMessage: t('Your range is not within the dataset range'),
-      };
-    }
+  // Check relationship between min and max when both are provided
+  if (inputMin !== null && inputMax !== null && inputMin > inputMax) {
+    return {
+      isValid: false,
+      errorMessage: minMaxError,
+    };
+  }
+
+  //   Check individual value bounds if provided
+  if (
+    (inputMin !== null && inputMin < min) ||
+    (inputMax !== null && inputMax > max)
+  ) {
+    return {
+      isValid: false,
+      errorMessage: rangeError,
+    };
   }
 
   return { isValid: true, errorMessage: null };
 };
 
 export default function RangeFilterPlugin(props: PluginFilterRangeProps) {
+  const theme = useTheme();
   const {
     data,
     formData,
@@ -150,16 +231,23 @@ export default function RangeFilterPlugin(props: PluginFilterRangeProps) {
     filterState,
     inputRef,
     filterBarOrientation = FilterBarOrientation.Vertical,
+    isOverflowingFilterBar,
   } = props;
+
   const [row] = data;
   // @ts-ignore
   const { min, max }: { min: number; max: number } = row;
   const { groupby, enableSingleValue, enableEmptyFilter, defaultValue } =
     formData;
+
+  // Get the display mode from formData
+  const rangeDisplayMode =
+    formData?.rangeDisplayMode || RangeDisplayMode.SliderAndInput;
+
   const minIndex = 0;
   const maxIndex = 1;
+
   const enableSingleExactValue = enableSingleValue === SingleValueType.Exact;
-  const rangeInput = enableSingleValue === undefined;
 
   const [col = ''] = ensureIsArray(groupby).map(getColumnLabel);
 
@@ -168,6 +256,30 @@ export default function RangeFilterPlugin(props: PluginFilterRangeProps) {
   );
   const [error, setError] = useState<string | null>(null);
 
+  // Prepare slider value from input value, converting nulls to min/max
+  const sliderValue = useMemo(() => {
+    const [inputMin, inputMax] = inputValue;
+
+    // For single value filters
+    if (
+      enableSingleValue === SingleValueType.Minimum ||
+      enableSingleValue === SingleValueType.Exact
+    ) {
+      return inputMin !== null ? inputMin : min;
+    }
+    if (enableSingleValue === SingleValueType.Maximum) {
+      return inputMax !== null ? inputMax : max;
+    }
+
+    // For range filters - use placeholders when values are null
+    // If only min is provided, set max to the dataset max
+    // If only max is provided, set min to the dataset min
+    const sliderMin = inputMin !== null ? inputMin : min;
+    const sliderMax = inputMax !== null ? inputMax : max;
+
+    return [sliderMin, sliderMax];
+  }, [inputValue, min, max, enableSingleValue]);
+
   const updateDataMaskError = useCallback(
     (errorMessage: string | null) => {
       setDataMask({
@@ -206,39 +318,27 @@ export default function RangeFilterPlugin(props: PluginFilterRangeProps) {
       return;
     }
 
-    if (
-      filterState.validateStatus === 'error' &&
-      error !== filterState.validateMessage
-    ) {
-      setError(filterState.validateMessage);
-
-      const [inputMin, inputMax] = inputValue;
-
-      const { isValid, errorMessage } = validateRange(
-        inputValue,
-        min,
-        max,
-        enableEmptyFilter,
-        enableSingleValue,
-      );
-
-      const isDefaultError =
-        inputMin === null &&
-        inputMax === null &&
-        filterState.validateStatus === 'error';
-
-      if (!isValid || isDefaultError) {
-        setError(errorMessage);
-        updateDataMaskError(errorMessage);
-        return;
-      }
-
-      setError(null);
-      updateDataMaskValue(inputValue);
-      return;
-    }
     if (filterState.validateStatus === 'error') {
       setError(filterState.validateMessage);
+
+      // Only re-validate if message changed to prevents redundant validation
+      if (error !== filterState.validateMessage) {
+        const { isValid, errorMessage } = validateRange(
+          inputValue,
+          min,
+          max,
+          enableEmptyFilter,
+          enableSingleValue,
+        );
+
+        if (!isValid) {
+          setError(errorMessage);
+          updateDataMaskError(errorMessage);
+        } else {
+          setError(null);
+          updateDataMaskValue(inputValue);
+        }
+      }
       return;
     }
 
@@ -261,6 +361,7 @@ export default function RangeFilterPlugin(props: PluginFilterRangeProps) {
     }
   }, [JSON.stringify(filterState.value)]);
 
+  // Get just the filter behavior text without the range information (which is shown in the tooltip)
   const metadataText = useMemo(() => {
     switch (enableSingleValue) {
       case SingleValueType.Minimum:
@@ -270,19 +371,44 @@ export default function RangeFilterPlugin(props: PluginFilterRangeProps) {
       case SingleValueType.Exact:
         return t('Filters for values equal to this exact value.');
       default:
-        return '';
+        return null;
     }
   }, [enableSingleValue]);
 
+  const keyPressed = useRef(false);
+
+  const handleKeyDown = (event: React.KeyboardEvent<HTMLInputElement>) => {
+    keyPressed.current = !!/^[0-9]$/.test(event.key);
+  };
+
   const handleChange = useCallback(
     (newValue: number | null, index: 0 | 1) => {
       if (row?.min === undefined && row?.max === undefined) {
         return;
       }
+
+      // When using increment/decrement buttons on an empty input,
+      // use the dataset min/max as the base value
+      let adjustedValue = newValue;
+      if (newValue !== null && inputValue[index] === null) {
+        if (keyPressed.current) {
+          adjustedValue = newValue;
+          keyPressed.current = false;
+        } else if (index === minIndex && newValue === 1) {
+          adjustedValue = min + 1;
+        } else if (index === minIndex && newValue === -1) {
+          adjustedValue = min - 1;
+        } else if (index === maxIndex && newValue === 1) {
+          adjustedValue = max + 1;
+        } else if (index === maxIndex && newValue === -1) {
+          adjustedValue = max - 1;
+        }
+      }
+
       const newInputValue: [number | null, number | null] =
         index === minIndex
-          ? [newValue, inputValue[maxIndex]]
-          : [inputValue[minIndex], newValue];
+          ? [adjustedValue, inputValue[maxIndex]]
+          : [inputValue[minIndex], adjustedValue];
 
       setInputValue(newInputValue);
 
@@ -303,29 +429,116 @@ export default function RangeFilterPlugin(props: PluginFilterRangeProps) {
       setError(null);
       updateDataMaskValue(newInputValue);
     },
-    [col, min, max, enableEmptyFilter, enableSingleValue, setDataMask],
+    [
+      min,
+      max,
+      enableEmptyFilter,
+      enableSingleValue,
+      updateDataMaskError,
+      updateDataMaskValue,
+      inputValue,
+    ],
   );
 
-  const formItemExtra = useMemo(() => {
+  // Handler for slider change
+  const handleSliderChange = useCallback(
+    (value: number | number[]) => {
+      let newInputValue: RangeValue;
+
+      if (enableSingleValue !== undefined) {
+        const singleValue =
+          typeof value === 'number'
+            ? value
+            : Array.isArray(value) && value.length > 0
+              ? value[0]
+              : (min + max) / 2;
+
+        if (enableSingleValue === SingleValueType.Minimum) {
+          newInputValue = [singleValue, null];
+        } else if (enableSingleValue === SingleValueType.Maximum) {
+          newInputValue = [null, singleValue];
+        } else {
+          newInputValue = [singleValue, singleValue];
+        }
+      } else {
+        const arrayValue = Array.isArray(value) ? value : [min, max];
+        const [sliderMin, sliderMax] =
+          arrayValue.length >= 2 ? [arrayValue[0], arrayValue[1]] : [min, max];
+        newInputValue = [sliderMin, sliderMax];
+      }
+
+      setInputValue(newInputValue);
+      setError(null);
+      updateDataMaskValue(newInputValue);
+    },
+    [min, max, enableSingleValue, updateDataMaskValue],
+  );
+
+  const getMessageAndStatus = useCallback(() => {
+    const defaultMessage = t('Choose numbers between %(min)s and %(max)s', {
+      min,
+      max,
+    });
+
     if (error) {
-      return <StatusMessage status="error">{error}</StatusMessage>;
+      return { message: error, status: 'error' as const };
     }
-    return undefined;
-  }, [error]);
+
+    if (enableSingleValue !== undefined && metadataText) {
+      return { message: metadataText, status: 'help' as const };
+    }
+
+    return { message: defaultMessage, status: 'help' as const };
+  }, [error, min, max, enableSingleValue, metadataText]);
+
+  const MessageDisplay = useCallback(() => {
+    const { message, status } = getMessageAndStatus();
+
+    if (filterBarOrientation === FilterBarOrientation.Vertical) {
+      return <StatusMessage status={status}>{message}</StatusMessage>;
+    }
+
+    return null;
+  }, [getMessageAndStatus, filterBarOrientation]);
+
+  const InfoTooltip = useCallback(() => {
+    const { message, status } = getMessageAndStatus();
+
+    return (
+      <Tooltip title={message} placement="top">
+        <Icons.InfoCircleOutlined
+          iconSize="m"
+          iconColor={
+            status === 'error'
+              ? theme.colors.error.base
+              : theme.colors.grayscale.base
+          }
+          className="tooltip-icon"
+        />
+      </Tooltip>
+    );
+  }, [getMessageAndStatus]);
 
   useEffect(() => {
-    switch (enableSingleValue) {
-      case SingleValueType.Minimum:
-      case SingleValueType.Exact:
-        handleChange(null, maxIndex);
-        break;
-      case SingleValueType.Maximum:
-        handleChange(null, minIndex);
-        break;
-      default:
-        break;
+    if (enableSingleValue !== undefined) {
+      switch (enableSingleValue) {
+        case SingleValueType.Minimum:
+        case SingleValueType.Exact:
+          if (inputValue[maxIndex] !== null) {
+            handleChange(null, maxIndex);
+          }
+          break;
+        case SingleValueType.Maximum:
+          if (inputValue[minIndex] !== null) {
+            handleChange(null, minIndex);
+          }
+          break;
+        default:
+          break;
+      }
     }
 
+    // Reset data mask when single value mode changes
     setDataMask({
       extraFormData: {},
       filterState: {
@@ -335,54 +548,124 @@ export default function RangeFilterPlugin(props: PluginFilterRangeProps) {
     });
   }, [enableSingleValue]);
 
+  const renderSlider = () => {
+    if (enableSingleValue !== undefined) {
+      return (
+        <SliderWrapper>
+          <Slider
+            min={min}
+            max={max}
+            value={Array.isArray(sliderValue) ? sliderValue[0] : sliderValue}
+            onChange={handleSliderChange}
+            tooltip={{
+              formatter: val => (val !== null ? numberFormatter(val) : ''),
+            }}
+          />
+        </SliderWrapper>
+      );
+    }
+    return (
+      <SliderWrapper data-test="range-filter-slider">
+        <Slider
+          min={min}
+          max={max}
+          range
+          value={Array.isArray(sliderValue) ? sliderValue : [min, sliderValue]}
+          onChange={handleSliderChange}
+          tooltip={{
+            formatter: val => (val !== null ? numberFormatter(val) : ''),
+          }}
+        />
+      </SliderWrapper>
+    );
+  };
+
+  const renderInputs = () => (
+    <Wrapper
+      tabIndex={-1}
+      ref={inputRef}
+      onFocus={setFocusedFilter}
+      onBlur={unsetFocusedFilter}
+      onMouseEnter={setHoveredFilter}
+      onMouseLeave={unsetHoveredFilter}
+      onMouseDown={() => setFilterActive(true)}
+      onMouseUp={() => setFilterActive(false)}
+    >
+      {/* Conditionally render based on enableSingleValue */}
+      {(enableSingleValue === undefined ||
+        enableSingleValue === SingleValueType.Minimum ||
+        enableSingleValue === SingleValueType.Exact) && (
+        <InputNumber
+          value={inputValue[minIndex]}
+          onChange={val => handleChange(val, minIndex)}
+          onKeyDown={handleKeyDown}
+          placeholder={`${min}`}
+          style={{ width: '100%' }}
+          status={filterState.validateStatus}
+          data-test="range-filter-from-input"
+        />
+      )}
+
+      {enableSingleValue === undefined && <StyledDivider>-</StyledDivider>}
+
+      {(enableSingleValue === undefined ||
+        enableSingleValue === SingleValueType.Maximum) && (
+        <InputNumber
+          value={inputValue[maxIndex]}
+          onChange={val => handleChange(val, maxIndex)}
+          onKeyDown={handleKeyDown}
+          placeholder={`${max}`}
+          style={{ width: '100%' }}
+          data-test="range-filter-to-input"
+          status={filterState.validateStatus}
+        />
+      )}
+    </Wrapper>
+  );
+
   return (
     <FilterPluginStyle height={height} width={width}>
       {Number.isNaN(Number(min)) || Number.isNaN(Number(max)) ? (
         <h4>{t('Chosen non-numeric column')}</h4>
       ) : (
-        <StyledFormItem
-          aria-labelledby={`filter-name-${formData.nativeFilterId}`}
-          extra={formItemExtra}
-        >
-          <Wrapper
-            tabIndex={-1}
-            ref={inputRef}
-            onFocus={setFocusedFilter}
-            onBlur={unsetFocusedFilter}
-            onMouseEnter={setHoveredFilter}
-            onMouseLeave={unsetHoveredFilter}
-            onMouseDown={() => setFilterActive(true)}
-            onMouseUp={() => setFilterActive(false)}
-          >
-            {(enableSingleValue === SingleValueType.Minimum ||
-              enableSingleValue === SingleValueType.Exact ||
-              enableSingleValue === undefined) && (
-              <InputNumber
-                value={inputValue[minIndex]}
-                onChange={val => handleChange(val, minIndex)}
-                placeholder={`${min}`}
-                status={filterState.validateStatus}
-                data-test="range-filter-from-input"
-              />
-            )}
-            {enableSingleValue === undefined && (
-              <StyledDivider>-</StyledDivider>
-            )}
-            {(enableSingleValue === SingleValueType.Maximum ||
-              enableSingleValue === undefined) && (
-              <InputNumber
-                value={inputValue[maxIndex]}
-                onChange={val => handleChange(val, maxIndex)}
-                placeholder={`${max}`}
-                data-test="range-filter-to-input"
-                status={filterState.validateStatus}
-              />
-            )}
-          </Wrapper>
-          {(rangeInput ||
-            filterBarOrientation === FilterBarOrientation.Vertical) &&
-            !filterState.validateStatus && <Metadata value={metadataText} />}
-        </StyledFormItem>
+        <FormItem aria-labelledby={`filter-name-${formData.nativeFilterId}`}>
+          {filterBarOrientation === FilterBarOrientation.Horizontal &&
+          !isOverflowingFilterBar ? (
+            <HorizontalLayout>
+              <div className="controls-container">
+                <InfoTooltip />
+                {(rangeDisplayMode === RangeDisplayMode.Slider ||
+                  rangeDisplayMode === RangeDisplayMode.SliderAndInput) && (
+                  <div className="slider-wrapper">
+                    <div className="slider-container">{renderSlider()}</div>
+                  </div>
+                )}
+                {(rangeDisplayMode === RangeDisplayMode.Input ||
+                  rangeDisplayMode === RangeDisplayMode.SliderAndInput) && (
+                  <div className="inputs-container">{renderInputs()}</div>
+                )}
+              </div>
+            </HorizontalLayout>
+          ) : (
+            <>
+              <div style={{ position: 'relative' }}>
+                {isOverflowingFilterBar && (
+                  <TooltipContainer>
+                    <InfoTooltip />
+                  </TooltipContainer>
+                )}
+                {(rangeDisplayMode === RangeDisplayMode.Slider ||
+                  rangeDisplayMode === RangeDisplayMode.SliderAndInput) &&
+                  renderSlider()}
+                {(rangeDisplayMode === RangeDisplayMode.Input ||
+                  rangeDisplayMode === RangeDisplayMode.SliderAndInput) &&
+                  renderInputs()}
+
+                <MessageDisplay />
+              </div>
+            </>
+          )}
+        </FormItem>
       )}
     </FilterPluginStyle>
   );
diff --git a/superset-frontend/src/filters/components/Range/types.ts b/superset-frontend/src/filters/components/Range/types.ts
index 25a18bb3e86..d020ebf96d0 100644
--- a/superset-frontend/src/filters/components/Range/types.ts
+++ b/superset-frontend/src/filters/components/Range/types.ts
@@ -26,9 +26,16 @@ import { RefObject } from 'react';
 import { PluginFilterHooks, PluginFilterStylesProps } from '../types';
 import { FilterBarOrientation } from '../../../dashboard/types';
 
+export enum RangeDisplayMode {
+  Slider = 'slider',
+  Input = 'input',
+  SliderAndInput = 'slider-and-input',
+}
+
 interface PluginFilterSelectCustomizeProps {
   max?: number;
   min?: number;
+  rangeDisplayMode?: RangeDisplayMode;
 }
 
 export type PluginFilterRangeQueryFormData = QueryFormData &
diff --git a/superset-frontend/src/filters/components/Select/SelectFilterPlugin.stories.tsx b/superset-frontend/src/filters/components/Select/SelectFilterPlugin.stories.tsx
index 46e056b5ffd..30bc333a799 100644
--- a/superset-frontend/src/filters/components/Select/SelectFilterPlugin.stories.tsx
+++ b/superset-frontend/src/filters/components/Select/SelectFilterPlugin.stories.tsx
@@ -27,7 +27,7 @@ new SelectFilterPlugin().configure({ key: 'filter_select' }).register();
 getChartTransformPropsRegistry().registerValue('filter_select', transformProps);
 
 export default {
-  title: 'Filter Plugins',
+  title: 'Components/Filter Plugins',
   argTypes: {
     creatable: { control: 'boolean', defaultValue: true },
     multiSelect: { control: 'boolean', defaultValue: true },
diff --git a/superset-frontend/src/filters/components/Select/SelectFilterPlugin.test.tsx b/superset-frontend/src/filters/components/Select/SelectFilterPlugin.test.tsx
index cb1f2de7cc4..c867077f3e0 100644
--- a/superset-frontend/src/filters/components/Select/SelectFilterPlugin.test.tsx
+++ b/superset-frontend/src/filters/components/Select/SelectFilterPlugin.test.tsx
@@ -141,7 +141,9 @@ describe('SelectFilterPlugin', () => {
     const filterSelect = screen.getAllByRole('combobox')[0];
     userEvent.click(filterSelect);
     userEvent.click(screen.getByTitle('girl'));
-    expect(await screen.findByTitle(/girl/i)).toBeInTheDocument();
+    expect(
+      await screen.findByRole('option', { name: /girl/i }),
+    ).toBeInTheDocument();
     expect(setDataMask).toHaveBeenCalledWith({
       extraFormData: {
         filters: [
@@ -328,7 +330,9 @@ describe('SelectFilterPlugin', () => {
     userEvent.click(filterSelect);
     expect(await screen.findByRole('combobox')).toBeInTheDocument();
     await userEvent.type(screen.getByRole('combobox'), '1');
-    expect(screen.queryByLabelText(String(bigValue))).toBeInTheDocument();
+    expect(
+      await screen.findByRole('option', { name: String(bigValue) }),
+    ).toBeInTheDocument();
   });
 
   test('Is/Is Not select is visible when inverseSelection is true', () => {
diff --git a/superset-frontend/src/filters/components/Select/SelectFilterPlugin.tsx b/superset-frontend/src/filters/components/Select/SelectFilterPlugin.tsx
index bb05307cc58..baa52d58e48 100644
--- a/superset-frontend/src/filters/components/Select/SelectFilterPlugin.tsx
+++ b/superset-frontend/src/filters/components/Select/SelectFilterPlugin.tsx
@@ -31,18 +31,22 @@ import {
   tn,
   styled,
 } from '@superset-ui/core';
-// eslint-disable-next-line no-restricted-imports
-import { LabeledValue as AntdLabeledValue } from 'antd/lib/select'; // TODO: Remove antd
 import { debounce, isUndefined } from 'lodash';
 import { useImmerReducer } from 'use-immer';
-import { Select } from 'src/components';
-// eslint-disable-next-line no-restricted-imports
-import { Space } from 'antd'; // Import Space directly from antd
-import { SLOW_DEBOUNCE } from 'src/constants';
-import { hasOption, propertyComparator } from 'src/components/Select/utils';
+import {
+  FormItem,
+  LabeledValue,
+  Select,
+  Space,
+  Constants,
+} from '@superset-ui/core/components';
+import {
+  hasOption,
+  propertyComparator,
+} from '@superset-ui/core/components/Select/utils';
 import { FilterBarOrientation } from 'src/dashboard/types';
 import { getDataRecordFormatter, getSelectExtraFormData } from '../../utils';
-import { FilterPluginStyle, StatusMessage, StyledFormItem } from '../common';
+import { FilterPluginStyle, StatusMessage } from '../common';
 import { PluginFilterSelectProps, SelectValue } from './types';
 
 type DataMaskAction =
@@ -99,10 +103,7 @@ const StyledSpace = styled(Space)<{
 
   &.ant-space {
     .ant-space-item {
-      width: ${({ inverseSelection, appSection }) =>
-        !inverseSelection || appSection === AppSection.FilterConfigModal
-          ? '100%'
-          : 'auto'};
+      width: ${({ inverseSelection }) => (!inverseSelection ? '100%' : 'auto')};
     }
   }
 `;
@@ -130,6 +131,8 @@ export default function PluginFilterSelect(props: PluginFilterSelectProps) {
     parentRef,
     inputRef,
     filterBarOrientation,
+    clearAllTrigger,
+    onClearAllComplete,
   } = props;
   const {
     enableEmptyFilter,
@@ -250,7 +253,7 @@ export default function PluginFilterSelect(props: PluginFilterSelectProps) {
             },
           });
         }
-      }, SLOW_DEBOUNCE),
+      }, Constants.SLOW_DEBOUNCE),
     [dispatchDataMask, initialColtypeMap, searchAllOptions],
   );
 
@@ -269,7 +272,7 @@ export default function PluginFilterSelect(props: PluginFilterSelectProps) {
         updateDataMask(values);
       }
     },
-    [updateDataMask],
+    [updateDataMask, formData.nativeFilterId, clearAllTrigger],
   );
 
   const placeholderText =
@@ -309,7 +312,7 @@ export default function PluginFilterSelect(props: PluginFilterSelectProps) {
   }, [multiSelect, search, uniqueOptions]);
 
   const sortComparator = useCallback(
-    (a: AntdLabeledValue, b: AntdLabeledValue) => {
+    (a: LabeledValue, b: LabeledValue) => {
       const labelComparator = propertyComparator('label');
       if (formData.sortAscending) {
         return labelComparator(a, b);
@@ -369,6 +372,23 @@ export default function PluginFilterSelect(props: PluginFilterSelectProps) {
     setDataMask(dataMask);
   }, [JSON.stringify(dataMask)]);
 
+  useEffect(() => {
+    if (clearAllTrigger) {
+      dispatchDataMask({
+        type: 'filterState',
+        extraFormData: {},
+        filterState: {
+          value: undefined,
+          label: undefined,
+        },
+      });
+
+      updateDataMask(null);
+      setSearch('');
+      onClearAllComplete?.(formData.nativeFilterId);
+    }
+  }, [clearAllTrigger, onClearAllComplete, updateDataMask]);
+
   useEffect(() => {
     if (prevExcludeFilterValues.current !== excludeFilterValues) {
       dispatchDataMask({
@@ -398,7 +418,7 @@ export default function PluginFilterSelect(props: PluginFilterSelectProps) {
 
   return (
     <FilterPluginStyle height={height} width={width}>
-      <StyledFormItem
+      <FormItem
         validateStatus={filterState.validateStatus}
         extra={formItemExtra}
       >
@@ -447,11 +467,11 @@ export default function PluginFilterSelect(props: PluginFilterSelectProps) {
             invertSelection={inverseSelection && excludeFilterValues}
             options={options}
             sortComparator={sortComparator}
-            onDropdownVisibleChange={setFilterActive}
+            onOpenChange={setFilterActive}
             className="select-container"
           />
         </StyledSpace>
-      </StyledFormItem>
+      </FormItem>
     </FilterPluginStyle>
   );
 }
diff --git a/superset-frontend/src/filters/components/Select/transformProps.ts b/superset-frontend/src/filters/components/Select/transformProps.ts
index 2ed3d74ff09..6b40e61ef00 100644
--- a/superset-frontend/src/filters/components/Select/transformProps.ts
+++ b/superset-frontend/src/filters/components/Select/transformProps.ts
@@ -44,6 +44,8 @@ export default function transformProps(
     setFocusedFilter = noOp,
     unsetFocusedFilter = noOp,
     setFilterActive = noOp,
+    clearAllTrigger,
+    onClearAllComplete,
   } = hooks;
   const [queryData] = queriesData;
   const { colnames = [], coltypes = [], data = [] } = queryData || {};
@@ -71,5 +73,7 @@ export default function transformProps(
     inputRef,
     filterBarOrientation: displaySettings?.filterBarOrientation,
     isOverflowingFilterBar: displaySettings?.isOverflowingFilterBar,
+    clearAllTrigger,
+    onClearAllComplete,
   };
 }
diff --git a/superset-frontend/src/filters/components/Select/types.ts b/superset-frontend/src/filters/components/Select/types.ts
index 896bcf16cc6..60e618b62c0 100644
--- a/superset-frontend/src/filters/components/Select/types.ts
+++ b/superset-frontend/src/filters/components/Select/types.ts
@@ -65,6 +65,8 @@ export type PluginFilterSelectProps = PluginFilterStylesProps & {
   inputRef?: RefObject<any>;
   filterBarOrientation?: FilterBarOrientation;
   isOverflowingFilterBar?: boolean;
+  clearAllTrigger?: Record<string, boolean>;
+  onClearAllComplete?: (filterId: string) => void;
 } & PluginFilterHooks;
 
 export const DEFAULT_FORM_DATA: PluginFilterSelectCustomizeProps = {
diff --git a/superset-frontend/src/filters/components/Time/TimeFilterPlugin.tsx b/superset-frontend/src/filters/components/Time/TimeFilterPlugin.tsx
index d2edadf3d2a..15d2c8b446d 100644
--- a/superset-frontend/src/filters/components/Time/TimeFilterPlugin.tsx
+++ b/superset-frontend/src/filters/components/Time/TimeFilterPlugin.tsx
@@ -16,7 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { styled, NO_TIME_RANGE } from '@superset-ui/core';
+import {
+  styled,
+  NO_TIME_RANGE,
+  getExtensionsRegistry,
+} from '@superset-ui/core';
 import { useCallback, useEffect } from 'react';
 import DateFilterControl from 'src/explore/components/controls/DateFilterControl';
 import { PluginFilterTimeProps } from './types';
@@ -44,6 +48,9 @@ const ControlContainer = styled.div<{
     ${({ validateStatus, theme }) =>
       validateStatus && `border-color: ${theme.colors[validateStatus]?.base}`}
   }
+  & > div {
+    width: 100%;
+  }
 `;
 
 export default function TimeFilterPlugin(props: PluginFilterTimeProps) {
@@ -60,6 +67,12 @@ export default function TimeFilterPlugin(props: PluginFilterTimeProps) {
     inputRef,
     isOverflowingFilterBar = false,
   } = props;
+  const extensionsRegistry = getExtensionsRegistry();
+
+  const DateFilterControlExtension = extensionsRegistry.get(
+    'filter.dateFilterControl',
+  );
+  const DateFilterComponent = DateFilterControlExtension ?? DateFilterControl;
 
   const handleTimeRangeChange = useCallback(
     (timeRange?: string): void => {
@@ -92,7 +105,7 @@ export default function TimeFilterPlugin(props: PluginFilterTimeProps) {
         onMouseEnter={setHoveredFilter}
         onMouseLeave={unsetHoveredFilter}
       >
-        <DateFilterControl
+        <DateFilterComponent
           value={filterState.value || NO_TIME_RANGE}
           name={props.formData.nativeFilterId || 'time_range'}
           onChange={handleTimeRangeChange}
diff --git a/superset-frontend/src/filters/components/TimeColumn/TimeColumnFilterPlugin.tsx b/superset-frontend/src/filters/components/TimeColumn/TimeColumnFilterPlugin.tsx
index 0e456b35c08..80b1dff5c00 100644
--- a/superset-frontend/src/filters/components/TimeColumn/TimeColumnFilterPlugin.tsx
+++ b/superset-frontend/src/filters/components/TimeColumn/TimeColumnFilterPlugin.tsx
@@ -24,10 +24,12 @@ import {
   tn,
 } from '@superset-ui/core';
 import { useEffect, useState } from 'react';
-import { Select } from 'src/components';
-// eslint-disable-next-line no-restricted-imports
-import { FormItemProps } from 'antd/lib/form'; // TODO: Remove antd
-import { FilterPluginStyle, StyledFormItem, StatusMessage } from '../common';
+import {
+  FormItem,
+  type FormItemProps,
+  Select,
+} from '@superset-ui/core/components';
+import { FilterPluginStyle, StatusMessage } from '../common';
 import { PluginFilterTimeColumnProps } from './types';
 
 export default function PluginFilterTimeColumn(
@@ -107,10 +109,7 @@ export default function PluginFilterTimeColumn(
 
   return (
     <FilterPluginStyle height={height} width={width}>
-      <StyledFormItem
-        validateStatus={filterState.validateStatus}
-        {...formItemData}
-      >
+      <FormItem validateStatus={filterState.validateStatus} {...formItemData}>
         <Select
           name={formData.nativeFilterId}
           allowClear
@@ -124,9 +123,9 @@ export default function PluginFilterTimeColumn(
           onMouseLeave={unsetHoveredFilter}
           ref={inputRef}
           options={options}
-          onDropdownVisibleChange={setFilterActive}
+          onOpenChange={setFilterActive}
         />
-      </StyledFormItem>
+      </FormItem>
     </FilterPluginStyle>
   );
 }
diff --git a/superset-frontend/src/filters/components/TimeColumn/types.ts b/superset-frontend/src/filters/components/TimeColumn/types.ts
index 95b1e5edfdc..9767c53f129 100644
--- a/superset-frontend/src/filters/components/TimeColumn/types.ts
+++ b/superset-frontend/src/filters/components/TimeColumn/types.ts
@@ -23,6 +23,7 @@ import {
   QueryFormData,
 } from '@superset-ui/core';
 import { RefObject } from 'react';
+import type { RefSelectProps } from '@superset-ui/core/components';
 import { PluginFilterHooks, PluginFilterStylesProps } from '../types';
 
 interface PluginFilterTimeColumnCustomizeProps {
@@ -39,7 +40,7 @@ export type PluginFilterTimeColumnProps = PluginFilterStylesProps & {
   data: DataRecord[];
   filterState: FilterState;
   formData: PluginFilterTimeColumnQueryFormData;
-  inputRef: RefObject<HTMLInputElement>;
+  inputRef: RefObject<RefSelectProps>;
 } & PluginFilterHooks;
 
 export const DEFAULT_FORM_DATA: PluginFilterTimeColumnCustomizeProps = {
diff --git a/superset-frontend/src/filters/components/TimeGrain/TimeGrainFilterPlugin.tsx b/superset-frontend/src/filters/components/TimeGrain/TimeGrainFilterPlugin.tsx
index e8381f53e52..e3be55a8829 100644
--- a/superset-frontend/src/filters/components/TimeGrain/TimeGrainFilterPlugin.tsx
+++ b/superset-frontend/src/filters/components/TimeGrain/TimeGrainFilterPlugin.tsx
@@ -24,10 +24,12 @@ import {
   tn,
 } from '@superset-ui/core';
 import { useEffect, useMemo, useState } from 'react';
-import { Select } from 'src/components';
-// eslint-disable-next-line no-restricted-imports
-import { FormItemProps } from 'antd/lib/form'; // TODO: Remove antd
-import { FilterPluginStyle, StyledFormItem, StatusMessage } from '../common';
+import {
+  FormItem,
+  type FormItemProps,
+  Select,
+} from '@superset-ui/core/components';
+import { FilterPluginStyle, StatusMessage } from '../common';
 import { PluginFilterTimeGrainProps } from './types';
 
 export default function PluginFilterTimegrain(
@@ -117,10 +119,7 @@ export default function PluginFilterTimegrain(
 
   return (
     <FilterPluginStyle height={height} width={width}>
-      <StyledFormItem
-        validateStatus={filterState.validateStatus}
-        {...formItemData}
-      >
+      <FormItem validateStatus={filterState.validateStatus} {...formItemData}>
         <Select
           name={formData.nativeFilterId}
           allowClear
@@ -134,9 +133,9 @@ export default function PluginFilterTimegrain(
           onMouseLeave={unsetHoveredFilter}
           ref={inputRef}
           options={options}
-          onDropdownVisibleChange={setFilterActive}
+          onOpenChange={setFilterActive}
         />
-      </StyledFormItem>
+      </FormItem>
     </FilterPluginStyle>
   );
 }
diff --git a/superset-frontend/src/filters/components/TimeGrain/types.ts b/superset-frontend/src/filters/components/TimeGrain/types.ts
index 3dfa9a99d8d..611566f0d1d 100644
--- a/superset-frontend/src/filters/components/TimeGrain/types.ts
+++ b/superset-frontend/src/filters/components/TimeGrain/types.ts
@@ -18,6 +18,7 @@
  */
 import { FilterState, QueryFormData, DataRecord } from '@superset-ui/core';
 import { RefObject } from 'react';
+import type { RefSelectProps } from '@superset-ui/core/components';
 import { PluginFilterHooks, PluginFilterStylesProps } from '../types';
 
 interface PluginFilterTimeGrainCustomizeProps {
@@ -33,7 +34,7 @@ export type PluginFilterTimeGrainProps = PluginFilterStylesProps & {
   data: DataRecord[];
   filterState: FilterState;
   formData: PluginFilterTimeGrainQueryFormData;
-  inputRef: RefObject<HTMLInputElement>;
+  inputRef: RefObject<RefSelectProps>;
 } & PluginFilterHooks;
 
 export const DEFAULT_FORM_DATA: PluginFilterTimeGrainCustomizeProps = {
diff --git a/superset-frontend/src/filters/components/common.ts b/superset-frontend/src/filters/components/common.ts
index cb6d7f22f14..6ba9eabb144 100644
--- a/superset-frontend/src/filters/components/common.ts
+++ b/superset-frontend/src/filters/components/common.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 import { styled } from '@superset-ui/core';
+import { FormItem } from '@superset-ui/core/components';
 import { PluginFilterStylesProps } from './types';
-import FormItem from '../../components/Form/FormItem';
 
 export const RESPONSIVE_WIDTH = 0;
 
@@ -34,7 +34,13 @@ export const StyledFormItem = styled(FormItem)`
 `;
 
 export const StatusMessage = styled.div<{
-  status?: 'error' | 'warning' | 'info';
+  status?: 'error' | 'warning' | 'info' | 'help';
+  centerText?: boolean;
 }>`
-  color: ${({ theme, status = 'error' }) => theme.colors[status]?.base};
+  color: ${({ theme, status = 'error' }) =>
+    status === 'help'
+      ? theme.colors.grayscale.light1
+      : theme.colors[status]?.base};
+  text-align: ${({ centerText }) => (centerText ? 'center' : 'left')};
+  width: 100%;
 `;
diff --git a/superset-frontend/src/hooks/apiResources/dashboards.test.ts b/superset-frontend/src/hooks/apiResources/dashboards.test.ts
new file mode 100644
index 00000000000..3a6265163e0
--- /dev/null
+++ b/superset-frontend/src/hooks/apiResources/dashboards.test.ts
@@ -0,0 +1,89 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { renderHook } from '@testing-library/react-hooks';
+import fetchMock from 'fetch-mock';
+import { useDashboardDatasets } from './dashboards';
+
+describe('useDashboardDatasets', () => {
+  const mockDatasets = [
+    {
+      id: 1,
+      metrics: [
+        {
+          metric_name: 'count',
+          currency: { symbol: 'GBP', symbolPosition: 'prefix' },
+        },
+        {
+          metric_name: 'revenue',
+          currency: { symbol: 'USD', symbolPosition: 'suffix' },
+        },
+        { metric_name: 'no_currency' },
+      ],
+    },
+    {
+      id: 2,
+      metrics: [{ metric_name: 'no_currency' }],
+    },
+    {
+      id: 3,
+      metrics: [
+        {
+          metric_name: 'other_currency',
+          currency: { symbol: 'CNY', symbolPosition: 'suffix' },
+        },
+      ],
+    },
+  ];
+
+  beforeEach(() => {
+    fetchMock.reset();
+  });
+
+  it('adds currencyFormats to datasets', async () => {
+    fetchMock.get('glob:*/api/v1/dashboard/*/datasets', {
+      result: mockDatasets,
+    });
+
+    const { result, waitForNextUpdate } = renderHook(() =>
+      useDashboardDatasets(1),
+    );
+    await waitForNextUpdate();
+
+    const expectedContent = [
+      {
+        ...mockDatasets[0],
+        currencyFormats: {
+          count: { symbol: 'GBP', symbolPosition: 'prefix' },
+          revenue: { symbol: 'USD', symbolPosition: 'suffix' },
+        },
+      },
+      {
+        ...mockDatasets[1],
+        currencyFormats: {},
+      },
+      {
+        ...mockDatasets[2],
+        currencyFormats: {
+          other_currency: { symbol: 'CNY', symbolPosition: 'suffix' },
+        },
+      },
+    ];
+    expect(result.current.result).toEqual(expectedContent);
+  });
+});
diff --git a/superset-frontend/src/hooks/apiResources/dashboards.ts b/superset-frontend/src/hooks/apiResources/dashboards.ts
index 61896ba1309..65e4b1c0bdd 100644
--- a/superset-frontend/src/hooks/apiResources/dashboards.ts
+++ b/superset-frontend/src/hooks/apiResources/dashboards.ts
@@ -19,6 +19,7 @@
 
 import { Dashboard, Datasource, EmbeddedDashboard } from 'src/dashboard/types';
 import { Chart } from 'src/types/Chart';
+import { Currency } from '@superset-ui/core';
 import { useApiV1Resource, useTransformedResource } from './apiResources';
 
 export const useDashboard = (idOrSlug: string | number) =>
@@ -43,7 +44,21 @@ export const useDashboardCharts = (idOrSlug: string | number) =>
 // important: this endpoint only returns the fields in the dataset
 // that are necessary for rendering the given dashboard
 export const useDashboardDatasets = (idOrSlug: string | number) =>
-  useApiV1Resource<Datasource[]>(`/api/v1/dashboard/${idOrSlug}/datasets`);
+  useTransformedResource(
+    useApiV1Resource<Datasource[]>(`/api/v1/dashboard/${idOrSlug}/datasets`),
+    datasets =>
+      datasets.map(dataset => ({
+        ...dataset,
+        currencyFormats: Object.fromEntries(
+          (dataset.metrics ?? [])
+            .filter(metric => !!metric.currency)
+            .map((metric): [string, Currency] => [
+              metric.metric_name,
+              metric.currency!,
+            ]),
+        ),
+      })),
+  );
 
 export const useEmbeddedDashboard = (idOrSlug: string | number) =>
   useApiV1Resource<EmbeddedDashboard>(`/api/v1/dashboard/${idOrSlug}/embedded`);
diff --git a/superset-frontend/src/hooks/useDebounceValue.ts b/superset-frontend/src/hooks/useDebounceValue.ts
index 862c8377077..fc8ba57eda3 100644
--- a/superset-frontend/src/hooks/useDebounceValue.ts
+++ b/superset-frontend/src/hooks/useDebounceValue.ts
@@ -17,9 +17,9 @@
  * under the License.
  */
 import { useState, useEffect } from 'react';
-import { FAST_DEBOUNCE } from 'src/constants';
+import { Constants } from '@superset-ui/core/components';
 
-export function useDebounceValue<T>(value: T, delay = FAST_DEBOUNCE) {
+export function useDebounceValue<T>(value: T, delay = Constants.FAST_DEBOUNCE) {
   const [debouncedValue, setDebouncedValue] = useState<T>(value);
 
   useEffect(() => {
diff --git a/superset-frontend/src/hooks/useJsonTreeTheme.ts b/superset-frontend/src/hooks/useJsonTreeTheme.ts
index a052e22a639..d9145a6c77a 100644
--- a/superset-frontend/src/hooks/useJsonTreeTheme.ts
+++ b/superset-frontend/src/hooks/useJsonTreeTheme.ts
@@ -20,22 +20,23 @@ import { useTheme } from '@superset-ui/core';
 
 export const useJsonTreeTheme = () => {
   const theme = useTheme();
+
   return {
-    base00: theme.colors.grayscale.dark2,
-    base01: theme.colors.grayscale.dark1,
-    base02: theme.colors.grayscale.base,
-    base03: theme.colors.grayscale.light1,
-    base04: theme.colors.grayscale.light2,
-    base05: theme.colors.grayscale.light3,
-    base06: theme.colors.grayscale.light4,
-    base07: theme.colors.grayscale.light5,
-    base08: theme.colors.error.base,
-    base09: theme.colors.error.light1,
-    base0A: theme.colors.error.light2,
-    base0B: theme.colors.success.base,
-    base0C: theme.colors.primary.light1,
-    base0D: theme.colors.primary.base,
-    base0E: theme.colors.primary.dark1,
-    base0F: theme.colors.error.dark1,
+    base00: theme.colorBgContainer,
+    base01: theme.colorBgLayout,
+    base02: theme.colorBorder,
+    base03: theme.colorBorder,
+    base04: theme.colorText,
+    base05: theme.colorText,
+    base06: theme.colorText,
+    base07: theme.colorText,
+    base08: theme.colorError,
+    base09: theme.colorErrorHover,
+    base0A: theme.colorErrorText,
+    base0B: theme.colorSuccess,
+    base0C: theme.colorPrimaryBgHover,
+    base0D: theme.colorPrimary,
+    base0E: theme.colorPrimaryActive,
+    base0F: theme.colorErrorText,
   };
 };
diff --git a/superset-frontend/src/hooks/useLocale.ts b/superset-frontend/src/hooks/useLocale.ts
index 4a30db19fde..c17b528fc7f 100644
--- a/superset-frontend/src/hooks/useLocale.ts
+++ b/superset-frontend/src/hooks/useLocale.ts
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-import { Locale } from 'antd-v5/es/locale';
 import dayjs from 'dayjs';
 import { useEffect, useState } from 'react';
 import { useSelector } from 'react-redux';
@@ -37,22 +36,26 @@ import 'dayjs/locale/sk';
 import 'dayjs/locale/sl';
 import 'dayjs/locale/nl';
 
+/* eslint-disable no-restricted-imports */
+import { Locale } from 'antd/es/locale';
+
 export const LOCALE_MAPPING = {
-  en: () => import('antd-v5/locale/en_US'),
-  fr: () => import('antd-v5/locale/fr_FR'),
-  es: () => import('antd-v5/locale/es_ES'),
-  it: () => import('antd-v5/locale/it_IT'),
-  zh: () => import('antd-v5/locale/zh_CN'),
-  ja: () => import('antd-v5/locale/ja_JP'),
-  de: () => import('antd-v5/locale/de_DE'),
-  pt: () => import('antd-v5/locale/pt_PT'),
-  pt_BR: () => import('antd-v5/locale/pt_BR'),
-  ru: () => import('antd-v5/locale/ru_RU'),
-  ko: () => import('antd-v5/locale/ko_KR'),
-  sk: () => import('antd-v5/locale/sk_SK'),
-  sl: () => import('antd-v5/locale/sl_SI'),
-  nl: () => import('antd-v5/locale/nl_NL'),
+  en: () => import('antd/locale/en_US'),
+  fr: () => import('antd/locale/fr_FR'),
+  es: () => import('antd/locale/es_ES'),
+  it: () => import('antd/locale/it_IT'),
+  zh: () => import('antd/locale/zh_CN'),
+  ja: () => import('antd/locale/ja_JP'),
+  de: () => import('antd/locale/de_DE'),
+  pt: () => import('antd/locale/pt_PT'),
+  pt_BR: () => import('antd/locale/pt_BR'),
+  ru: () => import('antd/locale/ru_RU'),
+  ko: () => import('antd/locale/ko_KR'),
+  sk: () => import('antd/locale/sk_SK'),
+  sl: () => import('antd/locale/sl_SI'),
+  nl: () => import('antd/locale/nl_NL'),
 };
+/* eslint-enable no-restricted-imports */
 
 export const useLocale = (): Locale | undefined | null => {
   const [datePickerLocale, setDatePickerLocale] = useState<
diff --git a/superset-frontend/src/hooks/useOpenerRef.ts b/superset-frontend/src/hooks/useOpenerRef.ts
new file mode 100644
index 00000000000..be4b115ede5
--- /dev/null
+++ b/superset-frontend/src/hooks/useOpenerRef.ts
@@ -0,0 +1,32 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { useEffect, useRef } from 'react';
+
+export function useOpenerRef(active: boolean) {
+  const openerRef = useRef<HTMLElement | null>(null);
+
+  useEffect(() => {
+    if (active) {
+      openerRef.current = document.activeElement as HTMLElement;
+    }
+  }, [active]);
+
+  return openerRef;
+}
diff --git a/superset-frontend/src/hooks/useUnsavedChangesPrompt/index.ts b/superset-frontend/src/hooks/useUnsavedChangesPrompt/index.ts
new file mode 100644
index 00000000000..b09adece6af
--- /dev/null
+++ b/superset-frontend/src/hooks/useUnsavedChangesPrompt/index.ts
@@ -0,0 +1,124 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { getClientErrorObject, t } from '@superset-ui/core';
+import { useEffect, useRef, useCallback, useState } from 'react';
+import { useHistory } from 'react-router-dom';
+
+type UseUnsavedChangesPromptProps = {
+  hasUnsavedChanges: boolean;
+  onSave: () => Promise<void> | void;
+  isSaveModalVisible?: boolean;
+  manualSaveOnUnsavedChanges?: boolean;
+};
+
+export const useUnsavedChangesPrompt = ({
+  hasUnsavedChanges,
+  onSave,
+  isSaveModalVisible = false,
+  manualSaveOnUnsavedChanges = false,
+}: UseUnsavedChangesPromptProps) => {
+  const history = useHistory();
+  const [showModal, setShowModal] = useState(false);
+
+  const confirmNavigationRef = useRef<(() => void) | null>(null);
+  const unblockRef = useRef<() => void>(() => {});
+  const manualSaveRef = useRef(false); // Track if save was user-initiated (not via navigation)
+
+  const handleConfirmNavigation = useCallback(() => {
+    confirmNavigationRef.current?.();
+  }, []);
+
+  const handleSaveAndCloseModal = useCallback(async () => {
+    try {
+      if (manualSaveOnUnsavedChanges) manualSaveRef.current = true;
+
+      await onSave();
+      setShowModal(false);
+    } catch (err) {
+      const clientError = await getClientErrorObject(err);
+      throw new Error(
+        clientError.message ||
+          clientError.error ||
+          t('Sorry, an error occurred'),
+        { cause: err },
+      );
+    }
+  }, [manualSaveOnUnsavedChanges, onSave]);
+
+  const triggerManualSave = useCallback(() => {
+    manualSaveRef.current = true;
+    onSave();
+  }, [onSave]);
+
+  const blockCallback = useCallback(
+    ({ pathname }: { pathname: string }) => {
+      if (manualSaveRef.current) {
+        manualSaveRef.current = false;
+        return undefined;
+      }
+
+      confirmNavigationRef.current = () => {
+        unblockRef.current?.();
+        history.push(pathname);
+      };
+
+      setShowModal(true);
+      return false;
+    },
+    [history],
+  );
+
+  useEffect(() => {
+    if (!hasUnsavedChanges) return undefined;
+
+    const unblock = history.block(blockCallback);
+    unblockRef.current = unblock;
+
+    return () => unblock();
+  }, [blockCallback, hasUnsavedChanges, history]);
+
+  useEffect(() => {
+    const handleBeforeUnload = (event: BeforeUnloadEvent) => {
+      if (!hasUnsavedChanges) return;
+      event.preventDefault();
+
+      // Most browsers require a "returnValue" set to empty string
+      const evt = event as any;
+      evt.returnValue = '';
+    };
+
+    window.addEventListener('beforeunload', handleBeforeUnload);
+    return () => window.removeEventListener('beforeunload', handleBeforeUnload);
+  }, [hasUnsavedChanges]);
+
+  useEffect(() => {
+    if (!isSaveModalVisible && manualSaveRef.current) {
+      setShowModal(false);
+      manualSaveRef.current = false;
+    }
+  }, [isSaveModalVisible]);
+
+  return {
+    showModal,
+    setShowModal,
+    handleConfirmNavigation,
+    handleSaveAndCloseModal,
+    triggerManualSave,
+  };
+};
diff --git a/superset-frontend/src/hooks/useUnsavedChangesPrompt/useUnsavedChangesPrompt.test.tsx b/superset-frontend/src/hooks/useUnsavedChangesPrompt/useUnsavedChangesPrompt.test.tsx
new file mode 100644
index 00000000000..bc42cdcfc91
--- /dev/null
+++ b/superset-frontend/src/hooks/useUnsavedChangesPrompt/useUnsavedChangesPrompt.test.tsx
@@ -0,0 +1,106 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { renderHook } from '@testing-library/react-hooks';
+import { useUnsavedChangesPrompt } from 'src/hooks/useUnsavedChangesPrompt';
+import { Router } from 'react-router-dom';
+import { createMemoryHistory } from 'history';
+import { act } from 'spec/helpers/testing-library';
+
+const history = createMemoryHistory({
+  initialEntries: ['/dashboard'],
+});
+
+const wrapper = ({ children }: { children: React.ReactNode }) => (
+  <Router history={history}>{children}</Router>
+);
+
+describe('useUnsavedChangesPrompt', () => {
+  it('should not show modal initially', () => {
+    const { result } = renderHook(
+      () =>
+        useUnsavedChangesPrompt({
+          hasUnsavedChanges: true,
+          onSave: jest.fn(),
+        }),
+      { wrapper },
+    );
+
+    expect(result.current.showModal).toBe(false);
+  });
+
+  it('should block navigation and show modal if there are unsaved changes', () => {
+    const { result } = renderHook(
+      () =>
+        useUnsavedChangesPrompt({
+          hasUnsavedChanges: true,
+          onSave: jest.fn(),
+        }),
+      { wrapper },
+    );
+
+    // Simulate blocked navigation
+    act(() => {
+      const unblock = history.block((tx: any) => tx);
+      unblock();
+      history.push('/another-page');
+    });
+
+    expect(result.current.showModal).toBe(true);
+  });
+
+  it('should trigger onSave and hide modal on handleSaveAndCloseModal', async () => {
+    const onSave = jest.fn().mockResolvedValue(undefined);
+
+    const { result } = renderHook(
+      () =>
+        useUnsavedChangesPrompt({
+          hasUnsavedChanges: true,
+          onSave,
+        }),
+      { wrapper },
+    );
+
+    await act(async () => {
+      await result.current.handleSaveAndCloseModal();
+    });
+
+    expect(onSave).toHaveBeenCalled();
+    expect(result.current.showModal).toBe(false);
+  });
+
+  it('should trigger manual save and not show modal again', async () => {
+    const onSave = jest.fn().mockResolvedValue(undefined);
+
+    const { result } = renderHook(
+      () =>
+        useUnsavedChangesPrompt({
+          hasUnsavedChanges: true,
+          onSave,
+        }),
+      { wrapper },
+    );
+
+    act(() => {
+      result.current.triggerManualSave();
+    });
+
+    expect(onSave).toHaveBeenCalled();
+    expect(result.current.showModal).toBe(false);
+  });
+});
diff --git a/superset-frontend/src/middleware/asyncEvent.test.ts b/superset-frontend/src/middleware/asyncEvent.test.ts
index e49472cc6dc..34afd66b7c8 100644
--- a/superset-frontend/src/middleware/asyncEvent.test.ts
+++ b/superset-frontend/src/middleware/asyncEvent.test.ts
@@ -120,9 +120,9 @@ describe('asyncEvent middleware', () => {
     });
 
     it('resolves with chart data on event done status', async () => {
-      await expect(
-        asyncEvent.waitForAsyncData(asyncPendingEvent),
-      ).resolves.toEqual([chartData]);
+      const actualResolved =
+        await asyncEvent.waitForAsyncData(asyncPendingEvent);
+      expect(actualResolved).toEqual([chartData]);
 
       expect(fetchMock.calls(EVENTS_ENDPOINT)).toHaveLength(1);
       expect(fetchMock.calls(CACHED_DATA_ENDPOINT)).toHaveLength(1);
@@ -134,10 +134,15 @@ describe('asyncEvent middleware', () => {
         status: 200,
         body: { result: [asyncErrorEvent] },
       });
-      const errorResponse = await parseErrorJson(asyncErrorEvent);
-      await expect(
-        asyncEvent.waitForAsyncData(asyncPendingEvent),
-      ).rejects.toEqual(errorResponse);
+      const errorResponse = parseErrorJson(asyncErrorEvent);
+      let error: any = null;
+      try {
+        await asyncEvent.waitForAsyncData(asyncPendingEvent);
+      } catch (err) {
+        error = err;
+      } finally {
+        expect(error).toEqual(errorResponse);
+      }
 
       expect(fetchMock.calls(EVENTS_ENDPOINT)).toHaveLength(1);
       expect(fetchMock.calls(CACHED_DATA_ENDPOINT)).toHaveLength(0);
@@ -153,10 +158,14 @@ describe('asyncEvent middleware', () => {
         status: 400,
       });
 
-      const errorResponse = [{ error: 'Bad Request' }];
-      await expect(
-        asyncEvent.waitForAsyncData(asyncPendingEvent),
-      ).rejects.toEqual(errorResponse);
+      let error = '';
+      try {
+        await asyncEvent.waitForAsyncData(asyncPendingEvent);
+      } catch (err) {
+        [{ error }] = err;
+      } finally {
+        expect(error).toEqual('Bad request');
+      }
 
       expect(fetchMock.calls(EVENTS_ENDPOINT)).toHaveLength(1);
       expect(fetchMock.calls(CACHED_DATA_ENDPOINT)).toHaveLength(1);
@@ -209,7 +218,7 @@ describe('asyncEvent middleware', () => {
 
       wsServer.send(JSON.stringify(asyncErrorEvent));
 
-      const errorResponse = await parseErrorJson(asyncErrorEvent);
+      const errorResponse = parseErrorJson(asyncErrorEvent);
 
       await expect(promise).rejects.toEqual(errorResponse);
 
@@ -229,9 +238,14 @@ describe('asyncEvent middleware', () => {
 
       wsServer.send(JSON.stringify(asyncDoneEvent));
 
-      const errorResponse = [{ error: 'Bad Request' }];
-
-      await expect(promise).rejects.toEqual(errorResponse);
+      let error = '';
+      try {
+        await promise;
+      } catch (err) {
+        [{ error }] = err;
+      } finally {
+        expect(error).toEqual('Bad request');
+      }
 
       expect(fetchMock.calls(CACHED_DATA_ENDPOINT)).toHaveLength(1);
       expect(fetchMock.calls(EVENTS_ENDPOINT)).toHaveLength(0);
diff --git a/superset-frontend/src/pages/ActionLog/index.tsx b/superset-frontend/src/pages/ActionLog/index.tsx
index 7c2f708ddb7..f48d583b830 100644
--- a/superset-frontend/src/pages/ActionLog/index.tsx
+++ b/superset-frontend/src/pages/ActionLog/index.tsx
@@ -21,9 +21,12 @@ import { t, css } from '@superset-ui/core';
 import SubMenu, { SubMenuProps } from 'src/features/home/SubMenu';
 import { useListViewResource } from 'src/views/CRUD/hooks';
 import { useToasts } from 'src/components/MessageToasts/withToasts';
-import ListView, { Filters, FilterOperator } from 'src/components/ListView';
-// eslint-disable-next-line no-restricted-imports
-import { Typography } from 'antd-v5';
+import {
+  ListView,
+  ListViewFilterOperator,
+  type ListViewFilter,
+} from 'src/components/ListView';
+import { Typography } from '@superset-ui/core/components';
 import { fetchUserOptions } from 'src/features/groups/utils';
 
 export type ActionLogObject = {
@@ -62,52 +65,55 @@ function ActionLogList() {
     addDangerToast,
     false,
   );
-  const filters: Filters = useMemo(
+  const filters: ListViewFilter[] = useMemo(
     () => [
       {
         Header: t('Users'),
         key: 'user',
         id: 'user',
         input: 'select',
-        operator: FilterOperator.RelationOneMany,
+        operator: ListViewFilterOperator.RelationOneMany,
         unfilteredLabel: t('All'),
-        fetchSelects: async (filterValue, page, pageSize) =>
-          fetchUserOptions(filterValue, page, pageSize, addDangerToast),
+        fetchSelects: async (
+          filterValue: string,
+          page: number,
+          pageSize: number,
+        ) => fetchUserOptions(filterValue, page, pageSize, addDangerToast),
       },
       {
         Header: t('Dashboard Id'),
         key: 'dashboard_id',
         id: 'dashboard_id',
         input: 'search',
-        operator: FilterOperator.Equals,
+        operator: ListViewFilterOperator.Equals,
       },
       {
         Header: t('Slice Id'),
         key: 'slice_id',
         id: 'slice_id',
         input: 'search',
-        operator: FilterOperator.Equals,
+        operator: ListViewFilterOperator.Equals,
       },
       {
         Header: t('Action'),
         key: 'action',
         id: 'action',
         input: 'search',
-        operator: FilterOperator.Contains,
+        operator: ListViewFilterOperator.Contains,
       },
       {
         Header: t('JSON'),
         key: 'json',
         id: 'json',
         input: 'search',
-        operator: FilterOperator.Contains,
+        operator: ListViewFilterOperator.Contains,
       },
       {
         Header: t('dttm'),
         key: 'dttm',
         id: 'dttm',
         input: 'datetime_range',
-        operator: FilterOperator.Between,
+        operator: ListViewFilterOperator.Between,
         dateFilterValueType: 'iso',
       },
       {
@@ -115,14 +121,14 @@ function ActionLogList() {
         key: 'referrer',
         id: 'referrer',
         input: 'search',
-        operator: FilterOperator.Equals,
+        operator: ListViewFilterOperator.Equals,
       },
       {
         Header: t('Duration Ms'),
         key: 'duration_ms',
         id: 'duration_ms',
         input: 'search',
-        operator: FilterOperator.Equals,
+        operator: ListViewFilterOperator.Equals,
       },
     ],
     [],
diff --git a/superset-frontend/src/pages/AlertReportList/AlertReportList.test.jsx b/superset-frontend/src/pages/AlertReportList/AlertReportList.test.jsx
index ffa5717279a..da5e4b2a7b5 100644
--- a/superset-frontend/src/pages/AlertReportList/AlertReportList.test.jsx
+++ b/superset-frontend/src/pages/AlertReportList/AlertReportList.test.jsx
@@ -232,4 +232,45 @@ describe('AlertList', () => {
       'filters:!((col:type,opr:eq,value:Report))',
     );
   }, 15000);
+
+  it('renders listview table correctly', async () => {
+    renderAlertList();
+    await screen.findByTestId('alerts-list-view');
+
+    const table = await screen.findByTestId('listview-table');
+    expect(table).toBeInTheDocument();
+    expect(table).toBeVisible();
+  }, 15000);
+
+  it('renders correct column headers for alerts', async () => {
+    renderAlertList();
+    await screen.findByTestId('alerts-list-view');
+
+    expect(screen.getByText('Last run')).toBeInTheDocument();
+    expect(
+      screen.getByRole('columnheader', { name: /name/i }),
+    ).toBeInTheDocument();
+    expect(screen.getByText('Schedule')).toBeInTheDocument();
+    expect(screen.getByText('Notification method')).toBeInTheDocument();
+    expect(screen.getByText('Owners')).toBeInTheDocument();
+    expect(screen.getByText('Last modified')).toBeInTheDocument();
+    expect(screen.getByText('Active')).toBeInTheDocument();
+    expect(screen.getByText('Actions')).toBeInTheDocument();
+  }, 15000);
+
+  it('renders correct column headers for reports', async () => {
+    renderAlertList({ isReportEnabled: true });
+    await screen.findByTestId('alerts-list-view');
+
+    expect(screen.getByText('Last run')).toBeInTheDocument();
+    expect(
+      screen.getByRole('columnheader', { name: /name/i }),
+    ).toBeInTheDocument();
+    expect(screen.getByText('Schedule')).toBeInTheDocument();
+    expect(screen.getByText('Notification method')).toBeInTheDocument();
+    expect(screen.getByText('Owners')).toBeInTheDocument();
+    expect(screen.getByText('Last modified')).toBeInTheDocument();
+    expect(screen.getByText('Active')).toBeInTheDocument();
+    expect(screen.getByText('Actions')).toBeInTheDocument();
+  }, 15000);
 });
diff --git a/superset-frontend/src/pages/AlertReportList/index.tsx b/superset-frontend/src/pages/AlertReportList/index.tsx
index 2d24444d240..0efc4668ab8 100644
--- a/superset-frontend/src/pages/AlertReportList/index.tsx
+++ b/superset-frontend/src/pages/AlertReportList/index.tsx
@@ -21,31 +21,34 @@ import { useState, useMemo, useEffect, useCallback } from 'react';
 import { useHistory } from 'react-router-dom';
 import {
   t,
-  css,
-  useTheme,
   SupersetClient,
   makeApi,
   styled,
   getExtensionsRegistry,
 } from '@superset-ui/core';
-import { extendedDayjs } from 'src/utils/dates';
-import ActionsBar, { ActionProps } from 'src/components/ListView/ActionsBar';
-import FacePile from 'src/components/FacePile';
-import { Tooltip } from 'src/components/Tooltip';
-import ListView, {
-  FilterOperator,
-  Filters,
-  ListViewProps,
-} from 'src/components/ListView';
+import { extendedDayjs } from '@superset-ui/core/utils/dates';
+import {
+  Tooltip,
+  ConfirmStatusChange,
+  DeleteModal,
+  LastUpdated,
+} from '@superset-ui/core/components';
+import {
+  FacePile,
+  ModifiedInfo,
+  ListView,
+  ListViewFilterOperator as FilterOperator,
+  ListViewActionsBar,
+  type ListViewActionProps,
+  type ListViewProps,
+  type ListViewFilters,
+} from 'src/components';
 import SubMenu, { SubMenuProps } from 'src/features/home/SubMenu';
-import { Switch } from 'src/components/Switch';
+import { Switch } from '@superset-ui/core/components/Switch';
 import { DATETIME_WITH_TIME_ZONE } from 'src/constants';
 import withToasts from 'src/components/MessageToasts/withToasts';
 import AlertStatusIcon from 'src/features/alerts/components/AlertStatusIcon';
 import RecipientIcon from 'src/features/alerts/components/RecipientIcon';
-import ConfirmStatusChange from 'src/components/ConfirmStatusChange';
-import DeleteModal from 'src/components/DeleteModal';
-import LastUpdated from 'src/components/LastUpdated';
 import {
   useListViewResource,
   useSingleViewResource,
@@ -55,9 +58,9 @@ import { isUserAdmin } from 'src/dashboard/util/permissionUtils';
 import Owner from 'src/types/Owner';
 import AlertReportModal from 'src/features/alerts/AlertReportModal';
 import { AlertObject, AlertState } from 'src/features/alerts/types';
-import { ModifiedInfo } from 'src/components/AuditInfo';
 import { QueryObjectColumns } from 'src/views/CRUD/types';
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
+import { WIDER_DROPDOWN_WIDTH } from 'src/components/ListView/utils';
 
 const extensionsRegistry = getExtensionsRegistry();
 
@@ -89,8 +92,8 @@ const deleteAlerts = makeApi<number[], { message: string }>({
 
 const RefreshContainer = styled.div`
   width: 100%;
-  padding: 0 ${({ theme }) => theme.gridUnit * 4}px
-    ${({ theme }) => theme.gridUnit * 3}px;
+  padding: 0 ${({ theme }) => theme.sizeUnit * 4}px
+    ${({ theme }) => theme.sizeUnit * 3}px;
   background-color: ${({ theme }) => theme.colors.grayscale.light5};
 `;
 
@@ -100,7 +103,7 @@ const StyledHeaderWithIcon = styled.div`
   justify-content: space-between;
   align-items: center;
   > *:first-child {
-    margin-right: ${({ theme }) => theme.gridUnit}px;
+    margin-right: ${({ theme }) => theme.sizeUnit}px;
   }
 `;
 
@@ -112,7 +115,6 @@ function AlertList({
   user,
   addSuccessToast,
 }: AlertListProps) {
-  const theme = useTheme();
   const title = isReportEnabled ? t('Report') : t('Alert');
   const titlePlural = isReportEnabled ? t('reports') : t('alerts');
   const pathName = isReportEnabled ? 'Reports' : 'Alerts';
@@ -259,6 +261,7 @@ function AlertList({
         accessor: 'last_state',
         size: 'xs',
         disableSortBy: true,
+        id: 'last_state',
       },
       {
         Cell: ({
@@ -275,11 +278,13 @@ function AlertList({
         accessor: 'last_eval_dttm',
         Header: t('Last run'),
         size: 'lg',
+        id: 'last_eval_dttm',
       },
       {
         accessor: 'name',
         Header: t('Name'),
         size: 'xl',
+        id: 'name',
       },
       {
         Header: t('Schedule'),
@@ -297,6 +302,7 @@ function AlertList({
             <span>{`${crontab_humanized} (${timezone})`}</span>
           </Tooltip>
         ),
+        id: 'crontab_humanized',
       },
       {
         Cell: ({
@@ -311,6 +317,7 @@ function AlertList({
         Header: t('Notification method'),
         disableSortBy: true,
         size: 'xl',
+        id: 'recipients',
       },
       {
         Cell: ({
@@ -335,6 +342,7 @@ function AlertList({
         Header: t('Last modified'),
         accessor: 'changed_on_delta_humanized',
         size: 'xl',
+        id: 'changed_on_delta_humanized',
       },
       {
         Cell: ({ row: { original } }: any) => {
@@ -399,7 +407,9 @@ function AlertList({
               : null,
           ].filter(item => item !== null);
 
-          return <ActionsBar actions={actions as ActionProps[]} />;
+          return (
+            <ListViewActionsBar actions={actions as ListViewActionProps[]} />
+          );
         },
         Header: t('Actions'),
         id: 'actions',
@@ -410,6 +420,7 @@ function AlertList({
       {
         accessor: QueryObjectColumns.ChangedBy,
         hidden: true,
+        id: QueryObjectColumns.ChangedBy,
       },
     ],
     [canDelete, canEdit, isReportEnabled, toggleActive],
@@ -421,14 +432,7 @@ function AlertList({
     subMenuButtons.push({
       name: (
         <>
-          <Icons.PlusOutlined
-            iconColor={theme.colors.primary.light5}
-            iconSize="m"
-            css={css`
-              margin: auto ${theme.gridUnit * 2}px auto 0;
-              vertical-align: text-top;
-            `}
-          />
+          <Icons.PlusOutlined iconSize="m" />
           {title}
         </>
       ),
@@ -454,12 +458,7 @@ function AlertList({
     buttonText: canCreate ? (
       <>
         <Icons.PlusOutlined
-          iconColor={theme.colors.primary.light5}
           iconSize="m"
-          css={css`
-            margin: auto ${theme.gridUnit * 2}px auto 0;
-            vertical-align: text-top;
-          `}
           data-test="add-annotation-layer-button"
         />
         {title}{' '}
@@ -467,7 +466,7 @@ function AlertList({
     ) : null,
   };
 
-  const filters: Filters = useMemo(
+  const filters: ListViewFilters = useMemo(
     () => [
       {
         Header: t('Name'),
@@ -492,6 +491,7 @@ function AlertList({
           user,
         ),
         paginate: true,
+        dropdownStyle: { minWidth: WIDER_DROPDOWN_WIDTH },
       },
       {
         Header: t('Status'),
@@ -533,6 +533,7 @@ function AlertList({
           user,
         ),
         paginate: true,
+        dropdownStyle: { minWidth: WIDER_DROPDOWN_WIDTH },
       },
     ],
     [],
@@ -559,6 +560,8 @@ function AlertList({
             url: '/alert/list/',
             usesRouter: true,
             'data-test': 'alert-list',
+            id: 'alert-tab',
+            'aria-controls': 'alert-list',
           },
           {
             name: 'Reports',
@@ -566,6 +569,8 @@ function AlertList({
             url: '/report/list/',
             usesRouter: true,
             'data-test': 'report-list',
+            id: 'report-tab',
+            'aria-controls': 'report-list',
           },
         ]}
         buttons={subMenuButtons}
@@ -623,24 +628,30 @@ function AlertList({
               ]
             : [];
           return (
-            <ListView<AlertObject>
-              className="alerts-list-view"
-              columns={columns}
-              count={alertsCount}
-              data={alerts}
-              emptyState={emptyState}
-              fetchData={fetchData}
-              filters={filters}
-              initialSort={initialSort}
-              loading={loading}
-              bulkActions={bulkActions}
-              bulkSelectEnabled={bulkSelectEnabled}
-              disableBulkSelect={toggleBulkSelect}
-              refreshData={refreshData}
-              addDangerToast={addDangerToast}
-              addSuccessToast={addSuccessToast}
-              pageSize={PAGE_SIZE}
-            />
+            <div
+              id={isReportEnabled ? 'report-list' : 'alert-list'}
+              role="tabpanel"
+              aria-labelledby={isReportEnabled ? 'report-tab' : 'alert-tab'}
+            >
+              <ListView<AlertObject>
+                className="alerts-list-view"
+                columns={columns}
+                count={alertsCount}
+                data={alerts}
+                emptyState={emptyState}
+                fetchData={fetchData}
+                filters={filters}
+                initialSort={initialSort}
+                loading={loading}
+                bulkActions={bulkActions}
+                bulkSelectEnabled={bulkSelectEnabled}
+                disableBulkSelect={toggleBulkSelect}
+                refreshData={refreshData}
+                addDangerToast={addDangerToast}
+                addSuccessToast={addSuccessToast}
+                pageSize={PAGE_SIZE}
+              />
+            </div>
           );
         }}
       </ConfirmStatusChange>
diff --git a/superset-frontend/src/pages/AllEntities/index.tsx b/superset-frontend/src/pages/AllEntities/index.tsx
index 40e1f552ea8..659b32164a4 100644
--- a/superset-frontend/src/pages/AllEntities/index.tsx
+++ b/superset-frontend/src/pages/AllEntities/index.tsx
@@ -20,19 +20,18 @@ import { useEffect, useState } from 'react';
 import { styled, t, css, SupersetTheme } from '@superset-ui/core';
 import { NumberParam, useQueryParam } from 'use-query-params';
 import AllEntitiesTable from 'src/features/allEntities/AllEntitiesTable';
-import Button from 'src/components/Button';
+import { Button, Loading } from '@superset-ui/core/components';
 import MetadataBar, {
   MetadataType,
   Description,
   Owner,
   LastModified,
-} from 'src/components/MetadataBar';
-import { PageHeaderWithActions } from 'src/components/PageHeaderWithActions';
+} from '@superset-ui/core/components/MetadataBar';
+import { PageHeaderWithActions } from '@superset-ui/core/components/PageHeaderWithActions';
 import { Tag } from 'src/views/CRUD/types';
 import TagModal from 'src/features/tags/TagModal';
 import withToasts, { useToasts } from 'src/components/MessageToasts/withToasts';
 import { fetchObjectsByTagIds, fetchSingleTag } from 'src/features/tags/tags';
-import Loading from 'src/components/Loading';
 import getOwnerName from 'src/utils/getOwnerName';
 import { TaggedObject, TaggedObjects } from 'src/types/TaggedObject';
 import { findPermission } from 'src/utils/findPermission';
@@ -42,9 +41,9 @@ import { RootState } from 'src/dashboard/types';
 const additionalItemsStyles = (theme: SupersetTheme) => css`
   display: flex;
   align-items: center;
-  margin-left: ${theme.gridUnit}px;
+  margin-left: ${theme.sizeUnit}px;
   & > span {
-    margin-right: ${theme.gridUnit * 3}px;
+    margin-right: ${theme.sizeUnit * 3}px;
   }
 `;
 
@@ -52,17 +51,17 @@ const AllEntitiesContainer = styled.div`
   ${({ theme }) => `
   background-color: ${theme.colors.grayscale.light4};
   .select-control {
-    margin-left: ${theme.gridUnit * 4}px;
-    margin-right: ${theme.gridUnit * 4}px;
-    margin-bottom: ${theme.gridUnit * 2}px;
+    margin-left: ${theme.sizeUnit * 4}px;
+    margin-right: ${theme.sizeUnit * 4}px;
+    margin-bottom: ${theme.sizeUnit * 2}px;
   }
   .select-control-label {
-    font-size: ${theme.gridUnit * 3}px;
+    font-size: ${theme.sizeUnit * 3}px;
     color: ${theme.colors.grayscale.base};
-    margin-bottom: ${theme.gridUnit * 1}px;
+    margin-bottom: ${theme.sizeUnit * 1}px;
   }
   .entities {
-    margin: ${theme.gridUnit * 6}px; 0px;
+    margin: ${theme.sizeUnit * 6}px; 0px;
   }
   .pagination-container {
     background-color: transparent;
@@ -72,21 +71,21 @@ const AllEntitiesContainer = styled.div`
 
 const AllEntitiesNav = styled.div`
   ${({ theme }) => `
-  height: ${theme.gridUnit * 12.5}px;
+  height: ${theme.sizeUnit * 12.5}px;
   background-color: ${theme.colors.grayscale.light5};
-  margin-bottom: ${theme.gridUnit * 4}px;
+  margin-bottom: ${theme.sizeUnit * 4}px;
   .navbar-brand {
-    margin-left: ${theme.gridUnit * 2}px;
-    font-weight: ${theme.typography.weights.bold};
+    margin-left: ${theme.sizeUnit * 2}px;
+    font-weight: ${theme.fontWeightStrong};
   }
   .header {
-    font-weight: ${theme.typography.weights.bold};
-    margin-right:  ${theme.gridUnit * 3}px;
+    font-weight: ${theme.fontWeightStrong};
+    margin-right:  ${theme.sizeUnit * 3}px;
     text-align: left;
-    font-size: ${theme.gridUnit * 4.5}px;
-    padding: ${theme.gridUnit * 3}px;
+    font-size: ${theme.sizeUnit * 4.5}px;
+    padding: ${theme.sizeUnit * 3}px;
     display: inline-block;
-    line-height: ${theme.gridUnit * 9}px;
+    line-height: ${theme.sizeUnit * 9}px;
   }
   `};
 `;
@@ -110,7 +109,7 @@ function AllEntities() {
   const editableTitleProps = {
     title: tag?.name || '',
     placeholder: 'testing',
-    onSave: (newDatasetName: string) => {},
+    onSave: () => {},
     canEdit: false,
     label: t('dataset name'),
   };
diff --git a/superset-frontend/src/pages/AnnotationLayerList/index.tsx b/superset-frontend/src/pages/AnnotationLayerList/index.tsx
index 9ecb9be8606..e8930040339 100644
--- a/superset-frontend/src/pages/AnnotationLayerList/index.tsx
+++ b/superset-frontend/src/pages/AnnotationLayerList/index.tsx
@@ -19,26 +19,30 @@
 
 import { useMemo, useState } from 'react';
 import rison from 'rison';
-import { t, SupersetClient, useTheme, css } from '@superset-ui/core';
+import { t, SupersetClient } from '@superset-ui/core';
 import { Link, useHistory } from 'react-router-dom';
 import { useListViewResource } from 'src/views/CRUD/hooks';
 import { createFetchRelated, createErrorHandler } from 'src/views/CRUD/utils';
 import withToasts from 'src/components/MessageToasts/withToasts';
 import SubMenu, { SubMenuProps } from 'src/features/home/SubMenu';
-import ActionsBar, { ActionProps } from 'src/components/ListView/ActionsBar';
-import ListView, {
-  ListViewProps,
-  Filters,
-  FilterOperator,
-} from 'src/components/ListView';
-import DeleteModal from 'src/components/DeleteModal';
-import ConfirmStatusChange from 'src/components/ConfirmStatusChange';
+import { Typography } from '@superset-ui/core/components/Typography';
+
+import { DeleteModal, ConfirmStatusChange } from '@superset-ui/core/components';
+import {
+  ModifiedInfo,
+  ListView,
+  ListViewFilterOperator as FilterOperator,
+  ListViewActionsBar,
+  type ListViewActionProps,
+  type ListViewProps,
+  type ListViewFilters,
+} from 'src/components';
 import AnnotationLayerModal from 'src/features/annotationLayers/AnnotationLayerModal';
 import { AnnotationLayerObject } from 'src/features/annotationLayers/types';
-import { ModifiedInfo } from 'src/components/AuditInfo';
 import { QueryObjectColumns } from 'src/views/CRUD/types';
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { navigateTo } from 'src/utils/navigationUtils';
+import { WIDER_DROPDOWN_WIDTH } from 'src/components/ListView/utils';
 
 const PAGE_SIZE = 25;
 
@@ -57,7 +61,6 @@ function AnnotationLayersList({
   addSuccessToast,
   user,
 }: AnnotationLayersListProps) {
-  const theme = useTheme();
   const {
     state: {
       loading,
@@ -149,12 +152,18 @@ function AnnotationLayersList({
             return <Link to={`/annotationlayer/${id}/annotation`}>{name}</Link>;
           }
 
-          return <a href={`/annotationlayer/${id}/annotation`}>{name}</a>;
+          return (
+            <Typography.Link href={`/annotationlayer/${id}/annotation`}>
+              {name}
+            </Typography.Link>
+          );
         },
+        id: 'name',
       },
       {
         accessor: 'descr',
         Header: t('Description'),
+        id: 'descr',
       },
       {
         Cell: ({
@@ -168,6 +177,7 @@ function AnnotationLayersList({
         Header: t('Last modified'),
         accessor: 'changed_on',
         size: 'xl',
+        id: 'changed_on',
       },
       {
         Cell: ({ row: { original } }: any) => {
@@ -195,7 +205,9 @@ function AnnotationLayersList({
               : null,
           ].filter(item => !!item);
 
-          return <ActionsBar actions={actions as ActionProps[]} />;
+          return (
+            <ListViewActionsBar actions={actions as ListViewActionProps[]} />
+          );
         },
         Header: t('Actions'),
         id: 'actions',
@@ -206,6 +218,7 @@ function AnnotationLayersList({
       {
         accessor: QueryObjectColumns.ChangedBy,
         hidden: true,
+        id: QueryObjectColumns.ChangedBy,
       },
     ],
     [canDelete, canCreate],
@@ -217,13 +230,7 @@ function AnnotationLayersList({
     subMenuButtons.push({
       name: (
         <>
-          <Icons.PlusOutlined
-            iconColor={theme.colors.primary.light5}
-            iconSize="m"
-            css={css`
-              vertical-align: text-top;
-            `}
-          />
+          <Icons.PlusOutlined iconSize="m" />
           {t('Annotation layer')}
         </>
       ),
@@ -242,7 +249,7 @@ function AnnotationLayersList({
     });
   }
 
-  const filters: Filters = useMemo(
+  const filters: ListViewFilters = useMemo(
     () => [
       {
         Header: t('Name'),
@@ -270,6 +277,7 @@ function AnnotationLayersList({
           user,
         ),
         paginate: true,
+        dropdownStyle: { minWidth: WIDER_DROPDOWN_WIDTH },
       },
     ],
     [],
@@ -281,10 +289,7 @@ function AnnotationLayersList({
     buttonAction: () => handleAnnotationLayerEdit(null),
     buttonText: (
       <>
-        <Icons.PlusOutlined
-          iconSize="m"
-          iconColor={theme.colors.primary.light5}
-        />
+        <Icons.PlusOutlined iconSize="m" />
         {t('Annotation layer')}
       </>
     ),
diff --git a/superset-frontend/src/pages/AnnotationList/index.tsx b/superset-frontend/src/pages/AnnotationList/index.tsx
index 70a41024f6d..43b7bd992ea 100644
--- a/superset-frontend/src/pages/AnnotationList/index.tsx
+++ b/superset-frontend/src/pages/AnnotationList/index.tsx
@@ -22,7 +22,6 @@ import { useParams, Link, useHistory } from 'react-router-dom';
 import {
   css,
   t,
-  useTheme,
   styled,
   SupersetClient,
   getClientErrorObject,
@@ -30,10 +29,13 @@ import {
 import dayjs from 'dayjs';
 import rison from 'rison';
 
-import ActionsBar, { ActionProps } from 'src/components/ListView/ActionsBar';
-import ConfirmStatusChange from 'src/components/ConfirmStatusChange';
-import DeleteModal from 'src/components/DeleteModal';
-import ListView, { ListViewProps } from 'src/components/ListView';
+import { ConfirmStatusChange, DeleteModal } from '@superset-ui/core/components';
+import {
+  ListView,
+  ListViewActionsBar,
+  type ListViewProps,
+  type ListViewActionProps,
+} from 'src/components';
 import SubMenu, { SubMenuProps } from 'src/features/home/SubMenu';
 import withToasts from 'src/components/MessageToasts/withToasts';
 import { useListViewResource } from 'src/views/CRUD/hooks';
@@ -41,7 +43,8 @@ import { createErrorHandler } from 'src/views/CRUD/utils';
 
 import { AnnotationObject } from 'src/features/annotations/types';
 import AnnotationModal from 'src/features/annotations/AnnotationModal';
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
+import { Typography } from '@superset-ui/core/components/Typography';
 
 const PAGE_SIZE = 25;
 
@@ -57,9 +60,9 @@ const StyledHeader = styled.div`
 
     a,
     Link {
-      margin-left: ${theme.gridUnit * 4}px;
-      font-size: ${theme.typography.sizes.s}px;
-      font-weight: ${theme.typography.weights.normal};
+      margin-left: ${theme.sizeUnit * 4}px;
+      font-size: ${theme.fontSizeSM}px;
+      font-weight: ${theme.fontWeightNormal};
       text-decoration: underline;
     }
   `}
@@ -69,7 +72,6 @@ function AnnotationList({
   addDangerToast,
   addSuccessToast,
 }: AnnotationListProps) {
-  const theme = useTheme();
   const { annotationLayerId }: any = useParams();
   const {
     state: {
@@ -163,10 +165,12 @@ function AnnotationList({
       {
         accessor: 'short_descr',
         Header: t('Name'),
+        id: 'short_descr',
       },
       {
         accessor: 'long_descr',
         Header: t('Description'),
+        id: 'long_descr',
       },
       {
         Cell: ({
@@ -178,6 +182,7 @@ function AnnotationList({
         }) => dayjs(new Date(startDttm)).format('ll'),
         Header: t('Start'),
         accessor: 'start_dttm',
+        id: 'start_dttm',
       },
       {
         Cell: ({
@@ -189,6 +194,7 @@ function AnnotationList({
         }) => dayjs(new Date(endDttm)).format('ll'),
         Header: t('End'),
         accessor: 'end_dttm',
+        id: 'end_dttm',
       },
       {
         Cell: ({
@@ -214,7 +220,9 @@ function AnnotationList({
               onClick: handleDelete,
             },
           ];
-          return <ActionsBar actions={actions as ActionProps[]} />;
+          return (
+            <ListViewActionsBar actions={actions as ListViewActionProps[]} />
+          );
         },
         Header: t('Actions'),
         id: 'actions',
@@ -229,14 +237,7 @@ function AnnotationList({
   subMenuButtons.push({
     name: (
       <>
-        <Icons.PlusOutlined
-          iconColor={theme.colors.primary.light5}
-          iconSize="m"
-          css={css`
-            margin: auto ${theme.gridUnit * 2}px auto 0;
-            vertical-align: text-top;
-          `}
-        />
+        <Icons.PlusOutlined iconSize="m" />
         {t('Annotation')}
       </>
     ),
@@ -270,14 +271,7 @@ function AnnotationList({
     },
     buttonText: (
       <>
-        <Icons.PlusOutlined
-          iconColor={theme.colors.primary.light5}
-          iconSize="m"
-          css={css`
-            margin: auto ${theme.gridUnit * 2}px auto 0;
-            vertical-align: text-top;
-          `}
-        />
+        <Icons.PlusOutlined iconSize="m" />
         {t('Annotation')}
       </>
     ),
@@ -293,7 +287,9 @@ function AnnotationList({
               {hasHistory ? (
                 <Link to="/annotationlayer/list/">{t('Back to all')}</Link>
               ) : (
-                <a href="/annotationlayer/list/">{t('Back to all')}</a>
+                <Typography.Link href="/annotationlayer/list/">
+                  {t('Back to all')}
+                </Typography.Link>
               )}
             </span>
           </StyledHeader>
diff --git a/superset-frontend/src/pages/Chart/Chart.test.tsx b/superset-frontend/src/pages/Chart/Chart.test.tsx
index 2fe7599211f..6b0e9f820a3 100644
--- a/superset-frontend/src/pages/Chart/Chart.test.tsx
+++ b/superset-frontend/src/pages/Chart/Chart.test.tsx
@@ -30,9 +30,12 @@ import { LocalStorageKeys } from 'src/utils/localStorageHelpers';
 import getFormDataWithExtraFilters from 'src/dashboard/util/charts/getFormDataWithExtraFilters';
 import { URL_PARAMS } from 'src/constants';
 import { JsonObject, VizType } from '@superset-ui/core';
-
+import { useUnsavedChangesPrompt } from 'src/hooks/useUnsavedChangesPrompt';
 import ChartPage from '.';
 
+jest.mock('src/hooks/useUnsavedChangesPrompt', () => ({
+  useUnsavedChangesPrompt: jest.fn(),
+}));
 jest.mock('re-resizable', () => ({
   Resizable: () => <div data-test="mock-re-resizable" />,
 }));
@@ -48,6 +51,17 @@ jest.mock(
 jest.mock('src/dashboard/util/charts/getFormDataWithExtraFilters');
 
 describe('ChartPage', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+
+    (useUnsavedChangesPrompt as jest.Mock).mockReturnValue({
+      showModal: false,
+      setShowModal: jest.fn(),
+      handleConfirmNavigation: jest.fn(),
+      handleSaveAndCloseModal: jest.fn(),
+    });
+  });
+
   afterEach(() => {
     fetchMock.reset();
   });
diff --git a/superset-frontend/src/pages/Chart/index.tsx b/superset-frontend/src/pages/Chart/index.tsx
index 5bbeb5fa86c..cc2b431ffbc 100644
--- a/superset-frontend/src/pages/Chart/index.tsx
+++ b/superset-frontend/src/pages/Chart/index.tsx
@@ -28,7 +28,7 @@ import {
   t,
   getClientErrorObject,
 } from '@superset-ui/core';
-import Loading from 'src/components/Loading';
+import { Loading } from '@superset-ui/core/components';
 import { addDangerToast } from 'src/components/MessageToasts/actions';
 import { getUrlParam } from 'src/utils/urlUtils';
 import { URL_PARAMS } from 'src/constants';
diff --git a/superset-frontend/src/pages/ChartCreation/ChartCreation.test.tsx b/superset-frontend/src/pages/ChartCreation/ChartCreation.test.tsx
index 1a37d2e12e6..4f0c8117c8c 100644
--- a/superset-frontend/src/pages/ChartCreation/ChartCreation.test.tsx
+++ b/superset-frontend/src/pages/ChartCreation/ChartCreation.test.tsx
@@ -23,18 +23,11 @@ import {
   userEvent,
   waitFor,
 } from 'spec/helpers/testing-library';
-import { ReactElement } from 'react';
 import fetchMock from 'fetch-mock';
 import { createMemoryHistory } from 'history';
 import { ChartCreation } from 'src/pages/ChartCreation';
 import { UserWithPermissionsAndRoles } from 'src/types/bootstrapTypes';
-import { supersetTheme, ThemeProvider } from '@superset-ui/core';
-
-const renderWithTheme = (component: ReactElement, renderOptions = {}) =>
-  render(
-    <ThemeProvider theme={supersetTheme}>{component}</ThemeProvider>,
-    renderOptions,
-  );
+import { supersetTheme } from '@superset-ui/core';
 
 jest.mock('src/components/DynamicPlugins', () => ({
   usePluginContext: () => ({
@@ -45,7 +38,7 @@ jest.mock('src/components/DynamicPlugins', () => ({
 const mockDatasourceResponse = {
   result: [
     {
-      id: 1,
+      id: 'table_1',
       table_name: 'table',
       datasource_type: 'table',
       database: { database_name: 'test_db' },
@@ -95,21 +88,21 @@ const routeProps = {
   match: {} as any,
 };
 
-const renderOptions = {
-  useRouter: true,
-};
-
 async function renderComponent(user = mockUser) {
-  renderWithTheme(
+  const rendered = render(
     <ChartCreation
       user={user}
       addSuccessToast={() => null}
       theme={supersetTheme}
       {...routeProps}
     />,
-    renderOptions,
+    {
+      useRedux: true,
+      useRouter: true,
+    },
   );
   await waitFor(() => new Promise(resolve => setTimeout(resolve, 0)));
+  return rendered;
 }
 
 test('renders a select and a VizTypeGallery', async () => {
@@ -152,8 +145,8 @@ test('renders an enabled button if datasource and viz type are selected', async
   userEvent.click(await screen.findByText(/test_db/i));
 
   userEvent.click(
-    screen.getByRole('button', {
-      name: /ballot all charts/i,
+    screen.getByRole('tab', {
+      name: /All charts/i,
     }),
   );
   userEvent.click(await screen.findByText('Table'));
@@ -167,8 +160,8 @@ test('double-click viz type does nothing if no datasource is selected', async ()
   await renderComponent();
 
   userEvent.click(
-    screen.getByRole('button', {
-      name: /ballot all charts/i,
+    screen.getByRole('tab', {
+      name: /All charts/i,
     }),
   );
   userEvent.dblClick(await screen.findByText('Table'));
@@ -183,12 +176,13 @@ test('double-click viz type submits with formatted URL if datasource is selected
   await renderComponent();
 
   const datasourceSelect = screen.getByRole('combobox', { name: 'Dataset' });
+
   userEvent.click(datasourceSelect);
   userEvent.click(await screen.findByText(/test_db/i));
 
   userEvent.click(
-    screen.getByRole('button', {
-      name: /ballot all charts/i,
+    screen.getByRole('tab', {
+      name: /All charts/i,
     }),
   );
   userEvent.dblClick(await screen.findByText('Table'));
@@ -196,6 +190,6 @@ test('double-click viz type submits with formatted URL if datasource is selected
   expect(
     screen.getByRole('button', { name: 'Create new chart' }),
   ).toBeEnabled();
-  const formattedUrl = '/explore/?viz_type=table&datasource=1__table';
+  const formattedUrl = '/explore/?viz_type=table&datasource=table_1__table';
   expect(history.push).toHaveBeenCalledWith(formattedUrl);
 });
diff --git a/superset-frontend/src/pages/ChartCreation/index.tsx b/superset-frontend/src/pages/ChartCreation/index.tsx
index 77e86a3b99c..10740dbe1f2 100644
--- a/superset-frontend/src/pages/ChartCreation/index.tsx
+++ b/superset-frontend/src/pages/ChartCreation/index.tsx
@@ -18,7 +18,6 @@
  */
 import { PureComponent, ReactNode } from 'react';
 import rison from 'rison';
-import querystring from 'query-string';
 import {
   isDefined,
   JsonResponse,
@@ -30,9 +29,7 @@ import { withTheme, Theme } from '@emotion/react';
 import { getUrlParam } from 'src/utils/urlUtils';
 import { FilterPlugins, URL_PARAMS } from 'src/constants';
 import { Link, withRouter, RouteComponentProps } from 'react-router-dom';
-import Button from 'src/components/Button';
-import { AsyncSelect } from 'src/components';
-import { Steps } from 'src/components/Steps';
+import { AsyncSelect, Button, Steps } from '@superset-ui/core/components';
 import withToasts from 'src/components/MessageToasts/withToasts';
 
 import VizTypeGallery, {
@@ -45,7 +42,7 @@ import {
   Dataset,
   DatasetSelectLabel,
 } from 'src/features/datasets/DatasetSelectLabel';
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
 
 export interface ChartCreationProps extends RouteComponentProps {
   user: UserWithPermissionsAndRoles;
@@ -54,7 +51,7 @@ export interface ChartCreationProps extends RouteComponentProps {
 }
 
 export type ChartCreationState = {
-  datasource?: { label: string; value: string };
+  datasource?: { label: string | ReactNode; value: string };
   datasetName?: string | string[] | null;
   vizType: string | null;
   canCreateDataset: boolean;
@@ -77,23 +74,23 @@ const StyledContainer = styled.div`
     width: 100%;
     max-width: ${MAX_ADVISABLE_VIZ_GALLERY_WIDTH}px;
     max-height: calc(100vh - ${ESTIMATED_NAV_HEIGHT}px);
-    border-radius: ${theme.gridUnit}px;
-    background-color: ${theme.colors.grayscale.light5};
+    border-radius: ${theme.borderRadius}px;
+    background-color: ${theme.colorBgContainer};
     margin-left: auto;
     margin-right: auto;
-    padding-left: ${theme.gridUnit * 4}px;
-    padding-right: ${theme.gridUnit * 4}px;
-    padding-bottom: ${theme.gridUnit * 4}px;
+    padding-left: ${theme.sizeUnit * 4}px;
+    padding-right: ${theme.sizeUnit * 4}px;
+    padding-bottom: ${theme.sizeUnit * 4}px;
 
     h3 {
-      padding-bottom: ${theme.gridUnit * 3}px;
+      padding-bottom: ${theme.sizeUnit * 3}px;
     }
 
     & .dataset {
       display: flex;
       flex-direction: row;
       align-items: center;
-      margin-bottom: ${theme.gridUnit * 5}px;
+      margin-bottom: ${theme.sizeUnit * 5}px;
 
       & > div {
         min-width: 200px;
@@ -101,15 +98,15 @@ const StyledContainer = styled.div`
       }
 
       & > span {
-        color: ${theme.colors.grayscale.light1};
-        margin-left: ${theme.gridUnit * 4}px;
+        color: ${theme.colorText};
+        margin-left: ${theme.sizeUnit * 4}px;
       }
     }
 
     & .viz-gallery {
-      border: 1px solid ${theme.colors.grayscale.light2};
-      border-radius: ${theme.gridUnit}px;
-      margin: ${theme.gridUnit}px 0px;
+      border: 1px solid ${theme.colorBorder};
+      border-radius: ${theme.borderRadius}px;
+      margin: ${theme.sizeUnit}px 0px;
       max-height: calc(100vh - ${ELEMENTS_EXCEPT_VIZ_GALLERY}px);
       flex: 1;
     }
@@ -122,38 +119,38 @@ const StyledContainer = styled.div`
       align-items: center;
 
       & > span {
-        color: ${theme.colors.grayscale.light1};
-        margin-right: ${theme.gridUnit * 4}px;
+        color: ${theme.colorText};
+        margin-right: ${theme.sizeUnit * 4}px;
       }
     }
 
     /* The following extra ampersands (&&&&) are used to boost selector specificity */
 
-    &&&& .antd5-steps-item-tail {
+    &&&& .ant-steps-item-tail {
       display: none;
     }
 
-    &&&& .antd5-steps-item-icon {
-      margin-right: ${theme.gridUnit * 2}px;
-      width: ${theme.gridUnit * 5}px;
-      height: ${theme.gridUnit * 5}px;
-      line-height: ${theme.gridUnit * 5}px;
+    &&&& .ant-steps-item-icon {
+      margin-right: ${theme.sizeUnit * 2}px;
+      width: ${theme.sizeUnit * 5}px;
+      height: ${theme.sizeUnit * 5}px;
+      line-height: ${theme.sizeUnit * 5}px;
     }
 
-    &&&& .antd5-steps-item-title {
-      line-height: ${theme.gridUnit * 5}px;
+    &&&& .ant-steps-item-title {
+      line-height: ${theme.sizeUnit * 5}px;
     }
 
-    &&&& .antd5-steps-item-content {
+    &&&& .ant-steps-item-content {
       overflow: unset;
 
-      .antd5-steps-item-description {
-        margin-top: ${theme.gridUnit}px;
-        padding-bottom: ${theme.gridUnit}px;
+      .ant-steps-item-description {
+        margin-top: ${theme.sizeUnit}px;
+        padding-bottom: ${theme.sizeUnit}px;
       }
     }
 
-    &&&& .antd5-tooltip-open {
+    &&&& .ant-tooltip-open {
       display: inline;
     }
 
@@ -162,30 +159,26 @@ const StyledContainer = styled.div`
     }
 
     &&&& .ant-select-selection-placeholder {
-      padding-left: ${theme.gridUnit * 3}px;
+      padding-left: ${theme.sizeUnit * 3}px;
     }
 
     &&&& .ant-select-selection-item {
-      padding-left: ${theme.gridUnit * 3}px;
+      padding-left: ${theme.sizeUnit * 3}px;
     }
   `}
 `;
 
 const StyledStepTitle = styled.span`
-  ${({
-    theme: {
-      typography: { sizes, weights },
-    },
-  }) => `
-      font-size: ${sizes.m}px;
-      font-weight: ${weights.bold};
+  ${({ theme: { fontSize, fontWeightStrong } }) => `
+      font-size: ${fontSize}px;
+      font-weight: ${fontWeightStrong};
     `}
 `;
 
 const StyledStepDescription = styled.div`
-  ${({ theme: { gridUnit } }) => `
-    margin-top: ${gridUnit * 4}px;
-    margin-bottom: ${gridUnit * 3}px;
+  ${({ theme: { sizeUnit } }) => `
+    margin-top: ${sizeUnit * 4}px;
+    margin-bottom: ${sizeUnit * 3}px;
   `}
 `;
 
@@ -212,14 +205,10 @@ export class ChartCreation extends PureComponent<
   }
 
   componentDidMount() {
-    const params = querystring.parse(window.location.search)?.dataset as string;
+    const params = new URLSearchParams(window.location.search).get('dataset');
     if (params) {
       this.loadDatasources(params, 0, 1).then(r => {
         const datasource = r.data[0];
-        // override here to force styling of option label
-        // which expects a reactnode instead of string
-        // @ts-expect-error
-        datasource.label = datasource.customLabel;
         this.setState({ datasource });
       });
       this.props.addSuccessToast(t('The dataset has been saved'));
@@ -239,7 +228,7 @@ export class ChartCreation extends PureComponent<
     this.props.history.push(this.exploreUrl());
   }
 
-  changeDatasource(datasource: { label: string; value: string }) {
+  changeDatasource(datasource: { label: string | ReactNode; value: string }) {
     this.setState({ datasource });
   }
 
@@ -276,15 +265,13 @@ export class ChartCreation extends PureComponent<
       endpoint: `/api/v1/dataset/?q=${query}`,
     }).then((response: JsonResponse) => {
       const list: {
-        customLabel: ReactNode;
         id: number;
-        label: string;
+        label: string | ReactNode;
         value: string;
       }[] = response.json.result.map((item: Dataset) => ({
         id: item.id,
         value: `${item.id}__${item.datasource_type}`,
-        customLabel: DatasetSelectLabel(item),
-        label: item.table_name,
+        label: DatasetSelectLabel(item),
       }));
       return {
         data: list,
@@ -301,7 +288,7 @@ export class ChartCreation extends PureComponent<
       <span data-test="dataset-write">
         <Link to="/dataset/add/" data-test="add-chart-new-dataset">
           {t('Add a dataset')}
-        </Link>
+        </Link>{' '}
         {t('or')}{' '}
         <a
           href="https://superset.apache.org/docs/creating-charts-dashboards/creating-your-first-dashboard/#registering-a-new-table"
@@ -310,7 +297,7 @@ export class ChartCreation extends PureComponent<
           data-test="add-chart-new-dataset-instructions"
         >
           {`${VIEW_INSTRUCTIONS_TEXT} `}
-          <Icons.Full iconSize="m" iconColor={theme.colors.primary.dark1} />
+          <Icons.Full iconSize="m" iconColor={theme.colorPrimary} />
         </a>
         .
       </span>
@@ -322,7 +309,7 @@ export class ChartCreation extends PureComponent<
           target="_blank"
         >
           {`${VIEW_INSTRUCTIONS_TEXT} `}
-          <Icons.Full iconSize="m" iconColor={theme.colors.primary.dark1} />
+          <Icons.Full iconSize="m" iconColor={theme.colorPrimary} />
         </a>
         .
       </span>
diff --git a/superset-frontend/src/pages/ChartList/index.tsx b/superset-frontend/src/pages/ChartList/index.tsx
index 197e0a425f2..e4beb556da9 100644
--- a/superset-frontend/src/pages/ChartList/index.tsx
+++ b/superset-frontend/src/pages/ChartList/index.tsx
@@ -24,8 +24,6 @@ import {
   styled,
   SupersetClient,
   t,
-  useTheme,
-  css,
 } from '@superset-ui/core';
 import { useState, useMemo, useCallback } from 'react';
 import rison from 'rison';
@@ -42,39 +40,43 @@ import {
   useListViewResource,
 } from 'src/views/CRUD/hooks';
 import handleResourceExport from 'src/utils/export';
-import ConfirmStatusChange from 'src/components/ConfirmStatusChange';
-import { TagsList } from 'src/components/Tags';
+import {
+  ConfirmStatusChange,
+  CertifiedBadge,
+  Tooltip,
+  FaveStar,
+  InfoTooltip,
+  Loading,
+  type LabeledValue,
+} from '@superset-ui/core/components';
+import {
+  FacePile,
+  ImportModal as ImportModelsModal,
+  ModifiedInfo,
+  GenericLink,
+  TagsList,
+  TagType,
+  ListView,
+  ListViewFilterOperator as FilterOperator,
+  DashboardCrossLinks,
+  type ListViewProps,
+  type ListViewFilters,
+  type ListViewFilter,
+} from 'src/components';
 import SubMenu, { SubMenuProps } from 'src/features/home/SubMenu';
-import FaveStar from 'src/components/FaveStar';
 import { Link, useHistory } from 'react-router-dom';
-import ListView, {
-  Filter,
-  FilterOperator,
-  Filters,
-  ListViewProps,
-  SelectOption,
-} from 'src/components/ListView';
-import Loading from 'src/components/Loading';
 import { dangerouslyGetItemDoNotUse } from 'src/utils/localStorageHelpers';
 import withToasts from 'src/components/MessageToasts/withToasts';
 import PropertiesModal from 'src/explore/components/PropertiesModal';
-import ImportModelsModal from 'src/components/ImportModal/index';
 import Chart from 'src/types/Chart';
-import Tag from 'src/types/TagType';
-import { Tooltip } from 'src/components/Tooltip';
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { nativeFilterGate } from 'src/dashboard/components/nativeFilters/utils';
-import InfoTooltip from 'src/components/InfoTooltip';
-import CertifiedBadge from 'src/components/CertifiedBadge';
-import { GenericLink } from 'src/components/GenericLink/GenericLink';
-import { loadTags } from 'src/components/Tags/utils';
-import FacePile from 'src/components/FacePile';
+import { loadTags } from 'src/components/Tag/utils';
 import ChartCard from 'src/features/charts/ChartCard';
 import { UserWithPermissionsAndRoles } from 'src/types/bootstrapTypes';
 import { findPermission } from 'src/utils/findPermission';
-import { DashboardCrossLinks } from 'src/components/ListView/DashboardCrossLinks';
-import { ModifiedInfo } from 'src/components/AuditInfo';
 import { QueryObjectColumns } from 'src/views/CRUD/types';
+import { WIDER_DROPDOWN_WIDTH } from 'src/components/ListView/utils';
 
 const FlexRowContainer = styled.div`
   align-items: center;
@@ -88,7 +90,7 @@ const FlexRowContainer = styled.div`
   }
 
   svg {
-    margin-right: ${({ theme }) => theme.gridUnit}px;
+    margin-right: ${({ theme }) => theme.sizeUnit}px;
   }
 `;
 
@@ -139,7 +141,7 @@ const createFetchDatasets = async (
   );
 
   return {
-    data: uniqBy<SelectOption>(datasets, 'value'),
+    data: uniqBy<LabeledValue>(datasets, 'value'),
     totalCount: json?.count,
   };
 };
@@ -155,11 +157,10 @@ interface ChartListProps {
 }
 
 const StyledActions = styled.div`
-  color: ${({ theme }) => theme.colors.grayscale.base};
+  color: ${({ theme }) => theme.colorIcon};
 `;
 
 function ChartList(props: ChartListProps) {
-  const theme = useTheme();
   const {
     addDangerToast,
     addSuccessToast,
@@ -281,7 +282,7 @@ function ChartList(props: ChartListProps) {
         }
       : {};
     const queryParams = rison.encode({
-      columns: ['dashboard_title', 'id'],
+      select_columns: ['dashboard_title', 'id'],
       keys: ['none'],
       order_column: 'dashboard_title',
       order_direction: 'asc',
@@ -307,7 +308,7 @@ function ChartList(props: ChartListProps) {
       }),
     );
     return {
-      data: uniqBy<SelectOption>(dashboards, 'value'),
+      data: uniqBy<LabeledValue>(dashboards, 'value'),
       totalCount: response?.json?.count,
     };
   };
@@ -362,6 +363,7 @@ function ChartList(props: ChartListProps) {
         ),
         Header: t('Name'),
         accessor: 'slice_name',
+        id: 'slice_name',
       },
       {
         Cell: ({
@@ -372,6 +374,7 @@ function ChartList(props: ChartListProps) {
         Header: t('Type'),
         accessor: 'viz_type',
         size: 'xxl',
+        id: 'viz_type',
       },
       {
         Cell: ({
@@ -390,6 +393,7 @@ function ChartList(props: ChartListProps) {
         accessor: 'datasource_id',
         disableSortBy: true,
         size: 'xl',
+        id: 'datasource_id',
       },
       {
         Cell: ({
@@ -401,6 +405,7 @@ function ChartList(props: ChartListProps) {
         accessor: 'dashboards',
         disableSortBy: true,
         size: 'xxl',
+        id: 'dashboards',
       },
       {
         Cell: ({
@@ -410,7 +415,7 @@ function ChartList(props: ChartListProps) {
         }: any) => (
           // Only show custom type tags
           <TagsList
-            tags={tags.filter((tag: Tag) =>
+            tags={tags.filter((tag: TagType) =>
               tag.type
                 ? tag.type === 1 || tag.type === 'TagTypes.custom'
                 : true,
@@ -422,6 +427,7 @@ function ChartList(props: ChartListProps) {
         accessor: 'tags',
         disableSortBy: true,
         hidden: !isFeatureEnabled(FeatureFlag.TaggingSystem),
+        id: 'tags',
       },
       {
         Cell: ({
@@ -433,6 +439,7 @@ function ChartList(props: ChartListProps) {
         accessor: 'owners',
         disableSortBy: true,
         size: 'xl',
+        id: 'owners',
       },
       {
         Cell: ({
@@ -446,6 +453,7 @@ function ChartList(props: ChartListProps) {
         Header: t('Last modified'),
         accessor: 'last_saved_at',
         size: 'xl',
+        id: 'last_saved_at',
       },
       {
         Cell: ({ row: { original } }: any) => {
@@ -536,6 +544,7 @@ function ChartList(props: ChartListProps) {
       {
         accessor: QueryObjectColumns.ChangedBy,
         hidden: true,
+        id: QueryObjectColumns.ChangedBy,
       },
     ],
     [
@@ -551,7 +560,7 @@ function ChartList(props: ChartListProps) {
     ],
   );
 
-  const favoritesFilter: Filter = useMemo(
+  const favoritesFilter: ListViewFilter = useMemo(
     () => ({
       Header: t('Favorite'),
       key: 'favorite',
@@ -568,7 +577,7 @@ function ChartList(props: ChartListProps) {
     [],
   );
 
-  const filters: Filters = useMemo(() => {
+  const filters: ListViewFilters = useMemo(() => {
     const filters_list = [
       {
         Header: t('Name'),
@@ -612,6 +621,7 @@ function ChartList(props: ChartListProps) {
         unfilteredLabel: t('All'),
         fetchSelects: createFetchDatasets,
         paginate: true,
+        dropdownStyle: { minWidth: WIDER_DROPDOWN_WIDTH },
       },
       ...(isFeatureEnabled(FeatureFlag.TaggingSystem) && canReadTag
         ? [
@@ -647,6 +657,7 @@ function ChartList(props: ChartListProps) {
           props.user,
         ),
         paginate: true,
+        dropdownStyle: { minWidth: WIDER_DROPDOWN_WIDTH },
       },
       {
         Header: t('Dashboard'),
@@ -657,6 +668,7 @@ function ChartList(props: ChartListProps) {
         unfilteredLabel: t('All'),
         fetchSelects: fetchDashboards,
         paginate: true,
+        dropdownStyle: { minWidth: WIDER_DROPDOWN_WIDTH },
       },
       ...(userId ? [favoritesFilter] : []),
       {
@@ -691,8 +703,9 @@ function ChartList(props: ChartListProps) {
           props.user,
         ),
         paginate: true,
+        dropdownStyle: { minWidth: WIDER_DROPDOWN_WIDTH },
       },
-    ] as Filters;
+    ] as ListViewFilters;
     return filters_list;
   }, [addDangerToast, favoritesFilter, props.user]);
 
@@ -762,13 +775,7 @@ function ChartList(props: ChartListProps) {
     subMenuButtons.push({
       name: (
         <>
-          <Icons.PlusOutlined
-            iconColor={theme.colors.primary.light5}
-            iconSize="m"
-            css={css`
-              vertical-align: text-top;
-            `}
-          />
+          <Icons.PlusOutlined iconSize="m" />
           <span>{t('Chart')}</span>
         </>
       ),
@@ -785,10 +792,7 @@ function ChartList(props: ChartListProps) {
           title={t('Import charts')}
           placement="bottomRight"
         >
-          <Icons.DownloadOutlined
-            data-test="import-button"
-            iconColor={theme.colors.primary.dark1}
-          />
+          <Icons.DownloadOutlined iconSize="l" data-test="import-button" />
         </Tooltip>
       ),
       buttonStyle: 'link',
diff --git a/superset-frontend/src/pages/CssTemplateList/index.tsx b/superset-frontend/src/pages/CssTemplateList/index.tsx
index 13ad661c45c..f112f85474e 100644
--- a/superset-frontend/src/pages/CssTemplateList/index.tsx
+++ b/superset-frontend/src/pages/CssTemplateList/index.tsx
@@ -18,26 +18,28 @@
  */
 
 import { useMemo, useState } from 'react';
-import { t, SupersetClient, useTheme, css } from '@superset-ui/core';
+import { t, SupersetClient } from '@superset-ui/core';
 
 import rison from 'rison';
 import { useListViewResource } from 'src/views/CRUD/hooks';
 import { createErrorHandler, createFetchRelated } from 'src/views/CRUD/utils';
 import withToasts from 'src/components/MessageToasts/withToasts';
 import SubMenu, { SubMenuProps } from 'src/features/home/SubMenu';
-import DeleteModal from 'src/components/DeleteModal';
-import ConfirmStatusChange from 'src/components/ConfirmStatusChange';
-import ActionsBar, { ActionProps } from 'src/components/ListView/ActionsBar';
-import ListView, {
-  ListViewProps,
-  Filters,
-  FilterOperator,
-} from 'src/components/ListView';
+import { DeleteModal, ConfirmStatusChange } from '@superset-ui/core/components';
+import {
+  ModifiedInfo,
+  ListView,
+  ListViewActionsBar,
+  ListViewFilterOperator as FilterOperator,
+  type ListViewProps,
+  type ListViewActionProps,
+  type ListViewFilters,
+} from 'src/components';
+
 import CssTemplateModal from 'src/features/cssTemplates/CssTemplateModal';
 import { TemplateObject } from 'src/features/cssTemplates/types';
-import { ModifiedInfo } from 'src/components/AuditInfo';
 import { QueryObjectColumns } from 'src/views/CRUD/types';
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
 
 const PAGE_SIZE = 25;
 
@@ -56,7 +58,6 @@ function CssTemplatesList({
   addSuccessToast,
   user,
 }: CssTemplatesListProps) {
-  const theme = useTheme();
   const {
     state: {
       loading,
@@ -131,6 +132,7 @@ function CssTemplatesList({
       {
         accessor: 'template_name',
         Header: t('Name'),
+        id: 'template_name',
       },
       {
         Cell: ({
@@ -145,6 +147,7 @@ function CssTemplatesList({
         accessor: 'changed_on_delta_humanized',
         size: 'xl',
         disableSortBy: true,
+        id: 'changed_on_delta_humanized',
       },
       {
         Cell: ({ row: { original } }: any) => {
@@ -172,7 +175,9 @@ function CssTemplatesList({
               : null,
           ].filter(item => !!item);
 
-          return <ActionsBar actions={actions as ActionProps[]} />;
+          return (
+            <ListViewActionsBar actions={actions as ListViewActionProps[]} />
+          );
         },
         Header: t('Actions'),
         id: 'actions',
@@ -183,6 +188,7 @@ function CssTemplatesList({
       {
         accessor: QueryObjectColumns.ChangedBy,
         hidden: true,
+        id: QueryObjectColumns.ChangedBy,
       },
     ],
     [canDelete, canCreate],
@@ -196,20 +202,9 @@ function CssTemplatesList({
 
   if (canCreate) {
     subMenuButtons.push({
-      name: (
-        <>
-          <Icons.PlusOutlined
-            iconColor={theme.colors.primary.light5}
-            iconSize="m"
-            css={css`
-              margin: 'auto ${theme.gridUnit * 2}px auto 0';
-              vertical-align: text-top;
-            `}
-          />
-          {t('CSS template')}
-        </>
-      ),
+      name: <>{t('CSS template')}</>,
       buttonStyle: 'primary',
+      icon: <Icons.PlusOutlined iconSize="m" />,
       onClick: () => {
         setCurrentCssTemplate(null);
         setCssTemplateModalOpen(true);
@@ -227,7 +222,7 @@ function CssTemplatesList({
 
   menuData.buttons = subMenuButtons;
 
-  const filters: Filters = useMemo(
+  const filters: ListViewFilters = useMemo(
     () => [
       {
         Header: t('Name'),
diff --git a/superset-frontend/src/pages/DashboardList/index.tsx b/superset-frontend/src/pages/DashboardList/index.tsx
index a0c9e624df1..641726caa5e 100644
--- a/superset-frontend/src/pages/DashboardList/index.tsx
+++ b/superset-frontend/src/pages/DashboardList/index.tsx
@@ -22,8 +22,6 @@ import {
   styled,
   SupersetClient,
   t,
-  css,
-  useTheme,
 } from '@superset-ui/core';
 import { useSelector } from 'react-redux';
 import { useState, useMemo, useCallback } from 'react';
@@ -35,43 +33,47 @@ import {
   handleDashboardDelete,
 } from 'src/views/CRUD/utils';
 import { useListViewResource, useFavoriteStatus } from 'src/views/CRUD/hooks';
-import ConfirmStatusChange from 'src/components/ConfirmStatusChange';
-import { PublishedLabel } from 'src/components/Label';
-import { TagsList } from 'src/components/Tags';
+import {
+  CertifiedBadge,
+  ConfirmStatusChange,
+  DeleteModal,
+  FaveStar,
+  Loading,
+  PublishedLabel,
+  Tooltip,
+} from '@superset-ui/core/components';
+import {
+  FacePile,
+  TagType,
+  TagsList,
+  ModifiedInfo,
+  ImportModal as ImportModelsModal,
+  ListView,
+  ListViewFilterOperator as FilterOperator,
+  type ListViewProps,
+  type ListViewFilter,
+  type ListViewFilters,
+} from 'src/components';
 import handleResourceExport from 'src/utils/export';
-import Loading from 'src/components/Loading';
 import SubMenu, { SubMenuProps } from 'src/features/home/SubMenu';
-import ListView, {
-  ListViewProps,
-  Filter,
-  Filters,
-  FilterOperator,
-} from 'src/components/ListView';
 import { dangerouslyGetItemDoNotUse } from 'src/utils/localStorageHelpers';
 import Owner from 'src/types/Owner';
-import Tag from 'src/types/TagType';
 import withToasts from 'src/components/MessageToasts/withToasts';
-import FacePile from 'src/components/FacePile';
-import { Icons } from 'src/components/Icons';
-import DeleteModal from 'src/components/DeleteModal';
-import FaveStar from 'src/components/FaveStar';
+import { Icons } from '@superset-ui/core/components/Icons';
 import PropertiesModal from 'src/dashboard/components/PropertiesModal';
-import { Tooltip } from 'src/components/Tooltip';
-import ImportModelsModal from 'src/components/ImportModal/index';
 
 import Dashboard from 'src/dashboard/containers/Dashboard';
 import {
   Dashboard as CRUDDashboard,
   QueryObjectColumns,
 } from 'src/views/CRUD/types';
-import CertifiedBadge from 'src/components/CertifiedBadge';
-import { loadTags } from 'src/components/Tags/utils';
+import { loadTags } from 'src/components/Tag/utils';
 import DashboardCard from 'src/features/dashboards/DashboardCard';
 import { DashboardStatus } from 'src/features/dashboards/types';
 import { UserWithPermissionsAndRoles } from 'src/types/bootstrapTypes';
 import { findPermission } from 'src/utils/findPermission';
-import { ModifiedInfo } from 'src/components/AuditInfo';
 import { navigateTo } from 'src/utils/navigationUtils';
+import { WIDER_DROPDOWN_WIDTH } from 'src/components/ListView/utils';
 
 const PAGE_SIZE = 25;
 const PASSWORDS_NEEDED_MESSAGE = t(
@@ -107,7 +109,7 @@ export interface Dashboard {
   url: string;
   thumbnail_url: string;
   owners: Owner[];
-  tags: Tag[];
+  tags: TagType[];
   created_by: object;
 }
 
@@ -141,7 +143,6 @@ const DASHBOARD_COLUMNS_TO_FETCH = [
 
 function DashboardList(props: DashboardListProps) {
   const { addDangerToast, addSuccessToast, user } = props;
-  const theme = useTheme();
   const { roles } = useSelector<any, UserWithPermissionsAndRoles>(
     state => state.user,
   );
@@ -344,6 +345,7 @@ function DashboardList(props: DashboardListProps) {
         ),
         Header: t('Name'),
         accessor: 'dashboard_title',
+        id: 'dashboard_title',
       },
       {
         Cell: ({
@@ -356,6 +358,7 @@ function DashboardList(props: DashboardListProps) {
         Header: t('Status'),
         accessor: 'published',
         size: 'xl',
+        id: 'published',
       },
       {
         Cell: ({
@@ -365,14 +368,15 @@ function DashboardList(props: DashboardListProps) {
         }: {
           row: {
             original: {
-              tags: Tag[];
+              tags: TagType[];
             };
           };
         }) => (
           // Only show custom type tags
           <TagsList
             tags={tags.filter(
-              (tag: Tag) => tag.type === 'TagTypes.custom' || tag.type === 1,
+              (tag: TagType) =>
+                tag.type === 'TagTypes.custom' || tag.type === 1,
             )}
             maxTags={3}
           />
@@ -381,6 +385,7 @@ function DashboardList(props: DashboardListProps) {
         accessor: 'tags',
         disableSortBy: true,
         hidden: !isFeatureEnabled(FeatureFlag.TaggingSystem),
+        id: 'tags',
       },
       {
         Cell: ({
@@ -392,6 +397,7 @@ function DashboardList(props: DashboardListProps) {
         accessor: 'owners',
         disableSortBy: true,
         size: 'xl',
+        id: 'owners',
       },
       {
         Cell: ({
@@ -405,6 +411,7 @@ function DashboardList(props: DashboardListProps) {
         Header: t('Last modified'),
         accessor: 'changed_on_delta_humanized',
         size: 'xl',
+        id: 'changed_on_delta_humanized',
       },
       {
         Cell: ({ row: { original } }: any) => {
@@ -495,6 +502,7 @@ function DashboardList(props: DashboardListProps) {
       {
         accessor: QueryObjectColumns.ChangedBy,
         hidden: true,
+        id: QueryObjectColumns.ChangedBy,
       },
     ],
     [
@@ -510,7 +518,7 @@ function DashboardList(props: DashboardListProps) {
     ],
   );
 
-  const favoritesFilter: Filter = useMemo(
+  const favoritesFilter: ListViewFilter = useMemo(
     () => ({
       Header: t('Favorite'),
       key: 'favorite',
@@ -527,7 +535,7 @@ function DashboardList(props: DashboardListProps) {
     [],
   );
 
-  const filters: Filters = useMemo(() => {
+  const filters: ListViewFilters = useMemo(() => {
     const filters_list = [
       {
         Header: t('Name'),
@@ -582,6 +590,7 @@ function DashboardList(props: DashboardListProps) {
           props.user,
         ),
         paginate: true,
+        dropdownStyle: { minWidth: WIDER_DROPDOWN_WIDTH },
       },
       ...(user?.userId ? [favoritesFilter] : []),
       {
@@ -616,8 +625,9 @@ function DashboardList(props: DashboardListProps) {
           user,
         ),
         paginate: true,
+        dropdownStyle: { minWidth: WIDER_DROPDOWN_WIDTH },
       },
-    ] as Filters;
+    ] as ListViewFilters;
     return filters_list;
   }, [addDangerToast, favoritesFilter, props.user]);
 
@@ -686,14 +696,7 @@ function DashboardList(props: DashboardListProps) {
     subMenuButtons.push({
       name: (
         <>
-          <Icons.PlusOutlined
-            iconColor={theme.colors.primary.light5}
-            iconSize="m"
-            css={css`
-              margin: auto ${theme.gridUnit * 2}px auto 0;
-              vertical-align: text-top;
-            `}
-          />
+          <Icons.PlusOutlined iconSize="m" />
           {t('Dashboard')}
         </>
       ),
@@ -710,7 +713,7 @@ function DashboardList(props: DashboardListProps) {
           title={t('Import dashboards')}
           placement="bottomRight"
         >
-          <Icons.DownloadOutlined data-test="import-button" />
+          <Icons.DownloadOutlined iconSize="l" data-test="import-button" />
         </Tooltip>
       ),
       buttonStyle: 'link',
diff --git a/superset-frontend/src/pages/DatabaseList/index.tsx b/superset-frontend/src/pages/DatabaseList/index.tsx
index c1a83dc8f14..820af881521 100644
--- a/superset-frontend/src/pages/DatabaseList/index.tsx
+++ b/superset-frontend/src/pages/DatabaseList/index.tsx
@@ -21,15 +21,12 @@ import {
   styled,
   SupersetClient,
   t,
-  useTheme,
-  css,
 } from '@superset-ui/core';
 import { useState, useMemo, useEffect } from 'react';
 import rison from 'rison';
 import { useSelector } from 'react-redux';
 import { useQueryParams, BooleanParam } from 'use-query-params';
 import { LocalStorageKeys, setItem } from 'src/utils/localStorageHelpers';
-import Loading from 'src/components/Loading';
 import { useListViewResource } from 'src/views/CRUD/hooks';
 import {
   createErrorHandler,
@@ -38,13 +35,23 @@ import {
 } from 'src/views/CRUD/utils';
 import withToasts from 'src/components/MessageToasts/withToasts';
 import SubMenu, { SubMenuProps } from 'src/features/home/SubMenu';
-import DeleteModal from 'src/components/DeleteModal';
+import {
+  DeleteModal,
+  Tooltip,
+  List,
+  Loading,
+} from '@superset-ui/core/components';
+import {
+  ModifiedInfo,
+  ListView,
+  ListViewFilterOperator as FilterOperator,
+  ListViewFilters,
+} from 'src/components';
+import { Typography } from '@superset-ui/core/components/Typography';
 import { getUrlParam } from 'src/utils/urlUtils';
 import { URL_PARAMS } from 'src/constants';
-import { Tooltip } from 'src/components/Tooltip';
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { isUserAdmin } from 'src/dashboard/util/permissionUtils';
-import ListView, { FilterOperator, Filters } from 'src/components/ListView';
 import handleResourceExport from 'src/utils/export';
 import { ExtensionConfigs } from 'src/features/home/types';
 import { UserWithPermissionsAndRoles } from 'src/types/bootstrapTypes';
@@ -52,8 +59,8 @@ import type { MenuObjectProps } from 'src/types/bootstrapTypes';
 import DatabaseModal from 'src/features/databases/DatabaseModal';
 import UploadDataModal from 'src/features/databases/UploadDataModel';
 import { DatabaseObject } from 'src/features/databases/types';
-import { ModifiedInfo } from 'src/components/AuditInfo';
 import { QueryObjectColumns } from 'src/views/CRUD/types';
+import { WIDER_DROPDOWN_WIDTH } from 'src/components/ListView/utils';
 
 const extensionsRegistry = getExtensionsRegistry();
 const DatabaseDeleteRelatedExtension = extensionsRegistry.get(
@@ -82,26 +89,18 @@ interface DatabaseListProps {
 }
 
 const Actions = styled.div`
-  color: ${({ theme }) => theme.colors.grayscale.base};
-
   .action-button {
     display: inline-block;
     height: 100%;
+    color: ${({ theme }) => theme.colorIcon};
   }
 `;
 
 function BooleanDisplay({ value }: { value: Boolean }) {
-  const theme = useTheme();
   return value ? (
-    <Icons.CheckOutlined
-      iconSize="s"
-      iconColor={theme.colors.grayscale.dark1}
-    />
+    <Icons.CheckOutlined iconSize="s" />
   ) : (
-    <Icons.CloseOutlined
-      iconSize="s"
-      iconColor={theme.colors.grayscale.light1}
-    />
+    <Icons.CloseOutlined iconSize="s" />
   );
 }
 
@@ -111,7 +110,6 @@ function DatabaseList({
   addSuccessToast,
   user,
 }: DatabaseListProps) {
-  const theme = useTheme();
   const {
     state: {
       loading,
@@ -323,13 +321,7 @@ function DatabaseList({
         'data-test': 'btn-create-database',
         name: (
           <>
-            <Icons.PlusOutlined
-              css={css`
-                vertical-align: text-top;
-              `}
-              iconColor={theme.colors.primary.light5}
-              iconSize="m"
-            />
+            <Icons.PlusOutlined iconSize="m" />
             {t('Database')}
           </>
         ),
@@ -398,12 +390,14 @@ function DatabaseList({
       {
         accessor: 'database_name',
         Header: t('Name'),
+        id: 'database_name',
       },
       {
         accessor: 'backend',
         Header: t('Backend'),
         size: 'lg',
         disableSortBy: true, // TODO: api support for sorting by 'backend'
+        id: 'backend',
       },
       {
         accessor: 'allow_run_async',
@@ -424,6 +418,7 @@ function DatabaseList({
           row: { original: { allow_run_async: boolean } };
         }) => <BooleanDisplay value={allowRunAsync} />,
         size: 'sm',
+        id: 'allow_run_async',
       },
       {
         accessor: 'allow_dml',
@@ -442,6 +437,7 @@ function DatabaseList({
           },
         }: any) => <BooleanDisplay value={allowDML} />,
         size: 'sm',
+        id: 'allow_dml',
       },
       {
         accessor: 'allow_file_upload',
@@ -452,6 +448,7 @@ function DatabaseList({
           },
         }: any) => <BooleanDisplay value={allowFileUpload} />,
         size: 'md',
+        id: 'allow_file_upload',
       },
       {
         accessor: 'expose_in_sqllab',
@@ -462,6 +459,7 @@ function DatabaseList({
           },
         }: any) => <BooleanDisplay value={exposeInSqllab} />,
         size: 'md',
+        id: 'expose_in_sqllab',
       },
       {
         Cell: ({
@@ -475,6 +473,7 @@ function DatabaseList({
         Header: t('Last modified'),
         accessor: 'changed_on_delta_humanized',
         size: 'xl',
+        id: 'changed_on_delta_humanized',
       },
       {
         Cell: ({ row: { original } }: any) => {
@@ -566,12 +565,13 @@ function DatabaseList({
       {
         accessor: QueryObjectColumns.ChangedBy,
         hidden: true,
+        id: QueryObjectColumns.ChangedBy,
       },
     ],
     [canDelete, canEdit, canExport],
   );
 
-  const filters: Filters = useMemo(
+  const filters: ListViewFilters = useMemo(
     () => [
       {
         Header: t('Name'),
@@ -631,6 +631,7 @@ function DatabaseList({
           user,
         ),
         paginate: true,
+        dropdownStyle: { minWidth: WIDER_DROPDOWN_WIDTH },
       },
     ],
     [],
@@ -694,70 +695,85 @@ function DatabaseList({
               {databaseCurrentlyDeleting.dashboards.count >= 1 && (
                 <>
                   <h4>{t('Affected Dashboards')}</h4>
-                  <ul>
-                    {databaseCurrentlyDeleting.dashboards.result
-                      .slice(0, 10)
-                      .map(
-                        (
-                          result: { id: number; title: string },
-                          index: number,
-                        ) => (
-                          <li key={result.id}>
-                            <a
+                  <List
+                    split={false}
+                    size="small"
+                    dataSource={databaseCurrentlyDeleting.dashboards.result.slice(
+                      0,
+                      10,
+                    )}
+                    renderItem={(result: { id: number; title: string }) => (
+                      <List.Item key={result.id} compact>
+                        <List.Item.Meta
+                          avatar={<span>•</span>}
+                          title={
+                            <Typography.Link
                               href={`/superset/dashboard/${result.id}`}
                               target="_atRiskItem"
                             >
                               {result.title}
-                            </a>
-                          </li>
-                        ),
-                      )}
-                    {databaseCurrentlyDeleting.dashboards.result.length >
-                      10 && (
-                      <li>
-                        {t(
-                          '... and %s others',
-                          databaseCurrentlyDeleting.dashboards.result.length -
-                            10,
-                        )}
-                      </li>
+                            </Typography.Link>
+                          }
+                        />
+                      </List.Item>
                     )}
-                  </ul>
+                    footer={
+                      databaseCurrentlyDeleting.dashboards.result.length >
+                        10 && (
+                        <div>
+                          {t(
+                            '... and %s others',
+                            databaseCurrentlyDeleting.dashboards.result.length -
+                              10,
+                          )}
+                        </div>
+                      )
+                    }
+                  />
                 </>
               )}
               {databaseCurrentlyDeleting.charts.count >= 1 && (
                 <>
                   <h4>{t('Affected Charts')}</h4>
-                  <ul>
-                    {databaseCurrentlyDeleting.charts.result.slice(0, 10).map(
-                      (
-                        result: {
-                          id: number;
-                          slice_name: string;
-                        },
-                        index: number,
-                      ) => (
-                        <li key={result.id}>
-                          <a
-                            href={`/explore/?slice_id=${result.id}`}
-                            target="_atRiskItem"
-                          >
-                            {result.slice_name}
-                          </a>
-                        </li>
-                      ),
+                  <List
+                    split={false}
+                    size="small"
+                    dataSource={databaseCurrentlyDeleting.charts.result.slice(
+                      0,
+                      10,
                     )}
-                    {databaseCurrentlyDeleting.charts.result.length > 10 && (
-                      <li>
-                        {t(
-                          '... and %s others',
-                          databaseCurrentlyDeleting.charts.result.length - 10,
-                        )}
-                      </li>
+                    renderItem={(result: {
+                      id: number;
+                      slice_name: string;
+                    }) => (
+                      <List.Item key={result.id} compact>
+                        <List.Item.Meta
+                          avatar={<span>•</span>}
+                          title={
+                            <Typography.Link
+                              href={`/explore/?slice_id=${result.id}`}
+                              target="_atRiskItem"
+                            >
+                              {result.slice_name}
+                            </Typography.Link>
+                          }
+                        />
+                      </List.Item>
                     )}
-                  </ul>
+                    footer={
+                      databaseCurrentlyDeleting.charts.result.length > 10 && (
+                        <div>
+                          {t(
+                            '... and %s others',
+                            databaseCurrentlyDeleting.charts.result.length - 10,
+                          )}
+                        </div>
+                      )
+                    }
+                  />
                 </>
               )}
+
               {DatabaseDeleteRelatedExtension && (
                 <DatabaseDeleteRelatedExtension
                   database={databaseCurrentlyDeleting}
diff --git a/superset-frontend/src/pages/DatasetList/index.tsx b/superset-frontend/src/pages/DatasetList/index.tsx
index fbd07fb2364..80a5711492a 100644
--- a/superset-frontend/src/pages/DatasetList/index.tsx
+++ b/superset-frontend/src/pages/DatasetList/index.tsx
@@ -34,29 +34,34 @@ import {
 } from 'src/views/CRUD/utils';
 import { ColumnObject } from 'src/features/datasets/types';
 import { useListViewResource } from 'src/views/CRUD/hooks';
-import ConfirmStatusChange from 'src/components/ConfirmStatusChange';
-import { DatasourceModal } from 'src/components/Datasource';
-import DeleteModal from 'src/components/DeleteModal';
+import {
+  ConfirmStatusChange,
+  CertifiedBadge,
+  DeleteModal,
+  Tooltip,
+  InfoTooltip,
+  DatasetTypeLabel,
+  Loading,
+  List,
+} from '@superset-ui/core/components';
+import { DatasourceModal, GenericLink } from 'src/components';
+import {
+  FacePile,
+  ImportModal as ImportModelsModal,
+  ModifiedInfo,
+  ListView,
+  ListViewFilterOperator as FilterOperator,
+  type ListViewProps,
+  type ListViewFilters,
+} from 'src/components';
+import { Typography } from '@superset-ui/core/components/Typography';
 import handleResourceExport from 'src/utils/export';
-import ListView, {
-  ListViewProps,
-  Filters,
-  FilterOperator,
-} from 'src/components/ListView';
-import { DatasetTypeLabel } from 'src/components/Label';
-import Loading from 'src/components/Loading';
 import SubMenu, { SubMenuProps, ButtonProps } from 'src/features/home/SubMenu';
 import Owner from 'src/types/Owner';
 import withToasts from 'src/components/MessageToasts/withToasts';
-import { Tooltip } from 'src/components/Tooltip';
-import { Icons } from 'src/components/Icons';
-import FacePile from 'src/components/FacePile';
-import CertifiedBadge from 'src/components/CertifiedBadge';
-import InfoTooltip from 'src/components/InfoTooltip';
-import ImportModelsModal from 'src/components/ImportModal/index';
-import WarningIconWithTooltip from 'src/components/WarningIconWithTooltip';
+import { Icons } from '@superset-ui/core/components/Icons';
+import WarningIconWithTooltip from '@superset-ui/core/components/WarningIconWithTooltip';
 import { isUserAdmin } from 'src/dashboard/util/permissionUtils';
-import { GenericLink } from 'src/components/GenericLink/GenericLink';
 
 import {
   PAGE_SIZE,
@@ -66,8 +71,8 @@ import {
 } from 'src/features/datasets/constants';
 import DuplicateDatasetModal from 'src/features/datasets/DuplicateDatasetModal';
 import { useSelector } from 'react-redux';
-import { ModifiedInfo } from 'src/components/AuditInfo';
 import { QueryObjectColumns } from 'src/views/CRUD/types';
+import { WIDER_DROPDOWN_WIDTH } from 'src/components/ListView/utils';
 
 const extensionsRegistry = getExtensionsRegistry();
 const DatasetDeleteRelatedExtension = extensionsRegistry.get(
@@ -79,7 +84,7 @@ const FlexRowContainer = styled.div`
   display: flex;
 
   svg {
-    margin-right: ${({ theme }) => theme.gridUnit}px;
+    margin-right: ${({ theme }) => theme.sizeUnit}px;
   }
 `;
 
@@ -92,12 +97,12 @@ const Actions = styled.div`
       i {
         &:hover {
           path {
-            fill: ${theme.colors.grayscale.light1};
+            fill: ${theme.colorText};
           }
         }
       }
       color: ${theme.colors.grayscale.light1};
-      .antd5-menu-item:hover {
+      .ant-menu-item:hover {
         cursor: default;
       }
       &::after {
@@ -342,6 +347,7 @@ const DatasetList: FunctionComponent<DatasetListProps> = ({
         },
         Header: t('Name'),
         accessor: 'table_name',
+        id: 'table_name',
       },
       {
         Cell: ({
@@ -353,21 +359,25 @@ const DatasetList: FunctionComponent<DatasetListProps> = ({
         accessor: 'kind',
         disableSortBy: true,
         size: 'md',
+        id: 'kind',
       },
       {
         Header: t('Database'),
         accessor: 'database.database_name',
         size: 'lg',
+        id: 'database.database_name',
       },
       {
         Header: t('Schema'),
         accessor: 'schema',
         size: 'lg',
+        id: 'schema',
       },
       {
         accessor: 'database',
         disableSortBy: true,
         hidden: true,
+        id: 'database',
       },
       {
         Cell: ({
@@ -392,11 +402,13 @@ const DatasetList: FunctionComponent<DatasetListProps> = ({
         Header: t('Last modified'),
         accessor: 'changed_on_delta_humanized',
         size: 'xl',
+        id: 'changed_on_delta_humanized',
       },
       {
         accessor: 'sql',
         hidden: true,
         disableSortBy: true,
+        id: 'sql',
       },
       {
         Cell: ({ row: { original } }: any) => {
@@ -456,7 +468,7 @@ const DatasetList: FunctionComponent<DatasetListProps> = ({
                           'You must be a dataset owner in order to edit. Please reach out to a dataset owner to request modifications or edit access.',
                         )
                   }
-                  placement="bottomRight"
+                  placement="bottom"
                 >
                   <span
                     role="button"
@@ -480,7 +492,7 @@ const DatasetList: FunctionComponent<DatasetListProps> = ({
                     className="action-button"
                     onClick={handleDuplicate}
                   >
-                    <Icons.CopyOutlined />
+                    <Icons.CopyOutlined iconSize="l" />
                   </span>
                 </Tooltip>
               )}
@@ -495,12 +507,13 @@ const DatasetList: FunctionComponent<DatasetListProps> = ({
       {
         accessor: QueryObjectColumns.ChangedBy,
         hidden: true,
+        id: QueryObjectColumns.ChangedBy,
       },
     ],
     [canEdit, canDelete, canExport, openDatasetEditModal, canDuplicate, user],
   );
 
-  const filterTypes: Filters = useMemo(
+  const filterTypes: ListViewFilters = useMemo(
     () => [
       {
         Header: t('Name'),
@@ -536,6 +549,7 @@ const DatasetList: FunctionComponent<DatasetListProps> = ({
           ),
         ),
         paginate: true,
+        dropdownStyle: { minWidth: WIDER_DROPDOWN_WIDTH },
       },
       {
         Header: t('Schema'),
@@ -552,6 +566,7 @@ const DatasetList: FunctionComponent<DatasetListProps> = ({
           ),
         ),
         paginate: true,
+        dropdownStyle: { minWidth: WIDER_DROPDOWN_WIDTH },
       },
       {
         Header: t('Owner'),
@@ -572,6 +587,7 @@ const DatasetList: FunctionComponent<DatasetListProps> = ({
           user,
         ),
         paginate: true,
+        dropdownStyle: { minWidth: WIDER_DROPDOWN_WIDTH },
       },
       {
         Header: t('Certified'),
@@ -605,6 +621,7 @@ const DatasetList: FunctionComponent<DatasetListProps> = ({
           user,
         ),
         paginate: true,
+        dropdownStyle: { minWidth: WIDER_DROPDOWN_WIDTH },
       },
     ],
     [user],
@@ -629,13 +646,7 @@ const DatasetList: FunctionComponent<DatasetListProps> = ({
     buttonArr.push({
       name: (
         <>
-          <Icons.PlusOutlined
-            iconColor={theme.colors.primary.light5}
-            iconSize="m"
-            css={css`
-              vertical-align: text-top;
-            `}
-          />
+          <Icons.PlusOutlined iconSize="m" />
           {t('Dataset')}
         </>
       ),
@@ -653,8 +664,9 @@ const DatasetList: FunctionComponent<DatasetListProps> = ({
           placement="bottomRight"
         >
           <Icons.DownloadOutlined
-            iconColor={theme.colors.primary.dark1}
+            iconColor={theme.colorPrimary}
             data-test="import-button"
+            iconSize="l"
           />
         </Tooltip>
       ),
@@ -755,67 +767,85 @@ const DatasetList: FunctionComponent<DatasetListProps> = ({
               {datasetCurrentlyDeleting.dashboards.count >= 1 && (
                 <>
                   <h4>{t('Affected Dashboards')}</h4>
-                  <ul>
-                    {datasetCurrentlyDeleting.dashboards.result
-                      .slice(0, 10)
-                      .map(
-                        (
-                          result: { id: Key | null | undefined; title: string },
-                          index: number,
-                        ) => (
-                          <li key={result.id}>
-                            <a
+                  <List
+                    split={false}
+                    size="small"
+                    dataSource={datasetCurrentlyDeleting.dashboards.result.slice(
+                      0,
+                      10,
+                    )}
+                    renderItem={(result: {
+                      id: Key | null | undefined;
+                      title: string;
+                    }) => (
+                      <List.Item key={result.id} compact>
+                        <List.Item.Meta
+                          avatar={<span>•</span>}
+                          title={
+                            <Typography.Link
                               href={`/superset/dashboard/${result.id}`}
                               target="_atRiskItem"
                             >
                               {result.title}
-                            </a>
-                          </li>
-                        ),
-                      )}
-                    {datasetCurrentlyDeleting.dashboards.result.length > 10 && (
-                      <li>
-                        {t(
-                          '... and %s others',
-                          datasetCurrentlyDeleting.dashboards.result.length -
-                            10,
-                        )}
-                      </li>
+                            </Typography.Link>
+                          }
+                        />
+                      </List.Item>
                     )}
-                  </ul>
+                    footer={
+                      datasetCurrentlyDeleting.dashboards.result.length >
+                        10 && (
+                        <div>
+                          {t(
+                            '... and %s others',
+                            datasetCurrentlyDeleting.dashboards.result.length -
+                              10,
+                          )}
+                        </div>
+                      )
+                    }
+                  />
                 </>
               )}
               {datasetCurrentlyDeleting.charts.count >= 1 && (
                 <>
                   <h4>{t('Affected Charts')}</h4>
-                  <ul>
-                    {datasetCurrentlyDeleting.charts.result.slice(0, 10).map(
-                      (
-                        result: {
-                          id: Key | null | undefined;
-                          slice_name: string;
-                        },
-                        index: number,
-                      ) => (
-                        <li key={result.id}>
-                          <a
-                            href={`/explore/?slice_id=${result.id}`}
-                            target="_atRiskItem"
-                          >
-                            {result.slice_name}
-                          </a>
-                        </li>
-                      ),
+                  <List
+                    split={false}
+                    size="small"
+                    dataSource={datasetCurrentlyDeleting.charts.result.slice(
+                      0,
+                      10,
                     )}
-                    {datasetCurrentlyDeleting.charts.result.length > 10 && (
-                      <li>
-                        {t(
-                          '... and %s others',
-                          datasetCurrentlyDeleting.charts.result.length - 10,
-                        )}
-                      </li>
+                    renderItem={(result: {
+                      id: Key | null | undefined;
+                      slice_name: string;
+                    }) => (
+                      <List.Item key={result.id} compact>
+                        <List.Item.Meta
+                          avatar={<span>•</span>}
+                          title={
+                            <Typography.Link
+                              href={`/explore/?slice_id=${result.id}`}
+                              target="_atRiskItem"
+                            >
+                              {result.slice_name}
+                            </Typography.Link>
+                          }
+                        />
+                      </List.Item>
                     )}
-                  </ul>
+                    footer={
+                      datasetCurrentlyDeleting.charts.result.length > 10 && (
+                        <div>
+                          {t(
+                            '... and %s others',
+                            datasetCurrentlyDeleting.charts.result.length - 10,
+                          )}
+                        </div>
+                      )
+                    }
+                  />
                 </>
               )}
               {DatasetDeleteRelatedExtension && (
diff --git a/superset-frontend/src/pages/ExecutionLogList/index.tsx b/superset-frontend/src/pages/ExecutionLogList/index.tsx
index 1c11bd82ada..f32dc606cf9 100644
--- a/superset-frontend/src/pages/ExecutionLogList/index.tsx
+++ b/superset-frontend/src/pages/ExecutionLogList/index.tsx
@@ -21,11 +21,11 @@ import { css, styled, t } from '@superset-ui/core';
 import dayjs from 'dayjs';
 import { useEffect, useMemo } from 'react';
 import { Link, useParams } from 'react-router-dom';
-import ListView from 'src/components/ListView';
-import { Tooltip } from 'src/components/Tooltip';
+import { Tooltip } from '@superset-ui/core/components';
+import { ListView } from 'src/components';
 import SubMenu from 'src/features/home/SubMenu';
 import withToasts from 'src/components/MessageToasts/withToasts';
-import { fDuration } from 'src/utils/dates';
+import { fDuration } from '@superset-ui/core/utils/dates';
 import AlertStatusIcon from 'src/features/alerts/components/AlertStatusIcon';
 import {
   useListViewResource,
@@ -43,9 +43,9 @@ const StyledHeader = styled.div`
 
     a,
     Link {
-      margin-left: ${theme.gridUnit * 4}px;
-      font-size: ${theme.typography.sizes.s};
-      font-weight: ${theme.typography.weights.normal};
+      margin-left: ${theme.sizeUnit * 4}px;
+      font-size: ${theme.fontSizeSM};
+      font-weight: ${theme.fontWeightNormal};
       text-decoration: underline;
     }
   `}
@@ -102,6 +102,7 @@ function ExecutionLog({
         Header: t('State'),
         size: 'xs',
         disableSortBy: true,
+        id: 'state',
       },
       {
         Cell: ({
@@ -113,6 +114,7 @@ function ExecutionLog({
         Header: t('Execution ID'),
         size: 'xs',
         disableSortBy: true,
+        id: 'uuid',
       },
       {
         Cell: ({
@@ -123,6 +125,7 @@ function ExecutionLog({
           dayjs(new Date(scheduledDttm)).format('YYYY-MM-DD hh:mm:ss a'),
         accessor: 'scheduled_dttm',
         Header: t('Scheduled at (UTC)'),
+        id: 'scheduled_dttm',
       },
       {
         Cell: ({
@@ -134,6 +137,7 @@ function ExecutionLog({
         }) => dayjs(new Date(startDttm)).format('YYYY-MM-DD hh:mm:ss a'),
         Header: t('Start at (UTC)'),
         accessor: 'start_dttm',
+        id: 'start_dttm',
       },
       {
         Cell: ({
@@ -146,10 +150,12 @@ function ExecutionLog({
           fDuration(new Date(startDttm).getTime(), new Date(endDttm).getTime()),
         Header: t('Duration'),
         disableSortBy: true,
+        id: 'duration',
       },
       {
         accessor: 'value',
         Header: t('Value'),
+        id: 'value',
       },
       {
         accessor: 'error_message',
@@ -163,6 +169,7 @@ function ExecutionLog({
             <span>{error_message}</span>
           </Tooltip>
         ),
+        id: 'error_message',
       },
     ],
     [isReportEnabled],
diff --git a/superset-frontend/src/pages/GroupsList/index.tsx b/superset-frontend/src/pages/GroupsList/index.tsx
index 0d6c956ad53..f497e343304 100644
--- a/superset-frontend/src/pages/GroupsList/index.tsx
+++ b/superset-frontend/src/pages/GroupsList/index.tsx
@@ -21,16 +21,10 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
 import { css, t, useTheme } from '@superset-ui/core';
 import { useListViewResource } from 'src/views/CRUD/hooks';
 import SubMenu, { SubMenuProps } from 'src/features/home/SubMenu';
-import ActionsBar, { ActionProps } from 'src/components/ListView/ActionsBar';
-import ListView, {
-  ListViewProps,
-  Filters,
-  FilterOperator,
-} from 'src/components/ListView';
-import DeleteModal from 'src/components/DeleteModal';
-import ConfirmStatusChange from 'src/components/ConfirmStatusChange';
+import { ActionsBar, ActionProps } from 'src/components/ListView/ActionsBar';
+import { ListView, ListViewProps } from 'src/components/ListView';
+import { type ListViewFilters, ListViewFilterOperator } from 'src/components';
 import { isUserAdmin } from 'src/dashboard/util/permissionUtils';
-import { Icons } from 'src/components/Icons';
 import {
   GroupListAddModal,
   GroupListEditModal,
@@ -38,7 +32,13 @@ import {
 import { useToasts } from 'src/components/MessageToasts/withToasts';
 import { deleteGroup, fetchUserOptions } from 'src/features/groups/utils';
 import { fetchPaginatedData } from 'src/utils/fetchOptions';
-import { Tooltip } from 'src/components/Tooltip';
+import {
+  Tooltip,
+  Icons,
+  ConfirmStatusChange,
+  DeleteModal,
+} from '@superset-ui/core/components';
+import { WIDER_DROPDOWN_WIDTH } from 'src/components/ListView/utils';
 
 const PAGE_SIZE = 25;
 
@@ -277,10 +277,10 @@ function GroupsList({ user }: GroupsListProps) {
         name: (
           <>
             <Icons.PlusOutlined
-              iconColor={theme.colors.primary.light5}
+              iconColor={theme.colorText}
               iconSize="m"
               css={css`
-                margin: auto ${theme.gridUnit * 2}px auto 0;
+                margin: auto ${theme.sizeUnit * 2}px auto 0;
                 vertical-align: text-top;
               `}
             />
@@ -302,51 +302,53 @@ function GroupsList({ user }: GroupsListProps) {
     );
   }
 
-  const filters: Filters = useMemo(
+  const filters: ListViewFilters = useMemo(
     () => [
       {
         Header: t('Name'),
         key: 'name',
         id: 'name',
         input: 'search',
-        operator: FilterOperator.Contains,
+        operator: ListViewFilterOperator.Contains,
       },
       {
         Header: t('Label'),
         key: 'label',
         id: 'label',
         input: 'search',
-        operator: FilterOperator.Contains,
+        operator: ListViewFilterOperator.Contains,
       },
       {
         Header: t('Description'),
         key: 'description',
         id: 'description',
         input: 'search',
-        operator: FilterOperator.Contains,
+        operator: ListViewFilterOperator.Contains,
       },
       {
         Header: t('Roles'),
         key: 'roles',
         id: 'roles',
         input: 'select',
-        operator: FilterOperator.RelationManyMany,
+        operator: ListViewFilterOperator.RelationManyMany,
         unfilteredLabel: t('All'),
         selects: roles?.map(role => ({
           label: role.name,
           value: role.id,
         })),
         loading: loadingState.roles,
+        dropdownStyle: { minWidth: WIDER_DROPDOWN_WIDTH },
       },
       {
         Header: t('Users'),
         key: 'users',
         id: 'users',
         input: 'select',
-        operator: FilterOperator.RelationManyMany,
+        operator: ListViewFilterOperator.RelationManyMany,
         unfilteredLabel: t('All'),
         fetchSelects: async (filterValue, page, pageSize) =>
           fetchUserOptions(filterValue, page, pageSize, addDangerToast),
+        dropdownStyle: { minWidth: WIDER_DROPDOWN_WIDTH },
       },
     ],
     [loadingState.roles, roles],
@@ -362,10 +364,10 @@ function GroupsList({ user }: GroupsListProps) {
       buttonText: (
         <>
           <Icons.PlusOutlined
-            iconColor={theme.colors.primary.light5}
+            iconColor={theme.colorText}
             iconSize="m"
             css={css`
-              margin: auto ${theme.gridUnit * 2}px auto 0;
+              margin: auto ${theme.sizeUnit * 2}px auto 0;
               vertical-align: text-top;
             `}
           />
diff --git a/superset-frontend/src/pages/Home/Home.test.tsx b/superset-frontend/src/pages/Home/Home.test.tsx
index e9dd039cbdb..96c4a0cceaf 100644
--- a/superset-frontend/src/pages/Home/Home.test.tsx
+++ b/superset-frontend/src/pages/Home/Home.test.tsx
@@ -177,7 +177,7 @@ test('With sql role - renders all panels on the page on page load', async () =>
 
 test('With sql role - renders distinct recent activities', async () => {
   await renderWelcome();
-  const recentPanel = screen.getByRole('button', { name: 'right Recents' });
+  const recentPanel = screen.getByRole('button', { name: 'collapsed Recents' });
   userEvent.click(recentPanel);
   await waitFor(() =>
     expect(
diff --git a/superset-frontend/src/pages/Home/index.tsx b/superset-frontend/src/pages/Home/index.tsx
index 6d005c79f6f..18f6c779e50 100644
--- a/superset-frontend/src/pages/Home/index.tsx
+++ b/superset-frontend/src/pages/Home/index.tsx
@@ -26,7 +26,7 @@ import {
   t,
 } from '@superset-ui/core';
 import rison from 'rison';
-import Collapse from 'src/components/Collapse';
+import { Collapse, ListViewCard } from '@superset-ui/core/components';
 import { User } from 'src/types/bootstrapTypes';
 import { reject } from 'lodash';
 import {
@@ -36,7 +36,6 @@ import {
   LocalStorageKeys,
   setItem,
 } from 'src/utils/localStorageHelpers';
-import ListViewCard from 'src/components/ListViewCard';
 import withToasts from 'src/components/MessageToasts/withToasts';
 import {
   CardContainer,
@@ -46,7 +45,7 @@ import {
   loadingCardCount,
   mq,
 } from 'src/views/CRUD/utils';
-import { Switch } from 'src/components/Switch';
+import { Switch } from '@superset-ui/core/components/Switch';
 import getBootstrapData from 'src/utils/getBootstrapData';
 import { TableTab } from 'src/views/CRUD/types';
 import SubMenu, { SubMenuProps } from 'src/features/home/SubMenu';
@@ -75,48 +74,42 @@ interface LoadingProps {
   cover?: boolean;
 }
 
-const DEFAULT_TAB_ARR = ['2', '3'];
+const DEFAULT_TAB_ARR = ['dashboards', 'charts'];
 
 const WelcomeContainer = styled.div`
-  background-color: ${({ theme }) => theme.colors.grayscale.light4};
   .ant-row.menu {
     margin-top: -15px;
-    background-color: ${({ theme }) => theme.colors.grayscale.light4};
+
     &:after {
       content: '';
       display: block;
-      border: 1px solid ${({ theme }) => theme.colors.grayscale.light2};
-      margin: 0px ${({ theme }) => theme.gridUnit * 6}px;
+      margin: 0px ${({ theme }) => theme.sizeUnit * 6}px;
       position: relative;
       width: 100%;
+
       ${mq[1]} {
         margin-top: 5px;
         margin: 0px 2px;
       }
     }
+
     button {
       padding: 3px 21px;
     }
   }
-  .antd5-card-meta-description {
-    margin-top: ${({ theme }) => theme.gridUnit}px;
+
+  .ant-card-meta-description {
+    margin-top: ${({ theme }) => theme.sizeUnit}px;
   }
-  .antd5-card.ant-card-bordered {
-    border: 1px solid ${({ theme }) => theme.colors.grayscale.light2};
-  }
-  .ant-collapse-item .ant-collapse-content {
-    margin-bottom: ${({ theme }) => theme.gridUnit * -6}px;
-  }
-  div.ant-collapse-item:last-child.ant-collapse-item-active
-    .ant-collapse-header {
-    padding-bottom: ${({ theme }) => theme.gridUnit * 3}px;
-  }
-  div.ant-collapse-item:last-child .ant-collapse-header {
-    padding-bottom: ${({ theme }) => theme.gridUnit * 9}px;
+
+  .ant-card.ant-card-bordered {
+    border: 1px solid ${({ theme }) => theme.colorBorder};
   }
+
   .loading-cards {
-    margin-top: ${({ theme }) => theme.gridUnit * 8}px;
-    .antd5-card-cover > div {
+    margin-top: ${({ theme }) => theme.sizeUnit * 8}px;
+
+    .ant-card-cover > div {
       height: 168px;
     }
   }
@@ -127,11 +120,11 @@ const WelcomeNav = styled.div`
     .switch {
       display: flex;
       flex-direction: row;
-      margin: ${theme.gridUnit * 4}px;
+      margin: ${theme.sizeUnit * 4}px;
       span {
         display: block;
-        margin: ${theme.gridUnit}px;
-        line-height: ${theme.gridUnit * 3.5}px;
+        margin: ${theme.sizeUnit}px;
+        line-height: ${theme.sizeUnit * 3.5}px;
       }
     }
   `}
@@ -365,68 +358,81 @@ function Welcome({ user, addDangerToast }: WelcomeProps) {
               activeKey={activeState}
               onChange={handleCollapse}
               ghost
-              bigger
-            >
-              <Collapse.Panel header={t('Recents')} key="1">
-                {activityData &&
-                (activityData[TableTab.Viewed] ||
-                  activityData[TableTab.Other] ||
-                  activityData[TableTab.Created]) &&
-                activeChild !== 'Loading' ? (
-                  <ActivityTable
-                    user={{ userId: user.userId! }} // user is definitely not a guest user on this page
-                    activeChild={activeChild}
-                    setActiveChild={setActiveChild}
-                    activityData={activityData}
-                    isFetchingActivityData={isFetchingActivityData}
-                  />
-                ) : (
-                  <LoadingCards />
-                )}
-              </Collapse.Panel>
-              <Collapse.Panel header={t('Dashboards')} key="2">
-                {!dashboardData || isRecentActivityLoading ? (
-                  <LoadingCards cover={checked} />
-                ) : (
-                  <DashboardTable
-                    user={user}
-                    mine={dashboardData}
-                    showThumbnails={checked}
-                    otherTabData={activityData?.[TableTab.Other]}
-                    otherTabFilters={otherTabFilters}
-                    otherTabTitle={otherTabTitle}
-                  />
-                )}
-              </Collapse.Panel>
-              <Collapse.Panel header={t('Charts')} key="3">
-                {!chartData || isRecentActivityLoading ? (
-                  <LoadingCards cover={checked} />
-                ) : (
-                  <ChartTable
-                    showThumbnails={checked}
-                    user={user}
-                    mine={chartData}
-                    otherTabData={activityData?.[TableTab.Other]}
-                    otherTabFilters={otherTabFilters}
-                    otherTabTitle={otherTabTitle}
-                  />
-                )}
-              </Collapse.Panel>
-              {canReadSavedQueries && (
-                <Collapse.Panel header={t('Saved queries')} key="4">
-                  {!queryData ? (
-                    <LoadingCards cover={checked} />
-                  ) : (
-                    <SavedQueries
-                      showThumbnails={checked}
-                      user={user}
-                      mine={queryData}
-                      featureFlag={isThumbnailsEnabled}
-                    />
-                  )}
-                </Collapse.Panel>
-              )}
-            </Collapse>
+              items={[
+                {
+                  key: 'recents',
+                  label: t('Recents'),
+                  children:
+                    activityData &&
+                    (activityData[TableTab.Viewed] ||
+                      activityData[TableTab.Other] ||
+                      activityData[TableTab.Created]) &&
+                    activeChild !== 'Loading' ? (
+                      <ActivityTable
+                        user={{ userId: user.userId! }} // user is definitely not a guest user on this page
+                        activeChild={activeChild}
+                        setActiveChild={setActiveChild}
+                        activityData={activityData}
+                        isFetchingActivityData={isFetchingActivityData}
+                      />
+                    ) : (
+                      <LoadingCards />
+                    ),
+                },
+                {
+                  key: 'dashboards',
+                  label: t('Dashboards'),
+                  children:
+                    !dashboardData || isRecentActivityLoading ? (
+                      <LoadingCards cover={checked} />
+                    ) : (
+                      <DashboardTable
+                        user={user}
+                        mine={dashboardData}
+                        showThumbnails={checked}
+                        otherTabData={activityData?.[TableTab.Other]}
+                        otherTabFilters={otherTabFilters}
+                        otherTabTitle={otherTabTitle}
+                      />
+                    ),
+                },
+                {
+                  key: 'charts',
+                  label: t('Charts'),
+                  children:
+                    !chartData || isRecentActivityLoading ? (
+                      <LoadingCards cover={checked} />
+                    ) : (
+                      <ChartTable
+                        showThumbnails={checked}
+                        user={user}
+                        mine={chartData}
+                        otherTabData={activityData?.[TableTab.Other]}
+                        otherTabFilters={otherTabFilters}
+                        otherTabTitle={otherTabTitle}
+                      />
+                    ),
+                },
+                ...(canReadSavedQueries
+                  ? [
+                      {
+                        key: 'saved-queries',
+                        label: t('Saved queries'),
+                        children: !queryData ? (
+                          <LoadingCards cover={checked} />
+                        ) : (
+                          <SavedQueries
+                            showThumbnails={checked}
+                            user={user}
+                            mine={queryData}
+                            featureFlag={isThumbnailsEnabled}
+                          />
+                        ),
+                      },
+                    ]
+                  : []),
+              ]}
+            />
           </>
         )}
       </WelcomeContainer>
diff --git a/superset-frontend/src/pages/Login/index.tsx b/superset-frontend/src/pages/Login/index.tsx
new file mode 100644
index 00000000000..591467fdcea
--- /dev/null
+++ b/superset-frontend/src/pages/Login/index.tsx
@@ -0,0 +1,224 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { SupersetClient, styled, t, css } from '@superset-ui/core';
+import {
+  Button,
+  Card,
+  Flex,
+  Form,
+  Input,
+  Typography,
+  Icons,
+} from '@superset-ui/core/components';
+import { useState } from 'react';
+import { capitalize } from 'lodash/fp';
+import getBootstrapData from 'src/utils/getBootstrapData';
+
+type OAuthProvider = {
+  name: string;
+  icon: string;
+};
+
+type OIDProvider = {
+  name: string;
+  url: string;
+};
+
+type Provider = OAuthProvider | OIDProvider;
+
+interface LoginForm {
+  username: string;
+  password: string;
+}
+
+enum AuthType {
+  AuthOID = 0,
+  AuthDB = 1,
+  AuthLDAP = 2,
+  AuthOauth = 4,
+}
+
+const StyledCard = styled(Card)`
+  ${({ theme }) => css`
+    width: 40%;
+    margin-top: ${theme.marginXL}px;
+    background: ${theme.colorBgBase};
+    .antd5-form-item-label label {
+      color: ${theme.colorPrimary};
+    }
+  `}
+`;
+
+const StyledLabel = styled(Typography.Text)`
+  ${({ theme }) => css`
+    font-size: ${theme.fontSizeSM}px;
+  `}
+`;
+
+export default function Login() {
+  const [form] = Form.useForm<LoginForm>();
+  const [loading, setLoading] = useState(false);
+
+  const bootstrapData = getBootstrapData();
+
+  const authType: AuthType = bootstrapData.common.conf.AUTH_TYPE;
+  const providers: Provider[] = bootstrapData.common.conf.AUTH_PROVIDERS;
+  const authRegistration: boolean =
+    bootstrapData.common.conf.AUTH_USER_REGISTRATION;
+
+  const onFinish = (values: LoginForm) => {
+    setLoading(true);
+    SupersetClient.postForm('/login/', values, '').finally(() => {
+      setLoading(false);
+    });
+  };
+
+  const getAuthIconElement = (
+    providerName: string,
+  ): React.JSX.Element | undefined => {
+    if (!providerName || typeof providerName !== 'string') {
+      return undefined;
+    }
+    const iconComponentName = `${capitalize(providerName)}Outlined`;
+    const IconComponent = (Icons as Record<string, React.ComponentType<any>>)[
+      iconComponentName
+    ];
+
+    if (IconComponent && typeof IconComponent === 'function') {
+      return <IconComponent />;
+    }
+    return undefined;
+  };
+
+  return (
+    <Flex
+      justify="center"
+      data-test="login-form"
+      css={css`
+        width: 100%;
+      `}
+    >
+      <StyledCard title={t('Sign in')} padded>
+        {authType === AuthType.AuthOID && (
+          <Flex justify="center" vertical gap="middle">
+            <Form layout="vertical" requiredMark="optional" form={form}>
+              {providers.map((provider: OIDProvider) => (
+                <Form.Item<LoginForm>>
+                  <Button
+                    href={`/login/${provider.name}`}
+                    block
+                    iconPosition="start"
+                    icon={getAuthIconElement(provider.name)}
+                  >
+                    {t('Sign in with')} {capitalize(provider.name)}
+                  </Button>
+                </Form.Item>
+              ))}
+            </Form>
+          </Flex>
+        )}
+        {authType === AuthType.AuthOauth && (
+          <Flex justify="center" gap={0} vertical>
+            <Form layout="vertical" requiredMark="optional" form={form}>
+              {providers.map((provider: OAuthProvider) => (
+                <Form.Item<LoginForm>>
+                  <Button
+                    href={`/login/${provider.name}`}
+                    block
+                    iconPosition="start"
+                    icon={getAuthIconElement(provider.name)}
+                  >
+                    {t('Sign in with')} {capitalize(provider.name)}
+                  </Button>
+                </Form.Item>
+              ))}
+            </Form>
+          </Flex>
+        )}
+
+        {(authType === AuthType.AuthDB || authType === AuthType.AuthLDAP) && (
+          <Flex justify="center" vertical gap="middle">
+            <Typography.Text type="secondary">
+              {t('Enter your login and password below:')}
+            </Typography.Text>
+            <Form
+              layout="vertical"
+              requiredMark="optional"
+              form={form}
+              onFinish={onFinish}
+            >
+              <Form.Item<LoginForm>
+                label={<StyledLabel>{t('Username:')}</StyledLabel>}
+                name="username"
+                rules={[
+                  { required: true, message: t('Please enter your username') },
+                ]}
+              >
+                <Input
+                  prefix={<Icons.UserOutlined iconSize="l" />}
+                  data-test="username-input"
+                />
+              </Form.Item>
+              <Form.Item<LoginForm>
+                label={<StyledLabel>{t('Password:')}</StyledLabel>}
+                name="password"
+                rules={[
+                  { required: true, message: t('Please enter your password') },
+                ]}
+              >
+                <Input.Password
+                  prefix={<Icons.KeyOutlined iconSize="l" />}
+                  data-test="password-input"
+                />
+              </Form.Item>
+              <Form.Item label={null}>
+                <Flex
+                  css={css`
+                    width: 100%;
+                  `}
+                >
+                  <Button
+                    block
+                    type="primary"
+                    htmlType="submit"
+                    loading={loading}
+                    data-test="login-button"
+                  >
+                    {t('Sign in')}
+                  </Button>
+                  {authRegistration && (
+                    <Button
+                      block
+                      type="default"
+                      href="/register/"
+                      data-test="register-button"
+                    >
+                      {t('Register')}
+                    </Button>
+                  )}
+                </Flex>
+              </Form.Item>
+            </Form>
+          </Flex>
+        )}
+      </StyledCard>
+    </Flex>
+  );
+}
diff --git a/superset-frontend/src/pages/QueryHistoryList/index.tsx b/superset-frontend/src/pages/QueryHistoryList/index.tsx
index 3986291aeaa..7f37e6dedcb 100644
--- a/superset-frontend/src/pages/QueryHistoryList/index.tsx
+++ b/superset-frontend/src/pages/QueryHistoryList/index.tsx
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { useMemo, useState, useCallback, ReactElement } from 'react';
+import { useMemo, useState, useCallback, ReactElement, useEffect } from 'react';
 import { Link, useHistory } from 'react-router-dom';
 import {
   css,
@@ -34,43 +34,53 @@ import {
 } from 'src/views/CRUD/utils';
 import withToasts from 'src/components/MessageToasts/withToasts';
 import { useListViewResource } from 'src/views/CRUD/hooks';
-import Label from 'src/components/Label';
 import SubMenu, { SubMenuProps } from 'src/features/home/SubMenu';
-import Popover from 'src/components/Popover';
+import { Popover, Label, Tooltip } from '@superset-ui/core/components';
 import { commonMenuData } from 'src/features/home/commonMenuData';
-import ListView, {
-  Filters,
-  FilterOperator,
-  ListViewProps,
-} from 'src/components/ListView';
-import { Tooltip } from 'src/components/Tooltip';
-import SyntaxHighlighter from 'react-syntax-highlighter/dist/cjs/light';
-import sql from 'react-syntax-highlighter/dist/cjs/languages/hljs/sql';
-import github from 'react-syntax-highlighter/dist/cjs/styles/hljs/github';
+import {
+  ListView,
+  ListViewFilterOperator as FilterOperator,
+  type ListViewProps,
+  type ListViewFilters,
+} from 'src/components';
+import CodeSyntaxHighlighter, {
+  preloadLanguages,
+} from '@superset-ui/core/components/CodeSyntaxHighlighter';
 import { DATETIME_WITH_TIME_ZONE, TIME_WITH_MS } from 'src/constants';
 import { QueryObject, QueryObjectColumns } from 'src/views/CRUD/types';
 
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
 import QueryPreviewModal from 'src/features/queries/QueryPreviewModal';
 import { addSuccessToast } from 'src/components/MessageToasts/actions';
 import getOwnerName from 'src/utils/getOwnerName';
-import { extendedDayjs } from 'src/utils/dates';
+import { extendedDayjs } from '@superset-ui/core/utils/dates';
 
 const PAGE_SIZE = 25;
 const SQL_PREVIEW_MAX_LINES = 4;
 
 const TopAlignedListView = styled(ListView)<ListViewProps<QueryObject>>`
-  table .table-cell {
+  table .ant-table-cell {
     vertical-align: top;
   }
 `;
 
-SyntaxHighlighter.registerLanguage('sql', sql);
-const StyledSyntaxHighlighter = styled(SyntaxHighlighter)`
-  height: ${({ theme }) => theme.gridUnit * 26}px;
+const StyledCodeSyntaxHighlighter = styled(CodeSyntaxHighlighter)`
+  height: ${({ theme }) => theme.sizeUnit * 26}px;
   overflow: hidden !important; /* needed to override inline styles */
   text-overflow: ellipsis;
   white-space: nowrap;
+
+  /* Ensure the syntax highlighter content respects the container constraints */
+  & > div {
+    height: 100%;
+    overflow: hidden;
+  }
+
+  pre {
+    height: 100% !important;
+    overflow: hidden !important;
+    margin: 0 !important;
+  }
 `;
 
 interface QueryListProps {
@@ -81,7 +91,7 @@ interface QueryListProps {
 const StyledTableLabel = styled.div`
   .count {
     margin-left: 5px;
-    color: ${({ theme }) => theme.colors.primary.base};
+    color: ${({ theme }) => theme.colorPrimary};
     text-decoration: underline;
     cursor: pointer;
   }
@@ -93,7 +103,7 @@ const StyledPopoverItem = styled.div`
 
 const TimerLabel = styled(Label)`
   text-align: left;
-  font-family: ${({ theme }) => theme.typography.families.monospace};
+  font-family: ${({ theme }) => theme.fontFamilyCode};
 `;
 
 function QueryList({ addDangerToast }: QueryListProps) {
@@ -113,6 +123,11 @@ function QueryList({ addDangerToast }: QueryListProps) {
   const theme = useTheme();
   const history = useHistory();
 
+  // Preload SQL language since this component will definitely display SQL
+  useEffect(() => {
+    preloadLanguages(['sql']);
+  }, []);
+
   const handleQueryPreview = useCallback(
     (id: number) => {
       SupersetClient.get({
@@ -162,7 +177,7 @@ function QueryList({ addDangerToast }: QueryListProps) {
             statusConfig.name = (
               <Icons.CheckOutlined
                 iconSize="m"
-                iconColor={theme.colors.success.base}
+                iconColor={theme.colorSuccess}
                 css={css`
                   vertical-align: -webkit-baseline-middle;
                 `}
@@ -178,7 +193,7 @@ function QueryList({ addDangerToast }: QueryListProps) {
                 iconSize="xs"
                 iconColor={
                   status === QueryState.Failed
-                    ? theme.colors.error.base
+                    ? theme.colorError
                     : theme.colors.grayscale.base
                 }
               />
@@ -186,7 +201,7 @@ function QueryList({ addDangerToast }: QueryListProps) {
             statusConfig.label = t('Failed');
           } else if (status === QueryState.Running) {
             statusConfig.name = (
-              <Icons.Running iconColor={theme.colors.primary.base} />
+              <Icons.Running iconColor={theme.colorPrimary} />
             );
             statusConfig.label = t('Running');
           } else if (status === QueryState.TimedOut) {
@@ -210,6 +225,7 @@ function QueryList({ addDangerToast }: QueryListProps) {
         accessor: QueryObjectColumns.Status,
         size: 'xs',
         disableSortBy: true,
+        id: QueryObjectColumns.Status,
       },
       {
         accessor: QueryObjectColumns.StartTime,
@@ -233,6 +249,7 @@ function QueryList({ addDangerToast }: QueryListProps) {
           );
           return formattedStartTime;
         },
+        id: QueryObjectColumns.StartTime,
       },
       {
         Header: t('Duration'),
@@ -254,25 +271,30 @@ function QueryList({ addDangerToast }: QueryListProps) {
             </TimerLabel>
           );
         },
+        id: 'duration',
       },
       {
         accessor: QueryObjectColumns.TabName,
         Header: t('Tab name'),
         size: 'xl',
+        id: QueryObjectColumns.TabName,
       },
       {
         accessor: QueryObjectColumns.DatabaseName,
         Header: t('Database'),
         size: 'xl',
+        id: QueryObjectColumns.DatabaseName,
       },
       {
         accessor: QueryObjectColumns.Database,
         hidden: true,
+        id: QueryObjectColumns.Database,
       },
       {
         accessor: QueryObjectColumns.Schema,
         Header: t('Schema'),
         size: 'xl',
+        id: QueryObjectColumns.Schema,
       },
       {
         Cell: ({
@@ -311,6 +333,7 @@ function QueryList({ addDangerToast }: QueryListProps) {
         Header: t('Tables'),
         size: 'xl',
         disableSortBy: true,
+        id: QueryObjectColumns.SqlTables,
       },
       {
         accessor: QueryObjectColumns.UserFirstName,
@@ -321,15 +344,18 @@ function QueryList({ addDangerToast }: QueryListProps) {
             original: { user },
           },
         }: any) => getOwnerName(user),
+        id: QueryObjectColumns.UserFirstName,
       },
       {
         accessor: QueryObjectColumns.User,
         hidden: true,
+        id: QueryObjectColumns.User,
       },
       {
         accessor: QueryObjectColumns.Rows,
         Header: t('Rows'),
         size: 'md',
+        id: QueryObjectColumns.Rows,
       },
       {
         accessor: QueryObjectColumns.Sql,
@@ -340,12 +366,26 @@ function QueryList({ addDangerToast }: QueryListProps) {
             role="button"
             data-test={`open-sql-preview-${id}`}
             onClick={() => setQueryCurrentlyPreviewing(original)}
+            onKeyDown={e => {
+              if (e.key === 'Enter' || e.key === ' ') {
+                e.preventDefault();
+                setQueryCurrentlyPreviewing(original);
+              }
+            }}
+            style={{ cursor: 'pointer' }}
           >
-            <StyledSyntaxHighlighter language="sql" style={github}>
+            <StyledCodeSyntaxHighlighter
+              language="sql"
+              customStyle={{
+                cursor: 'pointer',
+                userSelect: 'none',
+              }}
+            >
               {shortenSQL(original.sql, SQL_PREVIEW_MAX_LINES)}
-            </StyledSyntaxHighlighter>
+            </StyledCodeSyntaxHighlighter>
           </div>
         ),
+        id: QueryObjectColumns.Sql,
       },
       {
         Header: t('Actions'),
@@ -364,10 +404,10 @@ function QueryList({ addDangerToast }: QueryListProps) {
         ),
       },
     ],
-    [],
+    [theme], // Add theme to dependencies since it's used in the columns
   );
 
-  const filters: Filters = useMemo(
+  const filters: ListViewFilters = useMemo(
     () => [
       {
         Header: t('Database'),
diff --git a/superset-frontend/src/pages/Register/index.tsx b/superset-frontend/src/pages/Register/index.tsx
new file mode 100644
index 00000000000..473bbf64743
--- /dev/null
+++ b/superset-frontend/src/pages/Register/index.tsx
@@ -0,0 +1,246 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { SupersetClient, styled, t, css } from '@superset-ui/core';
+import {
+  Button,
+  Card,
+  Flex,
+  Form,
+  Input,
+  Result,
+} from '@superset-ui/core/components';
+import { useState } from 'react';
+import getBootstrapData from 'src/utils/getBootstrapData';
+import ReactCAPTCHA from 'react-google-recaptcha';
+import { useParams } from 'react-router-dom';
+
+interface RegisterForm {
+  username: string;
+  firstName: string;
+  lastName: string;
+  email: string;
+  password: string;
+  confirmPassword: string;
+}
+
+const StyledCard = styled(Card)`
+  ${({ theme }) => css`
+    width: 50%;
+    margin-top: ${theme.marginXL}px;
+    background: ${theme.colorBgBase};
+    .antd5-form-item-label label {
+      color: ${theme.colorPrimary};
+    }
+  `}
+`;
+
+const formItemLayout = {
+  labelCol: {
+    xs: { span: 24 },
+    sm: { span: 6 },
+  },
+  wrapperCol: {
+    xs: { span: 24 },
+    sm: { span: 24 },
+  },
+};
+
+export default function Login() {
+  const [form] = Form.useForm<RegisterForm>();
+  const [loading, setLoading] = useState(false);
+  const [captchaResponse, setCaptchaResponse] = useState<string | null>(null);
+  const { activationHash } = useParams<{ activationHash?: string }>();
+
+  const bootstrapData = getBootstrapData();
+
+  const authRecaptchaPublicKey: string =
+    bootstrapData.common.conf.RECAPTCHA_PUBLIC_KEY || '';
+
+  if (activationHash) {
+    return (
+      <Flex
+        justify="center"
+        css={css`
+          width: 100%;
+        `}
+        data-test="register-form"
+      >
+        <Result
+          status="success"
+          title="Registration successful"
+          subTitle="Your account is activated. You can log in with your credentials."
+          extra={[
+            <Button type="default" href="/login/" data-test="login-button">
+              {t('Login')}
+            </Button>,
+          ]}
+        />
+      </Flex>
+    );
+  }
+
+  const onFinish = (values: RegisterForm) => {
+    setLoading(true);
+    const payload = {
+      username: values.username,
+      first_name: values.firstName,
+      last_name: values.lastName,
+      email: values.email,
+      password: values.password,
+      conf_password: values.confirmPassword,
+      'g-recaptcha-response': captchaResponse,
+    };
+    SupersetClient.postForm('/register/form', payload, '').finally(() => {
+      setLoading(false);
+    });
+  };
+  return (
+    <Flex
+      justify="center"
+      css={css`
+        width: 100%;
+      `}
+      data-test="register-form"
+    >
+      <StyledCard title={t('Fill out the registration form')} padded>
+        <Form form={form} onFinish={onFinish} {...formItemLayout}>
+          <Form.Item<RegisterForm>
+            label={t('Username')}
+            name="username"
+            rules={[
+              { required: true, message: t('Please enter your username') },
+            ]}
+          >
+            <Input
+              placeholder={t('Username')}
+              autoComplete="username"
+              data-test="username-input"
+            />
+          </Form.Item>
+          <Form.Item<RegisterForm>
+            label={t('First Name')}
+            name="firstName"
+            rules={[
+              { required: true, message: t('Please enter your first name') },
+            ]}
+          >
+            <Input
+              placeholder={t('First name')}
+              autoComplete="given-name"
+              data-test="first-name-input"
+            />
+          </Form.Item>
+          <Form.Item<RegisterForm>
+            label={t('Last Name')}
+            name="lastName"
+            rules={[
+              { required: true, message: t('Please enter your last name') },
+            ]}
+          >
+            <Input
+              placeholder={t('Last name')}
+              autoComplete="family-name"
+              data-test="last-name-input"
+            />
+          </Form.Item>
+          <Form.Item<RegisterForm>
+            label={t('Email')}
+            name="email"
+            rules={[
+              { required: true, message: t('Please enter your email') },
+              { type: 'email', message: t('Please enter a valid email') },
+            ]}
+          >
+            <Input
+              placeholder={t('Email')}
+              autoComplete="email"
+              data-test="email-input"
+            />
+          </Form.Item>
+          <Form.Item<RegisterForm>
+            label={t('Password')}
+            name="password"
+            rules={[
+              { required: true, message: t('Please enter your password') },
+            ]}
+          >
+            <Input.Password
+              placeholder={t('Password')}
+              autoComplete="new-password"
+              data-test="password-input"
+            />
+          </Form.Item>
+
+          <Form.Item
+            name="confirmPassword"
+            label={t('Confirm password')}
+            dependencies={['password']}
+            hasFeedback
+            rules={[
+              {
+                required: true,
+                message: t('Please confirm your password'),
+              },
+              ({ getFieldValue }) => ({
+                validator(_, value) {
+                  if (!value || getFieldValue('password') === value) {
+                    return Promise.resolve();
+                  }
+                  return Promise.reject(
+                    new Error(
+                      t('The two passwords that you entered do not match!'),
+                    ),
+                  );
+                },
+              }),
+            ]}
+          >
+            <Input.Password
+              placeholder={t('Confirm password')}
+              data-test="confirm-password-input"
+            />
+          </Form.Item>
+          {authRecaptchaPublicKey && (
+            <Form.Item label="Captcha">
+              <ReactCAPTCHA
+                sitekey={authRecaptchaPublicKey}
+                onChange={value => {
+                  setCaptchaResponse(value);
+                }}
+                data-test="captcha-input"
+              />
+            </Form.Item>
+          )}
+          <Form.Item>
+            <Button
+              block
+              type="default"
+              htmlType="submit"
+              loading={loading}
+              data-test="register-button"
+            >
+              {t('Register')}
+            </Button>
+          </Form.Item>
+        </Form>
+      </StyledCard>
+    </Flex>
+  );
+}
diff --git a/superset-frontend/src/pages/RolesList/index.tsx b/superset-frontend/src/pages/RolesList/index.tsx
index aaec4acf392..529c1b9b447 100644
--- a/superset-frontend/src/pages/RolesList/index.tsx
+++ b/superset-frontend/src/pages/RolesList/index.tsx
@@ -18,26 +18,28 @@
  */
 
 import { useCallback, useEffect, useMemo, useState } from 'react';
-import { css, t, SupersetClient, useTheme } from '@superset-ui/core';
+import { t, SupersetClient } from '@superset-ui/core';
 import { useListViewResource } from 'src/views/CRUD/hooks';
 import RoleListAddModal from 'src/features/roles/RoleListAddModal';
 import RoleListEditModal from 'src/features/roles/RoleListEditModal';
 import RoleListDuplicateModal from 'src/features/roles/RoleListDuplicateModal';
 import withToasts from 'src/components/MessageToasts/withToasts';
 import SubMenu, { SubMenuProps } from 'src/features/home/SubMenu';
-import ActionsBar, { ActionProps } from 'src/components/ListView/ActionsBar';
-import ListView, {
-  ListViewProps,
-  Filters,
-  FilterOperator,
-} from 'src/components/ListView';
-import DeleteModal from 'src/components/DeleteModal';
-import ConfirmStatusChange from 'src/components/ConfirmStatusChange';
+import { ConfirmStatusChange, DeleteModal } from '@superset-ui/core/components';
+import {
+  ListView,
+  ListViewFilterOperator as FilterOperator,
+  ListViewActionsBar,
+  type ListViewProps,
+  type ListViewActionProps,
+  type ListViewFilters,
+} from 'src/components';
 import { FormattedPermission, UserObject } from 'src/features/roles/types';
 import { isUserAdmin } from 'src/dashboard/util/permissionUtils';
-import { Icons } from 'src/components/Icons';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { fetchPaginatedData } from 'src/utils/fetchOptions';
 import { fetchUserOptions } from 'src/features/groups/utils';
+import { WIDER_DROPDOWN_WIDTH } from 'src/components/ListView/utils';
 import { GroupObject } from '../GroupsList';
 
 const PAGE_SIZE = 25;
@@ -69,7 +71,6 @@ enum ModalType {
 }
 
 function RolesList({ addDangerToast, addSuccessToast, user }: RolesListProps) {
-  const theme = useTheme();
   const {
     state: {
       loading,
@@ -254,7 +255,9 @@ function RolesList({ addDangerToast, addSuccessToast, user }: RolesListProps) {
               ]
             : [];
 
-          return <ActionsBar actions={actions as ActionProps[]} />;
+          return (
+            <ListViewActionsBar actions={actions as ListViewActionProps[]} />
+          );
         },
         Header: t('Actions'),
         id: 'actions',
@@ -273,14 +276,7 @@ function RolesList({ addDangerToast, addSuccessToast, user }: RolesListProps) {
       {
         name: (
           <>
-            <Icons.PlusOutlined
-              iconColor={theme.colors.primary.light5}
-              iconSize="m"
-              css={css`
-                margin: auto ${theme.gridUnit * 2}px auto 0;
-                vertical-align: text-top;
-              `}
-            />
+            <Icons.PlusOutlined iconSize="m" />
             {t('Role')}
           </>
         ),
@@ -299,7 +295,7 @@ function RolesList({ addDangerToast, addSuccessToast, user }: RolesListProps) {
     );
   }
 
-  const filters: Filters = useMemo(
+  const filters: ListViewFilters = useMemo(
     () => [
       {
         Header: t('Name'),
@@ -317,6 +313,7 @@ function RolesList({ addDangerToast, addSuccessToast, user }: RolesListProps) {
         unfilteredLabel: t('All'),
         fetchSelects: async (filterValue, page, pageSize) =>
           fetchUserOptions(filterValue, page, pageSize, addDangerToast),
+        dropdownStyle: { minWidth: WIDER_DROPDOWN_WIDTH },
       },
       {
         Header: t('Permissions'),
@@ -330,6 +327,7 @@ function RolesList({ addDangerToast, addSuccessToast, user }: RolesListProps) {
           value: permission.id,
         })),
         loading: loadingState.permissions,
+        dropdownStyle: { minWidth: WIDER_DROPDOWN_WIDTH },
       },
       {
         Header: t('Groups'),
@@ -343,6 +341,7 @@ function RolesList({ addDangerToast, addSuccessToast, user }: RolesListProps) {
           value: group.id,
         })),
         loading: loadingState.groups,
+        dropdownStyle: { minWidth: WIDER_DROPDOWN_WIDTH },
       },
     ],
     [permissions, groups, loadingState.groups, loadingState.permissions],
@@ -357,14 +356,7 @@ function RolesList({ addDangerToast, addSuccessToast, user }: RolesListProps) {
       },
       buttonText: (
         <>
-          <Icons.PlusOutlined
-            iconColor={theme.colors.primary.light5}
-            iconSize="m"
-            css={css`
-              margin: auto ${theme.gridUnit * 2}px auto 0;
-              vertical-align: text-top;
-            `}
-          />
+          <Icons.PlusOutlined iconSize="m" />
           {t('Role')}
         </>
       ),
diff --git a/superset-frontend/src/pages/RowLevelSecurityList/index.tsx b/superset-frontend/src/pages/RowLevelSecurityList/index.tsx
index ac08540cf89..f1b75538921 100644
--- a/superset-frontend/src/pages/RowLevelSecurityList/index.tsx
+++ b/superset-frontend/src/pages/RowLevelSecurityList/index.tsx
@@ -16,31 +16,27 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { t, styled, SupersetClient, useTheme, css } from '@superset-ui/core';
+import { t, SupersetClient } from '@superset-ui/core';
 import { useMemo, useState } from 'react';
-import ConfirmStatusChange from 'src/components/ConfirmStatusChange';
-import { Icons } from 'src/components/Icons';
-import ListView, {
-  FetchDataConfig,
-  FilterOperator,
-  ListViewProps,
-  Filters,
-} from 'src/components/ListView';
+import { ConfirmStatusChange, Tooltip } from '@superset-ui/core/components';
+import {
+  ModifiedInfo,
+  ListView,
+  ListViewFilterOperator as FilterOperator,
+  type ListViewProps,
+  type ListViewFilters,
+  type ListViewFetchDataConfig as FetchDataConfig,
+} from 'src/components';
+import { Icons } from '@superset-ui/core/components/Icons';
 import withToasts from 'src/components/MessageToasts/withToasts';
-import { Tooltip } from 'src/components/Tooltip';
 import SubMenu, { SubMenuProps } from 'src/features/home/SubMenu';
 import rison from 'rison';
 import { useListViewResource } from 'src/views/CRUD/hooks';
 import RowLevelSecurityModal from 'src/features/rls/RowLevelSecurityModal';
 import { RLSObject } from 'src/features/rls/types';
 import { createErrorHandler, createFetchRelated } from 'src/views/CRUD/utils';
-import { ModifiedInfo } from 'src/components/AuditInfo';
 import { QueryObjectColumns } from 'src/views/CRUD/types';
 
-const Actions = styled.div`
-  color: ${({ theme }) => theme.colors.grayscale.base};
-`;
-
 interface RLSProps {
   addDangerToast: (msg: string) => void;
   addSuccessToast: (msg: string) => void;
@@ -55,7 +51,6 @@ function RowLevelSecurityList(props: RLSProps) {
   const { addDangerToast, addSuccessToast, user } = props;
   const [ruleModalOpen, setRuleModalOpen] = useState<boolean>(false);
   const [currentRule, setCurrentRule] = useState(null);
-  const theme = useTheme();
 
   const {
     state: {
@@ -131,20 +126,24 @@ function RowLevelSecurityList(props: RLSProps) {
       {
         accessor: 'name',
         Header: t('Name'),
+        id: 'name',
       },
       {
         accessor: 'filter_type',
         Header: t('Filter Type'),
         size: 'xl',
+        id: 'filter_type',
       },
       {
         accessor: 'group_key',
         Header: t('Group Key'),
         size: 'xl',
+        id: 'group_key',
       },
       {
         accessor: 'clause',
         Header: t('Clause'),
+        id: 'clause',
       },
       {
         Cell: ({
@@ -158,6 +157,7 @@ function RowLevelSecurityList(props: RLSProps) {
         Header: t('Last modified'),
         accessor: 'changed_on_delta_humanized',
         size: 'xl',
+        id: 'changed_on_delta_humanized',
       },
       {
         Cell: ({ row: { original } }: any) => {
@@ -170,7 +170,7 @@ function RowLevelSecurityList(props: RLSProps) {
             );
           const handleEdit = () => handleRuleEdit(original);
           return (
-            <Actions className="actions">
+            <div className="actions">
               {canWrite && (
                 <ConfirmStatusChange
                   title={t('Please confirm')}
@@ -219,7 +219,7 @@ function RowLevelSecurityList(props: RLSProps) {
                   </span>
                 </Tooltip>
               )}
-            </Actions>
+            </div>
           );
         },
         Header: t('Actions'),
@@ -230,6 +230,7 @@ function RowLevelSecurityList(props: RLSProps) {
       {
         accessor: QueryObjectColumns.ChangedBy,
         hidden: true,
+        id: QueryObjectColumns.ChangedBy,
       },
     ],
     [
@@ -250,21 +251,13 @@ function RowLevelSecurityList(props: RLSProps) {
     buttonAction: () => handleRuleEdit(null),
     buttonText: canEdit ? (
       <>
-        <Icons.PlusOutlined
-          iconColor={theme.colors.primary.light5}
-          iconSize="m"
-          css={css`
-            margin: auto ${theme.gridUnit * 2}px auto 0;
-            vertical-align: text-top;
-          `}
-          data-test="add-rule-empty"
-        />
+        <Icons.PlusOutlined iconSize="m" data-test="add-rule-empty" />
         {t('Rule')}
       </>
     ) : null,
   };
 
-  const filters: Filters = useMemo(
+  const filters: ListViewFilters = useMemo(
     () => [
       {
         Header: t('Name'),
@@ -325,15 +318,7 @@ function RowLevelSecurityList(props: RLSProps) {
     subMenuButtons.push({
       name: (
         <>
-          <Icons.PlusOutlined
-            iconColor={theme.colors.primary.light5}
-            iconSize="m"
-            css={css`
-              margin: auto ${theme.gridUnit * 2}px auto 0;
-              vertical-align: text-top;
-            `}
-            data-test="add-rule"
-          />
+          <Icons.PlusOutlined iconSize="m" data-test="add-rule" />
           {t('Rule')}
         </>
       ),
diff --git a/superset-frontend/src/pages/SavedQueryList/SavedQueryList.test.jsx b/superset-frontend/src/pages/SavedQueryList/SavedQueryList.test.tsx
similarity index 100%
rename from superset-frontend/src/pages/SavedQueryList/SavedQueryList.test.jsx
rename to superset-frontend/src/pages/SavedQueryList/SavedQueryList.test.tsx
diff --git a/superset-frontend/src/pages/SavedQueryList/index.tsx b/superset-frontend/src/pages/SavedQueryList/index.tsx
index 9a4ca9df7a2..58280bcb5a4 100644
--- a/superset-frontend/src/pages/SavedQueryList/index.tsx
+++ b/superset-frontend/src/pages/SavedQueryList/index.tsx
@@ -23,8 +23,6 @@ import {
   styled,
   SupersetClient,
   t,
-  css,
-  useTheme,
 } from '@superset-ui/core';
 import { useCallback, useMemo, useState, MouseEvent } from 'react';
 import { Link, useHistory } from 'react-router-dom';
@@ -35,29 +33,33 @@ import {
   createFetchRelated,
 } from 'src/views/CRUD/utils';
 import { useSelector } from 'react-redux';
-import Popover from 'src/components/Popover';
+import {
+  ConfirmStatusChange,
+  DeleteModal,
+  Loading,
+  Popover,
+  Tooltip,
+} from '@superset-ui/core/components';
 import withToasts from 'src/components/MessageToasts/withToasts';
 import { useListViewResource } from 'src/views/CRUD/hooks';
-import ConfirmStatusChange from 'src/components/ConfirmStatusChange';
+import {
+  ImportModal as ImportModelsModal,
+  TagType,
+  ModifiedInfo,
+  TagsList,
+  ListView,
+  ListViewActionsBar,
+  ListViewFilterOperator as FilterOperator,
+  type ListViewProps,
+  type ListViewActionProps,
+  type ListViewFilters,
+} from 'src/components';
 import handleResourceExport from 'src/utils/export';
 import SubMenu, { ButtonProps, SubMenuProps } from 'src/features/home/SubMenu';
-import ListView, {
-  FilterOperator,
-  Filters,
-  ListViewProps,
-} from 'src/components/ListView';
-import Loading from 'src/components/Loading';
-import DeleteModal from 'src/components/DeleteModal';
-import ActionsBar, { ActionProps } from 'src/components/ListView/ActionsBar';
-import { TagsList } from 'src/components/Tags';
-import { Tooltip } from 'src/components/Tooltip';
 import { commonMenuData } from 'src/features/home/commonMenuData';
 import { QueryObjectColumns, SavedQueryObject } from 'src/views/CRUD/types';
-import Tag from 'src/types/TagType';
-import ImportModelsModal from 'src/components/ImportModal/index';
-import { ModifiedInfo } from 'src/components/AuditInfo';
-import { loadTags } from 'src/components/Tags/utils';
-import { Icons } from 'src/components/Icons';
+import { loadTags } from 'src/components/Tag/utils';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { UserWithPermissionsAndRoles } from 'src/types/bootstrapTypes';
 import SavedQueryPreviewModal from 'src/features/queries/SavedQueryPreviewModal';
 import { findPermission } from 'src/utils/findPermission';
@@ -89,7 +91,7 @@ interface SavedQueryListProps {
 const StyledTableLabel = styled.div`
   .count {
     margin-left: 5px;
-    color: ${({ theme }) => theme.colors.primary.base};
+    color: ${({ theme }) => theme.colorPrimary};
     text-decoration: underline;
     cursor: pointer;
   }
@@ -104,7 +106,6 @@ function SavedQueryList({
   addSuccessToast,
   user,
 }: SavedQueryListProps) {
-  const theme = useTheme();
   const {
     state: {
       loading,
@@ -198,29 +199,16 @@ function SavedQueryList({
 
   subMenuButtons.push({
     name: (
-      <Link
-        to="/sqllab?new=true"
-        css={css`
-          display: flex;
-          &:hover {
-            color: currentColor;
-            text-decoration: none;
-          }
-        `}
-      >
-        <Icons.PlusOutlined
-          iconColor={theme.colors.primary.light5}
-          iconSize="m"
-          css={css`
-            margin: auto ${theme.gridUnit * 2}px auto 0;
-          `}
-        />
+      <>
+        <Icons.PlusOutlined iconSize="m" />
         {t('Query')}
-      </Link>
+      </>
     ),
     buttonStyle: 'primary',
+    onClick: () => {
+      history.push('/sqllab?new=true');
+    },
   });
-
   if (canCreate) {
     subMenuButtons.push({
       name: (
@@ -230,7 +218,7 @@ function SavedQueryList({
           placement="bottomRight"
           data-test="import-tooltip-test"
         >
-          <Icons.DownloadOutlined data-test="import-icon" />
+          <Icons.DownloadOutlined data-test="import-icon" iconSize="l" />
         </Tooltip>
       ),
       buttonStyle: 'link',
@@ -334,25 +322,30 @@ function SavedQueryList({
             original: { id, label },
           },
         }: any) => <Link to={`/sqllab?savedQueryId=${id}`}>{label}</Link>,
+        id: 'label',
       },
       {
         accessor: 'description',
         Header: t('Description'),
+        id: 'description',
       },
       {
         accessor: 'database.database_name',
         Header: t('Database'),
         size: 'xl',
+        id: 'database.database_name',
       },
       {
         accessor: 'database',
         hidden: true,
         disableSortBy: true,
+        id: 'database',
       },
       {
         accessor: 'schema',
         Header: t('Schema'),
         size: 'xl',
+        id: 'schema',
       },
       {
         Cell: ({
@@ -391,6 +384,7 @@ function SavedQueryList({
         Header: t('Tables'),
         size: 'xl',
         disableSortBy: true,
+        id: 'sql_tables',
       },
       {
         Cell: ({
@@ -399,12 +393,13 @@ function SavedQueryList({
           },
         }: any) => (
           // Only show custom type tags
-          <TagsList tags={tags.filter((tag: Tag) => tag.type === 1)} />
+          <TagsList tags={tags.filter((tag: TagType) => tag.type === 1)} />
         ),
         Header: t('Tags'),
         accessor: 'tags',
         disableSortBy: true,
         hidden: !isFeatureEnabled(FeatureFlag.TaggingSystem),
+        id: 'tags',
       },
       {
         Cell: ({
@@ -418,6 +413,7 @@ function SavedQueryList({
         Header: t('Last modified'),
         accessor: 'changed_on_delta_humanized',
         size: 'xl',
+        id: 'changed_on_delta_humanized',
       },
       {
         Cell: ({ row: { original } }: any) => {
@@ -468,7 +464,9 @@ function SavedQueryList({
             },
           ].filter(item => !!item);
 
-          return <ActionsBar actions={actions as ActionProps[]} />;
+          return (
+            <ListViewActionsBar actions={actions as ListViewActionProps[]} />
+          );
         },
         Header: t('Actions'),
         id: 'actions',
@@ -477,12 +475,13 @@ function SavedQueryList({
       {
         accessor: QueryObjectColumns.ChangedBy,
         hidden: true,
+        id: QueryObjectColumns.ChangedBy,
       },
     ],
     [canDelete, canEdit, canExport, copyQueryLink, handleSavedQueryPreview],
   );
 
-  const filters: Filters = useMemo(
+  const filters: ListViewFilters = useMemo(
     () => [
       {
         Header: t('Search'),
@@ -543,7 +542,7 @@ function SavedQueryList({
               fetchSelects: loadTags,
             },
           ]
-        : []) as Filters),
+        : []) as ListViewFilters),
       {
         Header: t('Modified by'),
         key: 'changed_by',
diff --git a/superset-frontend/src/pages/SqlLab/index.tsx b/superset-frontend/src/pages/SqlLab/index.tsx
index 93bf8e26cfb..4be0b45a00c 100644
--- a/superset-frontend/src/pages/SqlLab/index.tsx
+++ b/superset-frontend/src/pages/SqlLab/index.tsx
@@ -26,7 +26,7 @@ import { addDangerToast } from 'src/components/MessageToasts/actions';
 import type { SqlLabRootState } from 'src/SqlLab/types';
 import { SqlLabGlobalStyles } from 'src/SqlLab//SqlLabGlobalStyles';
 import App from 'src/SqlLab/components/App';
-import Loading from 'src/components/Loading';
+import { Loading } from '@superset-ui/core/components';
 import EditorAutoSync from 'src/SqlLab/components/EditorAutoSync';
 import useEffectEvent from 'src/hooks/useEffectEvent';
 import { LocationProvider } from './LocationContext';
diff --git a/superset-frontend/src/pages/Tags/index.tsx b/superset-frontend/src/pages/Tags/index.tsx
index 448afad88f8..739a5962c84 100644
--- a/superset-frontend/src/pages/Tags/index.tsx
+++ b/superset-frontend/src/pages/Tags/index.tsx
@@ -17,38 +17,34 @@
  * under the License.
  */
 import { useMemo, useState } from 'react';
-import {
-  isFeatureEnabled,
-  FeatureFlag,
-  t,
-  useTheme,
-  css,
-} from '@superset-ui/core';
+import { isFeatureEnabled, FeatureFlag, t } from '@superset-ui/core';
 import {
   Actions,
   createErrorHandler,
   createFetchRelated,
 } from 'src/views/CRUD/utils';
 import { useListViewResource, useFavoriteStatus } from 'src/views/CRUD/hooks';
-import ConfirmStatusChange from 'src/components/ConfirmStatusChange';
+import {
+  ConfirmStatusChange,
+  Tooltip,
+  FaveStar,
+} from '@superset-ui/core/components';
+import {
+  Tag as AntdTag,
+  ListView,
+  ModifiedInfo,
+  ListViewFilterOperator as FilterOperator,
+  type ListViewFilters,
+  type ListViewProps,
+} from 'src/components';
 import SubMenu, { SubMenuProps } from 'src/features/home/SubMenu';
-import ListView, {
-  ListViewProps,
-  Filters,
-  FilterOperator,
-} from 'src/components/ListView';
 import { dangerouslyGetItemDoNotUse } from 'src/utils/localStorageHelpers';
 import withToasts from 'src/components/MessageToasts/withToasts';
-import { Icons } from 'src/components/Icons';
-import { Tooltip } from 'src/components/Tooltip';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { Link } from 'react-router-dom';
 import { deleteTags } from 'src/features/tags/tags';
-// eslint-disable-next-line no-restricted-imports
-import { Tag as AntdTag } from 'antd'; // TODO: Remove antd
 import { QueryObjectColumns, Tag } from 'src/views/CRUD/types';
 import TagModal from 'src/features/tags/TagModal';
-import FaveStar from 'src/components/FaveStar';
-import { ModifiedInfo } from 'src/components/AuditInfo';
 
 const PAGE_SIZE = 25;
 
@@ -65,7 +61,6 @@ interface TagListProps {
 function TagList(props: TagListProps) {
   const { addDangerToast, addSuccessToast, user } = props;
   const { userId } = user;
-  const theme = useTheme();
 
   const initialFilters = useMemo(
     () => [
@@ -142,15 +137,7 @@ function TagList(props: TagListProps) {
     buttonAction: () => setShowTagModal(true),
     buttonText: (
       <>
-        <Icons.PlusOutlined
-          iconSize="m"
-          iconColor={theme.colors.primary.light5}
-          css={css`
-            margin: auto ${theme.gridUnit * 2}px auto 0;
-            vertical-align: text-top;
-          `}
-          data-test="add-rule-empty"
-        />
+        <Icons.PlusOutlined iconSize="m" data-test="add-rule-empty" />
         Create a new Tag
       </>
     ),
@@ -189,6 +176,7 @@ function TagList(props: TagListProps) {
         ),
         Header: t('Name'),
         accessor: 'name',
+        id: 'name',
       },
       {
         Cell: ({
@@ -202,6 +190,7 @@ function TagList(props: TagListProps) {
         Header: t('Last modified'),
         accessor: 'changed_on_delta_humanized',
         size: 'xl',
+        id: 'changed_on_delta_humanized',
       },
       {
         Cell: ({ row: { original } }: any) => {
@@ -267,12 +256,13 @@ function TagList(props: TagListProps) {
       {
         accessor: QueryObjectColumns.ChangedBy,
         hidden: true,
+        id: QueryObjectColumns.ChangedBy,
       },
     ],
     [userId, canDelete, refreshData, addSuccessToast, addDangerToast],
   );
 
-  const filters: Filters = useMemo(() => {
+  const filters: ListViewFilters = useMemo(() => {
     const filters_list = [
       {
         Header: t('Name'),
@@ -300,7 +290,7 @@ function TagList(props: TagListProps) {
         ),
         paginate: true,
       },
-    ] as Filters;
+    ] as ListViewFilters;
     return filters_list;
   }, [addDangerToast, props.user]);
 
@@ -340,14 +330,7 @@ function TagList(props: TagListProps) {
   subMenuButtons.push({
     name: (
       <>
-        <Icons.PlusOutlined
-          css={css`
-            vertical-align: text-top;
-          `}
-          iconSize="m"
-          iconColor={theme.colors.primary.light5}
-        />{' '}
-        {t('Tag')}
+        <Icons.PlusOutlined iconSize="m" /> {t('Tag')}
       </>
     ),
     buttonStyle: 'primary',
diff --git a/superset-frontend/src/pages/UserInfo/UserInfo.test.tsx b/superset-frontend/src/pages/UserInfo/UserInfo.test.tsx
index 479d9c3ee4a..a6acabe7cf9 100644
--- a/superset-frontend/src/pages/UserInfo/UserInfo.test.tsx
+++ b/superset-frontend/src/pages/UserInfo/UserInfo.test.tsx
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 import fetchMock from 'fetch-mock';
 import {
   render,
@@ -60,8 +59,8 @@ const mockUser: UserWithPermissionsAndRoles = {
 };
 
 describe('UserInfo', () => {
-  const renderPage = async () => {
-    await act(async () => {
+  const renderPage = async () =>
+    act(async () => {
       render(
         <MemoryRouter>
           <QueryParamProvider>
@@ -71,7 +70,6 @@ describe('UserInfo', () => {
         { useRedux: true, store },
       );
     });
-  };
 
   beforeEach(() => {
     fetchMock.restore();
@@ -84,7 +82,7 @@ describe('UserInfo', () => {
     });
   });
 
-  afterAll(() => {
+  afterEach(() => {
     fetchMock.restore();
   });
 
@@ -112,15 +110,24 @@ describe('UserInfo', () => {
 
   it('opens the reset password modal on button click', async () => {
     await renderPage();
+
     const button = await screen.findByTestId('reset-password-button');
-    fireEvent.click(button);
+    await act(async () => {
+      fireEvent.click(button);
+    });
+
     expect(await screen.findByText(/Reset password/i)).toBeInTheDocument();
   });
 
   it('opens the edit user modal on button click', async () => {
     await renderPage();
+
     const button = await screen.findByTestId('edit-user-button');
-    fireEvent.click(button);
-    expect(await screen.getAllByText(/Edit user/i).length).toBeGreaterThan(0);
+    await act(async () => {
+      fireEvent.click(button);
+    });
+
+    const modals = await screen.findAllByText(/Edit user/i);
+    expect(modals.length).toBeGreaterThan(0);
   });
 });
diff --git a/superset-frontend/src/pages/UserInfo/index.tsx b/superset-frontend/src/pages/UserInfo/index.tsx
index 270f743a845..3966ea99570 100644
--- a/superset-frontend/src/pages/UserInfo/index.tsx
+++ b/superset-frontend/src/pages/UserInfo/index.tsx
@@ -20,7 +20,6 @@
 import { useCallback, useEffect, useState } from 'react';
 import { css, t, SupersetClient, useTheme, styled } from '@superset-ui/core';
 import SubMenu, { SubMenuProps } from 'src/features/home/SubMenu';
-import { Icons } from 'src/components/Icons';
 import { useToasts } from 'src/components/MessageToasts/withToasts';
 import { Descriptions } from 'src/components/Descriptions';
 import { UserWithPermissionsAndRoles } from 'src/types/bootstrapTypes';
@@ -28,31 +27,27 @@ import {
   UserInfoEditModal,
   UserInfoResetPasswordModal,
 } from 'src/features/userInfo/UserInfoModal';
-import Collapse from 'src/components/Collapse';
-
-interface UserInfoProps {
-  user: UserWithPermissionsAndRoles;
-}
+import { Icons, Collapse } from '@superset-ui/core/components';
 
 const StyledHeader = styled.div`
   ${({ theme }) => css`
-    font-weight: ${theme.typography.weights.bold};
+    font-weight: ${theme.fontWeightStrong};
     text-align: left;
     font-size: 18px;
-    padding: ${theme.gridUnit * 3}px;
-    padding-left: ${theme.gridUnit * 7}px;
+    padding: ${theme.sizeUnit * 3}px;
+    padding-left: ${theme.sizeUnit * 7}px;
     display: inline-block;
-    line-height: ${theme.gridUnit * 9}px;
+    line-height: ${theme.sizeUnit * 9}px;
     width: 100%;
     background-color: ${theme.colors.grayscale.light5};
-    margin-bottom: ${theme.gridUnit * 6}px;
+    margin-bottom: ${theme.sizeUnit * 6}px;
   `}
 `;
 
 const DescriptionsContainer = styled.div`
   ${({ theme }) => css`
-    margin: 0px ${theme.gridUnit * 3}px ${theme.gridUnit * 6}px
-      ${theme.gridUnit * 3}px;
+    margin: 0px ${theme.sizeUnit * 3}px ${theme.sizeUnit * 6}px
+      ${theme.sizeUnit * 3}px;
     background-color: ${theme.colors.grayscale.light5};
   `}
 `;
@@ -60,24 +55,23 @@ const DescriptionsContainer = styled.div`
 const StyledLayout = styled.div`
   ${({ theme }) => css`
     .antd5-row {
-      margin: 0px ${theme.gridUnit * 3}px ${theme.gridUnit * 6}px
-        ${theme.gridUnit * 3}px;
+      margin: 0px ${theme.sizeUnit * 3}px ${theme.sizeUnit * 6}px
+        ${theme.sizeUnit * 3}px;
     }
     && .menu > .antd5-menu {
       padding: 0px;
     }
     && .nav-right {
       left: 0;
-      padding-left: ${theme.gridUnit * 4}px;
+      padding-left: ${theme.sizeUnit * 4}px;
       position: relative;
-      height: ${theme.gridUnit * 15}px;
-      background-color: ${theme.colors.grayscale.light5};
+      height: ${theme.sizeUnit * 15}px;
     }
   `}
 `;
 
 const DescriptionTitle = styled.span`
-  font-weight: ${({ theme }) => theme.typography.weights.bold};
+  font-weight: ${({ theme }) => theme.fontWeightStrong};
 `;
 
 enum ModalType {
@@ -85,7 +79,7 @@ enum ModalType {
   Edit = 'edit',
 }
 
-export function UserInfo({ user }: UserInfoProps) {
+export function UserInfo({ user }: { user: UserWithPermissionsAndRoles }) {
   const theme = useTheme();
   const [modalState, setModalState] = useState({
     resetPassword: false,
@@ -122,10 +116,10 @@ export function UserInfo({ user }: UserInfoProps) {
       name: (
         <>
           <Icons.LockOutlined
-            iconColor={theme.colors.primary.base}
+            iconColor={theme.colorPrimary}
             iconSize="m"
             css={css`
-              margin: auto ${theme.gridUnit * 2}px auto 0;
+              margin: auto ${theme.sizeUnit * 2}px auto 0;
               vertical-align: text-top;
             `}
           />
@@ -142,10 +136,10 @@ export function UserInfo({ user }: UserInfoProps) {
       name: (
         <>
           <Icons.FormOutlined
-            iconColor={theme.colors.primary.light5}
+            iconColor={theme.colorIcon}
             iconSize="m"
             css={css`
-              margin: auto ${theme.gridUnit * 2}px auto 0;
+              margin: auto ${theme.sizeUnit * 2}px auto 0;
               vertical-align: text-top;
             `}
           />
diff --git a/superset-frontend/src/pages/UserRegistrations/UserRegistrations.test.tsx b/superset-frontend/src/pages/UserRegistrations/UserRegistrations.test.tsx
new file mode 100644
index 00000000000..547d9093fd1
--- /dev/null
+++ b/superset-frontend/src/pages/UserRegistrations/UserRegistrations.test.tsx
@@ -0,0 +1,55 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 fetchMock from 'fetch-mock';
+import { render, screen } from 'spec/helpers/testing-library';
+import UserRegistrations from '.';
+
+const userRegistrationsEndpoint = 'glob:*/security/user_registrations/?*';
+
+const mockUserRegistrations = [...new Array(5)].map((_, i) => ({
+  id: i,
+  username: `user${i}`,
+  first_name: `User${i}`,
+  last_name: `Test${i}`,
+  email: `user${i}@test.com`,
+  registration_date: new Date(2025, 2, 25, 11, 4, 32 + i).toISOString(),
+  registration_hash: `hash${i}`,
+}));
+
+fetchMock.get(userRegistrationsEndpoint, {
+  ids: [0, 1, 2, 3, 4],
+  count: 5,
+  result: mockUserRegistrations,
+});
+
+describe('UserRegistrations', () => {
+  beforeEach(() => {
+    render(<UserRegistrations />, {
+      useRedux: true,
+      useRouter: true,
+      useQueryParams: true,
+    });
+  });
+  it('fetches and renders user registrations', async () => {
+    expect(await screen.findByText('User registrations')).toBeVisible();
+    const calls = fetchMock.calls(userRegistrationsEndpoint);
+    expect(calls.length).toBeGreaterThan(0);
+  });
+});
diff --git a/superset-frontend/src/pages/UserRegistrations/index.tsx b/superset-frontend/src/pages/UserRegistrations/index.tsx
new file mode 100644
index 00000000000..750d1efddc4
--- /dev/null
+++ b/superset-frontend/src/pages/UserRegistrations/index.tsx
@@ -0,0 +1,238 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { useMemo, useState } from 'react';
+import { SupersetClient, t } from '@superset-ui/core';
+import { useListViewResource } from 'src/views/CRUD/hooks';
+import { useToasts } from 'src/components/MessageToasts/withToasts';
+import {
+  ListViewFilters,
+  ListViewFilterOperator,
+  ListView,
+} from 'src/components';
+import { DeleteModal } from '@superset-ui/core/components';
+import { ActionProps, ActionsBar } from 'src/components/ListView/ActionsBar';
+import SubMenu from 'src/features/home/SubMenu';
+
+const PAGE_SIZE = 25;
+
+export type UserRegistration = {
+  id: number;
+  username: string;
+  first_name: string;
+  last_name: string;
+  email: string;
+  registration_date: string;
+  registration_hash: string;
+};
+
+export default function UserRegistrations() {
+  const { addSuccessToast, addDangerToast } = useToasts();
+  const [
+    userRegistrationCurrentlyDeleting,
+    setUserRegistrationCurrentlyDeleting,
+  ] = useState<UserRegistration | null>(null);
+
+  const {
+    state: {
+      loading,
+      resourceCount: registrationsCount,
+      resourceCollection: registrations,
+    },
+    refreshData,
+    fetchData,
+  } = useListViewResource<UserRegistration>(
+    'security/user_registrations',
+    t('User Registrations'),
+    addDangerToast,
+  );
+
+  const handleUserRegistrationDelete = async ({
+    id,
+    username,
+  }: UserRegistration) => {
+    try {
+      await SupersetClient.delete({
+        endpoint: `/api/v1/security/user_registrations/${id}`,
+      });
+      refreshData();
+      setUserRegistrationCurrentlyDeleting(null);
+      addSuccessToast(t('Deleted user registration for user: %s', username));
+    } catch (error) {
+      addDangerToast(
+        t('There was an issue deleting registration for user: %s', username),
+      );
+    }
+  };
+
+  const initialSort = [{ id: 'registration_date', desc: true }];
+
+  const columns = useMemo(
+    () => [
+      {
+        accessor: 'username',
+        id: 'username',
+        Header: t('Username'),
+        Cell: ({ row: { original } }: any) => original.username,
+      },
+      {
+        accessor: 'first_name',
+        id: 'first_name',
+        Header: t('First name'),
+        Cell: ({ row: { original } }: any) => original.first_name,
+      },
+      {
+        accessor: 'last_name',
+        id: 'last_name',
+        Header: t('Last name'),
+        Cell: ({ row: { original } }: any) => original.last_name,
+      },
+      {
+        accessor: 'email',
+        id: 'email',
+        Header: t('Email'),
+        Cell: ({ row: { original } }: any) => original.email,
+      },
+      {
+        accessor: 'registration_hash',
+        id: 'registration_hash',
+        Header: t('Registration hash'),
+        Cell: ({ row: { original } }: any) => original.registration_hash,
+      },
+      {
+        accessor: 'registration_date',
+        id: 'registration_date',
+        Header: t('Registration date'),
+        Cell: ({ row: { original } }: any) => original.registration_date,
+      },
+      {
+        id: 'actions',
+        Header: t('Actions'),
+        Cell: ({ row: { original } }: any) => {
+          const actions = [
+            {
+              label: 'registrations-list-delete-action',
+              tooltip: t('Delete user registration'),
+              placement: 'bottom',
+              icon: 'DeleteOutlined',
+              onClick: () => {
+                setUserRegistrationCurrentlyDeleting(original);
+              },
+            },
+          ];
+          return <ActionsBar actions={actions as ActionProps[]} />;
+        },
+        hidden: false,
+        disableSortBy: true,
+        size: 'xl',
+      },
+    ],
+    [],
+  );
+
+  const filters: ListViewFilters = useMemo(
+    () => [
+      {
+        Header: t('Username'),
+        key: 'username',
+        id: 'username',
+        input: 'search',
+        operator: ListViewFilterOperator.Contains,
+      },
+      {
+        Header: t('First name'),
+        key: 'first_name',
+        id: 'first_name',
+        input: 'search',
+        operator: ListViewFilterOperator.Contains,
+      },
+      {
+        Header: t('Last name'),
+        key: 'last_name',
+        id: 'last_name',
+        input: 'search',
+        operator: ListViewFilterOperator.Contains,
+      },
+      {
+        Header: t('Email'),
+        key: 'email',
+        id: 'email',
+        input: 'search',
+        operator: ListViewFilterOperator.Contains,
+      },
+      {
+        Header: t('Registration hash'),
+        key: 'registration_hash',
+        id: 'registration_hash',
+        input: 'search',
+        operator: ListViewFilterOperator.Contains,
+      },
+      {
+        Header: t('Registration date'),
+        key: 'registration_date',
+        id: 'registration_date',
+        input: 'datetime_range',
+        operator: ListViewFilterOperator.Between,
+        dateFilterValueType: 'iso',
+      },
+    ],
+    [],
+  );
+
+  const emptyState = {
+    title: t('No user registrations yet'),
+    image: 'filter-results.svg',
+  };
+
+  return (
+    <>
+      <SubMenu name={t('User registrations')} />
+      {userRegistrationCurrentlyDeleting && (
+        <DeleteModal
+          description={t(
+            'This action will permanently delete the user registration.',
+          )}
+          onConfirm={() => {
+            if (userRegistrationCurrentlyDeleting) {
+              handleUserRegistrationDelete(userRegistrationCurrentlyDeleting);
+            }
+          }}
+          onHide={() => setUserRegistrationCurrentlyDeleting(null)}
+          open
+          title={t('Delete user registration?')}
+        />
+      )}
+      <ListView<UserRegistration>
+        className="user-registrations-list-view"
+        columns={columns}
+        count={registrationsCount}
+        data={registrations}
+        fetchData={fetchData}
+        refreshData={refreshData}
+        addDangerToast={addDangerToast}
+        addSuccessToast={addSuccessToast}
+        filters={filters}
+        initialSort={initialSort}
+        loading={loading}
+        pageSize={PAGE_SIZE}
+        emptyState={emptyState}
+      />
+    </>
+  );
+}
diff --git a/superset-frontend/src/pages/UsersList/index.tsx b/superset-frontend/src/pages/UsersList/index.tsx
index 7ab56a7d3f8..e2cb04f8bd0 100644
--- a/superset-frontend/src/pages/UsersList/index.tsx
+++ b/superset-frontend/src/pages/UsersList/index.tsx
@@ -18,19 +18,23 @@
  */
 
 import { useCallback, useEffect, useMemo, useState } from 'react';
-import { css, t, useTheme } from '@superset-ui/core';
+import { t } from '@superset-ui/core';
 import { useListViewResource } from 'src/views/CRUD/hooks';
 import SubMenu, { SubMenuProps } from 'src/features/home/SubMenu';
-import ActionsBar, { ActionProps } from 'src/components/ListView/ActionsBar';
-import ListView, {
+import { ActionsBar, ActionProps } from 'src/components/ListView/ActionsBar';
+import {
+  Tooltip,
+  Icons,
+  DeleteModal,
+  ConfirmStatusChange,
+} from '@superset-ui/core/components';
+import {
+  ListView,
   ListViewProps,
-  Filters,
-  FilterOperator,
-} from 'src/components/ListView';
-import DeleteModal from 'src/components/DeleteModal';
-import ConfirmStatusChange from 'src/components/ConfirmStatusChange';
+  ListViewFilterOperator,
+  ListViewFilters,
+} from 'src/components';
 import { isUserAdmin } from 'src/dashboard/util/permissionUtils';
-import { Icons } from 'src/components/Icons';
 import {
   UserListAddModal,
   UserListEditModal,
@@ -38,47 +42,10 @@ import {
 import { useToasts } from 'src/components/MessageToasts/withToasts';
 import { deleteUser } from 'src/features/users/utils';
 import { fetchPaginatedData } from 'src/utils/fetchOptions';
-import { Tooltip } from 'src/components/Tooltip';
+import type { UsersListProps, Group, Role, UserObject } from './types';
 
 const PAGE_SIZE = 25;
 
-interface UsersListProps {
-  user: {
-    userId: string | number;
-    firstName: string;
-    lastName: string;
-    roles: object;
-  };
-}
-
-export type Role = {
-  id: number;
-  name: string;
-};
-
-export type Group = {
-  id: number;
-  name: string;
-};
-
-export type UserObject = {
-  active: boolean;
-  changed_by: string | null;
-  changed_on: string;
-  created_by: string | null;
-  created_on: string;
-  email: string;
-  fail_login_count: number;
-  first_name: string;
-  id: number;
-  last_login: string;
-  last_name: string;
-  login_count: number;
-  roles: Role[];
-  username: string;
-  groups: Group[];
-};
-
 enum ModalType {
   ADD = 'add',
   EDIT = 'edit',
@@ -96,7 +63,6 @@ const isActiveOptions = [
 ];
 
 function UsersList({ user }: UsersListProps) {
-  const theme = useTheme();
   const { addDangerToast, addSuccessToast } = useToasts();
   const {
     state: {
@@ -222,8 +188,8 @@ function UsersList({ user }: UsersListProps) {
     () => [
       {
         accessor: 'first_name',
-        Header: t('First name'),
         id: 'first_name',
+        Header: t('First name'),
         Cell: ({
           row: {
             original: { first_name },
@@ -232,8 +198,8 @@ function UsersList({ user }: UsersListProps) {
       },
       {
         accessor: 'last_name',
-        Header: t('Last name'),
         id: 'last_name',
+        Header: t('Last name'),
         Cell: ({
           row: {
             original: { last_name },
@@ -242,8 +208,8 @@ function UsersList({ user }: UsersListProps) {
       },
       {
         accessor: 'username',
-        Header: t('Username'),
         id: 'username',
+        Header: t('Username'),
         Cell: ({
           row: {
             original: { username },
@@ -252,8 +218,8 @@ function UsersList({ user }: UsersListProps) {
       },
       {
         accessor: 'email',
-        Header: t('Email'),
         id: 'email',
+        Header: t('Email'),
         Cell: ({
           row: {
             original: { email },
@@ -262,8 +228,8 @@ function UsersList({ user }: UsersListProps) {
       },
       {
         accessor: 'active',
-        Header: t('Is active?'),
         id: 'active',
+        Header: t('Is active?'),
         Cell: ({
           row: {
             original: { active },
@@ -272,8 +238,8 @@ function UsersList({ user }: UsersListProps) {
       },
       {
         accessor: 'roles',
-        Header: t('Roles'),
         id: 'roles',
+        Header: t('Roles'),
         Cell: ({
           row: {
             original: { roles },
@@ -311,22 +277,22 @@ function UsersList({ user }: UsersListProps) {
       },
       {
         accessor: 'login_count',
-        Header: t('Login count'),
         id: 'login_count',
+        Header: t('Login count'),
         hidden: true,
         Cell: ({ row: { original } }: any) => original.login_count,
       },
       {
         accessor: 'fail_login_count',
-        Header: t('Fail login count'),
         id: 'fail_login_count',
+        Header: t('Fail login count'),
         hidden: true,
         Cell: ({ row: { original } }: any) => original.fail_login_count,
       },
       {
         accessor: 'created_on',
-        Header: t('Created on'),
         id: 'created_on',
+        Header: t('Created on'),
         hidden: true,
         Cell: ({
           row: {
@@ -347,8 +313,8 @@ function UsersList({ user }: UsersListProps) {
       },
       {
         accessor: 'last_login',
-        Header: t('Last login'),
         id: 'last_login',
+        Header: t('Last login'),
         hidden: true,
         Cell: ({
           row: {
@@ -401,14 +367,7 @@ function UsersList({ user }: UsersListProps) {
       {
         name: (
           <>
-            <Icons.PlusOutlined
-              iconColor={theme.colors.primary.light5}
-              iconSize="m"
-              css={css`
-                margin: auto ${theme.gridUnit * 2}px auto 0;
-                vertical-align: text-top;
-              `}
-            />
+            <Icons.PlusOutlined iconSize="m" />
             {t('User')}
           </>
         ),
@@ -427,42 +386,42 @@ function UsersList({ user }: UsersListProps) {
     );
   }
 
-  const filters: Filters = useMemo(
+  const filters: ListViewFilters = useMemo(
     () => [
       {
         Header: t('First name'),
         key: 'first_name',
         id: 'first_name',
         input: 'search',
-        operator: FilterOperator.Contains,
+        operator: ListViewFilterOperator.Contains,
       },
       {
         Header: t('Last name'),
         key: 'last_name',
         id: 'last_name',
         input: 'search',
-        operator: FilterOperator.Contains,
+        operator: ListViewFilterOperator.Contains,
       },
       {
         Header: t('Username'),
         key: 'username',
         id: 'username',
         input: 'search',
-        operator: FilterOperator.Contains,
+        operator: ListViewFilterOperator.Contains,
       },
       {
         Header: t('Email'),
         key: 'email',
         id: 'email',
         input: 'search',
-        operator: FilterOperator.Contains,
+        operator: ListViewFilterOperator.Contains,
       },
       {
         Header: t('Is active?'),
         key: 'active',
         id: 'active',
         input: 'select',
-        operator: FilterOperator.Equals,
+        operator: ListViewFilterOperator.Equals,
         unfilteredLabel: t('All'),
         selects: isActiveOptions?.map(option => ({
           label: option.label,
@@ -474,7 +433,7 @@ function UsersList({ user }: UsersListProps) {
         key: 'roles',
         id: 'roles',
         input: 'select',
-        operator: FilterOperator.RelationManyMany,
+        operator: ListViewFilterOperator.RelationManyMany,
         unfilteredLabel: t('All'),
         selects: roles?.map(role => ({
           label: role.name,
@@ -487,7 +446,7 @@ function UsersList({ user }: UsersListProps) {
         key: 'groups',
         id: 'groups',
         input: 'select',
-        operator: FilterOperator.RelationManyMany,
+        operator: ListViewFilterOperator.RelationManyMany,
         unfilteredLabel: t('All'),
         selects: groups?.map(group => ({
           label: group.name,
@@ -500,7 +459,7 @@ function UsersList({ user }: UsersListProps) {
         key: 'created_on',
         id: 'created_on',
         input: 'datetime_range',
-        operator: FilterOperator.Between,
+        operator: ListViewFilterOperator.Between,
         dateFilterValueType: 'iso',
       },
       {
@@ -508,7 +467,7 @@ function UsersList({ user }: UsersListProps) {
         key: 'changed_on',
         id: 'changed_on',
         input: 'datetime_range',
-        operator: FilterOperator.Between,
+        operator: ListViewFilterOperator.Between,
         dateFilterValueType: 'iso',
       },
       {
@@ -516,7 +475,7 @@ function UsersList({ user }: UsersListProps) {
         key: 'last_login',
         id: 'last_login',
         input: 'datetime_range',
-        operator: FilterOperator.Between,
+        operator: ListViewFilterOperator.Between,
         dateFilterValueType: 'iso',
       },
       {
@@ -524,7 +483,7 @@ function UsersList({ user }: UsersListProps) {
         key: 'login_count',
         id: 'login_count',
         input: 'numerical_range',
-        operator: FilterOperator.Between,
+        operator: ListViewFilterOperator.Between,
         min: loginCountStats.min,
         max: loginCountStats.max,
       },
@@ -533,7 +492,7 @@ function UsersList({ user }: UsersListProps) {
         key: 'fail_login_count',
         id: 'fail_login_count',
         input: 'numerical_range',
-        operator: FilterOperator.Between,
+        operator: ListViewFilterOperator.Between,
       },
     ],
     [
@@ -555,14 +514,7 @@ function UsersList({ user }: UsersListProps) {
       },
       buttonText: (
         <>
-          <Icons.PlusOutlined
-            iconColor={theme.colors.primary.light5}
-            iconSize="m"
-            css={css`
-              margin: auto ${theme.gridUnit * 2}px auto 0;
-              vertical-align: text-top;
-            `}
-          />
+          <Icons.PlusOutlined iconSize="m" />
           {t('User')}
         </>
       ),
diff --git a/superset-frontend/src/components/Tags/TagsList.stories.tsx b/superset-frontend/src/pages/UsersList/types.ts
similarity index 57%
rename from superset-frontend/src/components/Tags/TagsList.stories.tsx
rename to superset-frontend/src/pages/UsersList/types.ts
index 622ab155e74..6a493dae2af 100644
--- a/superset-frontend/src/components/Tags/TagsList.stories.tsx
+++ b/superset-frontend/src/pages/UsersList/types.ts
@@ -16,38 +16,39 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import TagType from 'src/types/TagType';
-import { TagsList } from '.';
-import { TagsListProps } from './TagsList';
+export interface UsersListProps {
+  user: {
+    userId: string | number;
+    firstName: string;
+    lastName: string;
+    roles: object;
+  };
+}
 
-export default {
-  title: 'Tags',
-  component: TagsList,
+export type Role = {
+  id: number;
+  name: string;
 };
 
-export const InteractiveTagsList = ({
-  tags,
-  editable,
-  maxTags,
-}: TagsListProps) => (
-  <TagsList tags={tags} editable={editable} maxTags={maxTags} />
-);
-
-const tags: TagType[] = [
-  { name: 'tag1' },
-  { name: 'tag2' },
-  { name: 'tag3' },
-  { name: 'tag4' },
-  { name: 'tag5' },
-  { name: 'tag6' },
-];
-
-const editable = true;
-
-const maxTags = 3;
-
-InteractiveTagsList.args = {
-  tags,
-  editable,
-  maxTags,
+export type Group = {
+  id: number;
+  name: string;
+};
+
+export type UserObject = {
+  active: boolean;
+  changed_by: string | null;
+  changed_on: string;
+  created_by: string | null;
+  created_on: string;
+  email: string;
+  fail_login_count: number;
+  first_name: string;
+  id: number;
+  last_login: string;
+  last_name: string;
+  login_count: number;
+  roles: Role[];
+  username: string;
+  groups: Group[];
 };
diff --git a/superset-frontend/src/preamble.ts b/superset-frontend/src/preamble.ts
index fecda854983..53f9d459ab1 100644
--- a/superset-frontend/src/preamble.ts
+++ b/superset-frontend/src/preamble.ts
@@ -16,17 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import 'abortcontroller-polyfill/dist/abortcontroller-polyfill-only';
 import dayjs from 'dayjs';
 // eslint-disable-next-line no-restricted-imports
-import {
-  configure,
-  makeApi,
-  // eslint-disable-next-line no-restricted-imports
-  supersetTheme, // TODO: DO not import theme directly
-  initFeatureFlags,
-} from '@superset-ui/core';
-import { merge } from 'lodash';
+import { configure, makeApi, initFeatureFlags } from '@superset-ui/core';
 import setupClient from './setup/setupClient';
 import setupColors from './setup/setupColors';
 import setupFormatters from './setup/setupFormatters';
@@ -64,11 +56,6 @@ setupFormatters(
 
 setupDashboardComponents();
 
-export const theme = merge(
-  supersetTheme,
-  bootstrapData.common.theme_overrides ?? {},
-);
-
 const getMe = makeApi<void, User>({
   method: 'GET',
   endpoint: '/api/v1/me/',
diff --git a/superset-frontend/src/setup/setupApp.ts b/superset-frontend/src/setup/setupApp.ts
index 44826829a0d..077ca6656d5 100644
--- a/superset-frontend/src/setup/setupApp.ts
+++ b/superset-frontend/src/setup/setupApp.ts
@@ -93,7 +93,6 @@ export default function setupApp() {
   // this allows for the server side generated menus to function
   window.$ = $;
   window.jQuery = $;
-  require('bootstrap');
 
   // set up app wide custom error messages
   setupErrorMessages();
diff --git a/superset-frontend/src/setup/setupErrorMessages.ts b/superset-frontend/src/setup/setupErrorMessages.ts
index 6f8183ba1cf..8fb867f2b5a 100644
--- a/superset-frontend/src/setup/setupErrorMessages.ts
+++ b/superset-frontend/src/setup/setupErrorMessages.ts
@@ -17,15 +17,17 @@
  * under the License.
  */
 import { ErrorTypeEnum } from '@superset-ui/core';
-import getErrorMessageComponentRegistry from 'src/components/ErrorMessage/getErrorMessageComponentRegistry';
-import TimeoutErrorMessage from 'src/components/ErrorMessage/TimeoutErrorMessage';
-import DatabaseErrorMessage from 'src/components/ErrorMessage/DatabaseErrorMessage';
-import MarshmallowErrorMessage from 'src/components/ErrorMessage/MarshmallowErrorMessage';
-import ParameterErrorMessage from 'src/components/ErrorMessage/ParameterErrorMessage';
-import DatasetNotFoundErrorMessage from 'src/components/ErrorMessage/DatasetNotFoundErrorMessage';
-import InvalidSQLErrorMessage from 'src/components/ErrorMessage/InvalidSQLErrorMessage';
-import OAuth2RedirectMessage from 'src/components/ErrorMessage/OAuth2RedirectMessage';
-import FrontendNetworkErrorMessage from 'src/components/ErrorMessage/FrontendNetworkErrorMessage';
+import {
+  getErrorMessageComponentRegistry,
+  TimeoutErrorMessage,
+  DatabaseErrorMessage,
+  MarshmallowErrorMessage,
+  ParameterErrorMessage,
+  DatasetNotFoundErrorMessage,
+  InvalidSQLErrorMessage,
+  OAuth2RedirectMessage,
+  FrontendNetworkErrorMessage,
+} from 'src/components';
 
 import setupErrorMessagesExtra from './setupErrorMessagesExtra';
 
diff --git a/superset-frontend/src/theme.ts b/superset-frontend/src/theme.ts
index 0c891911696..1d69c19d42a 100644
--- a/superset-frontend/src/theme.ts
+++ b/superset-frontend/src/theme.ts
@@ -17,8 +17,3 @@
  * under the License.
  */
 import 'src/public-path';
-
-import './assets/stylesheets/superset.less';
-
-// Importing Antd under its own stylesheet to prevent unintentional theming
-import './assets/stylesheets/antd/index.less';
diff --git a/superset-frontend/src/theme/ThemeController.tsx b/superset-frontend/src/theme/ThemeController.tsx
new file mode 100644
index 00000000000..37a6c8c5e90
--- /dev/null
+++ b/superset-frontend/src/theme/ThemeController.tsx
@@ -0,0 +1,246 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 {
+  Theme,
+  AnyThemeConfig,
+  ThemeStorage,
+  ThemeControllerOptions,
+  themeObject,
+} from '@superset-ui/core';
+import { ThemeMode } from '@superset-ui/core/theme/types';
+
+export class LocalStorageAdapter implements ThemeStorage {
+  getItem(key: string): string | null {
+    return localStorage.getItem(key);
+  }
+
+  setItem(key: string, value: string): void {
+    localStorage.setItem(key, value);
+  }
+
+  removeItem(key: string): void {
+    localStorage.removeItem(key);
+  }
+}
+
+export class ThemeController {
+  private themeObject: Theme;
+
+  private storage: ThemeStorage;
+
+  private storageKey: string;
+
+  private modeStorageKey: string;
+
+  private defaultTheme: AnyThemeConfig;
+
+  private systemMode: ThemeMode.DARK | ThemeMode.LIGHT;
+
+  private currentMode: ThemeMode;
+
+  private customizations: AnyThemeConfig = {};
+
+  private onChangeCallbacks: Set<(theme: Theme) => void> = new Set();
+
+  private canUpdateThemeFn: () => boolean;
+
+  private canUpdateModeFn: () => boolean;
+
+  private mediaQuery: MediaQueryList;
+
+  constructor(options: ThemeControllerOptions = { themeObject }) {
+    this.storage = options.storage || new LocalStorageAdapter();
+    this.storageKey = options.storageKey || 'superset-theme';
+    this.modeStorageKey = options.modeStorageKey || `${this.storageKey}-mode`;
+    this.defaultTheme = options.defaultTheme || {};
+    this.themeObject = options.themeObject;
+
+    // Load customizations from storage
+    const savedThemeJson = this.storage.getItem(this.storageKey);
+    if (savedThemeJson) {
+      try {
+        this.customizations = JSON.parse(savedThemeJson);
+      } catch (e) {
+        console.error('Failed to parse saved theme:', e);
+        this.storage.removeItem(this.storageKey);
+      }
+    }
+
+    // Determine initial mode
+    this.systemMode = ThemeController.getSystemMode();
+    const savedMode = this.storage.getItem(this.modeStorageKey) as ThemeMode;
+    this.currentMode = savedMode || ThemeMode.SYSTEM;
+
+    // Apply the initial theme and mode
+    this.applyTheme();
+
+    if (options.onChange) {
+      this.onChangeCallbacks.add(options.onChange);
+    }
+    this.canUpdateThemeFn = options.canUpdateTheme || (() => true);
+    this.canUpdateModeFn = options.canUpdateMode || (() => true);
+
+    // Listen for system theme changes to enable dynamic `SYSTEM` mode
+    this.mediaQuery = window.matchMedia('(prefers-color-scheme: dark)');
+    this.mediaQuery.addEventListener('change', this.handleSystemThemeChange);
+  }
+
+  /**
+   * Cleans up listeners. Should be called when the controller is no longer needed.
+   */
+  public destroy(): void {
+    this.mediaQuery.removeEventListener('change', this.handleSystemThemeChange);
+  }
+
+  public canUpdateTheme(): boolean {
+    return this.canUpdateThemeFn();
+  }
+
+  public canUpdateMode(): boolean {
+    return this.canUpdateModeFn();
+  }
+
+  public getTheme(): Theme {
+    return this.themeObject;
+  }
+
+  public getCurrentMode(): ThemeMode {
+    return this.currentMode;
+  }
+
+  /**
+   * Sets new theme customizations (e.g., from a JSON editor).
+   * This method updates the theme's appearance but preserves the current mode.
+   */
+  public setTheme(newCustomizations: AnyThemeConfig): void {
+    if (!this.canUpdateTheme()) {
+      throw new Error('User does not have permission to update the theme');
+    }
+    this.customizations = newCustomizations;
+
+    if (!newCustomizations.algorithm) {
+      this.currentMode = ThemeMode.LIGHT;
+    }
+
+    if (newCustomizations?.algorithm) {
+      this.currentMode = newCustomizations.algorithm as ThemeMode;
+    }
+
+    this.applyTheme();
+    this.persist();
+    this.notifyListeners();
+  }
+
+  /**
+   * Changes the theme mode (light, dark, or system).
+   * This is for the mode switch.
+   */
+  public changeThemeMode(newMode: ThemeMode): void {
+    if (!this.canUpdateMode()) {
+      throw new Error('User does not have permission to update the theme mode');
+    }
+    if (this.currentMode === newMode) return;
+
+    this.currentMode = newMode;
+
+    this.applyTheme();
+    this.persist();
+    this.notifyListeners();
+  }
+
+  public resetTheme(): void {
+    this.customizations = this.defaultTheme;
+    this.applyTheme();
+    this.persist();
+    this.notifyListeners();
+  }
+
+  public onChange(callback: (theme: Theme) => void): () => void {
+    this.onChangeCallbacks.add(callback);
+    return () => {
+      this.onChangeCallbacks.delete(callback);
+    };
+  }
+
+  private handleSystemThemeChange = (): void => {
+    const newSystemMode = ThemeController.getSystemMode();
+    if (this.systemMode === newSystemMode) return;
+
+    this.systemMode = newSystemMode;
+    // If the current mode is SYSTEM, we need to re-apply the theme
+    if (this.currentMode === ThemeMode.SYSTEM) {
+      this.applyTheme();
+      this.notifyListeners();
+    }
+  };
+
+  /**
+   * Centralized method to apply the current customizations and mode.
+   */
+  private applyTheme(): void {
+    const newConfig = { ...this.customizations };
+
+    switch (this.currentMode) {
+      case ThemeMode.DARK:
+        newConfig.algorithm = 'dark';
+        break;
+      case ThemeMode.LIGHT:
+        newConfig.algorithm = 'default';
+        break;
+      case ThemeMode.SYSTEM:
+        newConfig.algorithm =
+          this.systemMode === ThemeMode.DARK ? 'dark' : 'default';
+        break;
+      case ThemeMode.COMPACT:
+        newConfig.algorithm = 'compact';
+        break;
+      default:
+        newConfig.algorithm = 'default';
+        break;
+    }
+
+    this.themeObject.setConfig(newConfig);
+  }
+
+  private persist(): void {
+    this.storage.setItem(this.modeStorageKey, this.currentMode);
+
+    const { algorithm, ...persistedCustomizations } = this.customizations;
+    this.storage.setItem(
+      this.storageKey,
+      JSON.stringify(persistedCustomizations),
+    );
+  }
+
+  private notifyListeners(): void {
+    this.onChangeCallbacks.forEach(callback => {
+      try {
+        callback(this.themeObject);
+      } catch (e) {
+        console.error('Error in theme change callback:', e);
+      }
+    });
+  }
+
+  static getSystemMode(): ThemeMode.DARK | ThemeMode.LIGHT {
+    const isDark = window.matchMedia('(prefers-color-scheme: dark)').matches;
+    return isDark ? ThemeMode.DARK : ThemeMode.LIGHT;
+  }
+}
diff --git a/superset-frontend/src/theme/ThemeProvider.tsx b/superset-frontend/src/theme/ThemeProvider.tsx
new file mode 100644
index 00000000000..2df8974f9f2
--- /dev/null
+++ b/superset-frontend/src/theme/ThemeProvider.tsx
@@ -0,0 +1,104 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 {
+  createContext,
+  useCallback,
+  useContext,
+  useEffect,
+  useMemo,
+  useState,
+} from 'react';
+import { Theme, AnyThemeConfig, ThemeContextType } from '@superset-ui/core';
+import { ThemeMode } from '@superset-ui/core/theme/types';
+import { ThemeController } from './ThemeController';
+
+const ThemeContext = createContext<ThemeContextType | null>(null);
+
+interface ThemeProviderProps {
+  children: React.ReactNode;
+  themeController: ThemeController;
+}
+
+export function SupersetThemeProvider({
+  children,
+  themeController,
+}: ThemeProviderProps): JSX.Element {
+  const [currentTheme, setCurrentTheme] = useState<Theme>(
+    themeController.getTheme(),
+  );
+
+  const [currentThemeMode, setCurrentThemeMode] = useState<ThemeMode>(
+    themeController.getCurrentMode(),
+  );
+
+  useEffect(() => {
+    const unsubscribe = themeController.onChange(theme => {
+      setCurrentTheme(theme);
+      setCurrentThemeMode(themeController.getCurrentMode());
+    });
+
+    return unsubscribe;
+  }, [themeController]);
+
+  const setTheme = useCallback(
+    (config: AnyThemeConfig) => themeController.setTheme(config),
+    [themeController],
+  );
+
+  const changeThemeMode = useCallback(
+    (newMode: ThemeMode) => themeController.changeThemeMode(newMode),
+    [themeController],
+  );
+
+  const resetTheme = useCallback(
+    () => themeController.resetTheme(),
+    [themeController],
+  );
+
+  const contextValue = useMemo(
+    () => ({
+      theme: currentTheme,
+      themeMode: currentThemeMode,
+      setTheme,
+      changeThemeMode,
+      resetTheme,
+    }),
+    [currentTheme, currentThemeMode, setTheme, changeThemeMode, resetTheme],
+  );
+
+  return (
+    <ThemeContext.Provider value={contextValue}>
+      <currentTheme.SupersetThemeProvider>
+        {children}
+      </currentTheme.SupersetThemeProvider>
+    </ThemeContext.Provider>
+  );
+}
+
+/**
+ * React hook to use the theme context
+ */
+export function useThemeContext(): ThemeContextType {
+  const context = useContext(ThemeContext);
+  if (!context) {
+    throw new Error('useThemeContext must be used within a ThemeProvider');
+  }
+  return context;
+}
diff --git a/superset-frontend/src/theme/index.ts b/superset-frontend/src/theme/index.ts
deleted file mode 100644
index ff8e2aca6a7..00000000000
--- a/superset-frontend/src/theme/index.ts
+++ /dev/null
@@ -1,200 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 { addAlpha } from '@superset-ui/core';
-import { type ThemeConfig } from 'antd-v5';
-import { theme as supersetTheme } from 'src/preamble';
-import { mix } from 'polished';
-import { lightAlgorithm } from './light';
-
-export enum ThemeType {
-  LIGHT = 'light',
-}
-
-const themes = {
-  [ThemeType.LIGHT]: lightAlgorithm,
-};
-
-// Want to figure out which tokens look like what? Try this!
-// https://ant.design/theme-editor
-
-const baseConfig: ThemeConfig = {
-  token: {
-    borderRadius: supersetTheme.borderRadius,
-    colorBgBase: supersetTheme.colors.primary.light4,
-    colorError: supersetTheme.colors.error.base,
-    colorInfo: supersetTheme.colors.info.base,
-    colorLink: supersetTheme.colors.grayscale.dark1,
-    colorPrimary: supersetTheme.colors.primary.base,
-    colorSuccess: supersetTheme.colors.success.base,
-    colorTextBase: supersetTheme.colors.grayscale.dark2,
-    colorWarning: supersetTheme.colors.warning.base,
-    controlHeight: 32,
-    fontFamily: supersetTheme.typography.families.sansSerif,
-    fontFamilyCode: supersetTheme.typography.families.monospace,
-    fontSize: supersetTheme.typography.sizes.m,
-    lineType: 'solid',
-    lineWidth: 1,
-    sizeStep: supersetTheme.gridUnit,
-    sizeUnit: supersetTheme.gridUnit,
-    zIndexBase: 0,
-    zIndexPopupBase: supersetTheme.zIndex.max,
-  },
-  components: {
-    Avatar: {
-      containerSize: 32,
-      fontSize: supersetTheme.typography.sizes.s,
-      lineHeight: 32,
-    },
-    Badge: {
-      paddingXS: supersetTheme.gridUnit * 2,
-    },
-    Button: {
-      defaultBg: supersetTheme.colors.primary.light4,
-      defaultHoverBg: mix(
-        0.1,
-        supersetTheme.colors.primary.base,
-        supersetTheme.colors.primary.light4,
-      ),
-      defaultActiveBg: mix(
-        0.25,
-        supersetTheme.colors.primary.base,
-        supersetTheme.colors.primary.light4,
-      ),
-      defaultColor: supersetTheme.colors.primary.dark1,
-      defaultHoverColor: supersetTheme.colors.primary.dark1,
-      defaultBorderColor: 'transparent',
-      defaultHoverBorderColor: 'transparent',
-      colorPrimaryHover: supersetTheme.colors.primary.dark1,
-      colorPrimaryActive: mix(
-        0.2,
-        supersetTheme.colors.grayscale.dark2,
-        supersetTheme.colors.primary.dark1,
-      ),
-      primaryColor: supersetTheme.colors.grayscale.light5,
-      colorPrimaryTextHover: supersetTheme.colors.grayscale.light5,
-      colorError: supersetTheme.colors.error.base,
-      colorErrorHover: mix(
-        0.1,
-        supersetTheme.colors.grayscale.light5,
-        supersetTheme.colors.error.base,
-      ),
-      colorErrorBg: mix(
-        0.2,
-        supersetTheme.colors.grayscale.dark2,
-        supersetTheme.colors.error.base,
-      ),
-      dangerColor: supersetTheme.colors.grayscale.light5,
-      colorLinkHover: supersetTheme.colors.primary.base,
-      linkHoverBg: 'transparent',
-    },
-    Card: {
-      paddingLG: supersetTheme.gridUnit * 6,
-      fontWeightStrong: supersetTheme.typography.weights.medium,
-      colorBgContainer: supersetTheme.colors.grayscale.light4,
-    },
-    DatePicker: {
-      colorBgContainer: supersetTheme.colors.grayscale.light5,
-      colorBgElevated: supersetTheme.colors.grayscale.light5,
-      borderRadiusSM: supersetTheme.gridUnit / 2,
-    },
-    Divider: {
-      colorSplit: supersetTheme.colors.grayscale.light3,
-    },
-    Dropdown: {
-      colorBgElevated: supersetTheme.colors.grayscale.light5,
-      zIndexPopup: supersetTheme.zIndex.max,
-    },
-    Input: {
-      colorBorder: supersetTheme.colors.secondary.light3,
-      colorBgContainer: supersetTheme.colors.grayscale.light5,
-      activeShadow: `0 0 0 ${supersetTheme.gridUnit / 2}px ${
-        supersetTheme.colors.primary.light3
-      }`,
-    },
-    InputNumber: {
-      colorBorder: supersetTheme.colors.secondary.light3,
-      colorBgContainer: supersetTheme.colors.grayscale.light5,
-      activeShadow: `0 0 0 ${supersetTheme.gridUnit / 2}px ${
-        supersetTheme.colors.primary.light3
-      }`,
-    },
-    List: {
-      itemPadding: `${supersetTheme.gridUnit + 2}px ${supersetTheme.gridUnit * 3}px`,
-      paddingLG: supersetTheme.gridUnit * 3,
-      colorSplit: supersetTheme.colors.grayscale.light3,
-      colorText: supersetTheme.colors.grayscale.dark1,
-    },
-    Menu: {
-      itemHeight: 32,
-      colorBgContainer: supersetTheme.colors.grayscale.light5,
-      subMenuItemBg: supersetTheme.colors.grayscale.light5,
-      colorBgElevated: supersetTheme.colors.grayscale.light5,
-      boxShadowSecondary: `0 3px 6px -4px ${addAlpha(supersetTheme.colors.grayscale.dark2, 0.12)}, 0 6px 16px 0 ${addAlpha(supersetTheme.colors.grayscale.dark2, 0.08)}, 0 9px 28px 8px ${addAlpha(supersetTheme.colors.grayscale.dark2, 0.05)}`,
-      activeBarHeight: 0,
-      itemHoverBg: supersetTheme.colors.secondary.light5,
-      padding: supersetTheme.gridUnit * 2,
-      subMenuItemBorderRadius: 0,
-      horizontalLineHeight: 1.4,
-      zIndexPopup: supersetTheme.zIndex.max,
-    },
-    Modal: {
-      colorBgMask: `${supersetTheme.colors.grayscale.dark2}73`,
-      contentBg: supersetTheme.colors.grayscale.light5,
-      titleFontSize: supersetTheme.gridUnit * 4,
-      titleColor: `${supersetTheme.colors.grayscale.dark2}D9`,
-      headerBg: supersetTheme.colors.grayscale.light4,
-    },
-    Tag: {
-      borderRadiusSM: 2,
-      defaultBg: supersetTheme.colors.grayscale.light4,
-    },
-    Progress: {
-      fontSize: supersetTheme.typography.sizes.s,
-      colorText: supersetTheme.colors.text.label,
-      remainingColor: supersetTheme.colors.grayscale.light4,
-    },
-    Popover: {
-      colorBgElevated: supersetTheme.colors.grayscale.light5,
-    },
-    Slider: {
-      trackBgDisabled: supersetTheme.colors.grayscale.light1,
-      colorBgElevated: supersetTheme.colors.grayscale.light5,
-      handleSizeHover: 10,
-      handleLineWidthHover: 2,
-    },
-    Steps: {
-      margin: supersetTheme.gridUnit * 2,
-      iconSizeSM: 20,
-    },
-    Switch: {
-      colorPrimaryHover: supersetTheme.colors.primary.base,
-      colorTextTertiary: supersetTheme.colors.grayscale.light1,
-    },
-    Tooltip: {
-      fontSize: supersetTheme.typography.sizes.s,
-      lineHeight: 1.6,
-    },
-  },
-};
-
-export const getTheme = (themeType?: ThemeType) => ({
-  ...baseConfig,
-  algorithm: themes[themeType || ThemeType.LIGHT],
-});
diff --git a/superset-frontend/src/theme/light.ts b/superset-frontend/src/theme/light.ts
deleted file mode 100644
index 61591d99071..00000000000
--- a/superset-frontend/src/theme/light.ts
+++ /dev/null
@@ -1,119 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 { type MappingAlgorithm, theme } from 'antd-v5';
-import { theme as supersetTheme } from 'src/preamble';
-
-export const lightAlgorithm: MappingAlgorithm = seedToken => {
-  const defaultTokens = theme.defaultAlgorithm(seedToken);
-  return {
-    // Map Tokens
-    ...defaultTokens,
-    borderRadiusLG: supersetTheme.borderRadius,
-    borderRadiusOuter: supersetTheme.borderRadius,
-    borderRadiusSM: supersetTheme.borderRadius,
-    borderRadiusXS: supersetTheme.borderRadius,
-
-    colorBgContainer: supersetTheme.colors.primary.light4,
-    colorBgElevated: supersetTheme.colors.primary.base,
-    colorBgLayout: supersetTheme.colors.grayscale.light4,
-    colorBgMask: supersetTheme.colors.grayscale.light2,
-    colorBgSpotlight: supersetTheme.colors.grayscale.dark1,
-
-    colorBorder: supersetTheme.colors.grayscale.light2,
-    colorBorderSecondary: supersetTheme.colors.grayscale.light3,
-
-    colorErrorActive: supersetTheme.colors.error.dark1,
-    colorErrorBg: supersetTheme.colors.error.light2,
-    colorErrorBgActive: supersetTheme.colors.error.light1,
-    colorErrorBgHover: supersetTheme.colors.error.light2,
-    colorErrorBorder: supersetTheme.colors.error.light1,
-    colorErrorBorderHover: supersetTheme.colors.error.light1,
-    colorErrorHover: supersetTheme.colors.error.base,
-    colorErrorText: supersetTheme.colors.error.base,
-    colorErrorTextActive: supersetTheme.colors.error.dark1,
-    colorErrorTextHover: supersetTheme.colors.error.base,
-
-    colorFill: supersetTheme.colors.grayscale.light4,
-    colorFillSecondary: supersetTheme.colors.grayscale.light2,
-    colorFillTertiary: supersetTheme.colors.grayscale.light3,
-
-    colorInfoActive: supersetTheme.colors.info.dark1,
-    colorInfoBg: supersetTheme.colors.info.light2,
-    colorInfoBgHover: supersetTheme.colors.info.light1,
-    colorInfoBorder: supersetTheme.colors.info.light1,
-    colorInfoBorderHover: supersetTheme.colors.info.dark1,
-    colorInfoHover: supersetTheme.colors.info.dark1,
-    colorInfoText: supersetTheme.colors.info.dark1,
-    colorInfoTextActive: supersetTheme.colors.info.dark2,
-    colorInfoTextHover: supersetTheme.colors.info.dark1,
-
-    colorLinkActive: supersetTheme.colors.info.dark2,
-    colorLinkHover: supersetTheme.colors.info.dark1,
-
-    colorPrimaryActive: supersetTheme.colors.primary.dark2,
-    colorPrimaryBg: supersetTheme.colors.primary.light4,
-    colorPrimaryBgHover: supersetTheme.colors.primary.light3,
-    colorPrimaryBorder: supersetTheme.colors.primary.light2,
-    colorPrimaryBorderHover: supersetTheme.colors.primary.light1,
-    colorPrimaryHover: supersetTheme.colors.primary.dark1,
-    colorPrimaryText: supersetTheme.colors.primary.dark1,
-    colorPrimaryTextActive: supersetTheme.colors.primary.dark2,
-    colorPrimaryTextHover: supersetTheme.colors.primary.dark1,
-
-    colorSuccessActive: supersetTheme.colors.success.dark1,
-    colorSuccessBg: supersetTheme.colors.success.light2,
-    colorSuccessBgHover: supersetTheme.colors.success.light1,
-    colorSuccessBorder: supersetTheme.colors.success.light1,
-    colorSuccessBorderHover: supersetTheme.colors.success.dark1,
-    colorSuccessHover: supersetTheme.colors.success.dark1,
-    colorSuccessText: supersetTheme.colors.success.dark1,
-    colorSuccessTextActive: supersetTheme.colors.success.dark2,
-    colorSuccessTextHover: supersetTheme.colors.success.dark1,
-
-    colorText: supersetTheme.colors.grayscale.dark2,
-    colorTextQuaternary: supersetTheme.colors.grayscale.light1,
-    colorTextSecondary: supersetTheme.colors.text.label,
-    colorTextTertiary: supersetTheme.colors.text.help,
-
-    colorWarningActive: supersetTheme.colors.warning.dark1,
-    colorWarningBg: supersetTheme.colors.warning.light2,
-    colorWarningBgHover: supersetTheme.colors.warning.light1,
-    colorWarningBorder: supersetTheme.colors.warning.light1,
-    colorWarningBorderHover: supersetTheme.colors.warning.dark1,
-    colorWarningHover: supersetTheme.colors.warning.dark1,
-    colorWarningText: supersetTheme.colors.warning.dark1,
-    colorWarningTextActive: supersetTheme.colors.warning.dark2,
-    colorWarningTextHover: supersetTheme.colors.warning.dark1,
-
-    colorWhite: supersetTheme.colors.grayscale.light5,
-
-    fontSizeHeading1: supersetTheme.typography.sizes.xxl,
-    fontSizeHeading2: supersetTheme.typography.sizes.xl,
-    fontSizeHeading3: supersetTheme.typography.sizes.l,
-    fontSizeHeading4: supersetTheme.typography.sizes.m,
-    fontSizeHeading5: supersetTheme.typography.sizes.s,
-
-    fontSizeLG: supersetTheme.typography.sizes.l,
-    fontSizeSM: supersetTheme.typography.sizes.s,
-    fontSizeXL: supersetTheme.typography.sizes.xl,
-
-    lineWidthBold: supersetTheme.gridUnit / 2,
-  };
-};
diff --git a/superset-frontend/src/types/Chart.ts b/superset-frontend/src/types/Chart.ts
index b7c439cb211..4fff876f11b 100644
--- a/superset-frontend/src/types/Chart.ts
+++ b/superset-frontend/src/types/Chart.ts
@@ -22,8 +22,8 @@
  */
 
 import { QueryFormData } from '@superset-ui/core';
+import { TagType } from 'src/components';
 import Owner from './Owner';
-import Tag from './TagType';
 
 export type ChartLinkedDashboard = {
   id: number;
@@ -45,7 +45,7 @@ export interface Chart {
   cache_timeout: number | null;
   thumbnail_url?: string;
   owners?: Owner[];
-  tags?: Tag[];
+  tags?: TagType[];
   last_saved_at?: string;
   last_saved_by?: {
     id: number;
diff --git a/superset-frontend/src/types/DiffType.ts b/superset-frontend/src/types/DiffType.ts
new file mode 100644
index 00000000000..e146df35be2
--- /dev/null
+++ b/superset-frontend/src/types/DiffType.ts
@@ -0,0 +1,40 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+export type FilterItemType = {
+  comparator?: string | string[];
+  subject: string;
+  operator: string;
+  label?: string;
+};
+
+export type DiffItemType<
+  T = FilterItemType | number | string | Record<string | number, any>,
+> =
+  | T[]
+  | boolean
+  | number
+  | string
+  | Record<string | number, any>
+  | null
+  | undefined;
+
+export type DiffType = {
+  before: DiffItemType;
+  after: DiffItemType;
+};
diff --git a/superset-frontend/src/types/TagType.ts b/superset-frontend/src/types/TagType.ts
index ef68b1c1acf..04db0c18e68 100644
--- a/superset-frontend/src/types/TagType.ts
+++ b/superset-frontend/src/types/TagType.ts
@@ -16,19 +16,28 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
-import { MouseEventHandler } from 'react';
+import { CSSProperties, MouseEventHandler, ReactNode } from 'react';
+import { SerializedStyles } from '@emotion/react';
 
 export interface TagType {
   id?: number;
+  className?: string;
   type?: string | number;
   editable?: boolean;
   onDelete?: (index: number) => void;
   onClick?: MouseEventHandler<HTMLSpanElement>;
-  name: string;
-  index?: number | undefined;
+  onMouseDown?: MouseEventHandler<HTMLSpanElement>;
+  onClose?: () => void;
+  color?: string;
+  name?: string;
+  index?: number;
   toolTipTitle?: string;
-  children?: React.ReactNode;
+  children?: ReactNode;
+  role?: string;
+  style?: CSSProperties;
+  icon?: ReactNode;
+  css?: SerializedStyles;
+  closable?: boolean;
 }
 
 export default TagType;
diff --git a/superset-frontend/src/types/TaggedObject.ts b/superset-frontend/src/types/TaggedObject.ts
index bb01e82432a..34380d21fbf 100644
--- a/superset-frontend/src/types/TaggedObject.ts
+++ b/superset-frontend/src/types/TaggedObject.ts
@@ -18,7 +18,7 @@
  */
 
 import { ConfigType } from 'dayjs';
-import Tag from 'src/types/TagType';
+import { TagType } from 'src/components';
 import Owner from './Owner';
 
 export interface TaggedObject {
@@ -30,7 +30,7 @@ export interface TaggedObject {
   created_by: number | undefined;
   creator: string;
   owners: Owner[];
-  tags: Tag[];
+  tags: TagType[];
 }
 
 export interface TaggedObjects {
diff --git a/superset-frontend/src/types/bootstrapTypes.ts b/superset-frontend/src/types/bootstrapTypes.ts
index 5b87d12b3e2..9f20b586d0c 100644
--- a/superset-frontend/src/types/bootstrapTypes.ts
+++ b/superset-frontend/src/types/bootstrapTypes.ts
@@ -10,7 +10,7 @@ import { FormatLocaleDefinition } from 'd3-format';
 import { TimeLocaleDefinition } from 'd3-time-format';
 import { isPlainObject } from 'lodash';
 import { Languages } from 'src/features/home/LanguagePicker';
-import { FlashMessage } from '../components/FlashProvider';
+import type { FlashMessage } from 'src/components';
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -117,7 +117,7 @@ export interface NavBarProps {
 export interface MenuObjectChildProps {
   label: string;
   name?: string;
-  icon?: string;
+  icon?: React.ReactNode;
   index?: number;
   url?: string;
   onClick?: () => void;
@@ -153,7 +153,7 @@ export interface CommonBootstrapData {
   language_pack: LanguagePack;
   extra_categorical_color_schemes: ColorSchemeConfig[];
   extra_sequential_color_schemes: SequentialSchemeConfig[];
-  theme_overrides: JsonObject;
+  theme: JsonObject;
   menu_data: MenuData;
   d3_format: Partial<FormatLocaleDefinition>;
   d3_time_format: Partial<TimeLocaleDefinition>;
diff --git a/superset-frontend/src/utils/downloadAsImage.ts b/superset-frontend/src/utils/downloadAsImage.ts
index a16a13544ef..2700505f7e8 100644
--- a/superset-frontend/src/utils/downloadAsImage.ts
+++ b/superset-frontend/src/utils/downloadAsImage.ts
@@ -20,7 +20,7 @@ import { SyntheticEvent } from 'react';
 import domToImage from 'dom-to-image-more';
 import { kebabCase } from 'lodash';
 // eslint-disable-next-line no-restricted-imports
-import { t, supersetTheme } from '@superset-ui/core';
+import { SupersetTheme, t } from '@superset-ui/core';
 import { addWarningToast } from 'src/components/MessageToasts/actions';
 
 /**
@@ -45,6 +45,7 @@ export default function downloadAsImage(
   selector: string,
   description: string,
   isExactSelector = false,
+  theme?: SupersetTheme,
 ) {
   return (event: SyntheticEvent) => {
     const elementToPrint = isExactSelector
@@ -71,7 +72,7 @@ export default function downloadAsImage(
 
     return domToImage
       .toJpeg(elementToPrint, {
-        bgcolor: supersetTheme.colors.grayscale.light4,
+        bgcolor: theme?.colors.grayscale.light4,
         filter,
       })
       .then((dataUrl: string) => {
diff --git a/superset-frontend/src/utils/getChartFormDiffs/getChartFormDiffs.test.ts b/superset-frontend/src/utils/getChartFormDiffs/getChartFormDiffs.test.ts
new file mode 100644
index 00000000000..6b7680ec1c6
--- /dev/null
+++ b/superset-frontend/src/utils/getChartFormDiffs/getChartFormDiffs.test.ts
@@ -0,0 +1,115 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { JsonObject } from '@superset-ui/core';
+import { alterForComparison, getChartFormDiffs, isEqualish } from '.';
+
+jest.mock('../sanitizeFormData', () => ({
+  sanitizeFormData: (fd: JsonObject): JsonObject => ({
+    ...fd,
+    _sanitized: true,
+  }),
+}));
+
+describe('alterForComparison', () => {
+  it.each([
+    [null, null],
+    ['', null],
+    [[], null],
+    [{}, null],
+    [
+      [1, 2],
+      [1, 2],
+    ],
+    [{ a: 1 }, { a: 1 }],
+    ['foo', 'foo'],
+  ])('normalizes %p to %p', (input, expected) => {
+    expect(alterForComparison(input)).toEqual(expected);
+  });
+});
+
+describe('isEqualish', () => {
+  it('returns true for semantically equal values with different formats', () => {
+    expect(isEqualish('', null)).toBe(true);
+    expect(isEqualish([], null)).toBe(true);
+    expect(isEqualish({}, null)).toBe(true);
+    expect(isEqualish([1], [1])).toBe(true);
+  });
+
+  it('returns false for clearly different values', () => {
+    expect(isEqualish([1], [2])).toBe(false);
+    expect(isEqualish({ a: 1 }, { a: 2 })).toBe(false);
+    expect(isEqualish('foo', 'bar')).toBe(false);
+  });
+});
+
+describe('getChartFormDiffs', () => {
+  it('returns diffs for changed values', () => {
+    const original = { metric: 'count', adhoc_filters: [] };
+    const current = { metric: 'sum__num', adhoc_filters: [] };
+
+    const diffs = getChartFormDiffs(original, current);
+
+    expect(diffs).toHaveProperty('metric');
+    expect(diffs.metric).toEqual({
+      before: 'count',
+      after: 'sum__num',
+    });
+  });
+
+  it('ignores noisy keys', () => {
+    const original = { where: 'a = 1', metric: 'count' };
+    const current = { where: 'a = 2', metric: 'sum__num' };
+
+    const diffs = getChartFormDiffs(original, current);
+
+    expect(diffs).not.toHaveProperty('where');
+    expect(diffs).toHaveProperty('metric');
+  });
+
+  it('does not include values that are equalish', () => {
+    const original = { filters: [], metric: 'count' };
+    const current = { filters: null, metric: 'count' };
+
+    const diffs = getChartFormDiffs(original, current);
+
+    expect(diffs).toEqual({});
+  });
+
+  it('handles missing keys in original or current gracefully', () => {
+    const original = { metric: 'count' };
+    const current = { metric: 'count', new_field: 'value' };
+
+    const diffs = getChartFormDiffs(original, current);
+
+    expect(diffs).toHaveProperty('new_field');
+    expect(diffs.new_field).toEqual({
+      before: undefined,
+      after: 'value',
+    });
+  });
+
+  it('ignores keys that are missing in current and not explicitly changed', () => {
+    const original = { metric: 'count', removed_field: 'gone' };
+    const current = { metric: 'count' };
+
+    const diffs = getChartFormDiffs(original, current);
+
+    expect(diffs).not.toHaveProperty('removed_field');
+  });
+});
diff --git a/superset-frontend/src/utils/getChartFormDiffs/index.ts b/superset-frontend/src/utils/getChartFormDiffs/index.ts
new file mode 100644
index 00000000000..6c89b4fef31
--- /dev/null
+++ b/superset-frontend/src/utils/getChartFormDiffs/index.ts
@@ -0,0 +1,66 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { isEqual } from 'lodash';
+import { DiffType } from 'src/types/DiffType';
+import { JsonObject } from '@superset-ui/core';
+import { sanitizeFormData } from '../sanitizeFormData';
+
+export const noisyKeys = new Set(['filters', 'having', 'where']);
+
+export const alterForComparison = (value: unknown): unknown => {
+  if (value == null || value === '') return null;
+  if (Array.isArray(value) && value.length === 0) return null;
+  if (typeof value === 'object' && value && Object.keys(value).length === 0)
+    return null;
+
+  return value;
+};
+
+export const isEqualish = (a: unknown, b: unknown): boolean =>
+  isEqual(alterForComparison(a), alterForComparison(b));
+
+export const getChartFormDiffs = (
+  originalFormData: Record<string, unknown>,
+  currentFormData: Record<string, unknown>,
+): Record<string, DiffType> => {
+  const ofd: JsonObject = sanitizeFormData(originalFormData);
+  const cfd: JsonObject = sanitizeFormData(currentFormData);
+
+  const keys = new Set([...Object.keys(ofd), ...Object.keys(cfd)]);
+  const diffs: Record<string, DiffType> = {};
+
+  keys.forEach((key: string) => {
+    if (noisyKeys.has(key)) return;
+
+    const original = ofd[key];
+    const current = cfd[key];
+
+    const currentHasKey = Object.prototype.hasOwnProperty.call(cfd, key);
+    const originalHasKey = Object.prototype.hasOwnProperty.call(ofd, key);
+
+    const bothExplicit = currentHasKey && originalHasKey;
+
+    if (!bothExplicit && !currentHasKey) return;
+
+    if (!isEqualish(original, current))
+      diffs[key] = { before: original, after: current };
+  });
+
+  return diffs;
+};
diff --git a/superset-frontend/src/utils/sanitizeFormData/index.ts b/superset-frontend/src/utils/sanitizeFormData/index.ts
new file mode 100644
index 00000000000..9c55cfc6cf4
--- /dev/null
+++ b/superset-frontend/src/utils/sanitizeFormData/index.ts
@@ -0,0 +1,25 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { JsonObject } from '@superset-ui/core';
+import { omit } from 'lodash';
+
+const TEMPORARY_CONTROLS: string[] = ['url_params'];
+
+export const sanitizeFormData = (formData: JsonObject): JsonObject =>
+  omit(formData, TEMPORARY_CONTROLS);
diff --git a/superset-frontend/src/utils/sanitizeFormData/sanitizeFormData.test.ts b/superset-frontend/src/utils/sanitizeFormData/sanitizeFormData.test.ts
new file mode 100644
index 00000000000..98da5c86984
--- /dev/null
+++ b/superset-frontend/src/utils/sanitizeFormData/sanitizeFormData.test.ts
@@ -0,0 +1,28 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 { sanitizeFormData } from '.';
+
+test('sanitizeFormData removes temporary control values', () => {
+  expect(
+    sanitizeFormData({
+      url_params: { foo: 'bar' },
+      metrics: ['foo', 'bar'],
+    }),
+  ).toEqual({ metrics: ['foo', 'bar'] });
+});
diff --git a/superset-frontend/src/views/App.tsx b/superset-frontend/src/views/App.tsx
index 6901f441f0f..dad49d9b16d 100644
--- a/superset-frontend/src/views/App.tsx
+++ b/superset-frontend/src/views/App.tsx
@@ -25,10 +25,8 @@ import {
 } from 'react-router-dom';
 import { bindActionCreators } from 'redux';
 import { css } from '@superset-ui/core';
-import { GlobalStyles } from 'src/GlobalStyles';
-import ErrorBoundary from 'src/components/ErrorBoundary';
-import Loading from 'src/components/Loading';
-import { Layout } from 'src/components';
+import { Layout, Loading } from '@superset-ui/core/components';
+import { ErrorBoundary } from 'src/components';
 import Menu from 'src/features/home/Menu';
 import getBootstrapData, { applicationRoot } from 'src/utils/getBootstrapData';
 import ToastContainer from 'src/components/MessageToasts/ToastContainer';
@@ -76,7 +74,6 @@ const App = () => (
     <ScrollToTop />
     <LocationPathnameLogger />
     <RootContextProviders>
-      <GlobalStyles />
       <Menu
         data={bootstrapData.common.menu_data}
         isFrontendRoute={isFrontendRoute}
@@ -85,20 +82,22 @@ const App = () => (
         {routes.map(({ path, Component, props = {}, Fallback = Loading }) => (
           <Route path={path} key={path}>
             <Suspense fallback={<Fallback />}>
-              <Layout.Content
-                css={css`
-                  display: flex;
-                  flex-direction: column;
-                `}
-              >
-                <ErrorBoundary
+              <Layout>
+                <Layout.Content
                   css={css`
-                    margin: 16px;
+                    display: flex;
+                    flex-direction: column;
                   `}
                 >
-                  <Component user={bootstrapData.user} {...props} />
-                </ErrorBoundary>
-              </Layout.Content>
+                  <ErrorBoundary
+                    css={css`
+                      margin: 16px;
+                    `}
+                  >
+                    <Component user={bootstrapData.user} {...props} />
+                  </ErrorBoundary>
+                </Layout.Content>
+              </Layout>
             </Suspense>
           </Route>
         ))}
diff --git a/superset-frontend/src/views/CRUD/hooks.ts b/superset-frontend/src/views/CRUD/hooks.ts
index 6439739df49..5a5721205ee 100644
--- a/superset-frontend/src/views/CRUD/hooks.ts
+++ b/superset-frontend/src/views/CRUD/hooks.ts
@@ -35,8 +35,10 @@ import {
   getSSHPrivateKeysNeeded,
   getSSHPrivateKeyPasswordsNeeded,
 } from 'src/views/CRUD/utils';
-import { FetchDataConfig } from 'src/components/ListView';
-import { FilterValue } from 'src/components/ListView/types';
+import type {
+  ListViewFetchDataConfig as FetchDataConfig,
+  ListViewFilterValue as FilterValue,
+} from 'src/components';
 import Chart, { Slice } from 'src/types/Chart';
 import copyTextToClipboard from 'src/utils/copy';
 import { ensureAppRoot } from 'src/utils/pathUtils';
@@ -758,137 +760,98 @@ export function useDatabaseValidation() {
   const [validationErrors, setValidationErrors] = useState<JsonObject | null>(
     null,
   );
+  const [isValidating, setIsValidating] = useState(false);
+  const [hasValidated, setHasValidated] = useState(false);
+
   const getValidation = useCallback(
-    (database: Partial<DatabaseObject> | null, onCreate = false) => {
+    async (database: Partial<DatabaseObject> | null, onCreate = false) => {
       if (database?.parameters?.ssh) {
-        // TODO: /validate_parameters/ and related utils should support ssh tunnel
         setValidationErrors(null);
-        return [];
+        setIsValidating(false);
+        setHasValidated(true);
+        return Promise.resolve([]);
       }
 
-      return (
-        SupersetClient.post({
+      setIsValidating(true);
+
+      try {
+        await SupersetClient.post({
           endpoint: '/api/v1/database/validate_parameters/',
           body: JSON.stringify(transformDB(database)),
           headers: { 'Content-Type': 'application/json' },
-        })
-          .then(() => {
-            setValidationErrors(null);
-          })
-          // eslint-disable-next-line consistent-return
-          .catch(e => {
-            if (typeof e.json === 'function') {
-              return e.json().then(({ errors = [] }: JsonObject) => {
-                const parsedErrors = errors
-                  .filter((error: { error_type: string }) => {
-                    const skipValidationError = ![
-                      'CONNECTION_MISSING_PARAMETERS_ERROR',
-                      'CONNECTION_ACCESS_DENIED_ERROR',
-                    ].includes(error.error_type);
-                    return skipValidationError || onCreate;
-                  })
-                  .reduce(
-                    (
-                      obj: {},
-                      {
-                        error_type,
-                        extra,
-                        message,
-                      }: {
-                        error_type: string;
-                        extra: {
-                          invalid?: string[];
-                          missing?: string[];
-                          name: string;
-                          catalog: {
-                            name: string;
-                            url: string;
-                            idx: number;
-                          };
-                          issue_codes?: {
-                            code?: number;
-                            message?: string;
-                          }[];
-                        };
-                        message: string;
-                      },
-                    ) => {
-                      if (extra.catalog) {
-                        if (extra.catalog.name) {
-                          return {
-                            ...obj,
-                            error_type,
-                            [extra.catalog.idx]: {
-                              name: message,
-                            },
-                          };
-                        }
-                        if (extra.catalog.url) {
-                          return {
-                            ...obj,
-                            error_type,
-                            [extra.catalog.idx]: {
-                              url: message,
-                            },
-                          };
-                        }
+        });
+        setValidationErrors(null);
+        setIsValidating(false);
+        setHasValidated(true);
+        return [];
+      } catch (error) {
+        if (typeof error.json === 'function') {
+          return error.json().then(({ errors = [] }) => {
+            const parsedErrors = errors
+              .filter((err: { error_type: string }) => {
+                const allowed = [
+                  'CONNECTION_MISSING_PARAMETERS_ERROR',
+                  'CONNECTION_ACCESS_DENIED_ERROR',
+                  'INVALID_PAYLOAD_SCHEMA_ERROR',
+                ];
+                return allowed.includes(err.error_type) || onCreate;
+              })
+              .reduce((acc: JsonObject, err_2: any) => {
+                const { message, extra } = err_2;
 
-                        return {
-                          ...obj,
-                          error_type,
-                          [extra.catalog.idx]: {
-                            name: message,
-                            url: message,
-                          },
-                        };
-                      }
-                      // if extra.invalid doesn't exist then the
-                      // error can't be mapped to a parameter
-                      // so leave it alone
-                      if (extra.invalid) {
-                        return {
-                          ...obj,
-                          [extra.invalid[0]]: message,
-                          error_type,
-                        };
-                      }
-                      if (extra.missing) {
-                        return {
-                          ...obj,
-                          error_type,
-                          ...Object.assign(
-                            {},
-                            ...extra.missing.map(field => ({
-                              [field]: 'This is a required field',
-                            })),
-                          ),
-                        };
-                      }
-                      if (extra.issue_codes?.length) {
-                        return {
-                          ...obj,
-                          error_type,
-                          description: message || extra.issue_codes[0]?.message,
-                        };
-                      }
+                if (extra?.catalog) {
+                  const { idx } = extra.catalog;
+                  acc[idx] = {
+                    ...acc[idx],
+                    ...(extra.catalog.name ? { name: message } : {}),
+                    ...(extra.catalog.url ? { url: message } : {}),
+                  };
+                  return acc;
+                }
 
-                      return obj;
-                    },
-                    {},
-                  );
-                setValidationErrors(parsedErrors);
-                return parsedErrors;
-              });
-            }
-            // eslint-disable-next-line no-console
-            console.error(e);
-          })
-      );
+                if (extra?.invalid) {
+                  extra.invalid.forEach((field: string) => {
+                    acc[field] = message;
+                  });
+                }
+
+                if (extra?.missing) {
+                  extra.missing.forEach((field_1: string) => {
+                    acc[field_1] = 'This is a required field';
+                  });
+                }
+
+                if (extra?.issue_codes?.length) {
+                  acc.description = message || extra.issue_codes[0]?.message;
+                }
+
+                return acc;
+              }, {});
+
+            setValidationErrors(parsedErrors);
+            setIsValidating(false);
+            setHasValidated(true);
+            return parsedErrors;
+          });
+        }
+
+        console.error('Unexpected error during validation:', error);
+        setIsValidating(false);
+        setHasValidated(true);
+        return {};
+      }
     },
     [setValidationErrors],
   );
 
-  return [validationErrors, getValidation, setValidationErrors] as const;
+  return [
+    validationErrors,
+    getValidation,
+    setValidationErrors,
+    isValidating,
+    hasValidated,
+    setHasValidated,
+  ] as const;
 }
 
 export const reportSelector = (
diff --git a/superset-frontend/src/views/CRUD/utils.tsx b/superset-frontend/src/views/CRUD/utils.tsx
index c72de7d4380..ef021e51fa0 100644
--- a/superset-frontend/src/views/CRUD/utils.tsx
+++ b/superset-frontend/src/views/CRUD/utils.tsx
@@ -29,7 +29,10 @@ import {
 import Chart from 'src/types/Chart';
 import { intersection } from 'lodash';
 import rison from 'rison';
-import { FetchDataConfig, FilterValue } from 'src/components/ListView';
+import type {
+  ListViewFetchDataConfig as FetchDataConfig,
+  ListViewFilterValue as FilterValue,
+} from 'src/components';
 import SupersetText from 'src/utils/textUtils';
 import { findPermission } from 'src/utils/findPermission';
 import { User } from 'src/types/bootstrapTypes';
@@ -362,14 +365,15 @@ export const CardContainer = styled.div<{
   ${({ showThumbnails, theme }) => `
     overflow: hidden;
     display: grid;
-    grid-gap: ${theme.gridUnit * 12}px ${theme.gridUnit * 4}px;
+    justify-content: start;
+    grid-gap: ${theme.sizeUnit * 12}px ${theme.sizeUnit * 4}px;
     grid-template-columns: repeat(auto-fit, 300px);
     max-height: ${showThumbnails ? '314' : '148'}px;
-    margin-top: ${theme.gridUnit * -6}px;
+    margin-top: ${theme.sizeUnit * -6}px;
     padding: ${
       showThumbnails
-        ? `${theme.gridUnit * 8 + 3}px ${theme.gridUnit * 9}px`
-        : `${theme.gridUnit * 8 + 1}px ${theme.gridUnit * 9}px`
+        ? `${theme.sizeUnit * 8 + 3}px ${theme.sizeUnit * 20}px`
+        : `${theme.sizeUnit * 8 + 1}px ${theme.sizeUnit * 20}px`
     };
   `}
 `;
@@ -379,7 +383,7 @@ export const CardStyles = styled.div`
   a {
     text-decoration: none;
   }
-  .antd5-card-cover > div {
+  .ant-card-cover > div {
     /* Height is calculated based on 300px width, to keep the same aspect ratio as the 800*450 thumbnails */
     height: 168px;
   }
diff --git a/superset-frontend/src/views/RootContextProviders.tsx b/superset-frontend/src/views/RootContextProviders.tsx
index c0bc5c3af14..d27b271c44f 100644
--- a/superset-frontend/src/views/RootContextProviders.tsx
+++ b/superset-frontend/src/views/RootContextProviders.tsx
@@ -18,54 +18,55 @@
  */
 
 import { Route } from 'react-router-dom';
-import { getExtensionsRegistry, ThemeProvider } from '@superset-ui/core';
+import { getExtensionsRegistry, themeObject } from '@superset-ui/core';
 import { Provider as ReduxProvider } from 'react-redux';
 import { QueryParamProvider } from 'use-query-params';
 import { DndProvider } from 'react-dnd';
 import { HTML5Backend } from 'react-dnd-html5-backend';
 import getBootstrapData from 'src/utils/getBootstrapData';
-import { AntdThemeProvider } from '../components/AntdThemeProvider';
+import { FlashProvider, DynamicPluginProvider } from 'src/components';
+import { EmbeddedUiConfigProvider } from 'src/components/UiConfigContext';
+import { SupersetThemeProvider } from 'src/theme/ThemeProvider';
+import { ThemeController } from 'src/theme/ThemeController';
 import { store } from './store';
-import FlashProvider from '../components/FlashProvider';
-import { theme } from '../preamble';
-import { EmbeddedUiConfigProvider } from '../components/UiConfigContext';
-import { DynamicPluginProvider } from '../components/DynamicPlugins';
+import '../preamble';
 
 const { common } = getBootstrapData();
 
-const extensionsRegistry = getExtensionsRegistry();
+if (Object.keys(common?.theme || {}).length > 0) {
+  themeObject.setConfig(common.theme);
+}
+const themeController = new ThemeController({ themeObject });
 
+const extensionsRegistry = getExtensionsRegistry();
 export const RootContextProviders: React.FC = ({ children }) => {
   const RootContextProviderExtension = extensionsRegistry.get(
     'root.context.provider',
   );
-
   return (
-    <ThemeProvider theme={theme}>
-      <AntdThemeProvider>
-        <ReduxProvider store={store}>
-          <DndProvider backend={HTML5Backend}>
-            <FlashProvider messages={common.flash_messages}>
-              <EmbeddedUiConfigProvider>
-                <DynamicPluginProvider>
-                  <QueryParamProvider
-                    ReactRouterRoute={Route}
-                    stringifyOptions={{ encode: false }}
-                  >
-                    {RootContextProviderExtension ? (
-                      <RootContextProviderExtension>
-                        {children}
-                      </RootContextProviderExtension>
-                    ) : (
-                      children
-                    )}
-                  </QueryParamProvider>
-                </DynamicPluginProvider>
-              </EmbeddedUiConfigProvider>
-            </FlashProvider>
-          </DndProvider>
-        </ReduxProvider>
-      </AntdThemeProvider>
-    </ThemeProvider>
+    <SupersetThemeProvider themeController={themeController}>
+      <ReduxProvider store={store}>
+        <DndProvider backend={HTML5Backend}>
+          <FlashProvider messages={common.flash_messages}>
+            <EmbeddedUiConfigProvider>
+              <DynamicPluginProvider>
+                <QueryParamProvider
+                  ReactRouterRoute={Route}
+                  stringifyOptions={{ encode: false }}
+                >
+                  {RootContextProviderExtension ? (
+                    <RootContextProviderExtension>
+                      {children}
+                    </RootContextProviderExtension>
+                  ) : (
+                    children
+                  )}
+                </QueryParamProvider>
+              </DynamicPluginProvider>
+            </EmbeddedUiConfigProvider>
+          </FlashProvider>
+        </DndProvider>
+      </ReduxProvider>
+    </SupersetThemeProvider>
   );
 };
diff --git a/superset-frontend/src/views/menu.tsx b/superset-frontend/src/views/menu.tsx
index a1c93a2a34c..11dcc58c823 100644
--- a/superset-frontend/src/views/menu.tsx
+++ b/superset-frontend/src/views/menu.tsx
@@ -26,10 +26,8 @@ import { Route, BrowserRouter } from 'react-router-dom';
 import { CacheProvider } from '@emotion/react';
 import { QueryParamProvider } from 'use-query-params';
 import createCache from '@emotion/cache';
-import { ThemeProvider } from '@superset-ui/core';
+import { ThemeProvider, theme } from '@superset-ui/core';
 import Menu from 'src/features/home/Menu';
-import { theme } from 'src/preamble';
-import { AntdThemeProvider } from 'src/components/AntdThemeProvider';
 import getBootstrapData from 'src/utils/getBootstrapData';
 import { setupStore } from './store';
 
@@ -47,18 +45,16 @@ const App = () => (
   // @ts-ignore: emotion types defs are incompatible between core and cache
   <CacheProvider value={emotionCache}>
     <ThemeProvider theme={theme}>
-      <AntdThemeProvider>
-        <Provider store={store}>
-          <BrowserRouter>
-            <QueryParamProvider
-              ReactRouterRoute={Route}
-              stringifyOptions={{ encode: false }}
-            >
-              <Menu data={menu} />
-            </QueryParamProvider>
-          </BrowserRouter>
-        </Provider>
-      </AntdThemeProvider>
+      <Provider store={store}>
+        <BrowserRouter>
+          <QueryParamProvider
+            ReactRouterRoute={Route}
+            stringifyOptions={{ encode: false }}
+          >
+            <Menu data={menu} />
+          </QueryParamProvider>
+        </BrowserRouter>
+      </Provider>
     </ThemeProvider>
   </CacheProvider>
 );
diff --git a/superset-frontend/src/views/routes.tsx b/superset-frontend/src/views/routes.tsx
index 5c385eb3bd2..332aa0caf10 100644
--- a/superset-frontend/src/views/routes.tsx
+++ b/superset-frontend/src/views/routes.tsx
@@ -145,9 +145,24 @@ const ActionLogList: LazyExoticComponent<any> = lazy(
   () => import(/* webpackChunkName: "ActionLogList" */ 'src/pages/ActionLog'),
 );
 
+const Login = lazy(
+  () => import(/* webpackChunkName: "Login" */ 'src/pages/Login'),
+);
+
+const Register = lazy(
+  () => import(/* webpackChunkName: "Register" */ 'src/pages/Register'),
+);
+
 const GroupsList: LazyExoticComponent<any> = lazy(
   () => import(/* webpackChunkName: "GroupsList" */ 'src/pages/GroupsList'),
 );
+const UserRegistrations = lazy(
+  () =>
+    import(
+      /* webpackChunkName: "UserRegistrations" */ 'src/pages/UserRegistrations'
+    ),
+);
+
 type Routes = {
   path: string;
   Component: ComponentType;
@@ -156,6 +171,22 @@ type Routes = {
 }[];
 
 export const routes: Routes = [
+  {
+    path: '/login/',
+    Component: Login,
+  },
+  {
+    path: '/register/activation/:activationHash',
+    Component: Register,
+  },
+  {
+    path: '/register/',
+    Component: Register,
+  },
+  {
+    path: '/logout/',
+    Component: Login,
+  },
   {
     path: '/superset/welcome/',
     Component: Home,
@@ -255,6 +286,10 @@ export const routes: Routes = [
     path: '/actionlog/list',
     Component: ActionLogList,
   },
+  {
+    path: '/registrations/',
+    Component: UserRegistrations,
+  },
 ];
 
 if (isFeatureEnabled(FeatureFlag.TaggingSystem)) {
@@ -269,6 +304,8 @@ if (isFeatureEnabled(FeatureFlag.TaggingSystem)) {
 }
 
 const user = getBootstrapData()?.user;
+const authRegistrationEnabled =
+  getBootstrapData()?.common.conf.AUTH_USER_REGISTRATION;
 const isAdmin = isUserAdmin(user);
 
 if (isAdmin) {
@@ -288,6 +325,13 @@ if (isAdmin) {
   );
 }
 
+if (authRegistrationEnabled) {
+  routes.push({
+    path: '/registrations/',
+    Component: UserRegistrations,
+  });
+}
+
 const frontEndRoutes: Record<string, boolean> = routes
   .map(r => r.path)
   .reduce(
diff --git a/superset-frontend/src/visualizations/TimeTable/SparklineCell.tsx b/superset-frontend/src/visualizations/TimeTable/SparklineCell.tsx
index 3c35b572d09..fcf93e6bb94 100644
--- a/superset-frontend/src/visualizations/TimeTable/SparklineCell.tsx
+++ b/superset-frontend/src/visualizations/TimeTable/SparklineCell.tsx
@@ -34,7 +34,7 @@ import {
   XYChart,
   buildChartTheme,
 } from '@visx/xychart';
-import { extendedDayjs } from 'src/utils/dates';
+import { extendedDayjs } from '@superset-ui/core/utils/dates';
 
 interface Props {
   ariaLabel: string;
@@ -208,7 +208,7 @@ const SparklineCell = ({
           snapTooltipToDatumX
           snapTooltipToDatumY
           verticalCrosshairStyle={{
-            stroke: `${theme.colors.grayscale.dark1}`,
+            stroke: `${theme.colorText}`,
             strokeDasharray: '3 3',
             strokeWidth: 1,
           }}
diff --git a/superset-frontend/src/visualizations/TimeTable/TimeTable.jsx b/superset-frontend/src/visualizations/TimeTable/TimeTable.jsx
index 644c4051ef6..55d9882d788 100644
--- a/superset-frontend/src/visualizations/TimeTable/TimeTable.jsx
+++ b/superset-frontend/src/visualizations/TimeTable/TimeTable.jsx
@@ -20,14 +20,14 @@ import { useMemo } from 'react';
 import PropTypes from 'prop-types';
 import Mustache from 'mustache';
 import { scaleLinear } from 'd3-scale';
-import TableView from 'src/components/TableView';
-import { styled, t } from '@superset-ui/core';
 import {
-  InfoTooltipWithTrigger,
-  MetricOption,
-} from '@superset-ui/chart-controls';
+  InfoTooltip,
+  TableView,
+  Typography,
+} from '@superset-ui/core/components';
+import { styled, t } from '@superset-ui/core';
+import { MetricOption } from '@superset-ui/chart-controls';
 import sortNumericValues from 'src/utils/sortNumericValues';
-
 import FormattedNumber from './FormattedNumber';
 import SparklineCell from './SparklineCell';
 
@@ -128,7 +128,7 @@ const TimeTable = ({
           <>
             {columnConfig.label}{' '}
             {columnConfig.tooltip && (
-              <InfoTooltipWithTrigger
+              <InfoTooltip
                 tooltip={columnConfig.tooltip}
                 label={`tt-col-${i}`}
                 placement="top"
@@ -258,9 +258,13 @@ const TimeTable = ({
         const column = row;
         if (fullUrl) {
           return (
-            <a href={fullUrl} rel="noopener noreferrer" target="_blank">
+            <Typography.Link
+              href={fullUrl}
+              rel="noopener noreferrer"
+              target="_blank"
+            >
               {column.label}
-            </a>
+            </Typography.Link>
           );
         }
         return column.label;
diff --git a/superset-frontend/src/visualizations/presets/MainPreset.js b/superset-frontend/src/visualizations/presets/MainPreset.js
index b79de8f2623..387570a3262 100644
--- a/superset-frontend/src/visualizations/presets/MainPreset.js
+++ b/superset-frontend/src/visualizations/presets/MainPreset.js
@@ -68,6 +68,7 @@ import {
   EchartsWaterfallChartPlugin,
   BigNumberPeriodOverPeriodChartPlugin,
   EchartsHeatmapChartPlugin,
+  EchartsGanttChartPlugin,
 } from '@superset-ui/plugin-chart-echarts';
 import {
   SelectFilterPlugin,
@@ -111,6 +112,7 @@ export default class MainPreset extends Preset {
         new EchartsFunnelChartPlugin().configure({ key: VizType.Funnel }),
         new EchartsSankeyChartPlugin().configure({ key: VizType.Sankey }),
         new EchartsTreemapChartPlugin().configure({ key: VizType.Treemap }),
+        new EchartsGanttChartPlugin().configure({ key: VizType.Gantt }),
         new EchartsGaugeChartPlugin().configure({ key: VizType.Gauge }),
         new EchartsGraphChartPlugin().configure({ key: VizType.Graph }),
         new EchartsRadarChartPlugin().configure({ key: VizType.Radar }),
diff --git a/superset-frontend/tsconfig.base.json b/superset-frontend/tsconfig.base.json
new file mode 100644
index 00000000000..061d4ab9476
--- /dev/null
+++ b/superset-frontend/tsconfig.base.json
@@ -0,0 +1,43 @@
+{
+  "compilerOptions": {
+    /* Type Checking */
+    "noImplicitAny": true,
+    "noImplicitReturns": true,
+    "noImplicitThis": true,
+    "noUnusedLocals": true,
+    "strictNullChecks": true,
+    "module": "esnext",
+    "moduleResolution": "node",
+
+    "types": ["jest", "node", "@testing-library/jest-dom"],
+    "typeRoots": ["node_modules/@types"],
+
+    /* Emit */
+    "declaration": true,
+    "declarationMap": true,
+    "importHelpers": false,
+    "noEmitOnError": true,
+    "outDir": "./dist",
+    "sourceMap": true,
+
+    /* JavaScript Support */
+    "allowJs": true,
+
+    /* Interop Constraints */
+    "allowSyntheticDefaultImports": true,
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+
+    /* Language and Environment */
+    "target": "esnext",
+    "jsx": "react-jsx",
+    "jsxImportSource": "@emotion/react",
+    "lib": ["dom", "dom.iterable", "esnext"],
+
+    /* Projects */
+    "composite": true,
+
+    /* Completeness */
+    "skipLibCheck": true
+  }
+}
diff --git a/superset-frontend/tsconfig.json b/superset-frontend/tsconfig.json
index 13a933b1971..91d2433fbaa 100644
--- a/superset-frontend/tsconfig.json
+++ b/superset-frontend/tsconfig.json
@@ -1,18 +1,10 @@
 {
+  "extends": "./tsconfig.base.json",
   "compilerOptions": {
-    /* Type Checking */
-    "noImplicitAny": true,
-    "noImplicitReturns": true,
-    "noImplicitThis": true,
-    "noUnusedLocals": true,
-    "strictNullChecks": true,
-
-    /* Modules */
     "baseUrl": ".",
-    "module": "esnext",
-    "moduleResolution": "node",
     "paths": {
       "@superset-ui/core": ["./packages/superset-ui-core/src"],
+      "@superset-ui/core/*": ["./packages/superset-ui-core/src/*"],
       "@superset-ui/chart-controls": [
         "./packages/superset-ui-chart-controls/src"
       ],
@@ -26,39 +18,8 @@
       "@superset-ui/preset-chart-*": ["./plugins/preset-chart-*/src"],
       "@superset-ui/switchboard": ["./packages/superset-ui-switchboard/src"]
     },
-    "types": [
-      "@emotion/react/types/css-prop",
-      "jest",
-      "@testing-library/jest-dom",
-      "@types/node"
-    ],
+    "typeRoots": ["src/types", "node_modules/@types"]
 
-    /* Emit */
-    "declaration": true,
-    "declarationMap": true,
-    "importHelpers": false,
-    "noEmitOnError": true,
-    "outDir": "./dist",
-    "sourceMap": true,
-
-    /* JavaScript Support */
-    "allowJs": true,
-
-    /* Interop Constraints */
-    "allowSyntheticDefaultImports": true,
-    "esModuleInterop": false,
-    "forceConsistentCasingInFileNames": true,
-
-    /* Language and Environment */
-    "target": "esnext",
-    "jsx": "preserve",
-    "lib": ["dom", "dom.iterable", "esnext"],
-
-    /* Projects */
-    "composite": true,
-
-    /* Completeness */
-    "skipLibCheck": true
   },
   "exclude": [
     "./packages/generator-superset/test/**/*"
diff --git a/superset-frontend/webpack.config.js b/superset-frontend/webpack.config.js
index 95c5dc7a851..e0c0bc77920 100644
--- a/superset-frontend/webpack.config.js
+++ b/superset-frontend/webpack.config.js
@@ -124,11 +124,7 @@ const plugins = [
   }),
 
   new CopyPlugin({
-    patterns: [
-      'package.json',
-      { from: 'src/assets/images', to: 'images' },
-      { from: 'src/assets/stylesheets', to: 'stylesheets' },
-    ],
+    patterns: ['package.json', { from: 'src/assets/images', to: 'images' }],
   }),
 
   // static pages
@@ -262,7 +258,6 @@ const config = {
           name: 'vendors',
           test: new RegExp(
             `/node_modules/(${[
-              'abortcontroller-polyfill',
               'react',
               'react-dom',
               'prop-types',
@@ -305,9 +300,6 @@ const config = {
     // resolve modules from `/superset_frontend/node_modules` and `/superset_frontend`
     modules: ['node_modules', APP_DIR],
     alias: {
-      // TODO: remove aliases once React has been upgraded to v17 and
-      //  AntD version conflict has been resolved
-      antd: path.resolve(path.join(APP_DIR, './node_modules/antd')),
       react: path.resolve(path.join(APP_DIR, './node_modules/react')),
       // TODO: remove Handlebars alias once Handlebars NPM package has been updated to
       // correctly support webpack import (https://github.com/handlebars-lang/handlebars.js/issues/953)
@@ -332,6 +324,7 @@ const config = {
       fs: false,
       vm: require.resolve('vm-browserify'),
       path: false,
+      stream: require.resolve('stream-browserify'),
       ...(isDevMode ? { buffer: require.resolve('buffer/') } : {}), // Fix legacy-plugin-chart-paired-t-test broken Story
     },
   },
@@ -408,38 +401,6 @@ const config = {
           },
         ],
       },
-      {
-        test: /\.less$/,
-        include: APP_DIR,
-        use: [
-          isDevMode
-            ? 'style-loader'
-            : {
-                loader: MiniCssExtractPlugin.loader,
-                options: {
-                  publicPath: MINI_CSS_EXTRACT_PUBLICPATH,
-                },
-              },
-          {
-            loader: 'css-loader',
-            options: {
-              sourceMap: true,
-            },
-          },
-          {
-            loader: 'less-loader',
-            options: {
-              sourceMap: true,
-              lessOptions: {
-                javascriptEnabled: true,
-                modifyVars: {
-                  'root-entry-name': 'default',
-                },
-              },
-            },
-          },
-        ],
-      },
       /* for css linking images (and viz plugin thumbnails) */
       {
         test: /\.png$/,
diff --git a/superset-websocket/package-lock.json b/superset-websocket/package-lock.json
index 04cdc67d67d..f6b86d76638 100644
--- a/superset-websocket/package-lock.json
+++ b/superset-websocket/package-lock.json
@@ -10,7 +10,7 @@
       "license": "Apache-2.0",
       "dependencies": {
         "cookie": "^0.7.0",
-        "hot-shots": "^10.2.1",
+        "hot-shots": "^11.1.0",
         "ioredis": "^4.28.0",
         "jsonwebtoken": "^9.0.2",
         "lodash": "^4.17.21",
@@ -25,22 +25,22 @@
         "@types/ioredis": "^4.27.8",
         "@types/jest": "^29.5.14",
         "@types/jsonwebtoken": "^9.0.9",
-        "@types/lodash": "^4.17.13",
+        "@types/lodash": "^4.17.20",
         "@types/node": "^22.10.3",
         "@types/uuid": "^10.0.0",
         "@types/ws": "^8.5.12",
         "@typescript-eslint/eslint-plugin": "^8.26.0",
-        "@typescript-eslint/parser": "^8.29.0",
-        "eslint": "^9.27.0",
+        "@typescript-eslint/parser": "^8.33.0",
+        "eslint": "^9.30.0",
         "eslint-config-prettier": "^10.1.5",
         "eslint-plugin-lodash": "^8.0.0",
         "globals": "^16.0.0",
         "jest": "^29.7.0",
-        "prettier": "^3.4.2",
+        "prettier": "^3.6.2",
         "ts-jest": "^29.3.1",
         "ts-node": "^10.9.2",
         "tscw-config": "^1.1.2",
-        "typescript": "^5.6.2",
+        "typescript": "^5.7.3",
         "typescript-eslint": "^8.19.0"
       },
       "engines": {
@@ -747,11 +747,10 @@
       }
     },
     "node_modules/@eslint/config-array": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.0.tgz",
-      "integrity": "sha512-fxlS1kkIjx8+vy2SjuCB94q3htSNrufYTXubwiBFeaQHbH6Ipi43gFJq2zCMt6PHhImH3Xmr0NksKDvchWlpQQ==",
+      "version": "0.21.0",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.0.tgz",
+      "integrity": "sha512-ENIdc4iLu0d93HeYirvKmrzshzofPw6VkZRKQGe9Nv46ZnWUzcF1xV01dcvEg/1wXUR61OmmlSfyeyO7EvjLxQ==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "@eslint/object-schema": "^2.1.6",
         "debug": "^4.3.1",
@@ -762,11 +761,10 @@
       }
     },
     "node_modules/@eslint/config-helpers": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.2.tgz",
-      "integrity": "sha512-+GPzk8PlG0sPpzdU5ZvIRMPidzAnZDl/s9L+y13iodqvb8leL53bTannOrQ/Im7UkpsmFU5Ily5U60LWixnmLg==",
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.3.0.tgz",
+      "integrity": "sha512-ViuymvFmcJi04qdZeDc2whTHryouGcDlaxPqarTD0ZE10ISpxGUVZGZDx4w01upyIynL3iu6IXH2bS1NhclQMw==",
       "dev": true,
-      "license": "Apache-2.0",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
@@ -842,11 +840,10 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.27.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.27.0.tgz",
-      "integrity": "sha512-G5JD9Tu5HJEu4z2Uo4aHY2sLV64B7CDMXxFzqzjl3NKd6RVzSXNoE80jk7Y0lJkTTkjiIhBAqmlYwjuBY3tvpA==",
+      "version": "9.30.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.30.0.tgz",
+      "integrity": "sha512-Wzw3wQwPvc9sHM+NjakWTcPx11mbZyiYHuwWa/QfZ7cIRX7WK54PSk7bdyXDaoaopUcMatv1zaQvOAAO8hCdww==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
@@ -859,7 +856,6 @@
       "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz",
       "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==",
       "dev": true,
-      "license": "Apache-2.0",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
@@ -1825,9 +1821,9 @@
       }
     },
     "node_modules/@types/lodash": {
-      "version": "4.17.13",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.13.tgz",
-      "integrity": "sha512-lfx+dftrEZcdBPczf9d0Qv0x+j/rfNCMuC6OcfXmO8gkfeNAY88PgKUbvG56whcN23gc27yenwF6oJZXGFpYxg==",
+      "version": "4.17.20",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.20.tgz",
+      "integrity": "sha512-H3MHACvFUEiujabxhaI/ImO6gUrd8oOurg7LQtS7mbwIXA/cUqWrvBsaeJ23aZEPk1TAYkurjfMbSELfoCXlGA==",
       "dev": true
     },
     "node_modules/@types/ms": {
@@ -2071,16 +2067,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.29.0.tgz",
-      "integrity": "sha512-8C0+jlNJOwQso2GapCVWWfW/rzaq7Lbme+vGUFKE31djwNncIpgXD7Cd4weEsDdkoZDjH0lwwr3QDQFuyrMg9g==",
+      "version": "8.33.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.33.0.tgz",
+      "integrity": "sha512-JaehZvf6m0yqYp34+RVnihBAChkqeH+tqqhS0GuX1qgPpwLvmTPheKEs6OeCK6hVJgXZHJ2vbjnC9j119auStQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.29.0",
-        "@typescript-eslint/types": "8.29.0",
-        "@typescript-eslint/typescript-estree": "8.29.0",
-        "@typescript-eslint/visitor-keys": "8.29.0",
+        "@typescript-eslint/scope-manager": "8.33.0",
+        "@typescript-eslint/types": "8.33.0",
+        "@typescript-eslint/typescript-estree": "8.33.0",
+        "@typescript-eslint/visitor-keys": "8.33.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -2096,14 +2092,14 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.29.0.tgz",
-      "integrity": "sha512-aO1PVsq7Gm+tcghabUpzEnVSFMCU4/nYIgC2GOatJcllvWfnhrgW0ZEbnTxm36QsikmCN1K/6ZgM7fok2I7xNw==",
+      "version": "8.33.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.33.0.tgz",
+      "integrity": "sha512-LMi/oqrzpqxyO72ltP+dBSP6V0xiUb4saY7WLtxSfiNEBI8m321LLVFU9/QDJxjDQG9/tjSqKz/E3380TEqSTw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.29.0",
-        "@typescript-eslint/visitor-keys": "8.29.0"
+        "@typescript-eslint/types": "8.33.0",
+        "@typescript-eslint/visitor-keys": "8.33.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2114,9 +2110,9 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
-      "version": "8.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.29.0.tgz",
-      "integrity": "sha512-wcJL/+cOXV+RE3gjCyl/V2G877+2faqvlgtso/ZRbTCnZazh0gXhe+7gbAnfubzN2bNsBtZjDvlh7ero8uIbzg==",
+      "version": "8.33.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.33.0.tgz",
+      "integrity": "sha512-DKuXOKpM5IDT1FA2g9x9x1Ug81YuKrzf4mYX8FAVSNu5Wo/LELHWQyM1pQaDkI42bX15PWl0vNPt1uGiIFUOpg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2128,20 +2124,22 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.29.0.tgz",
-      "integrity": "sha512-yOfen3jE9ISZR/hHpU/bmNvTtBW1NjRbkSFdZOksL1N+ybPEE7UVGMwqvS6CP022Rp00Sb0tdiIkhSCe6NI8ow==",
+      "version": "8.33.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.33.0.tgz",
+      "integrity": "sha512-vegY4FQoB6jL97Tu/lWRsAiUUp8qJTqzAmENH2k59SJhw0Th1oszb9Idq/FyyONLuNqT1OADJPXfyUNOR8SzAQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.29.0",
-        "@typescript-eslint/visitor-keys": "8.29.0",
+        "@typescript-eslint/project-service": "8.33.0",
+        "@typescript-eslint/tsconfig-utils": "8.33.0",
+        "@typescript-eslint/types": "8.33.0",
+        "@typescript-eslint/visitor-keys": "8.33.0",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
         "minimatch": "^9.0.4",
         "semver": "^7.6.0",
-        "ts-api-utils": "^2.0.1"
+        "ts-api-utils": "^2.1.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2155,13 +2153,13 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.29.0.tgz",
-      "integrity": "sha512-Sne/pVz8ryR03NFK21VpN88dZ2FdQXOlq3VIklbrTYEt8yXtRFr9tvUhqvCeKjqYk5FSim37sHbooT6vzBTZcg==",
+      "version": "8.33.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.33.0.tgz",
+      "integrity": "sha512-7RW7CMYoskiz5OOGAWjJFxgb7c5UNjTG292gYhWeOAcFmYCtVCSqjqSBj5zMhxbXo2JOW95YYrUWJfU0zrpaGQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.29.0",
+        "@typescript-eslint/types": "8.33.0",
         "eslint-visitor-keys": "^4.2.0"
       },
       "engines": {
@@ -2224,6 +2222,39 @@
         "typescript": ">=4.8.4"
       }
     },
+    "node_modules/@typescript-eslint/project-service": {
+      "version": "8.33.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.33.0.tgz",
+      "integrity": "sha512-d1hz0u9l6N+u/gcrk6s6gYdl7/+pp8yHheRTqP6X5hVDKALEaTn8WfGiit7G511yueBEL3OpOEpD+3/MBdoN+A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/tsconfig-utils": "^8.33.0",
+        "@typescript-eslint/types": "^8.33.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/project-service/node_modules/@typescript-eslint/types": {
+      "version": "8.33.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.33.0.tgz",
+      "integrity": "sha512-DKuXOKpM5IDT1FA2g9x9x1Ug81YuKrzf4mYX8FAVSNu5Wo/LELHWQyM1pQaDkI42bX15PWl0vNPt1uGiIFUOpg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
     "node_modules/@typescript-eslint/scope-manager": {
       "version": "8.19.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.19.0.tgz",
@@ -2241,6 +2272,23 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
+    "node_modules/@typescript-eslint/tsconfig-utils": {
+      "version": "8.33.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.33.0.tgz",
+      "integrity": "sha512-sTkETlbqhEoiFmGr1gsdq5HyVbSOF0145SYDJ/EQmXHtKViCaGvnyLqWFFHtEXoS0J1yU8Wyou2UGmgW88fEug==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
     "node_modules/@typescript-eslint/type-utils": {
       "version": "8.26.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.26.0.tgz",
@@ -2534,9 +2582,9 @@
       }
     },
     "node_modules/acorn": {
-      "version": "8.14.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
-      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
+      "version": "8.15.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
+      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "dev": true,
       "bin": {
         "acorn": "bin/acorn"
@@ -3191,19 +3239,18 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.27.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.27.0.tgz",
-      "integrity": "sha512-ixRawFQuMB9DZ7fjU3iGGganFDp3+45bPOdaRurcFHSXO1e/sYwUX/FtQZpLZJR6SjMoJH8hR2pPEAfDyCoU2Q==",
+      "version": "9.30.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.30.0.tgz",
+      "integrity": "sha512-iN/SiPxmQu6EVkf+m1qpBxzUhE12YqFLOSySuOyVLJLEF9nzTf+h/1AJYc1JWzCnktggeNrjvQGLngDzXirU6g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.12.1",
-        "@eslint/config-array": "^0.20.0",
-        "@eslint/config-helpers": "^0.2.1",
+        "@eslint/config-array": "^0.21.0",
+        "@eslint/config-helpers": "^0.3.0",
         "@eslint/core": "^0.14.0",
         "@eslint/eslintrc": "^3.3.1",
-        "@eslint/js": "9.27.0",
+        "@eslint/js": "9.30.0",
         "@eslint/plugin-kit": "^0.3.1",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
@@ -3215,9 +3262,9 @@
         "cross-spawn": "^7.0.6",
         "debug": "^4.3.2",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^8.3.0",
-        "eslint-visitor-keys": "^4.2.0",
-        "espree": "^10.3.0",
+        "eslint-scope": "^8.4.0",
+        "eslint-visitor-keys": "^4.2.1",
+        "espree": "^10.4.0",
         "esquery": "^1.5.0",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
@@ -3284,11 +3331,10 @@
       }
     },
     "node_modules/eslint-scope": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.3.0.tgz",
-      "integrity": "sha512-pUNxi75F8MJ/GdeKtVLSbYg4ZI34J6C0C7sbL4YOp2exGwen7ZsuBqKzUhXd0qMQ362yET3z+uPwKeg/0C2XCQ==",
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz",
+      "integrity": "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "esrecurse": "^4.3.0",
         "estraverse": "^5.2.0"
@@ -3325,9 +3371,9 @@
       }
     },
     "node_modules/eslint/node_modules/eslint-visitor-keys": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
-      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
       "dev": true,
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3427,15 +3473,14 @@
       }
     },
     "node_modules/espree": {
-      "version": "10.3.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz",
-      "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==",
+      "version": "10.4.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz",
+      "integrity": "sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
-        "acorn": "^8.14.0",
+        "acorn": "^8.15.0",
         "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^4.2.0"
+        "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3445,11 +3490,10 @@
       }
     },
     "node_modules/espree/node_modules/eslint-visitor-keys": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
-      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
       "dev": true,
-      "license": "Apache-2.0",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
@@ -3488,7 +3532,6 @@
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
       "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "estraverse": "^5.2.0"
       },
@@ -3875,9 +3918,9 @@
       }
     },
     "node_modules/hot-shots": {
-      "version": "10.2.1",
-      "resolved": "https://registry.npmjs.org/hot-shots/-/hot-shots-10.2.1.tgz",
-      "integrity": "sha512-tmjcyZkG/qADhcdC7UjAp8D7v7W2DOYFgaZ48fYMuayMQmVVUg8fntKmrjes/b40ef6yZ+qt1lB8kuEDfLC4zw==",
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/hot-shots/-/hot-shots-11.1.0.tgz",
+      "integrity": "sha512-D4iAs/145g7EJ/wIzBLVANEpysTPthUy/K+4EUIw02YJQTqvzD1vUpYiM3vwR0qPAQj4FhQpQz8wBpY8KDcM0g==",
       "engines": {
         "node": ">=10.0.0"
       },
@@ -5965,9 +6008,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.4.2.tgz",
-      "integrity": "sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz",
+      "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
       "dev": true,
       "bin": {
         "prettier": "bin/prettier.cjs"
@@ -6675,9 +6718,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.6.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz",
-      "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==",
+      "version": "5.7.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz",
+      "integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==",
       "dev": true,
       "bin": {
         "tsc": "bin/tsc",
@@ -7599,9 +7642,9 @@
       "dev": true
     },
     "@eslint/config-array": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.0.tgz",
-      "integrity": "sha512-fxlS1kkIjx8+vy2SjuCB94q3htSNrufYTXubwiBFeaQHbH6Ipi43gFJq2zCMt6PHhImH3Xmr0NksKDvchWlpQQ==",
+      "version": "0.21.0",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.0.tgz",
+      "integrity": "sha512-ENIdc4iLu0d93HeYirvKmrzshzofPw6VkZRKQGe9Nv46ZnWUzcF1xV01dcvEg/1wXUR61OmmlSfyeyO7EvjLxQ==",
       "dev": true,
       "requires": {
         "@eslint/object-schema": "^2.1.6",
@@ -7610,9 +7653,9 @@
       }
     },
     "@eslint/config-helpers": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.2.tgz",
-      "integrity": "sha512-+GPzk8PlG0sPpzdU5ZvIRMPidzAnZDl/s9L+y13iodqvb8leL53bTannOrQ/Im7UkpsmFU5Ily5U60LWixnmLg==",
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.3.0.tgz",
+      "integrity": "sha512-ViuymvFmcJi04qdZeDc2whTHryouGcDlaxPqarTD0ZE10ISpxGUVZGZDx4w01upyIynL3iu6IXH2bS1NhclQMw==",
       "dev": true
     },
     "@eslint/core": {
@@ -7665,9 +7708,9 @@
       }
     },
     "@eslint/js": {
-      "version": "9.27.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.27.0.tgz",
-      "integrity": "sha512-G5JD9Tu5HJEu4z2Uo4aHY2sLV64B7CDMXxFzqzjl3NKd6RVzSXNoE80jk7Y0lJkTTkjiIhBAqmlYwjuBY3tvpA==",
+      "version": "9.30.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.30.0.tgz",
+      "integrity": "sha512-Wzw3wQwPvc9sHM+NjakWTcPx11mbZyiYHuwWa/QfZ7cIRX7WK54PSk7bdyXDaoaopUcMatv1zaQvOAAO8hCdww==",
       "dev": true
     },
     "@eslint/object-schema": {
@@ -8469,9 +8512,9 @@
       }
     },
     "@types/lodash": {
-      "version": "4.17.13",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.13.tgz",
-      "integrity": "sha512-lfx+dftrEZcdBPczf9d0Qv0x+j/rfNCMuC6OcfXmO8gkfeNAY88PgKUbvG56whcN23gc27yenwF6oJZXGFpYxg==",
+      "version": "4.17.20",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.20.tgz",
+      "integrity": "sha512-H3MHACvFUEiujabxhaI/ImO6gUrd8oOurg7LQtS7mbwIXA/cUqWrvBsaeJ23aZEPk1TAYkurjfMbSELfoCXlGA==",
       "dev": true
     },
     "@types/ms": {
@@ -8635,57 +8678,59 @@
       }
     },
     "@typescript-eslint/parser": {
-      "version": "8.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.29.0.tgz",
-      "integrity": "sha512-8C0+jlNJOwQso2GapCVWWfW/rzaq7Lbme+vGUFKE31djwNncIpgXD7Cd4weEsDdkoZDjH0lwwr3QDQFuyrMg9g==",
+      "version": "8.33.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.33.0.tgz",
+      "integrity": "sha512-JaehZvf6m0yqYp34+RVnihBAChkqeH+tqqhS0GuX1qgPpwLvmTPheKEs6OeCK6hVJgXZHJ2vbjnC9j119auStQ==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "8.29.0",
-        "@typescript-eslint/types": "8.29.0",
-        "@typescript-eslint/typescript-estree": "8.29.0",
-        "@typescript-eslint/visitor-keys": "8.29.0",
+        "@typescript-eslint/scope-manager": "8.33.0",
+        "@typescript-eslint/types": "8.33.0",
+        "@typescript-eslint/typescript-estree": "8.33.0",
+        "@typescript-eslint/visitor-keys": "8.33.0",
         "debug": "^4.3.4"
       },
       "dependencies": {
         "@typescript-eslint/scope-manager": {
-          "version": "8.29.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.29.0.tgz",
-          "integrity": "sha512-aO1PVsq7Gm+tcghabUpzEnVSFMCU4/nYIgC2GOatJcllvWfnhrgW0ZEbnTxm36QsikmCN1K/6ZgM7fok2I7xNw==",
+          "version": "8.33.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.33.0.tgz",
+          "integrity": "sha512-LMi/oqrzpqxyO72ltP+dBSP6V0xiUb4saY7WLtxSfiNEBI8m321LLVFU9/QDJxjDQG9/tjSqKz/E3380TEqSTw==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "8.29.0",
-            "@typescript-eslint/visitor-keys": "8.29.0"
+            "@typescript-eslint/types": "8.33.0",
+            "@typescript-eslint/visitor-keys": "8.33.0"
           }
         },
         "@typescript-eslint/types": {
-          "version": "8.29.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.29.0.tgz",
-          "integrity": "sha512-wcJL/+cOXV+RE3gjCyl/V2G877+2faqvlgtso/ZRbTCnZazh0gXhe+7gbAnfubzN2bNsBtZjDvlh7ero8uIbzg==",
+          "version": "8.33.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.33.0.tgz",
+          "integrity": "sha512-DKuXOKpM5IDT1FA2g9x9x1Ug81YuKrzf4mYX8FAVSNu5Wo/LELHWQyM1pQaDkI42bX15PWl0vNPt1uGiIFUOpg==",
           "dev": true
         },
         "@typescript-eslint/typescript-estree": {
-          "version": "8.29.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.29.0.tgz",
-          "integrity": "sha512-yOfen3jE9ISZR/hHpU/bmNvTtBW1NjRbkSFdZOksL1N+ybPEE7UVGMwqvS6CP022Rp00Sb0tdiIkhSCe6NI8ow==",
+          "version": "8.33.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.33.0.tgz",
+          "integrity": "sha512-vegY4FQoB6jL97Tu/lWRsAiUUp8qJTqzAmENH2k59SJhw0Th1oszb9Idq/FyyONLuNqT1OADJPXfyUNOR8SzAQ==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "8.29.0",
-            "@typescript-eslint/visitor-keys": "8.29.0",
+            "@typescript-eslint/project-service": "8.33.0",
+            "@typescript-eslint/tsconfig-utils": "8.33.0",
+            "@typescript-eslint/types": "8.33.0",
+            "@typescript-eslint/visitor-keys": "8.33.0",
             "debug": "^4.3.4",
             "fast-glob": "^3.3.2",
             "is-glob": "^4.0.3",
             "minimatch": "^9.0.4",
             "semver": "^7.6.0",
-            "ts-api-utils": "^2.0.1"
+            "ts-api-utils": "^2.1.0"
           }
         },
         "@typescript-eslint/visitor-keys": {
-          "version": "8.29.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.29.0.tgz",
-          "integrity": "sha512-Sne/pVz8ryR03NFK21VpN88dZ2FdQXOlq3VIklbrTYEt8yXtRFr9tvUhqvCeKjqYk5FSim37sHbooT6vzBTZcg==",
+          "version": "8.33.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.33.0.tgz",
+          "integrity": "sha512-7RW7CMYoskiz5OOGAWjJFxgb7c5UNjTG292gYhWeOAcFmYCtVCSqjqSBj5zMhxbXo2JOW95YYrUWJfU0zrpaGQ==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "8.29.0",
+            "@typescript-eslint/types": "8.33.0",
             "eslint-visitor-keys": "^4.2.0"
           }
         },
@@ -8722,6 +8767,25 @@
         }
       }
     },
+    "@typescript-eslint/project-service": {
+      "version": "8.33.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.33.0.tgz",
+      "integrity": "sha512-d1hz0u9l6N+u/gcrk6s6gYdl7/+pp8yHheRTqP6X5hVDKALEaTn8WfGiit7G511yueBEL3OpOEpD+3/MBdoN+A==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/tsconfig-utils": "^8.33.0",
+        "@typescript-eslint/types": "^8.33.0",
+        "debug": "^4.3.4"
+      },
+      "dependencies": {
+        "@typescript-eslint/types": {
+          "version": "8.33.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.33.0.tgz",
+          "integrity": "sha512-DKuXOKpM5IDT1FA2g9x9x1Ug81YuKrzf4mYX8FAVSNu5Wo/LELHWQyM1pQaDkI42bX15PWl0vNPt1uGiIFUOpg==",
+          "dev": true
+        }
+      }
+    },
     "@typescript-eslint/scope-manager": {
       "version": "8.19.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.19.0.tgz",
@@ -8732,6 +8796,13 @@
         "@typescript-eslint/visitor-keys": "8.19.0"
       }
     },
+    "@typescript-eslint/tsconfig-utils": {
+      "version": "8.33.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.33.0.tgz",
+      "integrity": "sha512-sTkETlbqhEoiFmGr1gsdq5HyVbSOF0145SYDJ/EQmXHtKViCaGvnyLqWFFHtEXoS0J1yU8Wyou2UGmgW88fEug==",
+      "dev": true,
+      "requires": {}
+    },
     "@typescript-eslint/type-utils": {
       "version": "8.26.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.26.0.tgz",
@@ -8904,9 +8975,9 @@
       }
     },
     "acorn": {
-      "version": "8.14.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
-      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
+      "version": "8.15.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
+      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "dev": true
     },
     "acorn-jsx": {
@@ -9398,18 +9469,18 @@
       "dev": true
     },
     "eslint": {
-      "version": "9.27.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.27.0.tgz",
-      "integrity": "sha512-ixRawFQuMB9DZ7fjU3iGGganFDp3+45bPOdaRurcFHSXO1e/sYwUX/FtQZpLZJR6SjMoJH8hR2pPEAfDyCoU2Q==",
+      "version": "9.30.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.30.0.tgz",
+      "integrity": "sha512-iN/SiPxmQu6EVkf+m1qpBxzUhE12YqFLOSySuOyVLJLEF9nzTf+h/1AJYc1JWzCnktggeNrjvQGLngDzXirU6g==",
       "dev": true,
       "requires": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.12.1",
-        "@eslint/config-array": "^0.20.0",
-        "@eslint/config-helpers": "^0.2.1",
+        "@eslint/config-array": "^0.21.0",
+        "@eslint/config-helpers": "^0.3.0",
         "@eslint/core": "^0.14.0",
         "@eslint/eslintrc": "^3.3.1",
-        "@eslint/js": "9.27.0",
+        "@eslint/js": "9.30.0",
         "@eslint/plugin-kit": "^0.3.1",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
@@ -9421,9 +9492,9 @@
         "cross-spawn": "^7.0.6",
         "debug": "^4.3.2",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^8.3.0",
-        "eslint-visitor-keys": "^4.2.0",
-        "espree": "^10.3.0",
+        "eslint-scope": "^8.4.0",
+        "eslint-visitor-keys": "^4.2.1",
+        "espree": "^10.4.0",
         "esquery": "^1.5.0",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
@@ -9447,9 +9518,9 @@
           "dev": true
         },
         "eslint-visitor-keys": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
-          "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+          "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
           "dev": true
         },
         "find-up": {
@@ -9531,9 +9602,9 @@
       }
     },
     "eslint-scope": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.3.0.tgz",
-      "integrity": "sha512-pUNxi75F8MJ/GdeKtVLSbYg4ZI34J6C0C7sbL4YOp2exGwen7ZsuBqKzUhXd0qMQ362yET3z+uPwKeg/0C2XCQ==",
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz",
+      "integrity": "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==",
       "dev": true,
       "requires": {
         "esrecurse": "^4.3.0",
@@ -9547,20 +9618,20 @@
       "dev": true
     },
     "espree": {
-      "version": "10.3.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz",
-      "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==",
+      "version": "10.4.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz",
+      "integrity": "sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==",
       "dev": true,
       "requires": {
-        "acorn": "^8.14.0",
+        "acorn": "^8.15.0",
         "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^4.2.0"
+        "eslint-visitor-keys": "^4.2.1"
       },
       "dependencies": {
         "eslint-visitor-keys": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
-          "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+          "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
           "dev": true
         }
       }
@@ -9883,9 +9954,9 @@
       }
     },
     "hot-shots": {
-      "version": "10.2.1",
-      "resolved": "https://registry.npmjs.org/hot-shots/-/hot-shots-10.2.1.tgz",
-      "integrity": "sha512-tmjcyZkG/qADhcdC7UjAp8D7v7W2DOYFgaZ48fYMuayMQmVVUg8fntKmrjes/b40ef6yZ+qt1lB8kuEDfLC4zw==",
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/hot-shots/-/hot-shots-11.1.0.tgz",
+      "integrity": "sha512-D4iAs/145g7EJ/wIzBLVANEpysTPthUy/K+4EUIw02YJQTqvzD1vUpYiM3vwR0qPAQj4FhQpQz8wBpY8KDcM0g==",
       "requires": {
         "unix-dgram": "2.x"
       }
@@ -11509,9 +11580,9 @@
       "dev": true
     },
     "prettier": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.4.2.tgz",
-      "integrity": "sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz",
+      "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
       "dev": true
     },
     "pretty-format": {
@@ -11958,9 +12029,9 @@
       "dev": true
     },
     "typescript": {
-      "version": "5.6.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz",
-      "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==",
+      "version": "5.7.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz",
+      "integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==",
       "dev": true
     },
     "typescript-eslint": {
diff --git a/superset-websocket/package.json b/superset-websocket/package.json
index 61ffc639598..8ca4c5af77b 100644
--- a/superset-websocket/package.json
+++ b/superset-websocket/package.json
@@ -18,7 +18,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "cookie": "^0.7.0",
-    "hot-shots": "^10.2.1",
+    "hot-shots": "^11.1.0",
     "ioredis": "^4.28.0",
     "jsonwebtoken": "^9.0.2",
     "lodash": "^4.17.21",
@@ -33,22 +33,22 @@
     "@types/ioredis": "^4.27.8",
     "@types/jest": "^29.5.14",
     "@types/jsonwebtoken": "^9.0.9",
-    "@types/lodash": "^4.17.13",
+    "@types/lodash": "^4.17.20",
     "@types/node": "^22.10.3",
     "@types/uuid": "^10.0.0",
     "@types/ws": "^8.5.12",
     "@typescript-eslint/eslint-plugin": "^8.26.0",
-    "@typescript-eslint/parser": "^8.29.0",
-    "eslint": "^9.27.0",
+    "@typescript-eslint/parser": "^8.33.0",
+    "eslint": "^9.30.0",
     "eslint-config-prettier": "^10.1.5",
     "eslint-plugin-lodash": "^8.0.0",
     "globals": "^16.0.0",
     "jest": "^29.7.0",
-    "prettier": "^3.4.2",
+    "prettier": "^3.6.2",
     "ts-jest": "^29.3.1",
     "ts-node": "^10.9.2",
     "tscw-config": "^1.1.2",
-    "typescript": "^5.6.2",
+    "typescript": "^5.7.3",
     "typescript-eslint": "^8.19.0"
   },
   "engines": {
diff --git a/superset/charts/api.py b/superset/charts/api.py
index 68b6f2cb0c9..7a15d6e5c3e 100644
--- a/superset/charts/api.py
+++ b/superset/charts/api.py
@@ -236,6 +236,7 @@ class ChartRestApi(BaseSupersetModelRestApi):
         "slice_name",
         "viz_type",
         "tags",
+        "uuid",
     ]
     base_order = ("changed_on", "desc")
     base_filters = [["id", ChartFilter, lambda: []]]
diff --git a/superset/commands/chart/fave.py b/superset/commands/chart/fave.py
index d45d1694761..c39873cbeed 100644
--- a/superset/commands/chart/fave.py
+++ b/superset/commands/chart/fave.py
@@ -17,8 +17,6 @@
 import logging
 from functools import partial
 
-from requests_cache import Optional
-
 from superset import security_manager
 from superset.commands.base import BaseCommand
 from superset.commands.chart.exceptions import (
@@ -37,12 +35,13 @@ logger = logging.getLogger(__name__)
 class AddFavoriteChartCommand(BaseCommand):
     def __init__(self, chart_id: int) -> None:
         self._chart_id = chart_id
-        self._chart: Optional[Slice] = None
+        self._chart: Slice | None = None
 
     @transaction(on_error=partial(on_error, reraise=ChartFaveError))
     def run(self) -> None:
         self.validate()
-        return ChartDAO.add_favorite(self._chart)
+        if self._chart:
+            return ChartDAO.add_favorite(self._chart)
 
     def validate(self) -> None:
         chart = ChartDAO.find_by_id(self._chart_id)
diff --git a/superset/commands/chart/unfave.py b/superset/commands/chart/unfave.py
index d19d2b27699..e6d0cace39c 100644
--- a/superset/commands/chart/unfave.py
+++ b/superset/commands/chart/unfave.py
@@ -17,8 +17,6 @@
 import logging
 from functools import partial
 
-from requests_cache import Optional
-
 from superset import security_manager
 from superset.commands.base import BaseCommand
 from superset.commands.chart.exceptions import (
@@ -37,12 +35,13 @@ logger = logging.getLogger(__name__)
 class DelFavoriteChartCommand(BaseCommand):
     def __init__(self, chart_id: int) -> None:
         self._chart_id = chart_id
-        self._chart: Optional[Slice] = None
+        self._chart: Slice | None = None
 
     @transaction(on_error=partial(on_error, reraise=ChartUnfaveError))
     def run(self) -> None:
         self.validate()
-        return ChartDAO.remove_favorite(self._chart)
+        if self._chart:
+            return ChartDAO.remove_favorite(self._chart)
 
     def validate(self) -> None:
         chart = ChartDAO.find_by_id(self._chart_id)
diff --git a/superset/commands/dashboard/fave.py b/superset/commands/dashboard/fave.py
index e3050c729db..6e08128edb7 100644
--- a/superset/commands/dashboard/fave.py
+++ b/superset/commands/dashboard/fave.py
@@ -17,8 +17,6 @@
 import logging
 from functools import partial
 
-from requests_cache import Optional
-
 from superset.commands.base import BaseCommand
 from superset.commands.dashboard.exceptions import (
     DashboardFaveError,
@@ -33,12 +31,13 @@ logger = logging.getLogger(__name__)
 class AddFavoriteDashboardCommand(BaseCommand):
     def __init__(self, dashboard_id: int) -> None:
         self._dashboard_id = dashboard_id
-        self._dashboard: Optional[Dashboard] = None
+        self._dashboard: Dashboard | None = None
 
     @transaction(on_error=partial(on_error, reraise=DashboardFaveError))
     def run(self) -> None:
         self.validate()
-        return DashboardDAO.add_favorite(self._dashboard)
+        if self._dashboard:
+            return DashboardDAO.add_favorite(self._dashboard)
 
     def validate(self) -> None:
         # Raises DashboardNotFoundError or DashboardAccessDeniedError
diff --git a/superset/commands/dashboard/unfave.py b/superset/commands/dashboard/unfave.py
index 811a2cdd1e6..66fa426edcc 100644
--- a/superset/commands/dashboard/unfave.py
+++ b/superset/commands/dashboard/unfave.py
@@ -17,8 +17,6 @@
 import logging
 from functools import partial
 
-from requests_cache import Optional
-
 from superset.commands.base import BaseCommand
 from superset.commands.dashboard.exceptions import (
     DashboardUnfaveError,
@@ -33,12 +31,13 @@ logger = logging.getLogger(__name__)
 class DelFavoriteDashboardCommand(BaseCommand):
     def __init__(self, dashboard_id: int) -> None:
         self._dashboard_id = dashboard_id
-        self._dashboard: Optional[Dashboard] = None
+        self._dashboard: Dashboard | None = None
 
     @transaction(on_error=partial(on_error, reraise=DashboardUnfaveError))
     def run(self) -> None:
         self.validate()
-        return DashboardDAO.remove_favorite(self._dashboard)
+        if self._dashboard:
+            return DashboardDAO.remove_favorite(self._dashboard)
 
     def validate(self) -> None:
         # Raises DashboardNotFoundError or DashboardAccessDeniedError
diff --git a/superset/commands/database/tables.py b/superset/commands/database/tables.py
index c0c0507eb0d..11b181e886b 100644
--- a/superset/commands/database/tables.py
+++ b/superset/commands/database/tables.py
@@ -54,6 +54,7 @@ class TablesDatabaseCommand(BaseCommand):
 
     def run(self) -> dict[str, Any]:
         self.validate()
+        self._catalog_name = self._catalog_name or self._model.get_default_catalog()
         try:
             tables = security_manager.get_datasources_accessible_by_user(
                 database=self._model,
diff --git a/superset/common/query_context_processor.py b/superset/common/query_context_processor.py
index 509dcba5a71..75c2013e44d 100644
--- a/superset/common/query_context_processor.py
+++ b/superset/common/query_context_processor.py
@@ -186,9 +186,11 @@ class QueryContextProcessor:
         label_map.update(
             {
                 column_name: [
-                    str(query_obj.columns[idx])
-                    if not is_adhoc_column(query_obj.columns[idx])
-                    else cast(AdhocColumn, query_obj.columns[idx])["sqlExpression"],
+                    (
+                        str(query_obj.columns[idx])
+                        if not is_adhoc_column(query_obj.columns[idx])
+                        else cast(AdhocColumn, query_obj.columns[idx])["sqlExpression"]
+                    ),
                 ]
                 for idx, column_name in enumerate(query_obj.column_names)
             }
@@ -196,12 +198,22 @@ class QueryContextProcessor:
         label_map.update(
             {
                 metric_name: [
-                    str(query_obj.metrics[idx])
-                    if not is_adhoc_metric(query_obj.metrics[idx])
-                    else str(cast(AdhocMetric, query_obj.metrics[idx])["sqlExpression"])
-                    if cast(AdhocMetric, query_obj.metrics[idx])["expressionType"]
-                    == "SQL"
-                    else metric_name,
+                    (
+                        str(query_obj.metrics[idx])
+                        if not is_adhoc_metric(query_obj.metrics[idx])
+                        else (
+                            str(
+                                cast(AdhocMetric, query_obj.metrics[idx])[
+                                    "sqlExpression"
+                                ]
+                            )
+                            if cast(AdhocMetric, query_obj.metrics[idx])[
+                                "expressionType"
+                            ]
+                            == "SQL"
+                            else metric_name
+                        )
+                    ),
                 ]
                 for idx, metric_name in enumerate(query_obj.metric_names)
                 if query_obj and query_obj.metrics
@@ -741,6 +753,47 @@ class QueryContextProcessor:
 
         return df.to_dict(orient="records")
 
+    def ensure_totals_available(self) -> None:
+        queries_needing_totals = []
+        totals_queries = []
+
+        for i, query in enumerate(self._query_context.queries):
+            needs_totals = any(
+                pp.get("operation") == "contribution"
+                for pp in getattr(query, "post_processing", []) or []
+            )
+
+            if needs_totals:
+                queries_needing_totals.append(i)
+
+            is_totals_query = (
+                not query.columns and query.metrics and not query.post_processing
+            )
+            if is_totals_query:
+                totals_queries.append(i)
+
+        if not queries_needing_totals or not totals_queries:
+            return
+
+        totals_idx = totals_queries[0]
+        totals_query = self._query_context.queries[totals_idx]
+
+        totals_query.row_limit = None
+
+        result = self._query_context.get_query_result(totals_query)
+        df = result.df
+
+        totals = {
+            col: df[col].sum() for col in df.columns if df[col].dtype.kind in "biufc"
+        }
+
+        for idx in queries_needing_totals:
+            query = self._query_context.queries[idx]
+            if hasattr(query, "post_processing") and query.post_processing:
+                for pp in query.post_processing:
+                    if pp.get("operation") == "contribution":
+                        pp["options"]["contribution_totals"] = totals
+
     def get_payload(
         self,
         cache_query_context: bool | None = False,
@@ -748,7 +801,8 @@ class QueryContextProcessor:
     ) -> dict[str, Any]:
         """Returns the query results with both metadata and data"""
 
-        # Get all the payloads from the QueryObjects
+        self.ensure_totals_available()
+
         query_results = [
             get_query_results(
                 query_obj.result_type or self._query_context.result_type,
@@ -758,6 +812,7 @@ class QueryContextProcessor:
             )
             for query_obj in self._query_context.queries
         ]
+
         return_value = {"queries": query_results}
 
         if cache_query_context:
@@ -858,13 +913,24 @@ class QueryContextProcessor:
         from superset.commands.chart.data.get_data_command import ChartDataCommand
 
         if not (chart := ChartDAO.find_by_id(annotation_layer["value"])):
-            raise QueryObjectValidationError(_("The chart does not exist"))
+            raise QueryObjectValidationError(
+                _(
+                    f"""Chart with ID {annotation_layer["value"]} (referenced by
+                    annotation layer '{annotation_layer["name"]}') was not found.
+                    Please verify that the chart exists and is accessible."""
+                )
+            )
 
         try:
             if chart.viz_type in viz_types:
                 if not chart.datasource:
                     raise QueryObjectValidationError(
-                        _("The chart datasource does not exist"),
+                        _(
+                            f"""The dataset for chart ID {chart.id} (referenced by
+                            annotation layer '{annotation_layer["name"]}') was
+                            not found. Please check that the dataset exists and
+                            is accessible."""
+                        )
                     )
 
                 form_data = chart.form_data.copy()
@@ -881,7 +947,12 @@ class QueryContextProcessor:
 
             if not (query_context := chart.get_query_context()):
                 raise QueryObjectValidationError(
-                    _("The chart query context does not exist"),
+                    _(
+                        f"""The query context for chart ID {chart.id} (referenced
+                        by annotation layer '{annotation_layer["name"]}') was not found.
+                        Please ensure the chart is properly configured and has a valid
+                        query context."""
+                    )
                 )
 
             if overrides := annotation_layer.get("overrides"):
diff --git a/superset/config.py b/superset/config.py
index 0711717ab17..6d847efe72e 100644
--- a/superset/config.py
+++ b/superset/config.py
@@ -67,7 +67,7 @@ logger = logging.getLogger(__name__)
 
 if TYPE_CHECKING:
     from flask_appbuilder.security.sqla import models
-    from sqlglot import Dialect, Dialects
+    from sqlglot import Dialect, Dialects  # pylint: disable=disallowed-sql-import
 
     from superset.connectors.sqla.models import SqlaTable
     from superset.models.core import Database
@@ -87,6 +87,10 @@ EVENT_LOGGER = DBEventLogger()
 
 SUPERSET_LOG_VIEW = True
 
+# This config is used to enable/disable the folowing security menu items:
+# List Users, List Roles, List Groups
+SUPERSET_SECURITY_VIEW_MENU = True
+
 BASE_DIR = str(files("superset"))
 if "SUPERSET_HOME" in os.environ:
     DATA_DIR = os.environ["SUPERSET_HOME"]
@@ -211,7 +215,7 @@ SQLALCHEMY_ENGINE_OPTIONS = {}
 # implement a function that takes a single argument of type 'sqla.engine.url',
 # returns a password and set SQLALCHEMY_CUSTOM_PASSWORD_STORE.
 #
-# e.g.:
+# example:
 # def lookup_password(url):
 #     return 'secret'
 # SQLALCHEMY_CUSTOM_PASSWORD_STORE = lookup_password
@@ -551,7 +555,8 @@ DEFAULT_FEATURE_FLAGS: dict[str, bool] = {
     "PLAYWRIGHT_REPORTS_AND_THUMBNAILS": False,
     # Set to True to enable experimental chart plugins
     "CHART_PLUGINS_EXPERIMENTAL": False,
-    # Regardless of database configuration settings, force SQLLAB to run async using Celery  # noqa: E501
+    # Regardless of database configuration settings, force SQLLAB to run async
+    # using Celery
     "SQLLAB_FORCE_RUN_ASYNC": False,
     # Set to True to to enable factory resent CLI command
     "ENABLE_FACTORY_RESET_COMMAND": False,
@@ -559,7 +564,17 @@ DEFAULT_FEATURE_FLAGS: dict[str, bool] = {
     # If on, you'll want to add "https://avatars.slack-edge.com" to the list of allowed
     # domains in your TALISMAN_CONFIG
     "SLACK_ENABLE_AVATARS": False,
-    # Allow users to optionally specify date formats in email subjects, which will be parsed if enabled. # noqa: E501
+    # Adds a switch to the navbar to easily switch between light and dark themes.
+    # This is intended to use for development, visual review, and theming-debugging
+    # purposes.
+    "THEME_ENABLE_DARK_THEME_SWITCH": False,
+    # Adds a theme editor as a modal dialog in the navbar. Allows people to type in JSON
+    # and see the changes applied to the current theme.
+    # This is intended to use for theme creation, visual review and theming-debugging
+    # purposes.
+    "THEME_ALLOW_THEME_EDITOR_BETA": False,
+    # Allow users to optionally specify date formats in email subjects, which will
+    # be parsed if enabled
     "DATE_FORMAT_IN_EMAIL_SUBJECT": False,
     # Allow metrics and columns to be grouped into (potentially nested) folders in the
     # chart builder
@@ -658,24 +673,17 @@ COMMON_BOOTSTRAP_OVERRIDES_FUNC: Callable[  # noqa: E731
 # This is merely a default
 EXTRA_CATEGORICAL_COLOR_SCHEMES: list[dict[str, Any]] = []
 
-# THEME_OVERRIDES is used for adding custom theme to superset
-# example code for "My theme" custom scheme
-# THEME_OVERRIDES = {
-#   "borderRadius": 4,
-#   "colors": {
-#     "primary": {
-#       "base": 'red',
-#     },
-#     "secondary": {
-#       "base": 'green',
-#     },
-#     "grayscale": {
-#       "base": 'orange',
-#     }
-#   }
-# }
+# THEME is used for setting a custom theme to Superset, it follows the ant design
+# theme structure
+# You can use the AntDesign theme editor to generate a theme structure
+# https://ant.design/theme-editor
+# To expose a JSON theme editor modal that can be triggered from the navbar
+# set the `ENABLE_THEME_EDITOR` feature flag to True.
+#
+# To set up the dark theme:
+# THEME = {"algorithm": "dark"}
 
-THEME_OVERRIDES: dict[str, Any] = {}
+THEME: dict[str, Any] = {}
 
 # EXTRA_SEQUENTIAL_COLOR_SCHEMES is used for adding custom sequential color schemes
 # EXTRA_SEQUENTIAL_COLOR_SCHEMES =  [
@@ -1627,6 +1635,7 @@ CONTENT_SECURITY_POLICY_WARNING = True
 
 # Do you want Talisman enabled?
 TALISMAN_ENABLED = utils.cast_to_boolean(os.environ.get("TALISMAN_ENABLED", True))
+TALISMAN_ENABLED = False
 
 # If you want Talisman, how do you want it configured??
 # For more information on setting up Talisman, please refer to
@@ -1644,6 +1653,7 @@ TALISMAN_CONFIG = {
             "https://static.scarf.sh/",
             # "https://cdn.brandfolder.io", # Uncomment when SLACK_ENABLE_AVATARS is True  # noqa: E501
             "ows.terrestris.de",
+            "https://cdn.document360.io",
         ],
         "worker-src": ["'self'", "blob:"],
         "connect-src": [
@@ -1675,6 +1685,7 @@ TALISMAN_DEV_CONFIG = {
             "https://static.scarf.sh/",
             "https://cdn.brandfolder.io",
             "ows.terrestris.de",
+            "https://cdn.document360.io",
         ],
         "worker-src": ["'self'", "blob:"],
         "connect-src": [
@@ -1806,7 +1817,10 @@ GUEST_TOKEN_JWT_SECRET = "test-guest-secret-change-me"  # noqa: S105
 GUEST_TOKEN_JWT_ALGO = "HS256"  # noqa: S105
 GUEST_TOKEN_HEADER_NAME = "X-GuestToken"  # noqa: S105
 GUEST_TOKEN_JWT_EXP_SECONDS = 300  # 5 minutes
-# Guest token audience for the embedded superset, either string or callable
+# Audience for the Superset guest token used in embedded mode.
+# Can be a string or a callable. Defaults to WEBDRIVER_BASEURL.
+# When generating the guest token, ensure the
+# payload's `aud` matches GUEST_TOKEN_JWT_AUDIENCE.
 GUEST_TOKEN_JWT_AUDIENCE: Callable[[], str] | str | None = None
 
 # A callable that can be supplied to do extra validation of guest token configuration
diff --git a/superset/connectors/sqla/__init__.py b/superset/connectors/sqla/__init__.py
index c7619537bca..13a83393a91 100644
--- a/superset/connectors/sqla/__init__.py
+++ b/superset/connectors/sqla/__init__.py
@@ -14,4 +14,3 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from . import models, views  # noqa: F401
diff --git a/superset/dashboards/api.py b/superset/dashboards/api.py
index 65d8fbd662a..4b7cb41a10f 100644
--- a/superset/dashboards/api.py
+++ b/superset/dashboards/api.py
@@ -254,6 +254,7 @@ class DashboardRestApi(BaseSupersetModelRestApi):
         "roles",
         "slug",
         "tags",
+        "uuid",
     )
     search_filters = {
         "dashboard_title": [DashboardTitleOrSlugFilter],
diff --git a/superset/datasets/api.py b/superset/datasets/api.py
index 9b84885b4ca..098e0f68289 100644
--- a/superset/datasets/api.py
+++ b/superset/datasets/api.py
@@ -277,6 +277,7 @@ class DatasetRestApi(BaseSupersetModelRestApi):
         "table_name",
         "created_by",
         "changed_by",
+        "uuid",
     ]
     allowed_rel_fields = {"database", "owners", "created_by", "changed_by"}
     allowed_distinct_fields = {"catalog", "schema"}
diff --git a/superset/datasets/schemas.py b/superset/datasets/schemas.py
index 54ce4481737..405d0bab3dd 100644
--- a/superset/datasets/schemas.py
+++ b/superset/datasets/schemas.py
@@ -74,6 +74,11 @@ class DatasetColumnsPutSchema(Schema):
     uuid = fields.UUID(allow_none=True)
 
 
+class DatasetMetricCurrencyPutSchema(Schema):
+    symbol = fields.String(validate=Length(1, 128))
+    symbolPosition = fields.String(validate=Length(1, 128))  # noqa: N815
+
+
 class DatasetMetricsPutSchema(Schema):
     id = fields.Integer()
     expression = fields.String(required=True)
@@ -82,7 +87,7 @@ class DatasetMetricsPutSchema(Schema):
     metric_name = fields.String(required=True, validate=Length(1, 255))
     metric_type = fields.String(allow_none=True, validate=Length(1, 32))
     d3format = fields.String(allow_none=True, validate=Length(1, 128))
-    currency = fields.String(allow_none=True, required=False, validate=Length(1, 128))
+    currency = fields.Nested(DatasetMetricCurrencyPutSchema, allow_none=True)
     verbose_name = fields.String(allow_none=True, metadata={Length: (1, 1024)})
     warning_text = fields.String(allow_none=True)
     uuid = fields.UUID(allow_none=True)
diff --git a/superset/db_engine_specs/README.md b/superset/db_engine_specs/README.md
index 75ab7351544..34904b79e74 100644
--- a/superset/db_engine_specs/README.md
+++ b/superset/db_engine_specs/README.md
@@ -53,9 +53,9 @@ Note that DB engine specs are completely optional. Superset can connect to any d
 
 The table below (generated via `python superset/db_engine_specs/lib.py`) summarizes the information about the status of all DB engine specs in Superset (note that this excludes 3rd party DB engine specs):
 
-| Feature | Amazon Athena | Amazon DynamoDB | Amazon Redshift | Apache Drill | Apache Druid | Apache Hive | Apache Impala | Apache Kylin | Apache Pinot | Apache Solr | Apache Spark SQL | Ascend | Aurora MySQL (Data API) | Aurora PostgreSQL (Data API) | Azure Synapse | ClickHouse | ClickHouse Connect (Superset) | CockroachDB | CrateDB | Databricks | Databricks Interactive Cluster | Databricks SQL Endpoint | Dremio | DuckDB | ElasticSearch (OpenDistro SQL) | ElasticSearch (SQL API) | Exasol | Firebird | Firebolt | Google BigQuery | Google Sheets | IBM Db2 | IBM Netezza Performance Server | KustoKQL | KustoSQL | Microsoft SQL Server | MySQL | Ocient | Oracle | PostgreSQL | Presto | RisingWave | Rockset | SAP HANA | SQLite | Shillelagh | Snowflake | StarRocks | Teradata | Trino | Vertica | base |
+| Feature | Amazon Athena | Amazon DynamoDB | Amazon Redshift | Apache Drill | Apache Druid | Apache Hive | Apache Impala | Apache Kylin | Apache Pinot | Apache Solr | Apache Spark SQL | Ascend | Aurora MySQL (Data API) | Aurora PostgreSQL (Data API) | Azure Synapse | ClickHouse | ClickHouse Connect (Superset) | CockroachDB | CrateDB | Databricks | Databricks Interactive Cluster | Databricks SQL Endpoint | Dremio | DuckDB | ElasticSearch (OpenDistro SQL) | ElasticSearch (SQL API) | Exasol | Firebird | Firebolt | Google BigQuery | Google Sheets | IBM Db2 | IBM Netezza Performance Server | KustoKQL | KustoSQL | Microsoft SQL Server | MySQL | Ocient | Oracle | PostgreSQL | Presto | RisingWave | SAP HANA | SQLite | Shillelagh | Snowflake | StarRocks | Teradata | Trino | Vertica | base |
 |  ---|  ---|  ---|  ---|  ---|  ---|  ---|  ---|  ---|  ---|  ---|  ---|  ---|  ---|  ---|  ---|  ---|  ---|  ---|  ---|  ---|  ---|  ---|  ---|  ---|  ---|  ---|  ---|  ---|  ---|  ---|  ---|  ---|  ---|  ---|  ---|  ---|  ---|  ---|  ---|  ---|  ---|  ---|  ---|  ---|  ---|  ---|  ---|  ---|  ---|  ---|  ---|  ---|
-| Module | superset.db_engine_specs.athena | superset.db_engine_specs.dynamodb | superset.db_engine_specs.redshift | superset.db_engine_specs.drill | superset.db_engine_specs.druid | superset.db_engine_specs.hive | superset.db_engine_specs.impala | superset.db_engine_specs.kylin | superset.db_engine_specs.pinot | superset.db_engine_specs.solr | superset.db_engine_specs.spark | superset.db_engine_specs.ascend | superset.db_engine_specs.aurora | superset.db_engine_specs.aurora | superset.db_engine_specs.mssql | superset.db_engine_specs.clickhouse | superset.db_engine_specs.clickhouse | superset.db_engine_specs.cockroachdb | superset.db_engine_specs.crate | superset.db_engine_specs.databricks | superset.db_engine_specs.databricks | superset.db_engine_specs.databricks | superset.db_engine_specs.dremio | superset.db_engine_specs.duckdb | superset.db_engine_specs.elasticsearch | superset.db_engine_specs.elasticsearch | superset.db_engine_specs.exasol | superset.db_engine_specs.firebird | superset.db_engine_specs.firebolt | superset.db_engine_specs.bigquery | superset.db_engine_specs.gsheets | superset.db_engine_specs.db2 | superset.db_engine_specs.netezza | superset.db_engine_specs.kusto | superset.db_engine_specs.kusto | superset.db_engine_specs.mssql | superset.db_engine_specs.mysql | superset.db_engine_specs.ocient | superset.db_engine_specs.oracle | superset.db_engine_specs.postgres | superset.db_engine_specs.presto | superset.db_engine_specs.risingwave | superset.db_engine_specs.rockset | superset.db_engine_specs.hana | superset.db_engine_specs.sqlite | superset.db_engine_specs.shillelagh | superset.db_engine_specs.snowflake | superset.db_engine_specs.starrocks | superset.db_engine_specs.teradata | superset.db_engine_specs.trino | superset.db_engine_specs.vertica | superset.db_engine_specs.presto |
+| Module | superset.db_engine_specs.athena | superset.db_engine_specs.dynamodb | superset.db_engine_specs.redshift | superset.db_engine_specs.drill | superset.db_engine_specs.druid | superset.db_engine_specs.hive | superset.db_engine_specs.impala | superset.db_engine_specs.kylin | superset.db_engine_specs.pinot | superset.db_engine_specs.solr | superset.db_engine_specs.spark | superset.db_engine_specs.ascend | superset.db_engine_specs.aurora | superset.db_engine_specs.aurora | superset.db_engine_specs.mssql | superset.db_engine_specs.clickhouse | superset.db_engine_specs.clickhouse | superset.db_engine_specs.cockroachdb | superset.db_engine_specs.crate | superset.db_engine_specs.databricks | superset.db_engine_specs.databricks | superset.db_engine_specs.databricks | superset.db_engine_specs.dremio | superset.db_engine_specs.duckdb | superset.db_engine_specs.elasticsearch | superset.db_engine_specs.elasticsearch | superset.db_engine_specs.exasol | superset.db_engine_specs.firebird | superset.db_engine_specs.firebolt | superset.db_engine_specs.bigquery | superset.db_engine_specs.gsheets | superset.db_engine_specs.db2 | superset.db_engine_specs.netezza | superset.db_engine_specs.kusto | superset.db_engine_specs.kusto | superset.db_engine_specs.mssql | superset.db_engine_specs.mysql | superset.db_engine_specs.ocient | superset.db_engine_specs.oracle | superset.db_engine_specs.postgres | superset.db_engine_specs.presto | superset.db_engine_specs.risingwave | superset.db_engine_specs.hana | superset.db_engine_specs.sqlite | superset.db_engine_specs.shillelagh | superset.db_engine_specs.snowflake | superset.db_engine_specs.starrocks | superset.db_engine_specs.teradata | superset.db_engine_specs.trino | superset.db_engine_specs.vertica | superset.db_engine_specs.presto |
 | Method used to limit the rows in the subquery | FORCE_LIMIT | FORCE_LIMIT | FORCE_LIMIT | FORCE_LIMIT | FORCE_LIMIT | FORCE_LIMIT | FORCE_LIMIT | FORCE_LIMIT | FORCE_LIMIT | FORCE_LIMIT | FORCE_LIMIT | FORCE_LIMIT | FORCE_LIMIT | FORCE_LIMIT | WRAP_SQL | FORCE_LIMIT | FORCE_LIMIT | FORCE_LIMIT | FORCE_LIMIT | FORCE_LIMIT | FORCE_LIMIT | FORCE_LIMIT | FORCE_LIMIT | FORCE_LIMIT | FORCE_LIMIT | FORCE_LIMIT | FORCE_LIMIT | FETCH_MANY | FORCE_LIMIT | FORCE_LIMIT | FORCE_LIMIT | WRAP_SQL | FORCE_LIMIT | WRAP_SQL | WRAP_SQL | WRAP_SQL | FORCE_LIMIT | FORCE_LIMIT | WRAP_SQL | FORCE_LIMIT | FORCE_LIMIT | FORCE_LIMIT | FORCE_LIMIT | WRAP_SQL | FORCE_LIMIT | FORCE_LIMIT | FORCE_LIMIT | FORCE_LIMIT | WRAP_SQL | FORCE_LIMIT | FORCE_LIMIT | FORCE_LIMIT |
 | Supports JOINs | True | True | True | True | False | True | True | True | False | False | True | True | True | True | True | True | True | True | True | True | True | True | True | True | False | False | True | True | True | True | True | True | True | True | True | True | True | True | True | True | True | True | True | True | True | True | True | True | True | True | True | True |
 | Supports subqueries | True | True | True | True | True | True | True | True | False | False | True | True | True | True | True | True | True | True | True | True | True | True | True | True | True | True | True | True | True | True | True | True | True | True | True | True | True | True | True | True | True | True | True | True | True | True | True | True | True | True | True | True |
diff --git a/superset/db_engine_specs/__init__.py b/superset/db_engine_specs/__init__.py
index 3c0911c2026..8fddccbb724 100644
--- a/superset/db_engine_specs/__init__.py
+++ b/superset/db_engine_specs/__init__.py
@@ -33,11 +33,11 @@ import logging
 import pkgutil
 from collections import defaultdict
 from importlib import import_module
+from importlib.metadata import entry_points
 from pathlib import Path
 from typing import Any, Optional
 
 import sqlalchemy.dialects
-from importlib_metadata import entry_points
 from sqlalchemy.engine.default import DefaultDialect
 from sqlalchemy.exc import NoSuchModuleError
 
diff --git a/superset/db_engine_specs/base.py b/superset/db_engine_specs/base.py
index 46786fdf659..e3ffdd335d8 100644
--- a/superset/db_engine_specs/base.py
+++ b/superset/db_engine_specs/base.py
@@ -1546,7 +1546,7 @@ class BaseEngineSpec:  # pylint: disable=too-many-public-methods
         cols: list[ResultSetColumnType] | None = None,
     ) -> str:
         """
-        Generate a "SELECT * from [schema.]table_name" query with appropriate limit.
+        Generate a "SELECT * from [catalog.][schema.]table_name" query with limit.
 
         WARNING: expects only unquoted table and schema names.
 
@@ -1560,6 +1560,9 @@ class BaseEngineSpec:  # pylint: disable=too-many-public-methods
         :param cols: Columns to include in query
         :return: SQL query
         """
+        if not cls.supports_cross_catalog_queries:
+            table = Table(table.table, table.schema, None)
+
         # pylint: disable=redefined-outer-name
         fields: str | list[Any] = "*"
         cols = cols or []
diff --git a/superset/db_engine_specs/clickhouse.py b/superset/db_engine_specs/clickhouse.py
index 8fb8e1d0992..91e7ccf4f51 100644
--- a/superset/db_engine_specs/clickhouse.py
+++ b/superset/db_engine_specs/clickhouse.py
@@ -20,6 +20,7 @@ import logging
 import re
 from datetime import datetime
 from typing import Any, cast, TYPE_CHECKING
+from urllib import parse
 
 from flask import current_app
 from flask_babel import gettext as __
@@ -267,6 +268,8 @@ class ClickHouseConnectEngineSpec(BasicParametersMixin, ClickHouseEngineSpec):
     parameters_schema = ClickHouseParametersSchema()
     encryption_parameters = {"secure": "true"}
 
+    supports_dynamic_schema = True
+
     @classmethod
     def get_dbapi_exception_mapping(cls) -> dict[type[Exception], type[Exception]]:
         return {}
@@ -414,3 +417,15 @@ class ClickHouseConnectEngineSpec(BasicParametersMixin, ClickHouseEngineSpec):
         :return: Conditionally mutated label
         """
         return f"{label}_{md5_sha_from_str(label)[:6]}"
+
+    @classmethod
+    def adjust_engine_params(
+        cls,
+        uri: URL,
+        connect_args: dict[str, Any],
+        catalog: str | None = None,
+        schema: str | None = None,
+    ) -> tuple[URL, dict[str, Any]]:
+        if schema:
+            uri = uri.set(database=parse.quote(schema, safe=""))
+        return uri, connect_args
diff --git a/superset/db_engine_specs/dremio.py b/superset/db_engine_specs/dremio.py
index 1f4338830bb..39fe48be635 100644
--- a/superset/db_engine_specs/dremio.py
+++ b/superset/db_engine_specs/dremio.py
@@ -25,6 +25,7 @@ from sqlalchemy import types
 
 from superset.constants import TimeGrain
 from superset.db_engine_specs.base import BaseEngineSpec
+from superset.utils.hashing import md5_sha_from_str
 
 if TYPE_CHECKING:
     from superset.models.core import Database
@@ -93,3 +94,14 @@ class DremioEngineSpec(BaseEngineSpec):
             dttm_formatted = dttm.isoformat(sep=" ", timespec="milliseconds")
             return f"""TO_TIMESTAMP('{dttm_formatted}', 'YYYY-MM-DD HH24:MI:SS.FFF')"""
         return None
+
+    @staticmethod
+    def _mutate_label(label: str) -> str:
+        """
+        Suffix with the first six characters from the md5 of the label to avoid
+        collisions with original column names
+
+        :param label: Expected expression label
+        :return: Conditionally mutated label
+        """
+        return f"{label}_{md5_sha_from_str(label)[:6]}"
diff --git a/superset/db_engine_specs/drill.py b/superset/db_engine_specs/drill.py
index 167ed386ea2..5a49f5993ae 100644
--- a/superset/db_engine_specs/drill.py
+++ b/superset/db_engine_specs/drill.py
@@ -27,6 +27,7 @@ from sqlalchemy.engine.url import URL
 from superset.constants import TimeGrain
 from superset.db_engine_specs.base import BaseEngineSpec
 from superset.db_engine_specs.exceptions import SupersetDBAPIProgrammingError
+from superset.utils.hashing import md5_sha_from_str
 
 if TYPE_CHECKING:
     from superset.models.core import Database
@@ -143,3 +144,14 @@ class DrillEngineSpec(BaseEngineSpec):
             if str(ex) == "generator raised StopIteration":
                 return []
             raise
+
+    @staticmethod
+    def _mutate_label(label: str) -> str:
+        """
+        Suffix with the first six characters from the md5 of the label to avoid
+        collisions with original column names
+
+        :param label: Expected expression label
+        :return: Conditionally mutated label
+        """
+        return f"{label}_{md5_sha_from_str(label)[:6]}"
diff --git a/superset/db_engine_specs/hive.py b/superset/db_engine_specs/hive.py
index 2297e2572b3..34ac2aa0ac8 100644
--- a/superset/db_engine_specs/hive.py
+++ b/superset/db_engine_specs/hive.py
@@ -498,6 +498,9 @@ class HiveEngineSpec(PrestoEngineSpec):
         latest_partition: bool = True,
         cols: list[ResultSetColumnType] | None = None,
     ) -> str:
+        # remove catalog from table name if it exists
+        table = Table(table.table, table.schema, None)
+
         return super(PrestoEngineSpec, cls).select_star(
             database,
             table,
diff --git a/superset/db_engine_specs/risingwave.py b/superset/db_engine_specs/risingwave.py
index 8f7b1c7de26..9ca0b1977fd 100644
--- a/superset/db_engine_specs/risingwave.py
+++ b/superset/db_engine_specs/risingwave.py
@@ -21,3 +21,6 @@ class RisingWaveDbEngineSpec(PostgresEngineSpec):
     engine = "risingwave"
     engine_name = "RisingWave"
     default_driver = ""
+    sqlalchemy_uri_placeholder = (
+        "risingwave://user:password@host:port/dbname[?key=value&key=value...]"
+    )
diff --git a/superset/db_engine_specs/rockset.py b/superset/db_engine_specs/rockset.py
deleted file mode 100644
index 73ca57ac06b..00000000000
--- a/superset/db_engine_specs/rockset.py
+++ /dev/null
@@ -1,72 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you 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.
-from datetime import datetime
-from typing import Any, Optional, TYPE_CHECKING
-
-from sqlalchemy import types
-
-from superset.constants import TimeGrain
-from superset.db_engine_specs.base import BaseEngineSpec
-
-if TYPE_CHECKING:
-    from superset.connectors.sqla.models import TableColumn
-
-
-class RocksetEngineSpec(BaseEngineSpec):
-    engine = "rockset"
-    engine_name = "Rockset"
-
-    _time_grain_expressions = {
-        None: "{col}",
-        TimeGrain.SECOND: "DATE_TRUNC('second', {col})",
-        TimeGrain.MINUTE: "DATE_TRUNC('minute', {col})",
-        TimeGrain.HOUR: "DATE_TRUNC('hour', {col})",
-        TimeGrain.DAY: "DATE_TRUNC('day', {col})",
-        TimeGrain.WEEK: "DATE_TRUNC('week', {col})",
-        TimeGrain.MONTH: "DATE_TRUNC('month', {col})",
-        TimeGrain.QUARTER: "DATE_TRUNC('quarter', {col})",
-        TimeGrain.YEAR: "DATE_TRUNC('year', {col})",
-    }
-
-    @classmethod
-    def epoch_to_dttm(cls) -> str:
-        return "{col} * 1000"
-
-    @classmethod
-    def epoch_ms_to_dttm(cls) -> str:
-        return "{col}"
-
-    @classmethod
-    def convert_dttm(
-        cls, target_type: str, dttm: datetime, db_extra: Optional[dict[str, Any]] = None
-    ) -> Optional[str]:
-        sqla_type = cls.get_sqla_column_type(target_type)
-
-        if isinstance(sqla_type, types.Date):
-            return f"DATE '{dttm.date().isoformat()}'"
-        if isinstance(sqla_type, types.TIMESTAMP):
-            dttm_formatted = dttm.isoformat(timespec="microseconds")
-            return f"""TIMESTAMP '{dttm_formatted}'"""
-        if isinstance(sqla_type, types.DateTime):
-            dttm_formatted = dttm.isoformat(sep=" ", timespec="microseconds")
-            return f"""DATETIME '{dttm_formatted}'"""
-        return None
-
-    @classmethod
-    def alter_new_orm_column(cls, orm_col: "TableColumn") -> None:
-        if orm_col.type == "TIMESTAMP":
-            orm_col.python_date_format = "epoch_ms"
diff --git a/superset/examples/configs/charts/Featured Charts/Gantt.yaml b/superset/examples/configs/charts/Featured Charts/Gantt.yaml
new file mode 100644
index 00000000000..6a564d07a08
--- /dev/null
+++ b/superset/examples/configs/charts/Featured Charts/Gantt.yaml	
@@ -0,0 +1,65 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+slice_name: Gantt
+description: null
+certified_by: null
+certification_details: null
+viz_type: gantt_chart
+params:
+  datasource: 61__table
+  viz_type: gantt_chart
+  slice_id: 1495
+  start_time: start_time
+  end_time: end_time
+  y_axis: status
+  series: priority
+  subcategories: true
+  tooltip_columns:
+  - project
+  - phase
+  adhoc_filters:
+  - clause: WHERE
+    comparator: No filter
+    expressionType: SIMPLE
+    operator: TEMPORAL_RANGE
+    subject: start_time
+  order_by_cols:
+  - '["status",false]'
+  row_limit: 10000
+  x_axis_title_margin: 15
+  y_axis_title_margin: 50
+  color_scheme: supersetAndPresetColors
+  show_legend: true
+  legendType: plain
+  legendOrientation: right
+  legendMargin: 100
+  zoomable: false
+  show_extra_controls: false
+  x_axis_time_bounds:
+  - '08:00:00'
+  - '19:00:00'
+  x_axis_time_format: smart_date
+  tooltipTimeFormat: smart_date
+  tooltipValuesFormat: SMART_NUMBER
+  extra_form_data: {}
+  dashboards:
+  - 9
+query_context: null
+cache_timeout: null
+uuid: c91c242e-ec16-43e4-84fd-1c69336e0a99
+version: 1.0.0
+dataset_uuid: d638a239-f255-44fc-b0c1-c3f3b7f00ee0
diff --git a/superset/examples/configs/dashboards/Featured_Charts.yaml b/superset/examples/configs/dashboards/Featured_Charts.yaml
index 20155692bd4..a0e3fe9d3f4 100644
--- a/superset/examples/configs/dashboards/Featured_Charts.yaml
+++ b/superset/examples/configs/dashboards/Featured_Charts.yaml
@@ -135,6 +135,20 @@ position:
       - GRID_ID
       - ROW-cUv-aKn4Yt
     type: CHART
+  CHART-Df3UIo8Y9s:
+    children: []
+    id: CHART-Df3UIo8Y9s
+    meta:
+      chartId: 1495
+      height: 50
+      sliceName: Gantt
+      uuid: c91c242e-ec16-43e4-84fd-1c69336e0a99
+      width: 4
+    parents:
+    - ROOT_ID
+    - GRID_ID
+    - ROW-W7YILGiS0-
+    type: CHART
   CHART-DqaJJ8Fse6:
     children: []
     id: CHART-DqaJJ8Fse6
@@ -370,6 +384,7 @@ position:
       - ROW-Jq9auQfs6-
       - ROW-3XARWMYOfz
       - ROW-ux6j1ePT8I
+      - ROW-FHBKXbZT5Z
     id: GRID_ID
     parents:
       - ROOT_ID
@@ -386,9 +401,9 @@ position:
     type: ROOT
   ROW-3XARWMYOfz:
     children:
+      - CHART-Yi0u5d9otw
       - CHART-33vjmwrGX1
       - CHART-3tEC_8e-uS
-      - CHART-A4qrvR24Ne
     id: ROW-3XARWMYOfz
     meta:
       background: BACKGROUND_TRANSPARENT
@@ -396,11 +411,21 @@ position:
       - ROOT_ID
       - GRID_ID
     type: ROW
+  ROW-FHBKXbZT5Z:
+    children:
+    - CHART-KE7lk61Tbt
+    id: ROW-FHBKXbZT5Z
+    meta:
+      background: BACKGROUND_TRANSPARENT
+    parents:
+      - ROOT_ID
+      - GRID_ID
+    type: ROW
   ROW-Jq9auQfs6-:
     children:
+      - CHART-jzyy9Sa3pS
       - CHART-qZh51tuuRH
       - CHART-j2o9aZo4HY
-      - CHART-Yi0u5d9otw
     id: ROW-Jq9auQfs6-
     meta:
       background: BACKGROUND_TRANSPARENT
@@ -434,9 +459,9 @@ position:
     type: ROW
   ROW-UxgGmS9gb3:
     children:
+      - CHART-EpsTnvUMuW
       - CHART-4Zm6Q1VGY5
       - CHART-AFzv0kyWG_
-      - CHART-jzyy9Sa3pS
     id: ROW-UxgGmS9gb3
     meta:
       background: BACKGROUND_TRANSPARENT
@@ -447,8 +472,8 @@ position:
   ROW-W7YILGiS0-:
     children:
       - CHART-gfrGP3BD76
+      - CHART-Df3UIo8Y9s
       - CHART-jC2_mEgWeL
-      - CHART-SjTqfJNmup
     id: ROW-W7YILGiS0-
     meta:
       background: BACKGROUND_TRANSPARENT
@@ -458,9 +483,9 @@ position:
     type: ROW
   ROW-cUv-aKn4Yt:
     children:
+      - CHART-SjTqfJNmup
       - CHART-CR0-igYucm
       - CHART-t5t_tQe43g
-      - CHART-EpsTnvUMuW
     id: ROW-cUv-aKn4Yt
     meta:
       background: BACKGROUND_TRANSPARENT
@@ -470,9 +495,9 @@ position:
     type: ROW
   ROW-ux6j1ePT8I:
     children:
+      - CHART-A4qrvR24Ne
       - CHART-DqaJJ8Fse6
       - CHART-XwFZukVv8E
-      - CHART-KE7lk61Tbt
     id: ROW-ux6j1ePT8I
     meta:
       background: BACKGROUND_TRANSPARENT
diff --git a/superset/examples/configs/datasets/examples/project_management.yaml b/superset/examples/configs/datasets/examples/project_management.yaml
new file mode 100644
index 00000000000..f5bb8f4a407
--- /dev/null
+++ b/superset/examples/configs/datasets/examples/project_management.yaml
@@ -0,0 +1,293 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+table_name: project_management
+main_dttm_col: start_time
+description: null
+default_endpoint: null
+offset: 0
+cache_timeout: null
+catalog: examples
+schema: public
+sql: |-
+  SELECT
+    1718870400000 AS start_time,
+    1718874000000 AS end_time,
+    'Project Alpha' AS project,
+    'Design Phase' AS phase,
+    'Initial design and architecture planning for Alpha.' AS description,
+    'Completed' AS status,
+    'High' AS priority
+  UNION ALL
+  SELECT
+      1718872800000,
+      1718877200000,
+      'Project Alpha',
+      'Development Phase',
+      'Core feature development for Alpha project.',
+      'In Progress',
+      'High'
+  UNION ALL
+  SELECT
+      1718876400000,
+      1718880000000,
+      'Project Alpha',
+      'Testing Phase',
+      'Internal testing and bug fixing for Alpha features.',
+      'Planned',
+      'Medium'
+  UNION ALL
+  SELECT
+      1718878800000,
+      1718882400000,
+      'Project Alpha',
+      'Deployment Phase',
+      'Preparation and execution of Alpha deployment.',
+      'On Hold',
+      'High'
+  UNION ALL
+  SELECT
+      1718880000000,
+      1718883600000,
+      'Project Beta',
+      'Design Phase',
+      'Gathering requirements and conceptual design for Beta.',
+      'Completed',
+      'Medium'
+  UNION ALL
+  SELECT
+      1718882400000,
+      1718886000000,
+      'Project Beta',
+      'Development Phase',
+      'Module-wise development for Beta project.',
+      'In Progress',
+      'Medium'
+  UNION ALL
+  SELECT
+      1718884800000,
+      1718888400000,
+      'Project Beta',
+      'Testing Phase',
+      'User acceptance testing for Beta release.',
+      'Planned',
+      'High'
+  UNION ALL
+  SELECT
+      1718887200000,
+      1718890800000,
+      'Project Beta',
+      'Deployment Phase',
+      'Final checks and release of Beta version.',
+      'Planned',
+      'Medium'
+  UNION ALL
+  SELECT
+      1718889600000,
+      1718893200000,
+      'Project Gamma',
+      'Design Phase',
+      'System design and database schema for Gamma.',
+      'Completed',
+      'Low'
+  UNION ALL
+  SELECT
+      1718892000000,
+      1718895600000,
+      'Project Gamma',
+      'Development Phase',
+      'Backend API and frontend integration for Gamma.',
+      'In Progress',
+      'High'
+  UNION ALL
+  SELECT
+      1718894400000,
+      1718898000000,
+      'Project Gamma',
+      'Testing Phase',
+      'Automated test suite execution for Gamma.',
+      'Planned',
+      'Medium'
+  UNION ALL
+  SELECT
+      1718896800000,
+      1718900400000,
+      'Project Gamma',
+      'Deployment Phase',
+      'Handover and post-deployment support for Gamma.',
+      'Planned',
+      'Low'
+  UNION ALL
+  SELECT
+      1718900000000,
+      1718904000000,
+      'Project Alpha',
+      'Risk Assessment',
+      'Analyzing potential risks and mitigation strategies.',
+      'Completed',
+      'High'
+  UNION ALL
+  SELECT
+      1718902000000,
+      1718906000000,
+      'Project Beta',
+      'Client Review',
+      'Review meeting with key stakeholders for Beta.',
+      'In Progress',
+      'High'
+  UNION ALL
+  SELECT
+      1718904000000,
+      1718908000000,
+      'Project Gamma',
+      'Documentation',
+      'Creating technical and user documentation.',
+      'Planned',
+      'Low'
+  UNION ALL
+  SELECT
+      1718906000000,
+      1718910000000,
+      'Project Alpha',
+      'Feature Implementation',
+      'Implementing new requested features for Alpha.',
+      'In Progress',
+      'High'
+  UNION ALL
+  SELECT
+      1718908000000,
+      1718912000000,
+      'Project Beta',
+      'User Acceptance Testing',
+      'Final UAT before production release.',
+      'Planned',
+      'High'
+  UNION ALL
+  SELECT
+      1718910000000,
+      1718914000000,
+      'Project Gamma',
+      'Bug Fixing',
+      'Addressing critical bugs reported post-release.',
+      'In Progress',
+      'Medium';
+params: null
+template_params: null
+filter_select_enabled: true
+fetch_values_predicate: null
+extra: null
+normalize_columns: false
+always_filter_main_dttm: false
+folders: null
+uuid: d638a239-f255-44fc-b0c1-c3f3b7f00ee0
+metrics:
+- metric_name: count
+  verbose_name: COUNT(*)
+  metric_type: count
+  expression: COUNT(*)
+  description: null
+  d3format: null
+  currency: null
+  extra:
+    warning_markdown: ''
+  warning_text: null
+columns:
+- column_name: start_time
+  verbose_name: null
+  is_dttm: true
+  is_active: true
+  type: LONGINTEGER
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra: {}
+- column_name: end_time
+  verbose_name: null
+  is_dttm: true
+  is_active: true
+  type: LONGINTEGER
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra: {}
+- column_name: phase
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra: {}
+- column_name: status
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra: {}
+- column_name: description
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra: {}
+- column_name: project
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra: {}
+- column_name: priority
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra: {}
+version: 1.0.0
+database_uuid: a2dc77af-e654-49bb-b321-40f6b559a1ee
diff --git a/superset/examples/helpers.py b/superset/examples/helpers.py
index c0673a8f77a..57b6bc63167 100644
--- a/superset/examples/helpers.py
+++ b/superset/examples/helpers.py
@@ -142,8 +142,8 @@ def read_example_data(
             if is_json:
                 return pd.read_json(url, **kwargs)
             return pd.read_csv(url, **kwargs)
-        except HTTPError as e:
-            if e.code == 429 and attempt < max_attempts:
+        except HTTPError:
+            if attempt < max_attempts:
                 sleep_time = wait_seconds * (2 ** (attempt - 1))
                 print(
                     f"HTTP 429 received from {url}. ",
diff --git a/superset/extensions/pylint.py b/superset/extensions/pylint.py
index 5925f180b78..fc177884da2 100644
--- a/superset/extensions/pylint.py
+++ b/superset/extensions/pylint.py
@@ -15,6 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import os
+from pathlib import Path
 
 from astroid import nodes
 from pylint.checkers import BaseChecker
@@ -22,12 +23,12 @@ from pylint.lint import PyLinter
 
 
 class JSONLibraryImportChecker(BaseChecker):
-    name = "json-library-import-checker"
+    name = "disallowed-json-import"
     priority = -1
     msgs = {
-        "C9999": (
+        "C9001": (
             "Disallowed json import used, use superset.utils.json instead",
-            "disallowed-import",
+            "disallowed-json-import",
             "Used when a disallowed import is used in a specific file.",
         ),
     }
@@ -47,19 +48,19 @@ class JSONLibraryImportChecker(BaseChecker):
         if file not in self.exclude_files:
             for module_name, _ in node.names:
                 if module_name in ["json", "simplejson"]:
-                    self.add_message("disallowed-import", node=node)
+                    self.add_message("disallowed-json-import", node=node)
 
     def visit_importfrom(self, node: nodes.ImportFrom) -> None:
         file = (node.root().file).replace(self.path_strip_prefix, "", 1)
         if file not in self.exclude_files:
             if node.modname in ["json", "simplejson"]:
-                self.add_message("disallowed-import", node=node)
+                self.add_message("disallowed-json-import", node=node)
 
 
 class TransactionChecker(BaseChecker):
     name = "consider-using-transaction"
     msgs = {
-        "W0001": (
+        "W9001": (
             'Consider using the @transaction decorator when defining a "unit of work"',
             "consider-using-transaction",
             "Used when an explicit commit or rollback call is detected",
@@ -72,6 +73,46 @@ class TransactionChecker(BaseChecker):
                 self.add_message("consider-using-transaction", node=node)
 
 
+class SQLParsingLibraryImportChecker(BaseChecker):
+    name = "disallowed-sql-import"
+    priority = 0
+    msgs = {
+        "C9002": (
+            "Disallowed SQL parsing import used",
+            "disallowed-sql-import",
+            "Used when a disallowed import is used in a specific file.",
+        ),
+    }
+
+    def _is_disallowed(self, file_path: Path, root_mod: str) -> bool:
+        # True if sqlglot is imported outside superset/sql,
+        # or if any forbidden library is imported anywhere
+        allowed = {
+            "**/supersql/sql/**/*.py",
+            "**/supersql/sql/*.py",
+            "**/superset/config.py",
+        }
+        in_superset_sql = any(file_path.match(pattern) for pattern in allowed)
+        return (root_mod == "sqlglot" and not in_superset_sql) or root_mod in {
+            "sqlparse",
+            "sqloxide",
+        }
+
+    def visit_import(self, node: nodes.Import) -> None:
+        root_file = Path(node.root().file or "")
+        for mod, _ in node.names:
+            root_mod = mod.split(".", 1)[0]
+            if self._is_disallowed(root_file, root_mod):
+                self.add_message("disallowed-sql-import", node=node)
+
+    def visit_importfrom(self, node: nodes.ImportFrom) -> None:
+        root_file = Path(node.root().file or "")
+        root_mod = (node.modname or "").split(".", 1)[0]
+        if self._is_disallowed(root_file, root_mod):
+            self.add_message("disallowed-sql-import", node=node)
+
+
 def register(linter: PyLinter) -> None:
     linter.register_checker(JSONLibraryImportChecker(linter))
+    linter.register_checker(SQLParsingLibraryImportChecker(linter))
     linter.register_checker(TransactionChecker(linter))
diff --git a/superset/initialization/__init__.py b/superset/initialization/__init__.py
index 0cbfd80cbff..7854954e297 100644
--- a/superset/initialization/__init__.py
+++ b/superset/initialization/__init__.py
@@ -130,10 +130,6 @@ class SupersetAppInitializer:  # pylint: disable=too-many-public-methods
         from superset.cachekeys.api import CacheRestApi
         from superset.charts.api import ChartRestApi
         from superset.charts.data.api import ChartDataRestApi
-        from superset.connectors.sqla.views import (
-            RowLevelSecurityView,
-            TableModelView,
-        )
         from superset.css_templates.api import CssTemplateRestApi
         from superset.dashboards.api import DashboardRestApi
         from superset.dashboards.filter_state.api import DashboardFilterStateRestApi
@@ -154,7 +150,11 @@ class SupersetAppInitializer:  # pylint: disable=too-many-public-methods
         from superset.reports.api import ReportScheduleRestApi
         from superset.reports.logs.api import ReportExecutionLogRestApi
         from superset.row_level_security.api import RLSRestApi
-        from superset.security.api import RoleRestAPI, SecurityRestApi
+        from superset.security.api import (
+            RoleRestAPI,
+            SecurityRestApi,
+            UserRegistrationsRestAPI,
+        )
         from superset.sqllab.api import SqlLabRestApi
         from superset.sqllab.permalink.api import SqlLabPermalinkRestApi
         from superset.tags.api import TagRestApi
@@ -183,9 +183,14 @@ class SupersetAppInitializer:  # pylint: disable=too-many-public-methods
             TableSchemaView,
             TabStateView,
         )
+        from superset.views.sqla import (
+            RowLevelSecurityView,
+            TableModelView,
+        )
         from superset.views.sqllab import SqllabView
         from superset.views.tags import TagModelView, TagView
         from superset.views.user_info import UserInfoView
+        from superset.views.user_registrations import UserRegistrationsView
         from superset.views.users.api import CurrentUserRestApi, UserRestApi
         from superset.views.users_list import UsersListView
 
@@ -281,7 +286,18 @@ class SupersetAppInitializer:  # pylint: disable=too-many-public-methods
             label=__("List Roles"),
             category="Security",
             category_label=__("Security"),
-            icon="fa-lock",
+            menu_cond=lambda: bool(
+                appbuilder.app.config.get("SUPERSET_SECURITY_VIEW_MENU", True)
+            ),
+        )
+
+        appbuilder.add_view(
+            UserRegistrationsView,
+            "User Registrations",
+            label=__("User Registrations"),
+            category="Security",
+            category_label=__("Security"),
+            menu_cond=lambda: bool(appbuilder.app.config["AUTH_USER_REGISTRATION"]),
         )
 
         appbuilder.add_view(
@@ -290,14 +306,9 @@ class SupersetAppInitializer:  # pylint: disable=too-many-public-methods
             label=__("List Users"),
             category="Security",
             category_label=__("Security"),
-        )
-
-        appbuilder.add_view(
-            ActionLogView,
-            "Action Logs",
-            label=__("Action Logs"),
-            category="Security",
-            category_label=__("Security"),
+            menu_cond=lambda: bool(
+                appbuilder.app.config.get("SUPERSET_SECURITY_VIEW_MENU", True)
+            ),
         )
 
         appbuilder.add_view(
@@ -306,6 +317,9 @@ class SupersetAppInitializer:  # pylint: disable=too-many-public-methods
             label=__("List Groups"),
             category="Security",
             category_label=__("Security"),
+            menu_cond=lambda: bool(
+                appbuilder.app.config.get("SUPERSET_SECURITY_VIEW_MENU", True)
+            ),
         )
 
         appbuilder.add_view(
@@ -389,6 +403,20 @@ class SupersetAppInitializer:  # pylint: disable=too-many-public-methods
             category="Manage",
             menu_cond=lambda: feature_flag_manager.is_feature_enabled("TAGGING_SYSTEM"),
         )
+        appbuilder.add_api(LogRestApi)
+        appbuilder.add_api(UserRegistrationsRestAPI)
+        appbuilder.add_view(
+            ActionLogView,
+            "Action Log",
+            label=__("Action Log"),
+            category="Security",
+            category_label=__("Security"),
+            icon="fa-list-ol",
+            menu_cond=lambda: (
+                self.config["FAB_ADD_SECURITY_VIEWS"]
+                and self.config["SUPERSET_LOG_VIEW"]
+            ),
+        )
         appbuilder.add_api(SecurityRestApi)
         #
         # Conditionally setup email views
diff --git a/superset/migrations/shared/migrate_viz/base.py b/superset/migrations/shared/migrate_viz/base.py
index 929039c0f67..e2a09731a12 100644
--- a/superset/migrations/shared/migrate_viz/base.py
+++ b/superset/migrations/shared/migrate_viz/base.py
@@ -4,7 +4,7 @@
 # regarding copyright ownership.  The ASF licenses this file
 # to you 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
+# with the License. You may obtain a copy of the License at
 #
 #   http://www.apache.org/licenses/LICENSE-2.0
 #
@@ -157,9 +157,10 @@ class MigrateViz:
             # because a source viz can be mapped to different target viz types
             slc.viz_type = clz.target_viz_type
 
-            backup = {FORM_DATA_BAK_FIELD_NAME: form_data_bak}
+            backup: Any | dict[str, Any] = {FORM_DATA_BAK_FIELD_NAME: form_data_bak}
 
             query_context = try_load_json(slc.query_context)
+            queries_bak = None
 
             if query_context:
                 if "form_data" in query_context:
@@ -169,10 +170,11 @@ class MigrateViz:
 
                 queries = clz._build_query()["queries"]
                 query_context["queries"] = queries
+            else:
+                query_context = clz._build_query()
 
-                slc.query_context = json.dumps(query_context)
-                backup[QUERIES_BAK_FIELD_NAME] = queries_bak
-
+            slc.query_context = json.dumps(query_context)
+            backup[QUERIES_BAK_FIELD_NAME] = queries_bak
             slc.params = json.dumps({**clz.data, **backup})
 
         except Exception as e:
@@ -189,11 +191,14 @@ class MigrateViz:
                 slc.viz_type = form_data_bak.get("viz_type")
                 query_context = try_load_json(slc.query_context)
                 queries_bak = form_data.get(QUERIES_BAK_FIELD_NAME, {})
-                query_context["queries"] = queries_bak
-                if "form_data" in query_context:
-                    query_context["form_data"] = form_data_bak
+                if queries_bak:
+                    query_context["queries"] = queries_bak
+                    if "form_data" in query_context:
+                        query_context["form_data"] = form_data_bak
+                        slc.query_context = json.dumps(query_context)
+                else:
+                    slc.query_context = None
 
-                slc.query_context = json.dumps(query_context)
         except Exception as e:
             logger.warning(f"Failed to downgrade slice {slc.id}: {e}")
 
diff --git a/superset/migrations/versions/2025-06-06_00-39_363a9b1e8992_convert_metric_currencies_from_str_to_json.py b/superset/migrations/versions/2025-06-06_00-39_363a9b1e8992_convert_metric_currencies_from_str_to_json.py
new file mode 100644
index 00000000000..708e7c52dae
--- /dev/null
+++ b/superset/migrations/versions/2025-06-06_00-39_363a9b1e8992_convert_metric_currencies_from_str_to_json.py
@@ -0,0 +1,84 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+"""convert_metric_currencies_from_str_to_json
+
+Revision ID: 363a9b1e8992
+Revises: f1edd4a4d4f2
+Create Date: 2025-06-06 00:39:00.107746
+
+"""
+
+import json
+import logging
+
+from alembic import op
+from sqlalchemy import Column, Integer, JSON, String
+from sqlalchemy.ext.declarative import declarative_base
+
+from superset import db
+from superset.migrations.shared.utils import paginated_update
+
+logger = logging.getLogger("alembic")
+logger.setLevel(logging.INFO)
+
+# revision identifiers, used by Alembic.
+revision = "363a9b1e8992"
+down_revision = "f1edd4a4d4f2"
+
+Base = declarative_base()
+
+
+class SqlMetric(Base):
+    __tablename__ = "sql_metrics"
+
+    id = Column(Integer, primary_key=True)
+    metric_name = Column(String(512))
+    currency = Column(JSON)
+
+
+def upgrade():
+    bind = op.get_bind()
+    session = db.Session(bind=bind)
+    currency_configs = session.query(SqlMetric).filter(SqlMetric.currency.isnot(None))
+    for metric in paginated_update(
+        currency_configs,
+        lambda current, total: logger.info((f"Upgrading {current}/{total} metrics")),
+    ):
+        while True:
+            if isinstance(metric.currency, str):
+                try:
+                    metric.currency = json.loads(metric.currency)
+                except Exception as e:
+                    logger.error(
+                        f"Error loading metric {metric.metric_name} as json: {e}"
+                    )
+                    metric.currency = {}
+                    break
+            else:
+                break
+
+
+def downgrade():
+    """
+    No op downgrade.
+
+    The downgrade could just do `metric.currency = json.dumps(metric.currency)`. However
+    this is happening after `f1edd4a4d4f2` which already converted the currency column
+    to JSON at the DB level, so we shouldn't have currencies in str anymore. It was the
+    case because the client was still stringifying it.
+    """
+    pass
diff --git a/superset/queries/api.py b/superset/queries/api.py
index 7e383e95bc1..d29d52fd363 100644
--- a/superset/queries/api.py
+++ b/superset/queries/api.py
@@ -162,6 +162,7 @@ class QueryRestApi(BaseSupersetModelRestApi):
         "user",
         "start_time",
         "sql_editor_id",
+        "uuid",
     ]
 
     allowed_rel_fields = {"database", "user"}
diff --git a/superset/security/api.py b/superset/security/api.py
index c0890da3ccd..3f291968af9 100644
--- a/superset/security/api.py
+++ b/superset/security/api.py
@@ -19,10 +19,10 @@ from typing import Any
 
 from flask import current_app, request, Response
 from flask_appbuilder import expose
-from flask_appbuilder.api import rison, safe
+from flask_appbuilder.api import rison, safe, SQLAInterface
 from flask_appbuilder.api.schemas import get_list_schema
 from flask_appbuilder.security.decorators import permission_name, protect
-from flask_appbuilder.security.sqla.models import Role
+from flask_appbuilder.security.sqla.models import RegisterUser, Role
 from flask_wtf.csrf import generate_csrf
 from marshmallow import EXCLUDE, fields, post_load, Schema, ValidationError
 from sqlalchemy import asc, desc
@@ -35,7 +35,11 @@ from superset.commands.exceptions import ForbiddenError
 from superset.exceptions import SupersetGenericErrorException
 from superset.extensions import db, event_logger
 from superset.security.guest_token import GuestTokenResourceType
-from superset.views.base_api import BaseSupersetApi, statsd_metrics
+from superset.views.base_api import (
+    BaseSupersetApi,
+    BaseSupersetModelRestApi,
+    statsd_metrics,
+)
 
 logger = logging.getLogger(__name__)
 
@@ -337,3 +341,22 @@ class RoleRestAPI(BaseSupersetApi):
             return self.response_403(message=str(e))
         except Exception as e:
             return self.response_500(message=str(e))
+
+
+class UserRegistrationsRestAPI(BaseSupersetModelRestApi):
+    """
+    APIs for listing user registrations (Admin only)
+    """
+
+    resource_name = "security/user_registrations"
+    datamodel = SQLAInterface(RegisterUser)
+    allow_browser_login = True
+    list_columns = [
+        "id",
+        "username",
+        "email",
+        "first_name",
+        "last_name",
+        "registration_date",
+        "registration_hash",
+    ]
diff --git a/superset/security/manager.py b/superset/security/manager.py
index 4a68936453d..0db217b30dd 100644
--- a/superset/security/manager.py
+++ b/superset/security/manager.py
@@ -275,7 +275,6 @@ class SupersetSecurityManager(  # pylint: disable=too-many-public-methods
         "UserGroupModelView",
         "Row Level Security",
         "Row Level Security Filters",
-        "RowLevelSecurityFiltersModelView",
         "Security",
         "SQL Lab",
         "User Registrations",
@@ -2787,12 +2786,19 @@ class SupersetSecurityManager(  # pylint: disable=too-many-public-methods
     # temporal change to remove the roles view from the security menu,
     # after migrating all views to frontend, we will set FAB_ADD_SECURITY_VIEWS = False
     def register_views(self) -> None:
+        from superset.views.auth import SupersetAuthView, SupersetRegisterUserView
+
+        self.auth_view = self.appbuilder.add_view_no_menu(SupersetAuthView)
+        self.registeruser_view = self.appbuilder.add_view_no_menu(
+            SupersetRegisterUserView
+        )
+
         super().register_views()
 
         for view in list(self.appbuilder.baseviews):
             if isinstance(view, self.rolemodelview.__class__) and getattr(
                 view, "route_base", None
-            ) in ["/roles", "/users", "/groups"]:
+            ) in ["/roles", "/users", "/groups", "registrations"]:
                 self.appbuilder.baseviews.remove(view)
 
         security_menu = next(
@@ -2800,5 +2806,10 @@ class SupersetSecurityManager(  # pylint: disable=too-many-public-methods
         )
         if security_menu:
             for item in list(security_menu.childs):
-                if item.name in ["List Roles", "List Users", "List Groups"]:
+                if item.name in [
+                    "List Roles",
+                    "List Users",
+                    "List Groups",
+                    "User Registrations",
+                ]:
                     security_menu.childs.remove(item)
diff --git a/superset/sql/dialects/__init__.py b/superset/sql/dialects/__init__.py
index ab09de3c2a6..3b43b15bec2 100644
--- a/superset/sql/dialects/__init__.py
+++ b/superset/sql/dialects/__init__.py
@@ -15,6 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
+from .dremio import Dremio
 from .firebolt import Firebolt, FireboltOld
 
-__all__ = ["Firebolt", "FireboltOld"]
+__all__ = ["Dremio", "Firebolt", "FireboltOld"]
diff --git a/superset/sql/dialects/dremio.py b/superset/sql/dialects/dremio.py
new file mode 100644
index 00000000000..d2b8e8c3b2f
--- /dev/null
+++ b/superset/sql/dialects/dremio.py
@@ -0,0 +1,46 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+
+from sqlglot import exp, generator, parser
+from sqlglot.dialects.dialect import Dialect, rename_func
+
+
+class DremioRegexpSplit(exp.Func):
+    """
+    Custom REGEXP_SPLIT function for Dremio that supports 4 arguments.
+    """
+
+    arg_types = {
+        "this": True,  # string to split
+        "expression": True,  # delimiter pattern
+        "mode": True,  # mode (like 'ALL') - required in Dremio
+        "limit": True,  # limit - required in Dremio
+    }
+
+
+class Dremio(Dialect):
+    class Parser(parser.Parser):
+        FUNCTIONS = {
+            **parser.Parser.FUNCTIONS,
+            "REGEXP_SPLIT": DremioRegexpSplit.from_arg_list,
+        }
+
+    class Generator(generator.Generator):
+        TRANSFORMS = {
+            **generator.Generator.TRANSFORMS,
+            DremioRegexpSplit: rename_func("REGEXP_SPLIT"),
+        }
diff --git a/superset/sql/parse.py b/superset/sql/parse.py
index ce26e8d13f8..93fe328d1c0 100644
--- a/superset/sql/parse.py
+++ b/superset/sql/parse.py
@@ -26,16 +26,25 @@ from collections.abc import Iterable
 from dataclasses import dataclass
 from typing import Any, Generic, TYPE_CHECKING, TypeVar
 
-import sqlglot
+import sqlglot  # pylint: disable=disallowed-sql-import
 from jinja2 import nodes, Template
-from sqlglot import exp
-from sqlglot.dialects.dialect import Dialect, Dialects
-from sqlglot.errors import ParseError
-from sqlglot.optimizer.pushdown_predicates import pushdown_predicates
-from sqlglot.optimizer.scope import Scope, ScopeType, traverse_scope
+from sqlglot import exp  # pylint: disable=disallowed-sql-import
+from sqlglot.dialects.dialect import (  # pylint: disable=disallowed-sql-import
+    Dialect,
+    Dialects,
+)
+from sqlglot.errors import ParseError  # pylint: disable=disallowed-sql-import
+from sqlglot.optimizer.pushdown_predicates import (  # pylint: disable=disallowed-sql-import
+    pushdown_predicates,
+)
+from sqlglot.optimizer.scope import (  # pylint: disable=disallowed-sql-import
+    Scope,
+    ScopeType,
+    traverse_scope,
+)
 
 from superset.exceptions import QueryClauseValidationException, SupersetParseError
-from superset.sql.dialects.firebolt import Firebolt
+from superset.sql.dialects import Dremio, Firebolt
 
 if TYPE_CHECKING:
     from superset.models.core import Database
@@ -59,7 +68,7 @@ SQLGLOT_DIALECTS = {
     "databricks": Dialects.DATABRICKS,
     # "db2": ???
     # "denodo": ???
-    # "dremio": ???
+    "dremio": Dremio,
     "drill": Dialects.DRILL,
     "druid": Dialects.DRUID,
     "duckdb": Dialects.DUCKDB,
@@ -75,7 +84,7 @@ SQLGLOT_DIALECTS = {
     # "impala": ???
     # "kustosql": ???
     # "kylin": ???
-    "mariadb: ": Dialects.MYSQL,
+    "mariadb": Dialects.MYSQL,
     "motherduck": Dialects.DUCKDB,
     "mssql": Dialects.TSQL,
     "mysql": Dialects.MYSQL,
@@ -85,13 +94,12 @@ SQLGLOT_DIALECTS = {
     # "odelasticsearch": ???
     "oracle": Dialects.ORACLE,
     "parseable": Dialects.POSTGRES,
-    # "pinot": ???
+    "pinot": Dialects.MYSQL,
     "postgresql": Dialects.POSTGRES,
     "presto": Dialects.PRESTO,
     "pydoris": Dialects.DORIS,
     "redshift": Dialects.REDSHIFT,
     "risingwave": Dialects.RISINGWAVE,
-    # "rockset": ???
     "shillelagh": Dialects.SQLITE,
     "singlestore": Dialects.MYSQL,
     "snowflake": Dialects.SNOWFLAKE,
diff --git a/superset/stats_logger.py b/superset/stats_logger.py
index 4cf2a735401..5b6b86c263d 100644
--- a/superset/stats_logger.py
+++ b/superset/stats_logger.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import logging
-from typing import Optional
+from typing import Any, Optional
 
 from colorama import Fore, Style
 
@@ -105,5 +105,27 @@ try:
         def gauge(self, key: str, value: float) -> None:
             self.client.gauge(key, value)
 
-except Exception:  # pylint: disable=broad-except  # noqa: S110
-    pass
+except Exception as e:  # pylint: disable=broad-except  # noqa: S110
+    # e can only be accessed in the catch and not later during class instantiation.
+    # We have to save it to a separate variable.
+    _saved_exception = e
+
+    class StatsdStatsLogger(BaseStatsLogger):  # type:ignore[no-redef] # the redefinition only happens when the original definition failed
+        def __init__(  # pylint: disable=super-init-not-called
+            self,
+            host: str = "localhost",
+            port: int = 8125,
+            prefix: str = "superset",
+            statsd_client: Any = None,
+        ) -> None:
+            """
+            Initializes from either params or a supplied, pre-constructed statsd client.
+
+            If statsd_client argument is given, all other arguments are ignored and the
+            supplied client will be used to emit metrics.
+
+            If an exception is raised while creating the StatsdStatsLogger class, for
+            example because the statsd package is not installed, it will be re-raised
+            on instantiation of the StatsdStatsLogger.
+            """
+            raise _saved_exception
diff --git a/superset/templates/appbuilder/baselayout.html b/superset/templates/appbuilder/baselayout.html
index f2c4c6414d1..ac596ae9675 100644
--- a/superset/templates/appbuilder/baselayout.html
+++ b/superset/templates/appbuilder/baselayout.html
@@ -23,10 +23,6 @@
     {% include 'appbuilder/general/confirm.html' %}
     {% include 'appbuilder/general/alert.html' %}
 
-    {% block navbar %}
-      {% include 'appbuilder/navbar.html' %}
-    {% endblock %}
-
     {% block uncontained %}{% endblock %}
 
     <div class="container">
diff --git a/superset/templates/email/alert.txt b/superset/templates/email/alert.txt
deleted file mode 100644
index 964a57e3cce..00000000000
--- a/superset/templates/email/alert.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you 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.
--->
-<h2 style="color: red;">Alert: {{label}} &#x26A0;</h2>
-<p><b>Query:</b></p>
-<code><mark style="background-color: LightGrey; font-size: 1.1em">{{sql}}</mark></code></p>
-<p><b>Result</b>: {{observation_value}}</p>
-<p><b>Reason</b>: {{validation_error_message}}</p>
-<p><a href="{{alert_url}}">View Alert Details</a></p>
-<p>Click <a href="{{image_url}}">here</a> or the image below to view the chart related to this alert.</p>
-<a href="{{image_url}}">
-    <img src="cid:screenshot" alt="{{label}}" />
-</a>
diff --git a/superset/templates/head_custom_extra.html b/superset/templates/head_custom_extra.html
deleted file mode 100644
index 591bbfc4fd0..00000000000
--- a/superset/templates/head_custom_extra.html
+++ /dev/null
@@ -1,24 +0,0 @@
-{#
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you 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.
-#}
-
-{#
-  This file may be overridden in your custom deployment.
-  It will be included in the head block in every view in superset and is a
-  good place to include your custom link, meta, style or script elements.
-#}
diff --git a/superset/templates/slack/alert.txt b/superset/templates/slack/alert.txt
deleted file mode 100644
index df943f5ef09..00000000000
--- a/superset/templates/slack/alert.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-{#
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you 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.
-#}
-*Triggered Alert: {{label}} :redalert:*
-*Query*:```{{sql}}```
-*Result*: {{observation_value}}
-*Reason*: {{validation_error_message}}
-<{{alert_url}}|View Alert Details>
-<{{url}}|*Explore in Superset*>
diff --git a/superset/templates/slack/alert_no_screenshot.txt b/superset/templates/slack/alert_no_screenshot.txt
deleted file mode 100644
index bca191bb035..00000000000
--- a/superset/templates/slack/alert_no_screenshot.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-{#
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you 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.
-#}
-*Triggered Alert: {{label}} :redalert:*
-*Query*:```{{sql}}```
-*Result*: {{observation_value}}
-*Reason*: {{validation_error_message}}
-<{{alert_url}}|View Alert Details>
diff --git a/superset/templates/superset/base.html b/superset/templates/superset/base.html
index 9cb6e7705cb..6fa3b4f3c82 100644
--- a/superset/templates/superset/base.html
+++ b/superset/templates/superset/base.html
@@ -35,13 +35,16 @@
 
 {% block head_js %}
   {{ super() }}
-  {% include "head_custom_extra.html" %}
   {{ js_bundle(assets_prefix, "theme") }}
 {% endblock %}
 
+{% block body %}
+  <div id="app-menu"></div>
+  {{ super() }}
+{% endblock %}
+
 {% block tail_js %}
   {{ super() }}
   {{ js_bundle(assets_prefix, "preamble") }}
   {{ js_bundle(assets_prefix, 'menu') }}
-  {% include "tail_js_custom_extra.html" %}
 {% endblock %}
diff --git a/superset/templates/superset/basic.html b/superset/templates/superset/basic.html
index 16eeeceb405..07676c05013 100644
--- a/superset/templates/superset/basic.html
+++ b/superset/templates/superset/basic.html
@@ -1,79 +1,67 @@
-
-{# Licensed to the Apache Software Foundation (ASF) under one or more
+{#
+  Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements. See the NOTICE file distributed with this work
   for additional information regarding copyright ownership. The ASF licenses this
   file to you 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. #}
+  the License at http://www.apache.org/licenses/LICENSE-2.0
 
-  <!DOCTYPE html>
-  {% import 'appbuilder/general/lib.html' as lib %} {% from
-  'superset/partials/asset_bundle.html' import css_bundle, js_bundle with context
-  %} {% set favicons = appbuilder.app.config['FAVICONS'] %}
+  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>
+  {% import 'appbuilder/general/lib.html' as lib %}
+  {% from 'superset/partials/asset_bundle.html' import css_bundle, js_bundle with context %}
   {% import "superset/macros.html" as macros %}
-  <html>
-    <head>
-      {% include "head_custom_extra.html" %}
-      <title>
-        {% block title %} {% if title %} {{ title }} {% elif appbuilder and
-        appbuilder.app_name %} {{ appbuilder.app_name }} {% endif %} {% endblock
-        %}
-      </title>
-      {% block head_meta %}{% endblock %} {% block head_css %} {% for favicon in
-      favicons %} <link rel="{{favicon.rel if favicon.rel else "icon"}}"
-      type="{{favicon.type if favicon.type else "image/png"}}" {% if favicon.sizes
-      %}sizes={{favicon.sizes}}{% endif %} href="{{ "" if
-      favicon.href.startswith("http") else assets_prefix }}{{favicon.href}}" > {%
-      endfor %}
+  {% set favicons = appbuilder.app.config['FAVICONS'] %}
+
+  <head>
+    <title>
+      {% block title %}
+        {% if title %}
+          {{ title }}
+        {% endif %}
+      {% endblock %}
+    </title>
+
+    {% block head_meta %}{% endblock %}
+
+    {% block head_css %}
+      {% for favicon in favicons %}
+        <link
+          rel="{{ favicon.rel if favicon.rel else 'icon' }}"
+          type="{{ favicon.type if favicon.type else 'image/png' }}"
+          {% if favicon.sizes %}sizes="{{ favicon.sizes }}"{% endif %}
+          href="{{ '' if favicon.href.startswith('http') else assets_prefix }}{{ favicon.href }}"
+        />
+      {% endfor %}
+
       <link
         rel="preload"
         type="text/css"
         href="{{ assets_prefix }}/static/appbuilder/css/flags/flags16.css"
         as="style"
       />
-      <link
-        rel="preload"
-        type="text/css"
-        href="{{ assets_prefix }}/static/appbuilder/css/fontawesome/fontawesome.min.css"
-        as="style"
-      />
-      <link
-        rel="preload"
-        type="text/css"
-        href="{{ assets_prefix }}/static/appbuilder/css/fontawesome/solid.min.css"
-        as="style"
-      />
-      <link
-        rel="preload"
-        type="text/css"
-        href="{{ assets_prefix }}/static/appbuilder/css/fontawesome/brands.min.css"
-        as="style"
-      />
-      <link
-        rel="preload"
-        type="text/css"
-        href="{{ assets_prefix }}/static/appbuilder/css/select2/select2.min.css"
-        as="style"
-      />
 
-      {{ css_bundle(assets_prefix, "theme") }} {% if entry %} {{ css_bundle(assets_prefix, entry) }} {% endif %}
-      {% endblock %} {{ js_bundle(assets_prefix, "theme") }}
+    {% endblock %}
 
-      <input
-        type="hidden"
-        name="csrf_token"
-        id="csrf_token"
-        value="{{ csrf_token() if csrf_token else '' }}"
-      />
-    </head>
+    {{ js_bundle(assets_prefix, 'theme') }}
 
-    <body {% if standalone_mode %}class="standalone" {% endif %}>
-      {% block navbar %} {% if not standalone_mode %} {% include
-      'appbuilder/navbar.html' %} {% endif %} {% endblock %} {% block body %}
+    <input
+      type="hidden"
+      name="csrf_token"
+      id="csrf_token"
+      value="{{ csrf_token() if csrf_token else '' }}"
+    />
+  </head>
+
+  <body {% if standalone_mode %}class="standalone"{% endif %}>
+
+    {% block body %}
       <div id="app" data-bootstrap="{{ bootstrap_data }}">
         <img
           src="{{ assets_prefix }}/static/assets/images/loading.gif"
@@ -86,52 +74,18 @@
           "
         />
       </div>
-      {% endblock %}
+    {% endblock %}
 
-      <!-- Modal for misc messages / alerts  -->
-      <div
-        class="misc-modal modal fade"
-        tabindex="-1"
-        role="dialog"
-        aria-labelledby="myModalLabel"
-      >
-        <div class="modal-dialog" role="document">
-          <div class="modal-content" data-test="modal-content">
-            <div class="modal-header" data-test="modal-header">
-              <button
-                type="button"
-                class="close"
-                data-dismiss="modal"
-                aria-label="Close"
-                data-test="modal-header-close-button"
-              >
-                <span aria-hidden="true">&times;</span>
-              </button>
-              <h4 data-test="modal-title" class="modal-title"></h4>
-            </div>
-            <div data-test="modal-body" class="modal-body"></div>
-            <div data-test="modal-footer" class="modal-footer">
-              <button type="button" class="btn btn-default" data-dismiss="modal">
-                Close
-              </button>
-            </div>
-          </div>
-        </div>
-      </div>
+    {% block tail_js %}
+    {% endblock %}
 
-      {% block tail_js %} {% if not standalone_mode %} {{ js_bundle(assets_prefix, 'menu') }} {%
-      endif %} {% if entry %} {{ js_bundle(assets_prefix, entry) }} {% endif %} {% include
-      "tail_js_custom_extra.html" %} {% endblock %}
-
-      <!-- Handle deferred stylesheets -->
-      <script nonce="{{ macros.get_nonce() }}">
-        document.addEventListener('DOMContentLoaded', function() {
-          var preloadLinks = document.querySelectorAll('link[rel="preload"][as="style"]');
-
-          preloadLinks.forEach(function(link) {
-            link.rel = 'stylesheet';
-          });
+    <script nonce="{{ macros.get_nonce() }}">
+      document.addEventListener('DOMContentLoaded', function () {
+        var preloadLinks = document.querySelectorAll('link[rel="preload"][as="style"]');
+        preloadLinks.forEach(function (link) {
+          link.rel = 'stylesheet';
         });
-      </script>
-    </body>
-  </html>
+      });
+    </script>
+  </body>
+</html>
diff --git a/superset/templates/superset/paper-theme.html b/superset/templates/superset/paper-theme.html
deleted file mode 100644
index c4221be13fa..00000000000
--- a/superset/templates/superset/paper-theme.html
+++ /dev/null
@@ -1,595 +0,0 @@
-{#
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you 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.
-#}
-{% extends "superset/basic.html" %}
-
-{% block body %}
-  <body role="document">
-
-    <!-- Fixed navbar -->
-    <nav class="navbar navbar-inverse navbar-fixed-top">
-      <div class="container">
-        <div class="navbar-header">
-          <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
-            <span class="sr-only">Toggle navigation</span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </button>
-          <a class="navbar-brand" href="#">Bootstrap theme</a>
-        </div>
-        <div id="navbar" class="navbar-collapse collapse">
-          <ul class="nav navbar-nav">
-            <li class="active"><a href="#">Home</a></li>
-            <li><a href="#">About</a></li>
-            <li><a href="#">Contact</a></li>
-            <li class="dropdown">
-              <a href="#"></span></a>
-              <ul class="dropdown-menu">
-                <li><a href="#">Action</a></li>
-                <li><a href="#">Another action</a></li>
-                <li><a href="#">Something else here</a></li>
-                <li role="separator" class="divider"></li>
-                <li class="dropdown-header">Nav header</li>
-                <li><a href="#">Separated link</a></li>
-                <li><a href="#">One more separated link</a></li>
-              </ul>
-            </li>
-          </ul>
-        </div><!--/.nav-collapse -->
-      </div>
-    </nav>
-
-    <div class="container theme-showcase" role="main">
-
-      <!-- Main jumbotron for a primary marketing message or call to action -->
-      <div class="jumbotron">
-        <h1>Theme example</h1>
-        <p>This is a template showcasing the optional theme stylesheet included in Bootstrap. Use it as a starting point to create something more unique by building on or modifying it.</p>
-      </div>
-
-
-      <div class="page-header">
-        <h1>Buttons</h1>
-      </div>
-      <p>
-        <button type="button" class="btn btn-lg btn-default">Default</button>
-        <button type="button" class="btn btn-lg btn-primary">Primary</button>
-        <button type="button" class="btn btn-lg btn-success">Success</button>
-        <button type="button" class="btn btn-lg btn-info">Info</button>
-        <button type="button" class="btn btn-lg btn-warning">Warning</button>
-        <button type="button" class="btn btn-lg btn-danger">Danger</button>
-        <button type="button" class="btn btn-lg btn-link">Link</button>
-      </p>
-      <p>
-        <button type="button" class="btn btn-default">Default</button>
-        <button type="button" class="btn btn-primary">Primary</button>
-        <button type="button" class="btn btn-success">Success</button>
-        <button type="button" class="btn btn-info">Info</button>
-        <button type="button" class="btn btn-warning">Warning</button>
-        <button type="button" class="btn btn-danger">Danger</button>
-        <button type="button" class="btn btn-link">Link</button>
-      </p>
-      <p>
-        <button type="button" class="btn btn-sm btn-default">Default</button>
-        <button type="button" class="btn btn-sm btn-primary">Primary</button>
-        <button type="button" class="btn btn-sm btn-success">Success</button>
-        <button type="button" class="btn btn-sm btn-info">Info</button>
-        <button type="button" class="btn btn-sm btn-warning">Warning</button>
-        <button type="button" class="btn btn-sm btn-danger">Danger</button>
-        <button type="button" class="btn btn-sm btn-link">Link</button>
-      </p>
-      <p>
-        <button type="button" class="btn btn-xs btn-default">Default</button>
-        <button type="button" class="btn btn-xs btn-primary">Primary</button>
-        <button type="button" class="btn btn-xs btn-success">Success</button>
-        <button type="button" class="btn btn-xs btn-info">Info</button>
-        <button type="button" class="btn btn-xs btn-warning">Warning</button>
-        <button type="button" class="btn btn-xs btn-danger">Danger</button>
-        <button type="button" class="btn btn-xs btn-link">Link</button>
-      </p>
-
-
-      <div class="page-header">
-        <h1>Tables</h1>
-      </div>
-      <div class="row">
-        <div class="col-md-6">
-          <table class="table">
-            <thead>
-              <tr>
-                <th>#</th>
-                <th>First Name</th>
-                <th>Last Name</th>
-                <th>Username</th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr>
-                <td>1</td>
-                <td>Mark</td>
-                <td>Otto</td>
-                <td>@mdo</td>
-              </tr>
-              <tr>
-                <td>2</td>
-                <td>Jacob</td>
-                <td>Thornton</td>
-                <td>@fat</td>
-              </tr>
-              <tr>
-                <td>3</td>
-                <td>Larry</td>
-                <td>the Bird</td>
-                <td>@twitter</td>
-              </tr>
-            </tbody>
-          </table>
-        </div>
-        <div class="col-md-6">
-          <table class="table table-striped">
-            <thead>
-              <tr>
-                <th>#</th>
-                <th>First Name</th>
-                <th>Last Name</th>
-                <th>Username</th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr>
-                <td>1</td>
-                <td>Mark</td>
-                <td>Otto</td>
-                <td>@mdo</td>
-              </tr>
-              <tr>
-                <td>2</td>
-                <td>Jacob</td>
-                <td>Thornton</td>
-                <td>@fat</td>
-              </tr>
-              <tr>
-                <td>3</td>
-                <td>Larry</td>
-                <td>the Bird</td>
-                <td>@twitter</td>
-              </tr>
-            </tbody>
-          </table>
-        </div>
-      </div>
-
-      <div class="row">
-        <div class="col-md-6">
-          <table class="table table-bordered">
-            <thead>
-              <tr>
-                <th>#</th>
-                <th>First Name</th>
-                <th>Last Name</th>
-                <th>Username</th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr>
-                <td rowspan="2">1</td>
-                <td>Mark</td>
-                <td>Otto</td>
-                <td>@mdo</td>
-              </tr>
-              <tr>
-                <td>Mark</td>
-                <td>Otto</td>
-                <td>@TwBootstrap</td>
-              </tr>
-              <tr>
-                <td>2</td>
-                <td>Jacob</td>
-                <td>Thornton</td>
-                <td>@fat</td>
-              </tr>
-              <tr>
-                <td>3</td>
-                <td colspan="2">Larry the Bird</td>
-                <td>@twitter</td>
-              </tr>
-            </tbody>
-          </table>
-        </div>
-        <div class="col-md-6">
-          <table class="table table-condensed">
-            <thead>
-              <tr>
-                <th>#</th>
-                <th>First Name</th>
-                <th>Last Name</th>
-                <th>Username</th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr>
-                <td>1</td>
-                <td>Mark</td>
-                <td>Otto</td>
-                <td>@mdo</td>
-              </tr>
-              <tr>
-                <td>2</td>
-                <td>Jacob</td>
-                <td>Thornton</td>
-                <td>@fat</td>
-              </tr>
-              <tr>
-                <td>3</td>
-                <td colspan="2">Larry the Bird</td>
-                <td>@twitter</td>
-              </tr>
-            </tbody>
-          </table>
-        </div>
-      </div>
-
-
-      <div class="page-header">
-        <h1>Thumbnails</h1>
-      </div>
-      <img data-src="holder.js/200x200" class="img-thumbnail" alt="200x200" style="width: 200px; height: 200px;" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9InllcyI/PjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iMjAwIiBoZWlnaHQ9IjIwMCIgdmlld0JveD0iMCAwIDIwMCAyMDAiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjwhLS0KU291cmNlIFVSTDogaG9sZGVyLmpzLzIwMHgyMDAKQ3JlYXRlZCB3aXRoIEhvbGRlci5qcyAyLjYuMC4KTGVhcm4gbW9yZSBhdCBodHRwOi8vaG9sZGVyanMuY29tCihjKSAyMDEyLTIwMTUgSXZhbiBNYWxvcGluc2t5IC0gaHR0cDovL2ltc2t5LmNvCi0tPjxkZWZzPjxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+PCFbQ0RBVEFbI2hvbGRlcl8xNTYwZTAxMWI3ZCB0ZXh0IHsgZmlsbDojQUFBQUFBO2ZvbnQtd2VpZ2h0OmJvbGQ7Zm9udC1mYW1pbHk6QXJpYWwsIEhlbHZldGljYSwgT3BlbiBTYW5zLCBzYW5zLXNlcmlmLCBtb25vc3BhY2U7Zm9udC1zaXplOjEwcHQgfSBdXT48L3N0eWxlPjwvZGVmcz48ZyBpZD0iaG9sZGVyXzE1NjBlMDExYjdkIj48cmVjdCB3aWR0aD0iMjAwIiBoZWlnaHQ9IjIwMCIgZmlsbD0iI0VFRUVFRSIvPjxnPjx0ZXh0IHg9Ijc0LjA1NDY4NzUiIHk9IjEwNC41Ij4yMDB4MjAwPC90ZXh0PjwvZz48L2c+PC9zdmc+" data-holder-rendered="true">
-
-
-      <div class="page-header">
-        <h1>Labels</h1>
-      </div>
-      <h1>
-        <span class="label label-default">Default</span>
-        <span class="label label-primary">Primary</span>
-        <span class="label label-success">Success</span>
-        <span class="label label-info">Info</span>
-        <span class="label label-warning">Warning</span>
-        <span class="label label-danger">Danger</span>
-      </h1>
-      <h2>
-        <span class="label label-default">Default</span>
-        <span class="label label-primary">Primary</span>
-        <span class="label label-success">Success</span>
-        <span class="label label-info">Info</span>
-        <span class="label label-warning">Warning</span>
-        <span class="label label-danger">Danger</span>
-      </h2>
-      <h3>
-        <span class="label label-default">Default</span>
-        <span class="label label-primary">Primary</span>
-        <span class="label label-success">Success</span>
-        <span class="label label-info">Info</span>
-        <span class="label label-warning">Warning</span>
-        <span class="label label-danger">Danger</span>
-      </h3>
-      <h4>
-        <span class="label label-default">Default</span>
-        <span class="label label-primary">Primary</span>
-        <span class="label label-success">Success</span>
-        <span class="label label-info">Info</span>
-        <span class="label label-warning">Warning</span>
-        <span class="label label-danger">Danger</span>
-      </h4>
-      <h5>
-        <span class="label label-default">Default</span>
-        <span class="label label-primary">Primary</span>
-        <span class="label label-success">Success</span>
-        <span class="label label-info">Info</span>
-        <span class="label label-warning">Warning</span>
-        <span class="label label-danger">Danger</span>
-      </h5>
-      <h6>
-        <span class="label label-default">Default</span>
-        <span class="label label-primary">Primary</span>
-        <span class="label label-success">Success</span>
-        <span class="label label-info">Info</span>
-        <span class="label label-warning">Warning</span>
-        <span class="label label-danger">Danger</span>
-      </h6>
-      <p>
-        <span class="label label-default">Default</span>
-        <span class="label label-primary">Primary</span>
-        <span class="label label-success">Success</span>
-        <span class="label label-info">Info</span>
-        <span class="label label-warning">Warning</span>
-        <span class="label label-danger">Danger</span>
-      </p>
-
-
-      <div class="page-header">
-        <h1>Badges</h1>
-      </div>
-      <p>
-        <a href="#">42</span></a>
-      </p>
-      <ul class="nav nav-pills" role="tablist">
-        <li role="presentation" class="active"><a href="#">42</span></a></li>
-        <li role="presentation"><a href="#">Profile</a></li>
-        <li role="presentation"><a href="#">3</span></a></li>
-      </ul>
-
-
-      <div class="page-header">
-        <h1>Dropdown menus</h1>
-      </div>
-      <div class="dropdown theme-dropdown clearfix">
-        <a id="dropdownMenu1" href="#"></span></a>
-        <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
-          <li class="active"><a href="#">Action</a></li>
-          <li><a href="#">Another action</a></li>
-          <li><a href="#">Something else here</a></li>
-          <li role="separator" class="divider"></li>
-          <li><a href="#">Separated link</a></li>
-        </ul>
-      </div>
-
-
-      <div class="page-header">
-        <h1>Navs</h1>
-      </div>
-      <ul class="nav nav-tabs" role="tablist">
-        <li role="presentation" class="active"><a href="#">Home</a></li>
-        <li role="presentation"><a href="#">Profile</a></li>
-        <li role="presentation"><a href="#">Messages</a></li>
-      </ul>
-      <ul class="nav nav-pills" role="tablist">
-        <li role="presentation" class="active"><a href="#">Home</a></li>
-        <li role="presentation"><a href="#">Profile</a></li>
-        <li role="presentation"><a href="#">Messages</a></li>
-      </ul>
-
-
-      <div class="page-header">
-        <h1>Navbars</h1>
-      </div>
-
-      <nav class="navbar navbar-default">
-        <div class="container">
-          <div class="navbar-header">
-            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
-              <span class="sr-only">Toggle navigation</span>
-              <span class="icon-bar"></span>
-              <span class="icon-bar"></span>
-              <span class="icon-bar"></span>
-            </button>
-            <a class="navbar-brand" href="#">Project name</a>
-          </div>
-          <div class="navbar-collapse collapse">
-            <ul class="nav navbar-nav">
-              <li class="active"><a href="#">Home</a></li>
-              <li><a href="#">About</a></li>
-              <li><a href="#">Contact</a></li>
-              <li class="dropdown">
-                <a href="#"></span></a>
-                <ul class="dropdown-menu">
-                  <li><a href="#">Action</a></li>
-                  <li><a href="#">Another action</a></li>
-                  <li><a href="#">Something else here</a></li>
-                  <li role="separator" class="divider"></li>
-                  <li class="dropdown-header">Nav header</li>
-                  <li><a href="#">Separated link</a></li>
-                  <li><a href="#">One more separated link</a></li>
-                </ul>
-              </li>
-            </ul>
-          </div><!--/.nav-collapse -->
-        </div>
-      </nav>
-
-      <nav class="navbar navbar-inverse">
-        <div class="container">
-          <div class="navbar-header">
-            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
-              <span class="sr-only">Toggle navigation</span>
-              <span class="icon-bar"></span>
-              <span class="icon-bar"></span>
-              <span class="icon-bar"></span>
-            </button>
-            <a class="navbar-brand" href="#">Project name</a>
-          </div>
-          <div class="navbar-collapse collapse">
-            <ul class="nav navbar-nav">
-              <li class="active"><a href="#">Home</a></li>
-              <li><a href="#">About</a></li>
-              <li><a href="#">Contact</a></li>
-              <li class="dropdown">
-                <a href="#"></span></a>
-                <ul class="dropdown-menu">
-                  <li><a href="#">Action</a></li>
-                  <li><a href="#">Another action</a></li>
-                  <li><a href="#">Something else here</a></li>
-                  <li role="separator" class="divider"></li>
-                  <li class="dropdown-header">Nav header</li>
-                  <li><a href="#">Separated link</a></li>
-                  <li><a href="#">One more separated link</a></li>
-                </ul>
-              </li>
-            </ul>
-          </div><!--/.nav-collapse -->
-        </div>
-      </nav>
-
-
-      <div class="page-header">
-        <h1>Alerts</h1>
-      </div>
-      <div class="alert alert-success" role="alert">
-        <strong>Well done!</strong> You successfully read this important alert message. With a <a href="#">link</a>.
-      </div>
-      <div class="alert alert-info" role="alert">
-        <strong>Heads up!</strong> This alert needs your attention, but it's not super important.
-      </div>
-      <div class="alert alert-warning" role="alert">
-        <strong>Warning!</strong> Best check yo self, you're not looking too good.
-      </div>
-      <div class="alert alert-danger" role="alert">
-        <strong>Oh snap!</strong> Change a few things up and try submitting again.
-      </div>
-
-
-      <div class="page-header">
-        <h1>Progress bars</h1>
-      </div>
-      <div class="progress">
-        <div class="progress-bar" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 60%;"><span class="sr-only">60% Complete</span></div>
-      </div>
-      <div class="progress">
-        <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="40" aria-valuemin="0" aria-valuemax="100" style="width: 40%"><span class="sr-only">40% Complete (success)</span></div>
-      </div>
-      <div class="progress">
-        <div class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="20" aria-valuemin="0" aria-valuemax="100" style="width: 20%"><span class="sr-only">20% Complete</span></div>
-      </div>
-      <div class="progress">
-        <div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 60%"><span class="sr-only">60% Complete (warning)</span></div>
-      </div>
-      <div class="progress">
-        <div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="80" aria-valuemin="0" aria-valuemax="100" style="width: 80%"><span class="sr-only">80% Complete (danger)</span></div>
-      </div>
-      <div class="progress">
-        <div class="progress-bar progress-bar-striped" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 60%"><span class="sr-only">60% Complete</span></div>
-      </div>
-      <div class="progress">
-        <div class="progress-bar progress-bar-success" style="width: 35%"><span class="sr-only">35% Complete (success)</span></div>
-        <div class="progress-bar progress-bar-warning" style="width: 20%"><span class="sr-only">20% Complete (warning)</span></div>
-        <div class="progress-bar progress-bar-danger" style="width: 10%"><span class="sr-only">10% Complete (danger)</span></div>
-      </div>
-
-
-      <div class="page-header">
-        <h1>List groups</h1>
-      </div>
-      <div class="row">
-        <div class="col-sm-4">
-          <ul class="list-group">
-            <li class="list-group-item">Cras justo odio</li>
-            <li class="list-group-item">Dapibus ac facilisis in</li>
-            <li class="list-group-item">Morbi leo risus</li>
-            <li class="list-group-item">Porta ac consectetur ac</li>
-            <li class="list-group-item">Vestibulum at eros</li>
-          </ul>
-        </div><!-- /.col-sm-4 -->
-        <div class="col-sm-4">
-          <div class="list-group">
-            <a href="#">
-              Cras justo odio
-            </a>
-            <a href="#">Dapibus ac facilisis in</a>
-            <a href="#">Morbi leo risus</a>
-            <a href="#">Porta ac consectetur ac</a>
-            <a href="#">Vestibulum at eros</a>
-          </div>
-        </div><!-- /.col-sm-4 -->
-        <div class="col-sm-4">
-          <div class="list-group">
-            <a href="#">
-              <h4 class="list-group-item-heading">List group item heading</h4>
-              <p class="list-group-item-text">Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.</p>
-            </a>
-            <a href="#">
-              <h4 class="list-group-item-heading">List group item heading</h4>
-              <p class="list-group-item-text">Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.</p>
-            </a>
-            <a href="#">
-              <h4 class="list-group-item-heading">List group item heading</h4>
-              <p class="list-group-item-text">Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.</p>
-            </a>
-          </div>
-        </div><!-- /.col-sm-4 -->
-      </div>
-
-
-      <div class="page-header">
-        <h1>Panels</h1>
-      </div>
-      <div class="row">
-        <div class="col-sm-4">
-          <div class="panel panel-default f1">
-            <div class="panel-heading">
-              <h3 class="panel-title">Panel title</h3>
-            </div>
-            <div class="panel-body">
-              Panel content
-            </div>
-          </div>
-          <div class="panel panel-primary">
-            <div class="panel-heading">
-              <h3 class="panel-title">Panel title</h3>
-            </div>
-            <div class="panel-body">
-              Panel content
-            </div>
-          </div>
-        </div><!-- /.col-sm-4 -->
-        <div class="col-sm-4">
-          <div class="panel panel-success">
-            <div class="panel-heading">
-              <h3 class="panel-title">Panel title</h3>
-            </div>
-            <div class="panel-body">
-              Panel content
-            </div>
-          </div>
-          <div class="panel panel-info">
-            <div class="panel-heading">
-              <h3 class="panel-title">Panel title</h3>
-            </div>
-            <div class="panel-body">
-              Panel content
-            </div>
-          </div>
-        </div><!-- /.col-sm-4 -->
-        <div class="col-sm-4">
-          <div class="panel panel-warning">
-            <div class="panel-heading">
-              <h3 class="panel-title">Panel title</h3>
-            </div>
-            <div class="panel-body">
-              Panel content
-            </div>
-          </div>
-          <div class="panel panel-danger">
-            <div class="panel-heading">
-              <h3 class="panel-title">Panel title</h3>
-            </div>
-            <div class="panel-body">
-              Panel content
-            </div>
-          </div>
-        </div><!-- /.col-sm-4 -->
-      </div>
-
-
-      <div class="page-header">
-        <h1>Wells</h1>
-      </div>
-      <div class="well">
-        <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas sed diam eget risus varius blandit sit amet non magna. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Cras mattis consectetur purus sit amet fermentum. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Aenean lacinia bibendum nulla sed consectetur.</p>
-      </div>
-      <ul class="nav nav-tabs">
-        <li role="presentation" class="active"><a href="#">Home</a></li>
-        <li role="presentation"><a href="#">Profile</a></li>
-        <li role="presentation"><a href="#">Messages</a></li>
-      </ul>
-      This is tabs above here
-
-    </div> <!-- /container -->
-
-
-{% endblock %}
diff --git a/superset/templates/superset/spa.html b/superset/templates/superset/spa.html
index cf284a66be5..232ab920159 100644
--- a/superset/templates/superset/spa.html
+++ b/superset/templates/superset/spa.html
@@ -23,5 +23,4 @@
 
 {% block tail_js %}
   {{ js_bundle(assets_prefix, entry) }}
-  {% include "tail_js_custom_extra.html" %}
 {% endblock %}
diff --git a/superset/templates/tail_js_custom_extra.html b/superset/templates/tail_js_custom_extra.html
deleted file mode 100644
index 92ad827614c..00000000000
--- a/superset/templates/tail_js_custom_extra.html
+++ /dev/null
@@ -1,25 +0,0 @@
-{#
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you 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.
-#}
-
-{#
-  This file may be overridden in your custom deployment.
-  It will be included in every view in superset and is a
-  good place to include your custom frontend code, such as
-  scripts to initialize google analytics, intercom, segment, etc.
-#}
diff --git a/superset/translations/fr/LC_MESSAGES/messages.po b/superset/translations/fr/LC_MESSAGES/messages.po
index 1b95452a4b6..8b8071e3748 100644
--- a/superset/translations/fr/LC_MESSAGES/messages.po
+++ b/superset/translations/fr/LC_MESSAGES/messages.po
@@ -17,16 +17,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2025-04-29 12:34+0330\n"
-"PO-Revision-Date: 2025-03-17 23:32+0100\n"
+"POT-Creation-Date: 2025-06-26 15:18+0200\n"
+"PO-Revision-Date: 2025-06-26 15:34+0200\n"
 "Last-Translator: \n"
 "Language: fr\n"
 "Language-Team: fr <LL@li.org>\n"
-"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.1\n"
+"Generated-By: Babel 2.10.3\n"
 
 msgid ""
 "\n"
@@ -138,6 +138,9 @@ msgstr " pour ajouter des colonnes calculées"
 msgid " to add metrics"
 msgstr " pour ajouter une mesure"
 
+msgid " to check for details."
+msgstr ""
+
 msgid " to edit or add columns and metrics."
 msgstr " pour modifier ou ajouter des colonnes et des mesures."
 
@@ -149,6 +152,10 @@ msgstr ""
 " pour ouvrir SQL Lab. À partir de là, vous pouvez enregistrer la requête "
 "sous forme d'ensemble de données."
 
+#, fuzzy
+msgid " to see details."
+msgstr "Voir les détails de la requête"
+
 msgid " to visualize your data."
 msgstr " pour visualiser vos données."
 
@@ -173,9 +180,9 @@ msgstr ""
 "%(dialect)s ne peut pas être utilisé comme source de données pour des "
 "raisons de sécurité."
 
-#, fuzzy, python-format
+#, python-format
 msgid "%(label)s file"
-msgstr "%(type)s Fichier"
+msgstr "%(label)s fichier"
 
 #, python-format
 msgid "%(name)s.csv"
@@ -207,7 +214,7 @@ msgstr ""
 msgid "%(rows)d rows returned"
 msgstr "%(rows)d lignes retournées"
 
-#, python-format
+#, fuzzy, python-format
 msgid "%(suggestion)s instead of \"%(undefinedParameter)s?\""
 msgid_plural ""
 "%(firstSuggestions)s or %(lastSuggestion)s instead of "
@@ -308,8 +315,12 @@ msgid "%s saved metric(s)"
 msgstr "%s mesure(s) sauvegardée(s)"
 
 #, fuzzy, python-format
+msgid "%s tab selected"
+msgstr "%s Sélectionné"
+
+#, python-format
 msgid "%s updated"
-msgstr "Dernière mise à jour %s"
+msgstr "%s mise à jour"
 
 #, python-format
 msgid "%s%s"
@@ -443,11 +454,10 @@ msgid "1 year start frequency"
 msgstr "Fréquence de début d’année"
 
 msgid "10 minute"
-msgstr "10 minutes"
+msgstr "10 minutes"
 
-#, fuzzy
 msgid "10/90 percentiles"
-msgstr "9/91 centiles"
+msgstr "10/90 percentiles"
 
 msgid "10000"
 msgstr ""
@@ -619,6 +629,10 @@ msgstr ">= (plus grand ou égal)"
 msgid "A Big Number"
 msgstr "Gros nombre"
 
+#, fuzzy
+msgid "A comma separated list of columns that should be parsed as dates"
+msgstr "Colonnes à traiter comme des dates"
+
 #, fuzzy
 msgid "A comma-separated list of schemas that files are allowed to upload to."
 msgstr ""
@@ -787,6 +801,10 @@ msgstr "Action"
 msgid "Action Log"
 msgstr "Journaux d'actions"
 
+#, fuzzy
+msgid "Action Logs"
+msgstr "Journaux d'actions"
+
 msgid "Actions"
 msgstr "Actions"
 
@@ -843,6 +861,9 @@ msgstr "Diviseur"
 msgid "Add Filter"
 msgstr "Ajouter un filtre"
 
+msgid "Add Group"
+msgstr ""
+
 #, fuzzy
 msgid "Add Layer"
 msgstr "Masquer la couche"
@@ -1019,7 +1040,7 @@ msgstr[1] ""
 #, python-format
 msgid "Added to 1 dashboard"
 msgid_plural "Added to %s dashboards"
-msgstr[0] "Ajouté à 1 tableau de bord"
+msgstr[0] "Ajouté à %s tableau de bord"
 msgstr[1] "Ajoutés à %s tableaux de bords"
 
 msgid "Additional Parameters"
@@ -1108,6 +1129,11 @@ msgstr "Sélectionner un tableau de bord"
 msgid "After"
 msgstr "Après"
 
+msgid ""
+"After making the changes, copy the query and paste in the virtual dataset"
+" SQL snippet settings."
+msgstr ""
+
 msgid "Aggregate"
 msgstr "Agrégger"
 
@@ -1148,6 +1174,12 @@ msgstr "Aggregation"
 msgid "Aggregation function"
 msgstr "Fonctions d’agrégation"
 
+msgid ""
+"Aggregation method used to compute the Big Number from the Trendline.For "
+"non-additive metrics like ratios, averages, distinct counts, etc use "
+"NONE."
+msgstr ""
+
 msgid "Alert"
 msgstr "Alerte"
 
@@ -1241,6 +1273,10 @@ msgstr "Tous les filtres"
 msgid "All panels"
 msgstr "Tous les panneaux"
 
+#, fuzzy
+msgid "All records"
+msgstr "Registres bruts"
+
 msgid "Allow CREATE TABLE AS"
 msgstr "Autoriser CREATE TABLE AS"
 
@@ -1352,12 +1388,6 @@ msgstr ""
 msgid "An error has occurred"
 msgstr "Une erreur est survenue"
 
-#, fuzzy, python-format
-msgid "An error has occurred while syncing virtual dataset columns"
-msgstr ""
-"Une erreur s'est produite lors de l'extraction des ensembles de données. "
-": %s"
-
 msgid "An error occurred"
 msgstr "Un erreur s'est produite"
 
@@ -1517,6 +1547,10 @@ msgstr ""
 "Une erreur s'est produite lors de l'extraction des valeurs de "
 "l’utilisateur·rice : %s"
 
+#, fuzzy, python-format
+msgid "An error occurred while formatting SQL"
+msgstr "Une erreur s'est produite lors de l'importation de %s : %s"
+
 #, fuzzy, python-format
 msgid "An error occurred while importing %s: %s"
 msgstr "Une erreur s'est produite lors de l'importation de %s : %s"
@@ -1812,6 +1846,10 @@ msgstr "Voulez-vous vraiment supprimer les tableaux de bord sélectionnés?"
 msgid "Are you sure you want to delete the selected datasets?"
 msgstr "Voulez-vous vraiment supprimer les ensembles de données sélectionnés?"
 
+#, fuzzy
+msgid "Are you sure you want to delete the selected groups?"
+msgstr "Voulez-vous vraiment supprimer les règles sélectionnées?"
+
 msgid "Are you sure you want to delete the selected layers?"
 msgstr "Voulez-vous vraiment supprimer les couches sélectionnées?"
 
@@ -2067,9 +2105,6 @@ msgstr "Avant"
 msgid "Big Number"
 msgstr "Grand nombre"
 
-msgid "Big Number Font Size"
-msgstr "Taille de police des grands nombres"
-
 msgid "Big Number with Time Period Comparison"
 msgstr ""
 
@@ -2080,6 +2115,10 @@ msgstr "Gros nombre avec tendance"
 msgid "Bins"
 msgstr "dans"
 
+#, python-format
+msgid "Block %(block_num)s out of %(block_count)s"
+msgstr ""
+
 #, fuzzy
 msgid "Border color"
 msgstr "Colonnes des séries temporelles"
@@ -2251,8 +2290,8 @@ msgid "CC recipients"
 msgstr "récents"
 
 #, fuzzy
-msgid "CREATE DATASET"
-msgstr "CREATE DATASET"
+msgid "COPY QUERY"
+msgstr "Arrêter la requête"
 
 msgid "CREATE TABLE AS"
 msgstr "CREATE TABLE AS"
@@ -2479,7 +2518,6 @@ msgstr "Certification"
 msgid "Certification details"
 msgstr "Détails de certification"
 
-#, fuzzy
 msgid "Certified"
 msgstr "Certifié"
 
@@ -2753,13 +2791,11 @@ msgstr "Choisissez une mesure pour l'axe de droite"
 msgid "Choose a number format"
 msgstr "Choisissez une mesure pour l'axe de droite"
 
-#, fuzzy
 msgid "Choose a source"
 msgstr "Choisissez une source"
 
-#, fuzzy
 msgid "Choose a target"
-msgstr "Choisissez un jeu de donnée"
+msgstr "Choisissez une cible"
 
 #, fuzzy
 msgid "Choose already exists"
@@ -2776,6 +2812,9 @@ msgstr "Colonnes à traiter comme des dates"
 msgid "Choose columns to read"
 msgstr "Colonnes à lire"
 
+msgid "Choose how many X-Axis labels to show"
+msgstr ""
+
 #, fuzzy
 msgid "Choose index column"
 msgstr "Index de colonne"
@@ -2831,6 +2870,9 @@ msgstr ""
 "doit lui être attribuée sur la base d'une palette de couleurs "
 "catégorielles"
 
+msgid "Choose..."
+msgstr "Choisissez…"
+
 msgid "Chord Diagram"
 msgstr "Diagramme d'accord"
 
@@ -2988,10 +3030,6 @@ msgstr "Réduire la rangée"
 msgid "Collapse tab content"
 msgstr "Réduire le contenu de l'onglet"
 
-#, fuzzy
-msgid "Collapse table preview"
-msgstr "Supprimer la prévisualisation du tableau"
-
 msgid "Color"
 msgstr "Couleur"
 
@@ -3290,6 +3328,10 @@ msgstr "Afficher le mot de passe."
 msgid "Confirm overwrite"
 msgstr "Confirmer le remplacement"
 
+#, fuzzy
+msgid "Confirm password"
+msgstr "Afficher le mot de passe."
+
 msgid "Confirm save"
 msgstr "Confirmer la sauvegarde"
 
@@ -3565,9 +3607,6 @@ msgstr "Créer une source de données et ouvrir un nouvel onglet"
 msgid "Creator"
 msgstr "Créateur"
 
-msgid "Credentials uploaded"
-msgstr ""
-
 #, fuzzy
 msgid "Crimson"
 msgstr "Cramoisi"
@@ -3766,6 +3805,10 @@ msgstr "Mode sombre"
 msgid "Dashboard"
 msgstr "Tableau de bord"
 
+#, fuzzy
+msgid "Dashboard Id"
+msgstr "tableau de bord"
+
 #, fuzzy, python-format
 msgid "Dashboard [%s] just got created and chart [%s] was added to it"
 msgstr "Le tableau de bord [%s] a été créé et le graphique [%s] y a été ajouté"
@@ -3830,7 +3873,6 @@ msgstr ""
 " Ajoutez des colonnes temporelles aux filtres des graphiques pour que ce "
 "filtre de tableau de bord ait un impact sur ces graphiques."
 
-#, fuzzy
 msgid "Dashboard title"
 msgstr "Titre du tableau de bord"
 
@@ -3841,21 +3883,18 @@ msgstr "Utilisation du tableau de bord"
 msgid "Dashboards"
 msgstr "Tableaux de bord"
 
-#, fuzzy
 msgid "Dashboards could not be created."
-msgstr "Le tableau de bord n'a pas pu être créé."
+msgstr "Les tableaux de bord n'ont pas pu être créés."
 
 msgid "Dashboards do not exist"
 msgstr "Le tableau de bord n'existe pas"
 
-#, fuzzy
 msgid "Dashed"
 msgstr "En pointillés"
 
 msgid "Data"
 msgstr "Données"
 
-#, fuzzy
 msgid "Data Table"
 msgstr "Tableau des données"
 
@@ -3882,19 +3921,18 @@ msgstr ""
 "Les données n'ont pas pu être extraites du programme dorsal des "
 "résultats. Vous devez réexécuter la requête initiale."
 
-#, fuzzy, python-format
+#, python-format
 msgid "Data for %s"
-msgstr "Données supplémentaires pour JS"
+msgstr "Données pour %s"
 
-#, fuzzy
 msgid "Data imported"
-msgstr "Ensemble de données importé"
+msgstr "Données importées"
 
 msgid "Data preview"
 msgstr "Prévisualiser les données"
 
 msgid "Data refreshed"
-msgstr "Données rafraîchies"
+msgstr "Données actualisées"
 
 msgid "Data type"
 msgstr "Type de données"
@@ -3908,17 +3946,14 @@ msgstr "Dataframe doit inclure une colonne temporelle"
 msgid "Database"
 msgstr "Base de données"
 
-#, fuzzy
 msgid "Database Connections"
 msgstr "Connexions à la base de données"
 
-#, fuzzy
 msgid "Database Creation Error"
 msgstr "Erreur de création de base de données"
 
-#, fuzzy
 msgid "Database connected"
-msgstr "Connexions à la base de données"
+msgstr "Base de données connectée"
 
 msgid "Database could not be created."
 msgstr "La base de données n'a pas pu être créée."
@@ -3958,16 +3993,12 @@ msgstr "Une base de données est requise pour les alertes"
 msgid "Database name"
 msgstr "Nom de la base de données"
 
-msgid "Database not allowed to change"
-msgstr "La base de données n'est pas autorisée à changer"
-
 msgid "Database not found."
 msgstr "Base de donnée non trouvée."
 
 msgid "Database parameters are invalid."
 msgstr "Les paramètres de base de données sont invalides."
 
-#, fuzzy
 msgid "Database passwords"
 msgstr "Mots de passe de la base de données"
 
@@ -4003,7 +4034,6 @@ msgstr "Ensemble de données"
 msgid "Dataset %(table)s already exists"
 msgstr "L’ensemble de données %(name)s existe déjà"
 
-#, fuzzy
 msgid "Dataset Name"
 msgstr "Nom de l’ensemble de données"
 
@@ -4016,7 +4046,6 @@ msgstr "Colonne de l’ensemble de données introuvable."
 msgid "Dataset could not be created."
 msgstr "L’ensemble de données n'a pas pu être créé."
 
-#, fuzzy
 msgid "Dataset could not be duplicated."
 msgstr "L’ensemble de données n'a pas pu être dupliqué."
 
@@ -4026,7 +4055,6 @@ msgstr "L’ensemble de données n'a pas pu être mis à jour."
 msgid "Dataset does not exist"
 msgstr "L’ensemble de données n'existe pas"
 
-#, fuzzy
 msgid "Dataset imported"
 msgstr "Ensemble de données importé"
 
@@ -4060,9 +4088,8 @@ msgstr ""
 "de données ou de requêtes SQL. Sélectionnez un tableau de base de données"
 " à gauche ou "
 
-#, fuzzy
 msgid "Datasets could not be deleted."
-msgstr "Le jeu de données n'a pas pu être supprimé."
+msgstr "L'ensemble de données n'a pas pu être supprimé."
 
 msgid "Datasets do not contain a temporal column"
 msgstr "Les ensembles de données ne comportent pas de colonne temporelle"
@@ -4070,11 +4097,9 @@ msgstr "Les ensembles de données ne comportent pas de colonne temporelle"
 msgid "Datasource"
 msgstr "Source de données"
 
-#, fuzzy
 msgid "Datasource & Chart Type"
-msgstr "Choisissez un type de graphique"
+msgstr "Source de données et type de graphique"
 
-#, fuzzy
 msgid "Datasource does not exist"
 msgstr "La source de données n'existe pas"
 
@@ -4088,11 +4113,9 @@ msgstr "Le type de source de données est requis quand datasource_id est spécif
 msgid "Date Time Format"
 msgstr "Format de la date et de l'heure"
 
-#, fuzzy
 msgid "Date format"
 msgstr "Format de la date"
 
-#, fuzzy
 msgid "Date format string"
 msgstr "Chaîne de format de date"
 
@@ -4124,7 +4147,6 @@ msgstr ""
 "Le moteur de base de données n'a pas retourné toutes les colonnes "
 "demandées"
 
-#, fuzzy
 msgid "Deactivate"
 msgstr "Désactiver"
 
@@ -4135,7 +4157,6 @@ msgstr "Décembre"
 msgid "Decides which column or measure to sort the base axis by."
 msgstr "Décide de la mesure par laquelle l'axe de base doit être trié."
 
-#, fuzzy
 msgid "Decimal character"
 msgstr "Caractère décimal"
 
@@ -4155,7 +4176,6 @@ msgstr "Deck.gl - Arc"
 msgid "Deck.gl - GeoJSON"
 msgstr "Deck.gl - GeoJSON"
 
-#, fuzzy
 msgid "Deck.gl - Heatmap"
 msgstr "Deck.gl - Carte thermique"
 
@@ -4174,17 +4194,14 @@ msgstr "Deck.gl - Diagramme de dispersion"
 msgid "Deck.gl - Screen Grid"
 msgstr "Deck.gl - Grille d'écran"
 
-#, fuzzy
 msgid "Decrease"
-msgstr "Créer"
+msgstr "Diminuer"
 
-#, fuzzy
 msgid "Default Catalog"
-msgstr "Valeur par défaut"
+msgstr "Catalogue par défaut"
 
-#, fuzzy
 msgid "Default Schema"
-msgstr "Sélectionner un schéma"
+msgstr "Schéma par défaut"
 
 msgid "Default URL"
 msgstr "URL par défaut"
@@ -4198,15 +4215,12 @@ msgstr ""
 msgid "Default Value"
 msgstr "Valeur par défaut"
 
-#, fuzzy
 msgid "Default datetime"
 msgstr "Horodatage par défaut"
 
-#, fuzzy
 msgid "Default latitude"
 msgstr "Latitude par défaut"
 
-#, fuzzy
 msgid "Default longitude"
 msgstr "Longitude par défaut"
 
@@ -4332,6 +4346,10 @@ msgstr "Supprimer la base de données?"
 msgid "Delete Dataset?"
 msgstr "Supprimer l’ensemble de données?"
 
+#, fuzzy
+msgid "Delete Group?"
+msgstr "supprimer"
+
 msgid "Delete Layer?"
 msgstr "Effacer couche?"
 
@@ -4367,6 +4385,10 @@ msgstr "Supprimer la base de données"
 msgid "Delete email report"
 msgstr "Supprimer le rapport par courriel"
 
+#, fuzzy
+msgid "Delete group"
+msgstr "supprimer"
+
 msgid "Delete query"
 msgstr "Supprimer la requête"
 
@@ -4384,6 +4406,14 @@ msgstr "Supprimez ce conteneur et sauvegardez pour supprimer ce message."
 msgid "Delete user"
 msgstr "Supprimer la requête"
 
+#, fuzzy, python-format
+msgid "Delete user registration"
+msgstr "%s supprimé"
+
+#, fuzzy
+msgid "Delete user registration?"
+msgstr "Supprimer l'annotation?"
+
 #, fuzzy
 msgid "Deleted"
 msgstr "Supprimé"
@@ -4446,6 +4476,14 @@ msgstr[1] "%(num)d requêtes sauvegardées supprimées"
 msgid "Deleted %s"
 msgstr "%s supprimé"
 
+#, fuzzy, python-format
+msgid "Deleted group: %s"
+msgstr "%s supprimé"
+
+#, fuzzy, python-format
+msgid "Deleted groups: %s"
+msgstr "%s supprimé"
+
 #, fuzzy, python-format
 msgid "Deleted role: %s"
 msgstr "%s supprimé"
@@ -4454,6 +4492,10 @@ msgstr "%s supprimé"
 msgid "Deleted roles: %s"
 msgstr "%s supprimé"
 
+#, python-format
+msgid "Deleted user registration for user: %s"
+msgstr ""
+
 #, fuzzy, python-format
 msgid "Deleted user: %s"
 msgstr "%s supprimé"
@@ -4795,6 +4837,10 @@ msgstr "Déposez une colonne temporelle ici ou cliquez sur"
 msgid "Drop columns/metrics here or click"
 msgstr "Déposez des colonnes/mesures ici ou cliquez sur"
 
+#, fuzzy
+msgid "Dttm"
+msgstr "dttm"
+
 #, fuzzy
 msgid "Duplicate"
 msgstr "Dupliquer"
@@ -4867,6 +4913,10 @@ msgstr ""
 "tableaux de cette base de données. Si cette valeur n'est pas définie, le "
 "cache n'expire jamais. "
 
+#, fuzzy
+msgid "Duration Ms"
+msgstr "Durée"
+
 msgid "Duration in ms (1.40008 => 1ms 400µs 80ns)"
 msgstr "Durée en ms (1.40008 => 1ms 400µs 80ns)"
 
@@ -4895,9 +4945,6 @@ msgstr "ECharts"
 msgid "EMAIL_REPORTS_CTA"
 msgstr "EMAIL_REPORTS_CTA"
 
-msgid "END (EXCLUSIVE)"
-msgstr "FIN (EXCLUSIF)"
-
 #, fuzzy
 msgid "ERROR"
 msgstr "ERREUR"
@@ -4938,6 +4985,10 @@ msgstr "Modifier le tableau de bord"
 msgid "Edit Dataset "
 msgstr "Modifier l’ensemble de données "
 
+#, fuzzy
+msgid "Edit Group"
+msgstr "mode edition"
+
 msgid "Edit Log"
 msgstr "Modifier le journal"
 
@@ -4956,10 +5007,6 @@ msgstr "mode edition"
 msgid "Edit Rule"
 msgstr "Modifier la règle"
 
-#, fuzzy
-msgid "Edit Tag"
-msgstr "Éditer le log"
-
 #, fuzzy
 msgid "Edit User"
 msgstr "Modifier la requête"
@@ -4995,6 +5042,10 @@ msgstr "Modifier le rapport par courriel"
 msgid "Edit formatter"
 msgstr "Modifier le formateur"
 
+#, fuzzy
+msgid "Edit group"
+msgstr "mode edition"
+
 msgid "Edit properties"
 msgstr "Modifier les propriétés"
 
@@ -5005,6 +5056,10 @@ msgstr "Modifier la requête"
 msgid "Edit role"
 msgstr "mode edition"
 
+#, fuzzy
+msgid "Edit tag"
+msgstr "Éditer le log"
+
 msgid "Edit template"
 msgstr "Modifier le modèle"
 
@@ -5063,26 +5118,21 @@ msgstr "Rapports par courriel actifs"
 msgid "Email subject name (optional)"
 msgstr ""
 
-#, fuzzy
 msgid "Embed"
 msgstr "Intégré"
 
-#, fuzzy
 msgid "Embed code"
 msgstr "Code intégré"
 
-#, fuzzy
 msgid "Embed dashboard"
 msgstr "Tableau de bord intégré"
 
-#, fuzzy
 msgid "Embedded dashboard could not be deleted."
-msgstr "Le tableau de bord n'a pas pu être supprimé."
+msgstr "Le tableau de bord intégré n'a pas pu être supprimé."
 
 msgid "Embedding deactivated."
 msgstr "L’intégration est désactivée."
 
-#, fuzzy
 msgid "Emit Filter Events"
 msgstr "Émettre des événements de filtrage"
 
@@ -5095,16 +5145,14 @@ msgstr "Cercle vide"
 msgid "Empty collection"
 msgstr "Collection vide"
 
-#, fuzzy
 msgid "Empty column"
 msgstr "Colonne vide"
 
-#, fuzzy
 msgid "Empty query result"
 msgstr "Résultat de requête vide"
 
 msgid "Empty query?"
-msgstr "Requête vide?"
+msgstr "Requête vide ?"
 
 msgid "Empty row"
 msgstr "Rangée vide"
@@ -5115,7 +5163,6 @@ msgstr ""
 "Activez l'option « Autoriser le chargement de données » dans les "
 "paramètres de la base de données"
 
-#, fuzzy
 msgid "Enable cross-filtering"
 msgstr "Activer le filtrage croisé"
 
@@ -5158,19 +5205,19 @@ msgstr ""
 msgid "End"
 msgstr "Fin"
 
-#, fuzzy
 msgid "End (Longitude, Latitude): "
 msgstr "Fin (longitude, latitude) : "
 
 #, fuzzy
+msgid "End (exclusive)"
+msgstr " (exclu)"
+
 msgid "End Longitude & Latitude"
 msgstr "Fin (longitude et latitude)"
 
-#, fuzzy
 msgid "End angle"
 msgstr "Angle de fin"
 
-#, fuzzy
 msgid "End date"
 msgstr "Date de fin"
 
@@ -5207,9 +5254,8 @@ msgstr "Saisir un nom pour cette feuille"
 msgid "Enter a new title for the tab"
 msgstr "Saisir un nouveau titre pour l'onglet"
 
-#, fuzzy
 msgid "Enter alert name"
-msgstr "Nom de l'alerte"
+msgstr "Saisir le nom de l'alerte"
 
 msgid "Enter duration in seconds"
 msgstr "Saisir la durée en secondes"
@@ -5217,9 +5263,19 @@ msgstr "Saisir la durée en secondes"
 msgid "Enter fullscreen"
 msgstr "Passer en plein écran"
 
-#, fuzzy
 msgid "Enter report name"
-msgstr "Nom du rapport"
+msgstr "Saisir le nom du rapport"
+
+msgid "Enter the group's description"
+msgstr ""
+
+#, fuzzy
+msgid "Enter the group's label"
+msgstr "Saisir le nom de famille de l'utilisateur"
+
+#, fuzzy
+msgid "Enter the group's name"
+msgstr "Saisir le nom de l'utilisateur"
 
 #, python-format
 msgid "Enter the required %(dbModelName)s credentials"
@@ -5231,15 +5287,16 @@ msgstr ""
 msgid "Enter the user's email"
 msgstr ""
 
-#, fuzzy
 msgid "Enter the user's first name"
-msgstr "Nom de l'alerte"
+msgstr "Saisir le prénom de l'utilisateur"
 
-#, fuzzy
 msgid "Enter the user's last name"
-msgstr "Nom de l'alerte"
+msgstr "Saisir le nom de famille de l'utilisateur"
 
 msgid "Enter the user's username"
+msgstr "Saisir le nom de l'utilisateur"
+
+msgid "Enter your login and password below:"
 msgstr ""
 
 msgid "Entity"
@@ -5251,7 +5308,6 @@ msgstr "Taille des dates égales"
 msgid "Equal to (=)"
 msgstr "Égal à (=)"
 
-#, fuzzy
 msgid "Error"
 msgstr "Erreur"
 
@@ -5265,14 +5321,14 @@ msgstr ""
 msgid "Error deleting %s"
 msgstr "Une erreur s'est produite durant la récupération des données : %s"
 
+#, fuzzy
+msgid "Error executing query. "
+msgstr "L'alerte a détecté une erreur lors de l'exécution d'une requête."
+
 #, fuzzy
 msgid "Error faving chart"
 msgstr "Une erreur s'est produite durant la sauvegarde du jeu de données"
 
-#, python-format
-msgid "Error in jinja expression in HAVING clause: %(msg)s"
-msgstr "Erreur d'expression jinja dans la clause HAVING : %(msg)s"
-
 #, python-format
 msgid "Error in jinja expression in RLS filters: %(msg)s"
 msgstr "Erreur dans l'expression jinja des filtres RLS : %(msg)s"
@@ -5319,18 +5375,6 @@ msgstr "Une erreur s'est produite durant la sauvegarde du jeu de données"
 msgid "Error unfaving chart"
 msgstr "Une erreur s'est produite durant la sauvegarde du jeu de données"
 
-#, fuzzy
-msgid "Error while adding role!"
-msgstr "Une erreur s'est produite durant la récupération des graphiques"
-
-#, fuzzy
-msgid "Error while adding user!"
-msgstr "Une erreur s'est produite durant la récupération des graphiques"
-
-#, fuzzy
-msgid "Error while duplicating role!"
-msgstr "Une erreur s'est produite durant la récupération des graphiques"
-
 #, fuzzy
 msgid "Error while fetching charts"
 msgstr "Une erreur s'est produite durant la récupération des graphiques"
@@ -5340,31 +5384,19 @@ msgid "Error while fetching data: %s"
 msgstr "Une erreur s'est produite durant la récupération des données : %s"
 
 #, fuzzy
-msgid "Error while fetching permissions"
+msgid "Error while fetching groups"
 msgstr "Une erreur s'est produite durant la récupération des graphiques"
 
 #, fuzzy
 msgid "Error while fetching roles"
 msgstr "Une erreur s'est produite durant la récupération des graphiques"
 
-#, fuzzy
-msgid "Error while fetching users"
-msgstr "Une erreur s'est produite durant la récupération des graphiques"
-
 #, python-format
 msgid "Error while rendering virtual dataset query: %(msg)s"
 msgstr ""
 "Erreur durant le rendu de la requête de l’ensemble de données virtuel : "
 "%(msg)s"
 
-#, fuzzy
-msgid "Error while updating role!"
-msgstr "Une erreur s'est produite durant la récupération des graphiques"
-
-#, fuzzy
-msgid "Error while updating user!"
-msgstr "Une erreur s'est produite durant la récupération des graphiques"
-
 #, python-format
 msgid "Error: %(error)s"
 msgstr "Erreur : %(error)s"
@@ -5415,11 +5447,9 @@ msgstr "Exemples"
 msgid "Excel file format cannot be determined"
 msgstr ""
 
-#, fuzzy
 msgid "Excel upload"
-msgstr "Téléversement d’un CSV"
+msgstr "Téléversement d’un fichier Excel"
 
-#, fuzzy
 msgid "Exclude selected values"
 msgstr "Exclure les valeurs sélectionnées"
 
@@ -5438,14 +5468,12 @@ msgstr "ID d'exécution"
 msgid "Execution log"
 msgstr "Journal d'exécution"
 
-#, fuzzy
 msgid "Existing dataset"
-msgstr "Ensemble de données manquant"
+msgstr "Ensemble de données existant"
 
 msgid "Exit fullscreen"
 msgstr "Sortir du mode plein écran"
 
-#, fuzzy
 msgid "Expand"
 msgstr "Agrandir"
 
@@ -5455,14 +5483,9 @@ msgstr "Développer tout"
 msgid "Expand data panel"
 msgstr "Développer le panneau de données"
 
-#, fuzzy
 msgid "Expand row"
 msgstr "Agrandir la rangée"
 
-#, fuzzy
-msgid "Expand table preview"
-msgstr "Agrandir la prévisualisation du tableau"
-
 msgid "Expand tool bar"
 msgstr "Étendre la barre d'outils"
 
@@ -5510,13 +5533,11 @@ msgstr "Exporter vers Excel"
 msgid "Export to PDF"
 msgstr "Exporter en PDF"
 
-#, fuzzy
 msgid "Export to Pivoted .CSV"
-msgstr "Exporter vers .CSV pivoté"
+msgstr "Exporter au format CSV avec un pivot "
 
-#, fuzzy
 msgid "Export to full .CSV"
-msgstr "Exporter en .CSV intégral"
+msgstr "Exporter en CSV intégralement"
 
 #, fuzzy
 msgid "Export to full Excel"
@@ -5638,7 +5659,7 @@ msgstr "Échec de l'enregistrement de la délimitation des filtres croisés"
 msgid "Failed to start remote query on a worker."
 msgstr "Échec du lancement d'une requête à distance sur un travailleur."
 
-#, fuzzy, python-format
+#, fuzzy
 msgid "Failed to stop query."
 msgstr "Échec de l'arrêt de la requête. %s"
 
@@ -5653,6 +5674,10 @@ msgstr "Échec de la mise à jour du rapport"
 msgid "Failed to verify select options: %s"
 msgstr "Échec de la vérification des options de sélection : %s"
 
+#, fuzzy
+msgid "False"
+msgstr "est faux"
+
 msgid "Favorite"
 msgstr "Favori"
 
@@ -5716,6 +5741,9 @@ msgstr ""
 msgid "Fill method"
 msgstr "Méthode de remplissage"
 
+msgid "Fill out the registration form"
+msgstr ""
+
 #, fuzzy
 msgid "Filled"
 msgstr "Rempli"
@@ -5832,6 +5860,10 @@ msgstr "Terminer"
 msgid "First"
 msgstr "Premier"
 
+#, fuzzy
+msgid "First Name"
+msgstr "Nom du graphique"
+
 #, fuzzy
 msgid "First name"
 msgstr "Nom du graphique"
@@ -5976,6 +6008,10 @@ msgstr ""
 msgid "Format SQL"
 msgstr "Format D3"
 
+#, fuzzy
+msgid "Format SQL query"
+msgstr "Exporter la requête"
+
 msgid ""
 "Format data labels. Use variables: {name}, {value}, {percent}. \\n "
 "represents a new line. ECharts compatibility:\n"
@@ -6134,6 +6170,10 @@ msgstr "Grille"
 msgid "Grid Size"
 msgstr "Taille de la grille"
 
+#, fuzzy
+msgid "Group"
+msgstr "Grouper par"
+
 msgid "Group By"
 msgstr "Grouper par"
 
@@ -6147,6 +6187,9 @@ msgstr "Clé de groupe"
 msgid "Group by"
 msgstr "Grouper par"
 
+msgid "Groups"
+msgstr ""
+
 msgid "Guest user cannot modify chart payload"
 msgstr ""
 
@@ -6309,11 +6352,6 @@ msgstr ""
 msgid "If a metric is specified, sorting will be done based on the metric value"
 msgstr "Si une mesure est définie, le tri sera basé sur sa valeur"
 
-msgid ""
-"If changes are made to your SQL query, columns in your dataset will be "
-"synced when saving the dataset."
-msgstr ""
-
 msgid ""
 "If enabled, this control sorts the results/values descending, otherwise "
 "it sorts the results ascending."
@@ -6356,6 +6394,10 @@ msgstr "Importer %s"
 msgid "Import Dashboard(s)"
 msgstr "Exporter le ou les tableaux de bords"
 
+#, fuzzy
+msgid "Import Error"
+msgstr "Erreur de dépassement de délai"
+
 msgid "Import chart failed for an unknown reason"
 msgstr "L'import du graphique a échoué pour une raison inconnue"
 
@@ -6396,9 +6438,16 @@ msgid ""
 "service account or configure an OAuth2 client."
 msgstr ""
 
+msgid "In this view you can preview the first 25 rows. "
+msgstr ""
+
 msgid "Include Series"
 msgstr "Inclure la série"
 
+#, fuzzy
+msgid "Include Template Parameters"
+msgstr "Modifier les paramètres du modèle"
+
 msgid "Include a description that will be sent with your report"
 msgstr "Inclure une description qui sera envoyée avec votre rapport"
 
@@ -6620,6 +6669,10 @@ msgstr "Sélection inverse"
 msgid "Invert current page"
 msgstr "Inverser la page actuelle"
 
+#, fuzzy
+msgid "Is Active?"
+msgstr "Alerte actives"
+
 #, fuzzy
 msgid "Is active?"
 msgstr "Alerte actives"
@@ -6824,6 +6877,10 @@ msgstr "Grand"
 msgid "Last"
 msgstr "Dernier"
 
+#, fuzzy
+msgid "Last Name"
+msgstr "nom de l’ensemble de données"
+
 #, python-format
 msgid "Last Updated %s"
 msgstr "Dernière mise à jour %s"
@@ -7089,16 +7146,17 @@ msgstr "Codage des lignes"
 msgid "Link Copied!"
 msgstr "Lien copié!"
 
-msgid "List Roles"
-msgstr ""
+msgid "List Groups"
+msgstr "Liste des groupes"
+
+msgid "List Roles"
+msgstr "Liste des rôles"
 
-#, fuzzy
 msgid "List Unique Values"
 msgstr "Liste des valeurs uniques"
 
-#, fuzzy
 msgid "List Users"
-msgstr "Numéro de fractionnement"
+msgstr "Liste des utilisateurs"
 
 msgid "List of extra columns made available in JavaScript functions"
 msgstr ""
@@ -7118,7 +7176,6 @@ msgstr "Liste des valeurs à marquer avec des lignes"
 msgid "List of values to mark with triangles"
 msgstr "Liste des valeurs à marquer avec des triangles"
 
-#, fuzzy
 msgid "List updated"
 msgstr "Liste mise à jour"
 
@@ -7137,17 +7194,18 @@ msgstr "Données mises en cache chargées"
 msgid "Loaded from cache"
 msgstr "Chargées depuis le cache"
 
-#, fuzzy
 msgid "Loading"
 msgstr "Chargement"
 
 msgid "Loading..."
 msgstr "Chargement..."
 
-#, fuzzy
 msgid "Locate the chart"
 msgstr "Situer le graphique"
 
+msgid "Log"
+msgstr "Log"
+
 msgid "Log Scale"
 msgstr "Échelle logarithmique"
 
@@ -7172,11 +7230,9 @@ msgstr "Axe des ordonnées logarithmique"
 msgid "Login"
 msgstr "Connexion"
 
-#, fuzzy
 msgid "Login count"
-msgstr "count"
+msgstr "Nombre de connexions"
 
-#, fuzzy
 msgid "Login with"
 msgstr "Se connecter avec"
 
@@ -7196,23 +7252,20 @@ msgstr "Long tiret"
 msgid "Longitude"
 msgstr "Longitude"
 
-#, fuzzy
 msgid "Longitude & Latitude"
-msgstr "Longitude et latitude"
+msgstr "Longitude & latitude"
 
 msgid "Longitude & Latitude columns"
 msgstr "Colonnes longitude et latitude"
 
-#, fuzzy
 msgid "Longitude and Latitude"
 msgstr "Longitude et latitude"
 
 msgid "Longitude of default viewport"
 msgstr "Longitude de la fenêtre de visualisation par défaut"
 
-#, fuzzy
 msgid "Lower Threshold"
-msgstr "Pourcentages"
+msgstr "Seuil bas"
 
 msgid "Lower threshold must be lower than upper threshold"
 msgstr ""
@@ -7223,16 +7276,14 @@ msgstr "MAR"
 msgid "MAY"
 msgstr "MAI"
 
-#, fuzzy
 msgid "MINUTE"
-msgstr "minute"
+msgstr "MINUTE"
 
 msgid "MON"
 msgstr "LUN"
 
-#, fuzzy
 msgid "Main"
-msgstr "min"
+msgstr "Principal"
 
 msgid ""
 "Make sure that the controls are configured properly and the datasource "
@@ -7269,13 +7320,11 @@ msgstr "Obligatoire"
 msgid "Manually set min/max values for the y-axis."
 msgstr "Définir manuellement les valeurs min/max pour l’axe des ordonnées."
 
-#, fuzzy
 msgid "Map"
 msgstr "Carte"
 
-#, fuzzy
 msgid "Map Options"
-msgstr "Options de carte thermique"
+msgstr "Options de carte"
 
 #, fuzzy
 msgid "Map Style"
@@ -7291,7 +7340,6 @@ msgstr "Mapbox"
 msgid "March"
 msgstr "Mars"
 
-#, fuzzy
 msgid "Margin"
 msgstr "Marge"
 
@@ -7300,7 +7348,6 @@ msgstr ""
 "Marquer une colonne comme temporelle dans le modal « Modifier la source "
 "de données »"
 
-#, fuzzy
 msgid "Marker"
 msgstr "Marqueur"
 
@@ -7327,13 +7374,15 @@ msgstr "Marqueurs"
 msgid "Markup type"
 msgstr "Type de marqueur"
 
+msgid "Match system"
+msgstr ""
+
 msgid "Match time shift color with original series"
 msgstr ""
 
 msgid "Max"
 msgstr "Max"
 
-#, fuzzy
 msgid "Max Bubble Size"
 msgstr "Taille maximale de la bulle"
 
@@ -7359,7 +7408,6 @@ msgstr ""
 "Taille maximale du rayon du cercle, en pixels. Lorsque le niveau de zoom "
 "change, cela permet de s'assurer que le cercle respecte ce rayon maximal."
 
-#, fuzzy
 msgid "Maximum value"
 msgstr "Valeur maximale"
 
@@ -7603,9 +7651,8 @@ msgstr "Minute"
 msgid "Minutes %s"
 msgstr "Minutes %s"
 
-#, fuzzy
 msgid "Minutes value"
-msgstr "Valeur minimale"
+msgstr "Valeur pour les minutes"
 
 msgid "Missing OAuth2 token"
 msgstr ""
@@ -7838,6 +7885,10 @@ msgstr "Pas encore de %s"
 msgid "No Data"
 msgstr "Aucune donnée"
 
+#, fuzzy, python-format
+msgid "No Logs yet"
+msgstr "Pas encore de %s"
+
 #, fuzzy
 msgid "No Results"
 msgstr "Aucun résultat"
@@ -7939,6 +7990,17 @@ msgstr "Aucun paramètre de formulaire n'a été conservé"
 msgid "No global filters are currently added"
 msgstr "Aucun filtre global n'est actuellement ajouté"
 
+msgid "No groups"
+msgstr ""
+
+#, fuzzy
+msgid "No groups yet"
+msgstr "Pas encore de règles"
+
+#, fuzzy
+msgid "No items"
+msgstr "Aucun filtre"
+
 msgid "No matching records found"
 msgstr "Aucun enregistrement correspondant n'a été trouvé"
 
@@ -7968,6 +8030,10 @@ msgstr ""
 "sont configurés correctement et que la source de données contient des "
 "données pour la période sélectionnée."
 
+#, fuzzy
+msgid "No roles"
+msgstr "Pas encore de règles"
+
 #, fuzzy
 msgid "No roles yet"
 msgstr "Pas encore de règles"
@@ -8007,6 +8073,9 @@ msgstr "Aucune colonne temporelle trouvée"
 msgid "No time columns"
 msgstr "Pas de colonnes horaires"
 
+msgid "No user registrations yet"
+msgstr ""
+
 #, fuzzy
 msgid "No users yet"
 msgstr "Pas encore de règles"
@@ -8309,6 +8378,9 @@ msgstr ""
 msgid "Only single queries supported"
 msgstr "Seules les requêtes uniques sont prises en charge"
 
+msgid "Only the default catalog is supported for this connection"
+msgstr ""
+
 #, fuzzy
 msgid "Oops! An error occurred!"
 msgstr "Oups! Une erreur s'est produite!"
@@ -8336,9 +8408,17 @@ msgstr "Opacité, attend des valeurs entre 0 et 100"
 msgid "Open Datasource tab"
 msgstr "Ouvrir l'onglet Source de données"
 
+#, fuzzy
+msgid "Open SQL Lab in a new tab"
+msgstr "Exécuter la requête dans une nouvelle fenêtre"
+
 msgid "Open in SQL Lab"
 msgstr "Ouvrir dans SQL Lab"
 
+#, fuzzy
+msgid "Open in SQL lab"
+msgstr "Ouvrir dans SQL Lab"
+
 msgid "Open query in SQL Lab"
 msgstr "Ouvrir une requête dans SQL Lab"
 
@@ -8616,6 +8696,10 @@ msgstr "Mot de passe"
 msgid "Password is required"
 msgstr "Le type est requis"
 
+#, fuzzy
+msgid "Password:"
+msgstr "Mot de passe"
+
 #, fuzzy
 msgid "Passwords do not match!"
 msgstr "Le tableau de bord n'existe pas"
@@ -8662,6 +8746,10 @@ msgstr "Pourcentage de variation"
 msgid "Percentage difference between the time periods"
 msgstr ""
 
+#, fuzzy
+msgid "Percentage metric calculation"
+msgstr "Mesures de pourcentage"
+
 #, fuzzy
 msgid "Percentage metrics"
 msgstr "Mesures de pourcentage"
@@ -8855,12 +8943,35 @@ msgstr "Veuillez confirmer"
 msgid "Please enter a SQLAlchemy URI to test"
 msgstr "Veuillez saisir un URI SQLAlchemy à tester"
 
+#, fuzzy
+msgid "Please enter a valid email"
+msgstr "email invalide"
+
 msgid "Please enter a valid email address"
 msgstr ""
 
 msgid "Please enter valid text. Spaces alone are not permitted."
 msgstr ""
 
+msgid "Please enter your email"
+msgstr ""
+
+#, fuzzy
+msgid "Please enter your first name"
+msgstr "Saisir le prénom de l'utilisateur"
+
+#, fuzzy
+msgid "Please enter your last name"
+msgstr "Saisir le nom de famille de l'utilisateur"
+
+#, fuzzy
+msgid "Please enter your password"
+msgstr "Veuillez confirmer"
+
+#, fuzzy
+msgid "Please enter your username"
+msgstr "Saisir le nom de l'utilisateur"
+
 msgid "Please provide a valid range"
 msgstr ""
 
@@ -8889,6 +9000,10 @@ msgstr ""
 "Veuillez d'abord sauvegarder votre tableau de bord, puis essayez de créer"
 " un nouveau rapport par courriel."
 
+#, fuzzy
+msgid "Please select at least one role or group"
+msgstr "Veuillez choisir au moins un groupe par"
+
 msgid "Please select both a Dataset and a Chart type to proceed"
 msgstr ""
 "Veuillez sélectionner un ensemble de données et un type de graphique pour"
@@ -9115,9 +9230,6 @@ msgstr "Mettez votre code ici"
 msgid "Python datetime string pattern"
 msgstr "Modèle de chaîne de date en Python"
 
-msgid "QUERY DATA IN SQL LAB"
-msgstr "INTERROGATION DE DONNÉES DANS SQL LAB"
-
 msgid "Quarter"
 msgstr "Trimestre"
 
@@ -9147,6 +9259,9 @@ msgstr "Requête B"
 msgid "Query History"
 msgstr "Historiques des requêtes"
 
+msgid "Query data in SQL Lab"
+msgstr ""
+
 #, fuzzy
 msgid "Query does not exist"
 msgstr "La requête n'existe pas"
@@ -9180,9 +9295,6 @@ msgstr "La requête a été arrêtée"
 msgid "Query was stopped."
 msgstr "La requête a été arrêtée."
 
-msgid "RANGE TYPE"
-msgstr "TYPE DE PLAGE"
-
 #, fuzzy
 msgid "RGB Color"
 msgstr "Couleur RVB"
@@ -9236,6 +9348,10 @@ msgstr "Module d'extension de filtre d’intervalle utilisant AntD"
 msgid "Range labels"
 msgstr "Étiquettes d’intervalle"
 
+#, fuzzy
+msgid "Range type"
+msgstr "Type de filtre"
+
 #, fuzzy
 msgid "Ranges"
 msgstr "Intervalles"
@@ -9300,6 +9416,10 @@ msgstr "Se référer à"
 msgid "Referenced columns not available in DataFrame."
 msgstr "Les colonnes référencées sont indisponibles dans la DataFrame."
 
+#, fuzzy
+msgid "Referrer"
+msgstr "erreur"
+
 msgid "Refetch results"
 msgstr "Récupérer les résultats"
 
@@ -9333,6 +9453,17 @@ msgstr "Actualisation des graphiques"
 msgid "Refreshing columns"
 msgstr "Actualisation des colonnes"
 
+#, fuzzy
+msgid "Register"
+msgstr "Préfiltre"
+
+#, fuzzy
+msgid "Registration date"
+msgstr "Source de l'annotation"
+
+msgid "Registration hash"
+msgstr ""
+
 msgid "Regular"
 msgstr "Régulier"
 
@@ -9563,6 +9694,14 @@ msgstr "Réinitialiser"
 msgid "Reset columns"
 msgstr "Sélectionner une colonne"
 
+#, fuzzy
+msgid "Reset my password"
+msgstr "Veuillez confirmer"
+
+#, fuzzy
+msgid "Reset password"
+msgstr "Masquer le mot de passe."
+
 msgid "Reset state"
 msgstr "Réinitialiser l'état"
 
@@ -9644,38 +9783,13 @@ msgstr "Rôle"
 msgid "Role Name"
 msgstr "Nom de l'alerte"
 
-#, fuzzy
-msgid "Role is required"
-msgstr "Une valeur est obligatoire"
-
 #, fuzzy
 msgid "Role name is required"
 msgstr "Le nom est obligatoire"
 
-#, fuzzy
-msgid "Role successfully updated!"
-msgstr "Ensemble de données modifé avec succès"
-
-msgid "Role was successfully created!"
-msgstr ""
-
-msgid "Role was successfully duplicated!"
-msgstr ""
-
 msgid "Roles"
 msgstr "Rôles"
 
-#, fuzzy
-msgid ""
-"Roles is a list which defines access to the dashboard. Granting a role "
-"access to a dashboard will bypass dataset level checks. If no roles are "
-"defined, regular access permissions apply."
-msgstr ""
-"Les rôles sont une liste qui définit l'accès au tableau de bord. En "
-"accordant à un rôle l'accès à un tableau de bord, les contrôles au niveau"
-" de l'ensemble de données seront contournés. Si aucun rôle n'est défini, "
-"les autorisations d'accès normales s'appliquent."
-
 #, fuzzy
 msgid ""
 "Roles is a list which defines access to the dashboard. Granting a role "
@@ -9730,6 +9844,12 @@ msgstr "Rangée"
 msgid "Row Level Security"
 msgstr "Sécurité au niveau de la rangée"
 
+msgid ""
+"Row Limit: percentages are calculated based on the subset of data "
+"retrieved, respecting the row limit. All Records: Percentages are "
+"calculated based on the total dataset, ignoring the row limit."
+msgstr ""
+
 #, fuzzy
 msgid ""
 "Row containing the headers to use as column names (0 is first line of "
@@ -9797,8 +9917,8 @@ msgstr "Exécuter la sélection"
 msgid "Running"
 msgstr "En cours d’exécution"
 
-#, python-format
-msgid "Running statement %(statement_num)s out of %(statement_count)s"
+#, fuzzy, python-format
+msgid "Running block %(block_num)s out of %(block_count)s"
 msgstr "Exécution de l’instruction %(statement_num)s sur %(statement_count)s"
 
 msgid "SAT"
@@ -9854,6 +9974,10 @@ msgstr "Expression SQL"
 msgid "SQL query"
 msgstr "Requête SQL"
 
+#, fuzzy
+msgid "SQL was formatted"
+msgstr "Ajouter un nouveau formateur"
+
 msgid "SQLAlchemy URI"
 msgstr "SQLAlchemy URI"
 
@@ -9895,9 +10019,6 @@ msgstr "La tunnellisation SSH n'est pas activée"
 msgid "SSL Mode \"require\" will be used."
 msgstr "Le mode SSL « require » sera utilisé."
 
-msgid "START (INCLUSIVE)"
-msgstr "START (INCLUSIF)"
-
 #, python-format
 msgid "STEP %(stepCurr)s OF %(stepLast)s"
 msgstr "ÉTAPE %(stepCurr)s DE %(stepLast)s"
@@ -10208,6 +10329,10 @@ msgstr "Sélectionner"
 msgid "Select ..."
 msgstr "Sélectionner…"
 
+#, fuzzy
+msgid "Select All"
+msgstr "Désélectionner tout"
+
 msgid "Select Delivery Method"
 msgstr "Sélectionner la méthode de livraison"
 
@@ -10307,9 +10432,6 @@ msgstr "Sélectionner toutes les données"
 msgid "Select all items"
 msgstr "Sélectionner tous les articles"
 
-msgid "Select an aggregation method to apply to the metric."
-msgstr ""
-
 #, fuzzy
 msgid "Select catalog or type to search catalogs"
 msgstr "Sélectionner un tableau ou un type de tableau pour effectuer une recherche"
@@ -10336,11 +10458,6 @@ msgstr "Sélectionner un schéma de couleurs"
 msgid "Select column"
 msgstr "Sélectionner une colonne"
 
-msgid "Select column names from a dropdown list that should be parsed as dates."
-msgstr ""
-"Sélectionnez dans la liste déroulante les noms des colonnes à analyser en"
-" tant que dates"
-
 msgid ""
 "Select columns that will be displayed in the table. You can multiselect "
 "columns."
@@ -10407,6 +10524,10 @@ msgstr "Sélectionner la première valeur du filtre par défaut"
 msgid "Select format"
 msgstr "Format de courriel"
 
+#, fuzzy
+msgid "Select groups"
+msgstr "Sélectionner les propriétaires"
+
 msgid ""
 "Select one or many metrics to display, that will be displayed in the "
 "percentages of total. Percentage metrics will be calculated only from "
@@ -10425,9 +10546,6 @@ msgstr "Sélectionner l'opérateur"
 msgid "Select or type a custom value..."
 msgstr "Sélectionner ou renseigner une valeur personnalisé..."
 
-msgid "Select or type a value"
-msgstr "Sélectionner ou renseigner une valeur"
-
 #, fuzzy
 msgid "Select or type currency symbol"
 msgstr "Sélectionner ou renseigner une valeur"
@@ -10514,6 +10632,10 @@ msgstr ""
 msgid "Select the geojson column"
 msgstr "Sélectionner la colonne geojson"
 
+#, fuzzy
+msgid "Select users"
+msgstr "Supprimer la requête"
+
 #, python-format
 msgid ""
 "Select values in highlighted field(s) in the control panel. Then run the "
@@ -10581,6 +10703,10 @@ msgstr "Longueur de la page du serveur"
 msgid "Server pagination"
 msgstr "Pagination du serveur"
 
+#, python-format
+msgid "Server pagination needs to be enabled for values over %s"
+msgstr ""
+
 msgid "Service Account"
 msgstr "Compte de service"
 
@@ -10588,6 +10714,10 @@ msgstr "Compte de service"
 msgid "Service version"
 msgstr "Compte de service"
 
+#, fuzzy, python-format
+msgid "Set %s as default datetime column"
+msgstr "Toujours filtrer sur la colonne temporelle principale"
+
 msgid "Set auto-refresh interval"
 msgstr "Définir l'intervalle de rafraîchissement automatique"
 
@@ -10705,6 +10835,10 @@ msgstr "Afficher les journaux"
 msgid "Show Markers"
 msgstr "Afficher les marqueurs"
 
+#, fuzzy
+msgid "Show Metric Name"
+msgstr "Afficher les noms de mesure"
+
 #, fuzzy
 msgid "Show Metric Names"
 msgstr "Afficher les noms de mesure"
@@ -10781,7 +10915,7 @@ msgstr ""
 msgid "Show empty columns"
 msgstr "Afficher les colonnes libres"
 
-#, fuzzy, python-format
+#, fuzzy
 msgid "Show entries per page"
 msgstr "Afficher la mesure"
 
@@ -10816,6 +10950,9 @@ msgstr ""
 msgid "Show only my charts"
 msgstr "Afficher uniquement mes graphiques"
 
+msgid "Show original SQL"
+msgstr ""
+
 #, fuzzy
 msgid "Show password."
 msgstr "Afficher le mot de passe."
@@ -10904,9 +11041,9 @@ msgstr ""
 "Affiche la progression d’une seule mesure par rapport à une cible donnée."
 " Plus le remplissage est élevé, plus la mesure est proche de la cible."
 
-#, fuzzy, python-format
+#, python-format
 msgid "Showing %s of %s items"
-msgstr "Affichage de %s sur %s"
+msgstr "Affichage de %s sur %s éléments"
 
 msgid "Shows a list of all series available at that point in time"
 msgstr "Affiche une liste de toutes les séries disponibles à ce moment"
@@ -10914,6 +11051,13 @@ msgstr "Affiche une liste de toutes les séries disponibles à ce moment"
 msgid "Shows or hides markers for the time series"
 msgstr "Affiche ou masque les marqueurs pour la série chronologique"
 
+msgid "Sign in"
+msgstr ""
+
+#, fuzzy
+msgid "Sign in with"
+msgstr "Se connecter avec"
+
 msgid "Significance Level"
 msgstr "Niveau de signification"
 
@@ -10925,7 +11069,6 @@ msgstr ""
 "Les mesures ponctuelles simples ne sont pas activées pour cet ensemble de"
 " données"
 
-#, fuzzy
 msgid "Single"
 msgstr "Unique"
 
@@ -10968,6 +11111,9 @@ msgstr "Sauter des rangées"
 msgid "Skip spaces after delimiter"
 msgstr "Supprimer l'espace après le délimiteur."
 
+msgid "Slice Id"
+msgstr ""
+
 msgid "Slug"
 msgstr "Slug"
 
@@ -10994,6 +11140,10 @@ msgstr "Solide"
 msgid "Some roles do not exist"
 msgstr "Des profils n'existent pas"
 
+#, fuzzy
+msgid "Something went wrong while saving the user info"
+msgstr "Une erreur s'est produite. Réessayez plus tard."
+
 msgid ""
 "Something went wrong with embedded authentication. Check the dev console "
 "for details."
@@ -11165,6 +11315,9 @@ msgstr ""
 msgid "Split number"
 msgstr "Numéro de fractionnement"
 
+msgid "Split stack by"
+msgstr ""
+
 #, fuzzy
 msgid "Square kilometers"
 msgstr "Kilomètres carrés"
@@ -11181,6 +11334,9 @@ msgstr "Milles carrés"
 msgid "Stack"
 msgstr "Empiler"
 
+msgid "Stack in groups, where each group corresponds to a dimension"
+msgstr ""
+
 msgid "Stack series"
 msgstr "Série de piles"
 
@@ -11207,6 +11363,9 @@ msgstr "Début"
 msgid "Start (Longitude, Latitude): "
 msgstr "Début (longitude, latitude) :"
 
+msgid "Start (inclusive)"
+msgstr ""
+
 #, fuzzy
 msgid "Start Longitude & Latitude"
 msgstr "Début (longitude et latitude)"
@@ -11242,10 +11401,6 @@ msgstr "Commencé"
 msgid "State"
 msgstr "État"
 
-#, python-format
-msgid "Statement %(statement_num)s out of %(statement_count)s"
-msgstr "Énoncé %(statement_num)s sur %(statement_count)s"
-
 msgid "Statistical"
 msgstr "Statistique"
 
@@ -11332,9 +11487,6 @@ msgstr "Modifier les extrémités de la barre de progression avec un capuchon ro
 msgid "Subdomain"
 msgstr "Sous-domaine"
 
-msgid "Subheader Font Size"
-msgstr "Taille de la police du sous-titre"
-
 msgid "Submit"
 msgstr "Soumettre"
 
@@ -11342,10 +11494,6 @@ msgstr "Soumettre"
 msgid "Subtitle"
 msgstr "Titre de l’onglet"
 
-#, fuzzy
-msgid "Subtitle Font Size"
-msgstr "Taille de la bulle"
-
 msgid "Subtotal"
 msgstr "Sous-total"
 
@@ -11970,6 +12118,13 @@ msgstr ""
 msgid "The function to use when aggregating points into groups"
 msgstr "La fonction à utiliser lors de l’agrégation de points en groupes"
 
+#, fuzzy
+msgid "The group has been created successfully."
+msgstr "Le rapport a été créé"
+
+msgid "The group has been updated successfully."
+msgstr ""
+
 msgid "The height of the current zoom level to compute all heights from"
 msgstr ""
 
@@ -12160,6 +12315,10 @@ msgstr "Le mot de passe fourni pour l'utilisateur « %(username)s » est incor
 msgid "The password provided when connecting to a database is not valid."
 msgstr "Le mot de passe fourni à une base de données est invalide."
 
+#, fuzzy
+msgid "The password reset was successfull"
+msgstr "Ce Tableau de Bord a été sauvegardé avec succès."
+
 msgid ""
 "The passwords for the databases below are needed in order to import them "
 "together with the charts. Please note that the \"Secure Extra\" and "
@@ -12362,6 +12521,17 @@ msgstr ""
 "L’infobulle détaillée affiche une liste de toutes les séries pour ce "
 "moment"
 
+#, fuzzy
+msgid "The role has been created successfully."
+msgstr "Le rapport a été créé"
+
+msgid "The role has been duplicated successfully."
+msgstr ""
+
+#, fuzzy
+msgid "The role has been updated successfully."
+msgstr "Cette annotation a été modifiée"
+
 msgid ""
 "The row limit set for the chart was reached. The chart may show partial "
 "data."
@@ -12506,6 +12676,10 @@ msgstr ""
 msgid "The time unit used for the grouping of blocks"
 msgstr "L’unité de temps utilisée pour le regroupement des blocs"
 
+#, fuzzy
+msgid "The two passwords that you entered do not match!"
+msgstr "Le tableau de bord n'existe pas"
+
 #, fuzzy
 msgid "The type of the layer"
 msgstr "Ajouter le nom du graphique"
@@ -12519,9 +12693,17 @@ msgstr "L'unité de mesure pour le rayon de point spécifié"
 msgid "The upper limit of the threshold range of the Isoband"
 msgstr ""
 
+#, fuzzy
+msgid "The user has been updated successfully."
+msgstr "Ce Tableau de Bord a été sauvegardé avec succès."
+
 msgid "The user seems to have been deleted"
 msgstr "L'utilisateur·rice semble avoir été effacé·e"
 
+#, fuzzy
+msgid "The user was updated successfully"
+msgstr "Ce Tableau de Bord a été sauvegardé avec succès."
+
 msgid "The user/password combination is not valid (Incorrect password for user)."
 msgstr ""
 "La combinaison utilisateur·rice/mot de passe n'est pas valide (mot de "
@@ -12606,6 +12788,22 @@ msgstr ""
 "Espace insuffisant pour ce composant. Diminuez sa largeur ou augmentez la"
 " largeur de destination."
 
+#, fuzzy
+msgid "There was an error creating the group. Please, try again."
+msgstr "Une erreur s'est produite lors de la récupération des schémas"
+
+#, fuzzy
+msgid "There was an error creating the role. Please, try again."
+msgstr "Une erreur s'est produite lors de la récupération des schémas"
+
+#, fuzzy
+msgid "There was an error creating the user. Please, try again."
+msgstr "Une erreur s'est produite lors de la récupération des schémas"
+
+#, fuzzy
+msgid "There was an error duplicating the role. Please, try again."
+msgstr "Il y a eu un problème de duplication de l'ensemble de données."
+
 #, fuzzy
 msgid "There was an error fetching dataset"
 msgstr ""
@@ -12650,7 +12848,11 @@ msgstr "Une erreur s'est produite lors de la récupération des schémas"
 msgid "There was an error loading the tables"
 msgstr "Une erreur s'est produite lors de la récupération des tableaux"
 
-#, fuzzy, python-format
+#, fuzzy
+msgid "There was an error loading users."
+msgstr "Une erreur s'est produite lors de la récupération des tableaux"
+
+#, fuzzy
 msgid "There was an error retrieving dashboard tabs."
 msgstr ""
 "Désolé, une erreur s'est produite lors de la récupération des graphiques "
@@ -12662,6 +12864,24 @@ msgstr ""
 "Une erreur s'est produite lors de l'enregistrement du statut de favori : "
 "%s"
 
+#, fuzzy
+msgid "There was an error updating the group. Please, try again."
+msgstr "Une erreur s'est produite lors de la récupération des schémas"
+
+#, fuzzy
+msgid "There was an error updating the role. Please, try again."
+msgstr "Une erreur s'est produite lors de la récupération des schémas"
+
+#, fuzzy
+msgid "There was an error updating the user. Please, try again."
+msgstr "Une erreur s'est produite lors de la récupération des schémas"
+
+#, fuzzy
+msgid "There was an error while fetching users"
+msgstr ""
+"Désolé, une erreur s'est produite lors de la récupération des "
+"informations de cet ensemble de données"
+
 msgid "There was an error with your request"
 msgstr "Il y avait une erreur avec vore requête"
 
@@ -12673,6 +12893,10 @@ msgstr "Il y a eu un problème lors de la suppression de : %s"
 msgid "There was an issue deleting %s: %s"
 msgstr "Il y a eu un problème lors de la suppression de %s : %s"
 
+#, fuzzy, python-format
+msgid "There was an issue deleting registration for user: %s"
+msgstr "Un problème s'est posé lors de la suppression des règles : %s"
+
 #, fuzzy, python-format
 msgid "There was an issue deleting rules: %s"
 msgstr "Un problème s'est posé lors de la suppression des règles : %s"
@@ -12796,6 +13020,10 @@ msgstr ""
 msgid "This action will permanently delete %s."
 msgstr "Cette action supprimera définitivement %s."
 
+#, fuzzy
+msgid "This action will permanently delete the group."
+msgstr "Cette action supprimera définitivement la couche ."
+
 msgid "This action will permanently delete the layer."
 msgstr "Cette action supprimera définitivement la couche ."
 
@@ -12809,6 +13037,10 @@ msgstr "Cette action supprimera définitivement la requête sauvegardée."
 msgid "This action will permanently delete the template."
 msgstr "Cette acion supprimera définitivement le modèle."
 
+#, fuzzy
+msgid "This action will permanently delete the user registration."
+msgstr "Cette action supprimera définitivement la couche ."
+
 #, fuzzy
 msgid "This action will permanently delete the user."
 msgstr "Cette action supprimera définitivement la couche ."
@@ -12929,11 +13161,14 @@ msgstr ""
 msgid "This dashboard was saved successfully."
 msgstr "Ce Tableau de Bord a été sauvegardé avec succès."
 
+#, fuzzy
 msgid ""
-"This database does not allow for DDL/DML, and the query could not be "
-"parsed to confirm it is a read-only query. Please contact your "
-"administrator for more assistance."
+"This database does not allow for DDL/DML, but the query mutates data. "
+"Please contact your administrator for more assistance."
 msgstr ""
+"Impossible de trouver la base de données référencée dans cette requête. "
+"Veuillez contacter un administrateur pour obtenir davantage d'aide ou "
+"essayez à nouveau."
 
 msgid "This database is managed externally, and can't be edited in Superset"
 msgstr ""
@@ -12958,7 +13193,9 @@ msgstr "Cet ensemble de données n'est pas utilisé pour alimenter des graphique
 msgid "This defines the element to be plotted on the chart"
 msgstr "Ceci définit l'élément à tracer sur le graphique"
 
-msgid "This email is already associated with an account."
+msgid ""
+"This email is already associated with an account. Please choose another "
+"one."
 msgstr ""
 
 msgid ""
@@ -13019,6 +13256,9 @@ msgstr "Cela peut être déclenché par :"
 msgid "This metric might be incompatible with current dataset"
 msgstr "Cette mesure pourrait être incompatible avec l’ensemble de données actuel"
 
+msgid "This name is already taken. Please choose another one."
+msgstr ""
+
 msgid "This option has been disabled by the administrator."
 msgstr "Cette option a été désactivée par les administrateurs."
 
@@ -13102,6 +13342,10 @@ msgstr "Pourcentages"
 msgid "Threshold alpha level for determining significance"
 msgstr "Seuil alpha pour déterminer l’importance"
 
+#, fuzzy
+msgid "Threshold for Other"
+msgstr "Pourcentages"
+
 #, fuzzy
 msgid "Threshold: "
 msgstr "Pourcentages"
@@ -13367,7 +13611,7 @@ msgstr "Total (%(aggfunc)s)"
 msgid "Total (%(aggregatorName)s)"
 msgstr "Total (%(aggregatorName)s)"
 
-#, fuzzy, python-format
+#, fuzzy
 msgid "Total (Sum)"
 msgstr "Total : (%s)"
 
@@ -13417,6 +13661,10 @@ msgstr "Triangle"
 msgid "Trigger Alert If..."
 msgstr "Déclencher une alerte si…"
 
+#, fuzzy
+msgid "True"
+msgstr "Est vrai"
+
 msgid "Truncate Axis"
 msgstr "Tronquer l’axe"
 
@@ -13582,6 +13830,10 @@ msgstr ""
 msgid "Unable to parse SQL"
 msgstr ""
 
+#, fuzzy
+msgid "Unable to read the file, please refresh and try again."
+msgstr "Échec du téléchargement de l’image, veuillez actualiser et réessayer."
+
 msgid "Unable to retrieve dashboard colors"
 msgstr "Impossible de récupérer les couleurs du tableau de bord"
 
@@ -13878,6 +14130,14 @@ msgstr ""
 msgid "User"
 msgstr "Utilisateur·rice"
 
+#, fuzzy
+msgid "User Name"
+msgstr "Nom de la requête"
+
+#, fuzzy
+msgid "User Registrations"
+msgstr "Imputation nulle"
+
 msgid "User doesn't have the proper permissions."
 msgstr "Lutilisateur·rice n'a pas les droits."
 
@@ -13888,11 +14148,9 @@ msgstr "L'utilisateur·rice doit sélectionner une valeur pour ce filtre"
 msgid "User query"
 msgstr "Requête d’utilisateur·rice"
 
-msgid "User was successfully created!"
-msgstr ""
-
-msgid "User was successfully updated!"
-msgstr ""
+#, fuzzy
+msgid "User registrations"
+msgstr "Imputation nulle"
 
 msgid "Username"
 msgstr "Username"
@@ -13901,6 +14159,10 @@ msgstr "Username"
 msgid "Username is required"
 msgstr "Le nom est obligatoire"
 
+#, fuzzy
+msgid "Username:"
+msgstr "Username"
+
 #, fuzzy
 msgid "Users"
 msgstr "série"
@@ -13994,6 +14256,9 @@ msgstr "Les valeurs dépendent d'autres filtres"
 msgid "Values dependent on"
 msgstr "Valeurs dépendent de"
 
+msgid "Values less than this percentage will be grouped into the Other category."
+msgstr ""
+
 msgid ""
 "Values selected in other filters will affect the filter options to only "
 "show relevant values"
@@ -14228,13 +14493,13 @@ msgstr "Impossible de vérifier votre requête"
 msgid "Waterfall Chart"
 msgstr "Graphique en cascade"
 
-msgid ""
-"We are unable to connect to your database. Click \"See more\" for "
-"database-provided information that may help troubleshoot the issue."
-msgstr ""
-"Nous ne pouvons pas nous connecter à votre base de données. Cliquez sur «"
-" Voir plus » pour obtenir des renseignements fournis par la base de "
-"données qui pourraient aider à résoudre le problème."
+#, fuzzy
+msgid "We are unable to connect to your database."
+msgstr "Besoin d’aide? Apprenez comment connecter votre base de données"
+
+#, fuzzy
+msgid "We are working on your query"
+msgstr "Label pour votre requête"
 
 #, python-format
 msgid "We can't seem to resolve column \"%(column)s\" at line %(location)s."
@@ -14384,10 +14649,12 @@ msgstr ""
 "Lorsque seule une mesure primaire est fournie, une échelle de couleur "
 "catégorique est utilisée."
 
+#, fuzzy
 msgid ""
 "When specifying SQL, the datasource acts as a view. Superset will use "
 "this statement as a subquery while grouping and filtering on the "
-"generated parent queries."
+"generated parent queries.If changes are made to your SQL query, columns "
+"in your dataset will be synced when saving the dataset."
 msgstr ""
 "Lorsque vous spécifiez SQL, la source de données agit comme une vue. "
 "Superset utilisera cette déclaration comme une sous-requête tout en "
@@ -14499,6 +14766,10 @@ msgstr "Afficher ou non des étiquettes."
 msgid "Whether to display the legend (toggles)"
 msgstr "Affichage ou non de la légende (commutateurs)"
 
+#, fuzzy
+msgid "Whether to display the metric name"
+msgstr "Affichage ou non du nom de la mesure sous forme de titre"
+
 msgid "Whether to display the metric name as a title"
 msgstr "Affichage ou non du nom de la mesure sous forme de titre"
 
@@ -14691,6 +14962,10 @@ msgstr "Format de l'axe des abscisses"
 msgid "X Axis Label"
 msgstr "Étiquette de l’axe des abscisses"
 
+#, fuzzy
+msgid "X Axis Label Interval"
+msgstr "Intervalle YScale"
+
 msgid "X Axis Title"
 msgstr "Titre de l’axe des absisses"
 
@@ -14716,7 +14991,6 @@ msgstr "Axe des abscisses – Trier par"
 msgid "X-axis"
 msgstr "Axe des abscisses"
 
-#, fuzzy
 msgid "XScale Interval"
 msgstr "Intervalle XScale"
 
@@ -14744,7 +15018,6 @@ msgstr "Format de l'axe des ordonnées"
 msgid "Y Axis Label"
 msgstr "Étiquette de l’axe des ordonnées"
 
-#, fuzzy
 msgid "Y Axis Title"
 msgstr "Titre de l’axe des ordonnées"
 
@@ -14760,7 +15033,6 @@ msgstr "Échelle logarithmique des ordonnées"
 msgid "Y bounds"
 msgstr "Limites des ordonnées"
 
-#, fuzzy
 msgid "Y-Axis"
 msgstr "Axe des ordonnées"
 
@@ -14771,7 +15043,6 @@ msgstr "Tri croissant sur l'axe des ordonnées"
 msgid "Y-Axis Sort By"
 msgstr "Axe des ordonnées – Trier par"
 
-#, fuzzy
 msgid "Y-axis"
 msgstr "Axe des ordonnées"
 
@@ -14808,6 +15079,10 @@ msgstr "Oui, écraser les modifications"
 msgid "You are adding tags to %s %ss"
 msgstr ""
 
+#, fuzzy, python-format
+msgid "You are edting a query from the virtual dataset "
+msgstr ""
+
 msgid ""
 "You are importing one or more charts that already exist. Overwriting "
 "might cause you to lose some of your work. Are you sure you want to "
@@ -15000,9 +15275,6 @@ msgstr ""
 "ne pourrez pas annuler complètement les actions subséquentes. Vous pouvez"
 " enregistrer votre état actuel pour réinitialiser l’historique."
 
-msgid "You may have an error in your SQL statement. {message}"
-msgstr "Vous avez possiblement une erreur dans votre requête SQL. {message}"
-
 msgid ""
 "You must be a dataset owner in order to edit. Please reach out to a "
 "dataset owner to request modifications or edit access."
@@ -15193,10 +15465,6 @@ msgstr "alerte"
 msgid "alert condition"
 msgstr "condition d'alerte"
 
-#, fuzzy
-msgid "alert dark"
-msgstr "alerte sombre"
-
 msgid "alerts"
 msgstr "alertes"
 
@@ -15483,9 +15751,6 @@ msgstr "entrées"
 msgid "error"
 msgstr "erreur"
 
-msgid "error dark"
-msgstr "erreur sombre"
-
 #, fuzzy
 msgid "error_message"
 msgstr "error_message"
@@ -15512,10 +15777,6 @@ msgstr "chaque mois"
 msgid "expand"
 msgstr "agrandir"
 
-#, fuzzy
-msgid "explore"
-msgstr "explorer"
-
 #, fuzzy
 msgid "failed"
 msgstr "échoué"
@@ -15875,10 +16136,6 @@ msgstr "icône de type de chaîne"
 msgid "success"
 msgstr "succès"
 
-#, fuzzy
-msgid "success dark"
-msgstr "succès sombre"
-
 msgid "sum"
 msgstr "somme"
 
@@ -15914,7 +16171,7 @@ msgstr "icône de type inconnu"
 msgid "unset"
 msgstr "Juin"
 
-#, fuzzy, python-format
+#, fuzzy
 msgid "updated"
 msgstr "Dernière mise à jour %s"
 
diff --git a/superset/utils/pandas_postprocessing/contribution.py b/superset/utils/pandas_postprocessing/contribution.py
index 3c0ea04f102..ec6716fcba0 100644
--- a/superset/utils/pandas_postprocessing/contribution.py
+++ b/superset/utils/pandas_postprocessing/contribution.py
@@ -37,6 +37,7 @@ def contribution(
     columns: list[str] | None = None,
     time_shifts: list[str] | None = None,
     rename_columns: list[str] | None = None,
+    contribution_totals: dict[str, float] | None = None,
 ) -> DataFrame:
     """
     Calculate cell contribution to row/column total for numeric columns.
@@ -82,10 +83,19 @@ def contribution(
     numeric_df_view = numeric_df[actual_columns]
 
     if orientation == PostProcessingContributionOrientation.COLUMN:
-        numeric_df_view = numeric_df_view / numeric_df_view.values.sum(
-            axis=0, keepdims=True
-        )
-        contribution_df[rename_columns] = numeric_df_view
+        if contribution_totals:
+            for i, col in enumerate(numeric_df_view.columns):
+                total = contribution_totals.get(col)
+                rename_col = rename_columns[i]
+                if total is None or total == 0:
+                    contribution_df[rename_col] = 0
+                else:
+                    contribution_df[rename_col] = numeric_df_view[col] / total
+        else:
+            numeric_df_view = numeric_df_view / numeric_df_view.values.sum(
+                axis=0, keepdims=True
+            )
+            contribution_df[rename_columns] = numeric_df_view
         return contribution_df
 
     result = get_column_groups(numeric_df_view, time_shifts, rename_columns)
diff --git a/superset/views/auth.py b/superset/views/auth.py
new file mode 100644
index 00000000000..c24e0ae3622
--- /dev/null
+++ b/superset/views/auth.py
@@ -0,0 +1,91 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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 logging
+from typing import Optional
+
+from flask import flash, g, redirect
+from flask_appbuilder import expose
+from flask_appbuilder._compat import as_unicode
+from flask_appbuilder.const import LOGMSG_ERR_SEC_NO_REGISTER_HASH
+from flask_appbuilder.security.decorators import no_cache
+from flask_appbuilder.security.views import AuthView, WerkzeugResponse
+from flask_babel import lazy_gettext
+
+from superset.views.base import BaseSupersetView
+
+logger = logging.getLogger(__name__)
+
+
+class SupersetAuthView(BaseSupersetView, AuthView):
+    route_base = "/login"
+
+    @expose("/")
+    @no_cache
+    def login(self, provider: Optional[str] = None) -> WerkzeugResponse:
+        if g.user is not None and g.user.is_authenticated:
+            return redirect(self.appbuilder.get_url_for_index)
+
+        return super().render_app_template()
+
+
+class SupersetRegisterUserView(BaseSupersetView):
+    route_base = "/register"
+    activation_template = ""
+    error_message = lazy_gettext(
+        "Not possible to register you at the moment, try again later"
+    )
+    false_error_message = lazy_gettext("Registration not found")
+
+    @expose("/")
+    @no_cache
+    def register(self) -> WerkzeugResponse:
+        return super().render_app_template()
+
+    @expose("/activation/<string:activation_hash>")
+    def activation(self, activation_hash: str) -> WerkzeugResponse:
+        """
+        Endpoint to expose an activation url, this url
+        is sent to the user by email, when accessed the user is inserted
+        and activated
+        """
+        reg = self.appbuilder.sm.find_register_user(activation_hash)
+        if not reg:
+            logger.error(LOGMSG_ERR_SEC_NO_REGISTER_HASH, activation_hash)
+            flash(as_unicode(self.false_error_message), "danger")
+            return redirect(self.appbuilder.get_url_for_index)
+        if not self.appbuilder.sm.add_user(
+            username=reg.username,
+            email=reg.email,
+            first_name=reg.first_name,
+            last_name=reg.last_name,
+            role=self.appbuilder.sm.find_role(
+                self.appbuilder.sm.auth_user_registration_role
+            ),
+            hashed_password=reg.password,
+        ):
+            flash(as_unicode(self.error_message), "danger")
+            return redirect(self.appbuilder.get_url_for_index)
+        else:
+            self.appbuilder.sm.del_register_user(reg)
+            return super().render_app_template(
+                {
+                    "username": reg.username,
+                    "first_name": reg.first_name,
+                    "last_name": reg.last_name,
+                },
+            )
diff --git a/superset/views/base.py b/superset/views/base.py
index 67f2ec55f7f..8d315617759 100644
--- a/superset/views/base.py
+++ b/superset/views/base.py
@@ -36,6 +36,7 @@ from flask import (
 )
 from flask_appbuilder import BaseView, Model, ModelView
 from flask_appbuilder.actions import action
+from flask_appbuilder.const import AUTH_OAUTH, AUTH_OID
 from flask_appbuilder.forms import DynamicForm
 from flask_appbuilder.models.sqla.filters import BaseFilter
 from flask_appbuilder.security.sqla.models import User
@@ -326,6 +327,37 @@ def cached_common_bootstrap_data(  # pylint: disable=unused-argument
     )
 
     language = locale.language if locale else "en"
+    auth_type = appbuilder.app.config["AUTH_TYPE"]
+    auth_user_registration = appbuilder.app.config["AUTH_USER_REGISTRATION"]
+    frontend_config["AUTH_USER_REGISTRATION"] = auth_user_registration
+    should_show_recaptcha = auth_user_registration and (auth_type != AUTH_OAUTH)
+
+    if auth_user_registration:
+        frontend_config["AUTH_USER_REGISTRATION_ROLE"] = appbuilder.app.config[
+            "AUTH_USER_REGISTRATION_ROLE"
+        ]
+    if should_show_recaptcha:
+        frontend_config["RECAPTCHA_PUBLIC_KEY"] = appbuilder.app.config[
+            "RECAPTCHA_PUBLIC_KEY"
+        ]
+
+    frontend_config["AUTH_TYPE"] = auth_type
+    if auth_type == AUTH_OAUTH:
+        oauth_providers = []
+        for provider in appbuilder.sm.oauth_providers:
+            oauth_providers.append(
+                {
+                    "name": provider["name"],
+                    "icon": provider["icon"],
+                }
+            )
+        frontend_config["AUTH_PROVIDERS"] = oauth_providers
+
+    if auth_type == AUTH_OID:
+        oid_providers = []
+        for provider in appbuilder.sm.openid_providers:
+            oid_providers.append(provider)
+        frontend_config["AUTH_PROVIDERS"] = oid_providers
 
     bootstrap_data = {
         "application_root": conf["APPLICATION_ROOT"],
@@ -339,7 +371,7 @@ def cached_common_bootstrap_data(  # pylint: disable=unused-argument
         "feature_flags": get_feature_flags(),
         "extra_sequential_color_schemes": conf["EXTRA_SEQUENTIAL_COLOR_SCHEMES"],
         "extra_categorical_color_schemes": conf["EXTRA_CATEGORICAL_COLOR_SCHEMES"],
-        "theme_overrides": conf["THEME_OVERRIDES"],
+        "theme": conf["THEME"],
         "menu_data": menu_data(g.user),
     }
     bootstrap_data.update(conf["COMMON_BOOTSTRAP_OVERRIDES_FUNC"](bootstrap_data))
diff --git a/superset/connectors/sqla/views.py b/superset/views/sqla.py
similarity index 100%
rename from superset/connectors/sqla/views.py
rename to superset/views/sqla.py
diff --git a/superset/views/user_registrations.py b/superset/views/user_registrations.py
new file mode 100644
index 00000000000..10c8fab2dcf
--- /dev/null
+++ b/superset/views/user_registrations.py
@@ -0,0 +1,34 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+from flask_appbuilder import permission_name
+from flask_appbuilder.api import expose
+from flask_appbuilder.security.decorators import has_access
+
+from superset.superset_typing import FlaskResponse
+
+from .base import BaseSupersetView
+
+
+class UserRegistrationsView(BaseSupersetView):
+    route_base = "/"
+    class_permission_name = "security"
+
+    @expose("/registrations/")
+    @has_access
+    @permission_name("read")
+    def list(self) -> FlaskResponse:
+        return super().render_app_template()
diff --git a/tests/integration_tests/core_tests.py b/tests/integration_tests/core_tests.py
index 1cbd26574de..de276c7e9e8 100644
--- a/tests/integration_tests/core_tests.py
+++ b/tests/integration_tests/core_tests.py
@@ -109,19 +109,6 @@ class TestCore(SupersetTestCase):
         db.session.delete(dashboard)
         db.session.commit()
 
-    def test_login(self):
-        resp = self.get_resp("/login/", data=dict(username="admin", password="general"))  # noqa: S106, C408
-        assert "User confirmation needed" not in resp
-
-        resp = self.get_resp("/logout/", follow_redirects=True)
-        assert "User confirmation needed" in resp
-
-        resp = self.get_resp(
-            "/login/",
-            data=dict(username="admin", password="wrongPassword"),  # noqa: S106, C408
-        )
-        assert "User confirmation needed" in resp
-
     def test_dashboard_endpoint(self):
         self.login(ADMIN_USERNAME)
         resp = self.client.get("/superset/dashboard/-1/")
diff --git a/tests/integration_tests/databases/commands_tests.py b/tests/integration_tests/databases/commands_tests.py
index 75343cef666..0ecc777320b 100644
--- a/tests/integration_tests/databases/commands_tests.py
+++ b/tests/integration_tests/databases/commands_tests.py
@@ -1202,3 +1202,44 @@ class TestTablesDatabaseCommand(SupersetTestCase):
         assert result["count"] > 0
         assert len(result["result"]) > 0
         assert len(result["result"]) == result["count"]
+
+    @patch("superset.daos.database.DatabaseDAO.find_by_id")
+    @patch("superset.security.manager.SupersetSecurityManager.can_access_database")
+    @patch("superset.utils.core.g")
+    def test_database_tables_list_tables_default_catalog(
+        self, mock_g, mock_can_access_database, mock_find_by_id
+    ):
+        database = get_example_database()
+        mock_find_by_id.return_value = database
+        mock_can_access_database.return_value = True
+        mock_g.user = security_manager.find_user("admin")
+
+        with (
+            patch.object(
+                database, "get_default_catalog", return_value="default_catalog"
+            ),
+            patch.object(
+                database, "get_all_table_names_in_schema", return_value=[]
+            ) as mock_get_all_table_names,
+            patch.object(
+                database, "get_all_view_names_in_schema", return_value=[]
+            ) as mock_get_all_view_names,
+        ):
+            command = TablesDatabaseCommand(database.id, None, "schema_name", False)
+            command.run()
+
+            # Assert that the default catalog is used instead of None
+            mock_get_all_table_names.assert_called_once_with(
+                catalog="default_catalog",
+                schema="schema_name",
+                force=False,
+                cache=database.table_cache_enabled,
+                cache_timeout=database.table_cache_timeout,
+            )
+            mock_get_all_view_names.assert_called_once_with(
+                catalog="default_catalog",
+                schema="schema_name",
+                force=False,
+                cache=database.table_cache_enabled,
+                cache_timeout=database.table_cache_timeout,
+            )
diff --git a/tests/integration_tests/datasets/api_tests.py b/tests/integration_tests/datasets/api_tests.py
index ab645d300e1..9d226f793dc 100644
--- a/tests/integration_tests/datasets/api_tests.py
+++ b/tests/integration_tests/datasets/api_tests.py
@@ -1462,6 +1462,29 @@ class TestDatasetApi(SupersetTestCase):
         assert data == expected_result
         self.items_to_delete = [dataset]
 
+    def test_update_dataset_update_metric_invalid_currency(self):
+        """
+        Dataset API: Test update dataset metric with an invalid currency config
+        """
+
+        dataset = self.insert_default_dataset()
+
+        self.login(ADMIN_USERNAME)
+        uri = f"api/v1/dataset/{dataset.id}"
+        data = {
+            "metrics": [
+                {
+                    "metric_name": "test",
+                    "expression": "COUNT(*)",
+                    "currency": '{"symbol": "USD", "symbolPosition": "suffix"}',
+                },
+            ]
+        }
+        rv = self.put_assert_metric(uri, data, "put")
+        assert rv.status_code == 422
+
+        self.items_to_delete = [dataset]
+
     def test_update_dataset_item_gamma(self):
         """
         Dataset API: Test update dataset item gamma
diff --git a/tests/integration_tests/security_tests.py b/tests/integration_tests/security_tests.py
index f6df5ad88ec..7528fcb620b 100644
--- a/tests/integration_tests/security_tests.py
+++ b/tests/integration_tests/security_tests.py
@@ -1553,6 +1553,10 @@ class TestRolePermission(SupersetTestCase):
             ["SupersetIndexView", "index"],
             ["SupersetIndexView", "patch_flask_locale"],
             ["DatabaseRestApi", "oauth2"],
+            ["SupersetAuthView", "login"],
+            ["SupersetAuthView", "logout"],
+            ["SupersetRegisterUserView", "register"],
+            ["SupersetRegisterUserView", "activation"],
         ]
         unsecured_views = []
         for view_class in appbuilder.baseviews:
diff --git a/tests/unit_tests/commands/databases/tables_test.py b/tests/unit_tests/commands/databases/tables_test.py
index d7eaecfa53f..863399ce450 100644
--- a/tests/unit_tests/commands/databases/tables_test.py
+++ b/tests/unit_tests/commands/databases/tables_test.py
@@ -34,6 +34,7 @@ def database_with_catalog(mocker: MockerFixture) -> MagicMock:
 
     database = mocker.MagicMock()
     database.database_name = "test_database"
+    database.get_default_catalog.return_value = "catalog1"
     database.get_all_table_names_in_schema.return_value = {
         ("table1", "schema1", "catalog1"),
         ("table2", "schema1", "catalog1"),
@@ -57,6 +58,7 @@ def database_without_catalog(mocker: MockerFixture) -> MagicMock:
 
     database = mocker.MagicMock()
     database.database_name = "test_database"
+    database.get_default_catalog.return_value = None
     database.get_all_table_names_in_schema.return_value = {
         ("table1", "schema1", None),
         ("table2", "schema1", None),
diff --git a/tests/unit_tests/db_engine_specs/test_base.py b/tests/unit_tests/db_engine_specs/test_base.py
index 5ccbc7d627c..95261ba0469 100644
--- a/tests/unit_tests/db_engine_specs/test_base.py
+++ b/tests/unit_tests/db_engine_specs/test_base.py
@@ -206,7 +206,7 @@ def test_select_star(mocker: MockerFixture) -> None:
 
     sql = BaseEngineSpec.select_star(
         database=database,
-        table=Table("my_table"),
+        table=Table("my_table", "my_schema", "my_catalog"),
         engine=engine,
         limit=100,
         show_cols=True,
@@ -214,7 +214,7 @@ def test_select_star(mocker: MockerFixture) -> None:
         latest_partition=False,
         cols=cols,
     )
-    assert sql == "SELECT\n  a\nFROM my_table\nLIMIT ?\nOFFSET ?"
+    assert sql == "SELECT\n  a\nFROM my_schema.my_table\nLIMIT ?\nOFFSET ?"
 
 
 def test_extra_table_metadata(mocker: MockerFixture) -> None:
diff --git a/tests/unit_tests/db_engine_specs/test_clickhouse.py b/tests/unit_tests/db_engine_specs/test_clickhouse.py
index c4277ce4ed6..5e532e6ffdc 100644
--- a/tests/unit_tests/db_engine_specs/test_clickhouse.py
+++ b/tests/unit_tests/db_engine_specs/test_clickhouse.py
@@ -20,6 +20,7 @@ from typing import Any, Optional
 from unittest.mock import Mock
 
 import pytest
+from sqlalchemy.engine.url import make_url
 from sqlalchemy.types import (
     Boolean,
     Date,
@@ -225,3 +226,26 @@ def test_connect_make_label_compatible(column_name: str, expected_result: str) -
 
     label = spec.make_label_compatible(column_name)
     assert label == expected_result
+
+
+@pytest.mark.parametrize(
+    "schema, expected_result",
+    [
+        (None, "clickhousedb+connect://localhost:443/__default__"),
+        (
+            "new_schema",
+            "clickhousedb+connect://localhost:443/new_schema",
+        ),
+    ],
+)
+def test_adjust_engine_params_fully_qualified(
+    schema: str, expected_result: str
+) -> None:
+    from superset.db_engine_specs.clickhouse import (
+        ClickHouseConnectEngineSpec as spec,  # noqa: N813
+    )
+
+    url = make_url("clickhousedb+connect://localhost:443/__default__")
+
+    uri = spec.adjust_engine_params(url, {}, None, schema)[0]
+    assert str(uri) == expected_result
diff --git a/tests/unit_tests/db_engine_specs/test_drill.py b/tests/unit_tests/db_engine_specs/test_drill.py
index 366190eaaa7..60a455e8afc 100644
--- a/tests/unit_tests/db_engine_specs/test_drill.py
+++ b/tests/unit_tests/db_engine_specs/test_drill.py
@@ -157,3 +157,19 @@ def test_get_schema_from_engine_params() -> None:
         )
         == "dfs.test"
     )
+
+
+@pytest.mark.parametrize(
+    "column_name,expected_result",
+    [
+        ("time", "time_07cc69"),
+        ("count", "count_e2942a"),
+    ],
+)
+def test_connect_make_label_compatible(column_name: str, expected_result: str) -> None:
+    from superset.db_engine_specs.drill import (
+        DrillEngineSpec as spec,  # noqa: N813
+    )
+
+    label = spec.make_label_compatible(column_name)
+    assert label == expected_result
diff --git a/tests/unit_tests/db_engine_specs/test_hive.py b/tests/unit_tests/db_engine_specs/test_hive.py
index e534259d2c1..2bbb979782f 100644
--- a/tests/unit_tests/db_engine_specs/test_hive.py
+++ b/tests/unit_tests/db_engine_specs/test_hive.py
@@ -20,8 +20,11 @@ from datetime import datetime
 from typing import Optional
 
 import pytest
+from pytest_mock import MockerFixture
+from sqlalchemy.engine.interfaces import Dialect
 from sqlalchemy.engine.url import make_url
 
+from superset.sql.parse import Table
 from tests.unit_tests.db_engine_specs.utils import assert_convert_dttm
 from tests.unit_tests.fixtures.common import dttm  # noqa: F401
 
@@ -59,3 +62,40 @@ def test_get_schema_from_engine_params() -> None:
         )
         == "default"
     )
+
+
+def test_select_star(mocker: MockerFixture) -> None:
+    """
+    Test the ``select_star`` method.
+    """
+    from superset.db_engine_specs.hive import HiveEngineSpec
+
+    database = mocker.MagicMock()
+    engine = mocker.MagicMock()
+
+    def quote_table(table: Table, dialect: Dialect) -> str:
+        return ".".join(
+            part for part in (table.catalog, table.schema, table.table) if part
+        )
+
+    mocker.patch.object(HiveEngineSpec, "quote_table", quote_table)
+
+    HiveEngineSpec.select_star(
+        database=database,
+        table=Table("my_table", "my_schema", "my_catalog"),
+        engine=engine,
+        limit=100,
+        show_cols=False,
+        indent=True,
+        latest_partition=False,
+        cols=None,
+    )
+
+    query = database.compile_sqla_query.mock_calls[0][1][0]
+    assert (
+        str(query)
+        == """
+SELECT * \nFROM my_schema.my_table
+ LIMIT :param_1
+    """.strip()
+    )
diff --git a/tests/unit_tests/db_engine_specs/test_postgres.py b/tests/unit_tests/db_engine_specs/test_postgres.py
index b93d70f5f76..290aa3575c9 100644
--- a/tests/unit_tests/db_engine_specs/test_postgres.py
+++ b/tests/unit_tests/db_engine_specs/test_postgres.py
@@ -22,10 +22,12 @@ import pytest
 from pytest_mock import MockerFixture
 from sqlalchemy import column, types
 from sqlalchemy.dialects.postgresql import DOUBLE_PRECISION, ENUM, JSON
+from sqlalchemy.engine.interfaces import Dialect
 from sqlalchemy.engine.url import make_url
 
 from superset.db_engine_specs.postgres import PostgresEngineSpec as spec  # noqa: N813
 from superset.exceptions import SupersetSecurityException
+from superset.sql.parse import Table
 from superset.utils.core import GenericDataType
 from tests.unit_tests.db_engine_specs.utils import (
     assert_column_spec,
@@ -243,3 +245,38 @@ def test_timegrain_expressions(time_grain: str, expected_result: str) -> None:
         spec.get_timestamp_expr(col=column("col"), pdf=None, time_grain=time_grain)
     )
     assert actual == expected_result
+
+
+def test_select_star(mocker: MockerFixture) -> None:
+    """
+    Test the ``select_star`` method.
+    """
+    database = mocker.MagicMock()
+    engine = mocker.MagicMock()
+
+    def quote_table(table: Table, dialect: Dialect) -> str:
+        return ".".join(
+            part for part in (table.catalog, table.schema, table.table) if part
+        )
+
+    mocker.patch.object(spec, "quote_table", quote_table)
+
+    spec.select_star(
+        database=database,
+        table=Table("my_table", "my_schema", "my_catalog"),
+        engine=engine,
+        limit=100,
+        show_cols=False,
+        indent=True,
+        latest_partition=False,
+        cols=None,
+    )
+
+    query = database.compile_sqla_query.mock_calls[0][1][0]
+    assert (
+        str(query)
+        == """
+SELECT * \nFROM my_schema.my_table
+ LIMIT :param_1
+    """.strip()
+    )
diff --git a/tests/unit_tests/db_engine_specs/test_presto.py b/tests/unit_tests/db_engine_specs/test_presto.py
index 9cba2653a52..857bc19b9be 100644
--- a/tests/unit_tests/db_engine_specs/test_presto.py
+++ b/tests/unit_tests/db_engine_specs/test_presto.py
@@ -21,7 +21,9 @@ from unittest import mock
 import pytest
 import pytz
 from pyhive.sqlalchemy_presto import PrestoDialect
+from pytest_mock import MockerFixture
 from sqlalchemy import column, sql, text, types
+from sqlalchemy.engine.interfaces import Dialect
 from sqlalchemy.engine.url import make_url
 
 from superset.sql.parse import Table
@@ -303,3 +305,40 @@ def test_timegrain_expressions(time_grain: str, expected_result: str) -> None:
         spec.get_timestamp_expr(col=column("col"), pdf=None, time_grain=time_grain)
     )
     assert actual == expected_result
+
+
+def test_select_star(mocker: MockerFixture) -> None:
+    """
+    Test the ``select_star`` method.
+    """
+    from superset.db_engine_specs.presto import PrestoEngineSpec as spec  # noqa: N813
+
+    database = mocker.MagicMock()
+    engine = mocker.MagicMock()
+
+    def quote_table(table: Table, dialect: Dialect) -> str:
+        return ".".join(
+            part for part in (table.catalog, table.schema, table.table) if part
+        )
+
+    mocker.patch.object(spec, "quote_table", quote_table)
+
+    spec.select_star(
+        database=database,
+        table=Table("my_table", "my_schema", "my_catalog"),
+        engine=engine,
+        limit=100,
+        show_cols=False,
+        indent=True,
+        latest_partition=False,
+        cols=None,
+    )
+
+    query = database.compile_sqla_query.mock_calls[0][1][0]
+    assert (
+        str(query)
+        == """
+SELECT * \nFROM my_catalog.my_schema.my_table
+ LIMIT :param_1
+    """.strip()
+    )
diff --git a/tests/unit_tests/models/core_test.py b/tests/unit_tests/models/core_test.py
index a7471074cda..9742390b2d8 100644
--- a/tests/unit_tests/models/core_test.py
+++ b/tests/unit_tests/models/core_test.py
@@ -16,8 +16,6 @@
 # under the License.
 
 # pylint: disable=import-outside-toplevel
-
-
 from datetime import datetime
 
 import pytest
diff --git a/tests/unit_tests/db_engine_specs/test_rockset.py b/tests/unit_tests/sql/dialects/dremio_tests.py
similarity index 50%
rename from tests/unit_tests/db_engine_specs/test_rockset.py
rename to tests/unit_tests/sql/dialects/dremio_tests.py
index 2d5f23c1800..7d7aa9b6702 100644
--- a/tests/unit_tests/db_engine_specs/test_rockset.py
+++ b/tests/unit_tests/sql/dialects/dremio_tests.py
@@ -15,29 +15,18 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from datetime import datetime
-from typing import Optional
+from sqlglot import parse_one
 
-import pytest
-
-from tests.unit_tests.db_engine_specs.utils import assert_convert_dttm
-from tests.unit_tests.fixtures.common import dttm  # noqa: F401
+from superset.sql.dialects.dremio import Dremio
 
 
-@pytest.mark.parametrize(
-    "target_type,expected_result",
-    [
-        ("Date", "DATE '2019-01-02'"),
-        ("DateTime", "DATETIME '2019-01-02 03:04:05.678900'"),
-        ("Timestamp", "TIMESTAMP '2019-01-02T03:04:05.678900'"),
-        ("UnknownType", None),
-    ],
-)
-def test_convert_dttm(
-    target_type: str,
-    expected_result: Optional[str],
-    dttm: datetime,  # noqa: F811
-) -> None:
-    from superset.db_engine_specs.rockset import RocksetEngineSpec as spec  # noqa: N813
+def test_regexp_split() -> None:
+    """
+    Test that regexp_split works correctly in Dremio dialect.
+    """
+    sql = "SELECT REGEXP_SPLIT(tags, ',', 'ALL', 1000) as t"
 
-    assert_convert_dttm(spec, target_type, expected_result, dttm)
+    ast = parse_one(sql, dialect=Dremio)
+    regenerated = ast.sql(dialect=Dremio)
+
+    assert regenerated == "SELECT REGEXP_SPLIT(tags, ',', 'ALL', 1000) AS t"
diff --git a/tests/unit_tests/sql/parse_tests.py b/tests/unit_tests/sql/parse_tests.py
index 46774759abe..1ab7174a184 100644
--- a/tests/unit_tests/sql/parse_tests.py
+++ b/tests/unit_tests/sql/parse_tests.py
@@ -1163,7 +1163,6 @@ def test_custom_dialect(app: None) -> None:
         "pydoris",
         "redshift",
         "risingwave",
-        "rockset",
         "shillelagh",
         "snowflake",
         "solr",
@@ -1236,7 +1235,7 @@ WHERE
     """.strip()
 
     assert SQLStatement(sql, "sqlite").optimize().format() == optimized
-    assert SQLStatement(sql, "dremio").optimize().format() == not_optimized
+    assert SQLStatement(sql, "crate").optimize().format() == not_optimized
 
     # also works for scripts
     assert SQLScript(sql, "sqlite").optimize().format() == optimized